From ec77ead7c29e8e8a202d7e745bec0e31513c5efd Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Thu, 23 Apr 2020 09:09:14 +0100 Subject: [PATCH 1/9] Docs: Update README with basic participation details --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index c94cbf9..0a1acd4 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,21 @@ A react web application, in the early stages of development, that will allow use Eventually the goal is to implement this as a cryptocurrency of sorts with smart contracts, maybe using some proof stake systems. The project is under development at Foodhall, a grassroots community project based in Sheffield. + +## Getting involved + +We warmly welcome participants. + +- User stories are on [this Trello board](https://trello.com/b/6yiDv1ZW/mutual-impact) +- We discuss development on the [National Food Service Slack](national-food-service.slack.com) +- If you're new to development in general, or React in particular, we can set you up with some scaffolded tasks to get started. + +## Workflow + +Our current development process is to: +1. Make changes locally on the [Code Sandbox image of the webapp]( https://codesandbox.io/s/mutual-impact-feed-mvdl7) +2. Create a Pull Request to this repo from the Code Sandbox image. +3. Netlify will deploy automatically once the Pull Request is approved. + +## How to add a component +*TBC* From d256087c02992cfee332fc25d3c14f709180143a Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Thu, 23 Apr 2020 14:51:59 +0100 Subject: [PATCH 2/9] Fix: add contact email --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a1acd4..2b0bd0c 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,9 @@ The project is under development at Foodhall, a grassroots community project bas ## Getting involved -We warmly welcome participants. +We warmly welcome new participants. +- Please get in touch with us at [info@nationalfoodservice.uk](mailto:info@nationalfoodservice.uk) - User stories are on [this Trello board](https://trello.com/b/6yiDv1ZW/mutual-impact) - We discuss development on the [National Food Service Slack](national-food-service.slack.com) - If you're new to development in general, or React in particular, we can set you up with some scaffolded tasks to get started. From a1673dabc38e76435cd7894868d8a5ddb456b3ee Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Fri, 24 Apr 2020 09:29:59 +0100 Subject: [PATCH 3/9] Fix: Add disclaimer to front page --- src/components/HomePage/index.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/components/HomePage/index.js b/src/components/HomePage/index.js index 638a53a..496dd44 100644 --- a/src/components/HomePage/index.js +++ b/src/components/HomePage/index.js @@ -1,12 +1,23 @@ -import React, { Fragment } from 'react'; -import { Segment } from 'semantic-ui-react'; +import React, { Fragment } from "react"; +import { Segment } from "semantic-ui-react"; -import EventFeed from './EventFeed'; +import EventFeed from "./EventFeed"; -const HomePage = () => - - Welcome to the hours project dude - - +const HomePage = () => ( + + +

Welcome to the mutual impact feed

+

+ Please note: this feed is only populated with data that has been + collected and uploaded. +

+

+ An absence of data for a given area should not be interpreted to mean + that work hasn't happened, just that it hasn't been recorded. +

+ + + +); -export default HomePage; \ No newline at end of file +export default HomePage; From 933879152f421b1fc14648a92bbb148b9fa9bd30 Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Sat, 25 Apr 2020 16:55:27 +0100 Subject: [PATCH 4/9] Feat: add about page component --- src/components/AboutPage/index.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/components/AboutPage/index.js diff --git a/src/components/AboutPage/index.js b/src/components/AboutPage/index.js new file mode 100644 index 0000000..24cdee0 --- /dev/null +++ b/src/components/AboutPage/index.js @@ -0,0 +1,28 @@ +import React, { Fragment } from "react"; +import { Segment } from "semantic-ui-react"; + +const AboutPage = () => ( + + +

What is this?

+

Mutual impact is an impact tracker for the National Food Service and partnering + mutual community groups to collect vital evidence to demonstrate impact as a whole.

+

This allows accessiblity and transparency. To paint a picture to the public and can + be shared with funders to enable more support for work.

+

It also aims to remove some administrative burden and enable automatic reports and grant applications in the future, as well as increasing the total evidence base for Mutual Aid and voluntary labor.

+

How do I get involved?

+

To log your organisations impact, please Sign In

+ +

We also warmly welcome any help developing the webapp.

+ +

For more information on the National Food Service campaign, please check out our site!

+ + +); + +export default AboutPage; From c075a940e5fd6e20b4c5a25c880f8194d5ffff23 Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Sat, 25 Apr 2020 17:02:25 +0100 Subject: [PATCH 5/9] Fix: add about to app.js --- src/components/App.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/App.js b/src/components/App.js index 55dfa47..c826f30 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -12,6 +12,7 @@ import InfoModal from './InfoModal'; import TimeLoggingForm from './TimeLoggingForm'; import SendHrsForm from './SendHrsForm'; +import AboutPage from './AboutPage'; import HomePage from './HomePage'; import SignInPage from './SignInPage'; import SignUpPage from './SignUpPage'; @@ -48,6 +49,7 @@ const App = (props) => { + From 68bc1ed8b36c623aa90be0aa7da60b0b5d614788 Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Sat, 25 Apr 2020 17:02:47 +0100 Subject: [PATCH 6/9] Fix: add about to nav --- src/components/Navigation/index.js | 45 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/components/Navigation/index.js b/src/components/Navigation/index.js index 93f6f30..92a5371 100644 --- a/src/components/Navigation/index.js +++ b/src/components/Navigation/index.js @@ -7,45 +7,46 @@ import AccountDropdown from './AccountDropdown'; import { FirebaseAuthUserContext } from '../Session/FirebaseAuthUserProvider'; import * as routes from '../../constants/routes'; -// const Navigation = () => +// const Navigation = () => // // {user => user.isUserSignedIn && !user.pendingUser ? : } // // const NavigationAuth = (props) => { // const isAdmin = props.user.role === 'ADMIN'; - + // return ( // // Homepage // Log Hrs -// Send Hrs -// Your Profile +// Send Hrs +// Your Profile // {isAdmin ? Admin Page : null} // // // // {/* */} -// +// // // ) // } - -// const NavigationNonAuth = () => + +// const NavigationNonAuth = () => // // Homepage -// Sign in +// Sign in // // -// +// // -const NonAuthMenuItems = () => +const NonAuthMenuItems = () => Homepage Sign in + About @@ -53,27 +54,27 @@ const NonAuthMenuItems = () => const AuthMenuItems = (props) => { const isAdmin = props.user.role === 'ADMIN'; - + return ( Homepage Log Hrs - Send Hrs - Your Profile + Send Hrs + Your Profile {isAdmin ? Admin Page : null} {/* */} - + ) } const MenuItems = () => - {user => user.isUserSignedIn && !user.pendingUser - ? : + {user => user.isUserSignedIn && !user.pendingUser + ? : } @@ -90,7 +91,7 @@ const SidebarMenu = (props) => ( ) -const BarMenu = () => +const BarMenu = () => @@ -106,7 +107,7 @@ class ResponsiveNavigation extends React.Component { if (locationChanged) this.hideSidebar(); } - handleButtonClick = () => + handleButtonClick = () => this.setState(prevState => ({ sidebarActive: !prevState.sidebarActive })); hideSidebar = () => this.setState({ sidebarActive: false }); @@ -120,12 +121,12 @@ class ResponsiveNavigation extends React.Component { - + - - + + ) } @@ -133,4 +134,4 @@ class ResponsiveNavigation extends React.Component { const ResponsiveNavigationWithRouter = withRouter(ResponsiveNavigation); -export default ResponsiveNavigationWithRouter; \ No newline at end of file +export default ResponsiveNavigationWithRouter; From ae7f2d1078e60d466944e056a3c5baa925ae7512 Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Sat, 25 Apr 2020 17:03:10 +0100 Subject: [PATCH 7/9] Fix: add route to constants --- src/constants/routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/constants/routes.js b/src/constants/routes.js index 11b88df..969d813 100644 --- a/src/constants/routes.js +++ b/src/constants/routes.js @@ -1,4 +1,5 @@ export const HOME_PAGE = '/'; +export const ABOUT_PAGE = "/about"; export const ADD_HRS = '/add-hrs'; export const SEND_HRS = '/send-hrs'; export const USER_PAGE = '/user/:userId'; From 52d53cd339a82c5a6982ff927c2f1db08306ca6e Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Sat, 25 Apr 2020 17:53:02 +0100 Subject: [PATCH 8/9] Fix indentation --- src/components/App.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/App.js b/src/components/App.js index c826f30..70b77b0 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -40,20 +40,20 @@ const App = (props) => { - - - - - - - - - + + + + + + + + + - - - - { + + + + { // console.log(location); return (

404! {location.pathname} not found!

From 2b8dbbc947ff145c5fb9e173e3f22888f60fd9df Mon Sep 17 00:00:00 2001 From: Solvi Goard Date: Sat, 25 Apr 2020 17:54:33 +0100 Subject: [PATCH 9/9] Fix: change nav order --- src/components/Navigation/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Navigation/index.js b/src/components/Navigation/index.js index 92a5371..f799d2f 100644 --- a/src/components/Navigation/index.js +++ b/src/components/Navigation/index.js @@ -45,8 +45,8 @@ import * as routes from '../../constants/routes'; const NonAuthMenuItems = () => Homepage - Sign in About + Sign in