+
+
+
+
+
+
{children}
GIVEME.lk is here to voice your needs.": "ஊரடங்கு உத்தரவின் போது அடிப்படை ரேஷன்களைப் பற்றி கவலைப்படுகிறீர்களா?
உங்கள் தேவைகளுக்கு குரல் கொடுக்க GIVEME.lk இங்கே உள்ளது.", + "Welcome to GIVE<1>ME.lk!": "GIVE<1>ME.lk க்கு வருக!", + "Log-in and start adding your requirements to GiveME. This is how you do that...": "පුරනය වී ඔබගේ අවශ්යතා GiveME වෙත එක් කිරීම ආරම්භ කරන්න. ඔබ එය කරන්නේ එලෙසයි ...", + "Step": "පියවර", + "You log in to GIVE<1>ME.": "ඔබ GIVE<1>ME වෙත පිවිසෙන්න", + "You request items that you need": "ඔබට අවශ්ය අයිතම ඉල්ලා සිටී", + "Authorized vendors see your requirements": "බලයලත් වෙළෙන්දෝ ඔබේ අවශ්යතා දකිති", + "Vendors will come and fulfill your needs.": "විකුණුම්කරුවන් පැමිණ ඔබේ අවශ්යතා සපුරාලනු ඇත.", + "Developed By": "සංවර්ධනය කළේ", + "About": "எங்களை பற்றி", + "My Requests": "எனது கோரிக்கைகள்", + "My Account": "என் கணக்கு", + "Account Settings": "கணக்கு அமைப்புகள்", + "Sign Out": "வெளியேறு" + } + }, + "si": { + "translation": { + "Worried about basic rations during the curfew?
GIVEME.lk is here to voice your needs.": "ඇඳිරි නීතිය අතරේ ආහාර පාන මිලදී ගන්න කරදරද?
ඔබගේ අවශ්යතා සපුරාලීමට GIVEME.lk සැදී පැහැදී සිටී.", + "Welcome to GIVE<1>ME.lk!": "GIVE<1>ME.lk වෙත සාදරයෙන් පිළිගනිමු!", + "Log-in and start adding your requirements to GiveME. This is how you do that...": "Login වෙලා ඔබේ අවශ්යතා GiveMe.lk ට කියන්න. මෙන්න මෙහෙමයි කරන්නේ...", + "Step": "පියවර", + "You log in to GIVE<1>ME.": "ඔබ GIVE<1>ME වෙත පිවිසෙන්න", + "You request items that you need": "ඔබට අවශ්ය භාණ්ඩ තෝරා ගන්න", + "Authorized vendors see your requirements": "වෙළෙන්දන් ඔබේ අවශ්යතා GIVE<1>ME හරහා දැනගන්නවා", + "Vendors will come and fulfill your needs.": "බඩු බෙදාහරින අය පැමිණ ඔබට අදාල දේ ලබා දෙනවා", + "Developed By": "නිර්මාණය කළේ", + "About": "අපි ගැන", + "My Requests": "මගේ ඉල්ලීම්", + "My Account": "මගේ ගිණුම", + "Account Settings": "මගේ විස්තර", + "Sign Out": "Logout වෙන්න", + "Sign In": "Login වෙන්න", + "Hello User": "ආයුබෝවන්", + "Request new item": "භාණ්ඩයක් ඉල්ලන්න", + "Your Needs List": "ඔබේ අවශ්යතා ලැයිස්තුව", + "What do you want?": "ඔබට අවශ්ය මොනවාද ?", + "Category": "වර්ගය", + "Products": "නිෂ්පාදන", + "How much?": "ප්රමාණය", + "Dairy": "කිරි ආහාර", + "Meat, Seafood & Poultry": "මස්, මුහුදු ආහාර සහ කුකුළු මස්", + "Vegetables": "එළවළු", + "Grains": "ධාන්ය වර්ග", + "Grocery Items": "සිල්ලර බඩු", + "Pharmacy Items": "ඖෂධ වර්ග", + "Request": "ලැයිස්තුවට දාන්න", + "Requesting...": "ලැයිස්තුගත වේ...", + "Cancel": "අවලංගු කරන්න", + "Display Name": "මගේ නම", + "Contact Number": "සම්බන්ධ කරගත හැකි දුරකථනය", + "Delivery Address": "භාණ්ඩ එවිය යුතු ලිපිනය", + "Your Email": "විද්යුත් තැපෑල", + "NIC Number": "හැඳුනුම්පත් අංකය", + "Saving": "වෙනස් වෙමින් පවතී", + "Save": "වෙනස් කරන්න", + "Linked Accounts": "සම්බන්ධිත ගිණුම්", + "Your email here...": "විද්යුත් තැපෑල (ඊ මේල් එක) මෙතන ඇතුල් කරන්න", + "Email must be valid": "විද්යුත් තැපෑල (ඊ මේල් එක) එක වැරදීද බලන්න. එය නිවැරදි විය යුතුයි", + "Your password here...": "මුරපදය (පාස්වර්ඩ් එක) මෙතන ඇතුල් කරන්න", + "Password is required": "මුරපදයක් (පාස්වර්ඩ් එකක්) අවශ්යමයි.", + "Loading": "රැඳී සිටින්න...", + "Login": "Login වෙන්න", + "Not Registered Yet?": "ඔබ අප සමඟ ලියාපදිංච් වෙලා නැද්ද?", + "Sign Up": "ලියාපදිංචි වෙන්න", + "Use your Google Account to Sign In": "ඔබේ Google ගිණුමෙන් GiveMe.lk පාවිච්චි කරන්න හැකියි", + "About GiveME.lk": "GiveME.lk ගැන", + "What is GiveME.lk?": "GiveME.lk යනු කුමක්ද?", + "GiveME.lk is a platform aimed at connecting people with wholesale and retail businesses during the SARS-CoV-2 breakout's social distancing period. Our goal is to tell the sellers where the requirement exists for their produce to make the home delivery more efficient for them and more effective for people who are expecting goods and services.": "GiveME.lk යනු SARS-CoV-2 සමාජ දුරස්ථ කාල පරිච්ඡේදය තුළ තොග හා සිල්ලර ව්යාපාර සමඟ පුද්ගලයින් සම්බන්ධ කිරීම අරමුණු කරගත් වේදිකාවකි. අපගේ ඉලක්කය වන්නේ විකුණුම්කරුවන්ට ඔවුන්ගේ නිෂ්පාදන සඳහා අවශ්යතාවය පවතින්නේ කොතැනද යන්න කීමෙන් ඔවුන්ට සැපයුම වඩාත් කාර්යක්ෂම කිරීමටයි. භාණ්ඩ හා සේවා අපේක්ෂා කරන පුද්ගලයින් සඳහා මෙමඟින් වඩාත් ඵලදායී සේවාවක් සැපයීමට ඔවුනට හැකිවනු ඇත.", + "This is an idea by the co-founders of Siyomek, Harshadewa Ariyasinghe and Keshan Sodimana. The project is run as an open-sourced project by CodeLanka. Codelanka is an initiative by GDG Sri Lanka to code things that make sense to the public, irrespective of the existence of a financial gain.": "මෙය Siyomek සම නිර්මාතෘන් වන හර්ෂදේව ආරියසිංහ සහ කේෂන් සෝදිමාන මහත්වරුන්ගේ අදහසකි. මෙම ව්යාපෘතිය CodeLanka විසින් විවෘතකේත ව්යාපෘතියක් ලෙස ක්රියාත්මක වේ. CodeLanka යනු මූල්යමය වාසියක් නොතකා මහජනයාට අර්ථවත් වන දේ කේත කිරීමට GDG SriLanka වීසින් ගත් මුලපිරීමකි.", + "Who is involved?": "සම්බන්ධ වන්නේ කවුද?", + "If the marker on the map is wrong, please drag the map to the correct location and press Save": "සිතියමේ පෙන්වන ස්ථානය වැරදි නම් සිතියම එහා මෙහා කර නිවැරදි තැනට ගන්න. ඉන්පසු වෙනස් කරන බොත්තම ඔබන්න" + } + } +} diff --git a/src/routes/About/components/AboutPage.js b/src/routes/About/components/AboutPage.js new file mode 100644 index 0000000..b4c0c3e --- /dev/null +++ b/src/routes/About/components/AboutPage.js @@ -0,0 +1,138 @@ +import React from 'react' +import { makeStyles } from '@material-ui/core/styles' +import Typography from '@material-ui/core/Typography' +import Grid from '@material-ui/core/Grid' +import styles from './AboutPage.styles' +import Image from 'material-ui-image' +import Button from '@material-ui/core/Button' + +const useStyles = makeStyles(styles) + +function About() { + const classes = useStyles() + + return ( +
+
+
+
+ By{' '}
+
+ CodeLanka
+
+
+
+
+
+ What is GiveME.lk?
+
+
+ GiveME.lk is a platform
+ aimed at connecting people with wholesale and retail businesses
+ during the SARS-CoV-2 breakout's social distancing period.
+
+ Our goal is to tell the sellers where the requirement exists for + their produce to make the home delivery more efficient for them and + more effective for people who are expecting goods and services. +
+
+
+
+ Who is involved?
+
+
+ This is an idea by the co-founders of{' '}
+
+ Siyomek
+
+ , Harshadewa Ariyasinghe and Keshan Sodimana.
+ The project is run as an open-sourced{' '} + + project + + by CodeLanka. Codelanka is an initiative by GDG Sri Lanka to + code things that make sense to the public, irrespective of the + existence of a financial gain. +
+
+
+
+ )
+}
+
+export default About
diff --git a/src/routes/About/components/AboutPage.styles.js b/src/routes/About/components/AboutPage.styles.js
new file mode 100644
index 0000000..8cf275e
--- /dev/null
+++ b/src/routes/About/components/AboutPage.styles.js
@@ -0,0 +1,61 @@
+import amber from '@material-ui/core/colors/amber'
+export default (theme) => ({
+ root: {
+ ...theme.flexColumnCenter,
+ flexGrow: 1
+ },
+ section: {
+ ...theme.flexColumnCenter,
+ padding: theme.spacing(2)
+ },
+ mainContainer: {
+ padding: '2.5em'
+ },
+ leftSide: {
+ justifyContent: 'center',
+ textAlign: 'center',
+ display: 'flex',
+ flexDirection: 'column'
+ },
+ rightSide: {
+ textAlign: 'center'
+ },
+ strong: {
+ color: amber[300]
+ },
+ aboutTitle: {
+ fontWeight: 'bold'
+ },
+ welcome: {
+ textAlign: 'center',
+ marginTop: '2rem'
+ },
+ aboutText: {
+ marginTop: '1rem',
+ textAlign: 'justify'
+ },
+ infoButton: {
+ color: 'black',
+ backgroundColor: amber[300]
+ },
+ btnDiv: {
+ textAlign: 'left',
+ marginTop: '1rem'
+ },
+ linkPrimary: {
+ color: '#363636'
+ },
+ linkSecondary: {
+ color: '#6ce97d'
+ },
+ partners: {
+ ...theme.flexRowCenter,
+ flex: 1,
+ marginTop: '2rem'
+ },
+ partnerBlock: {
+ ...theme.flexColumnCenter,
+ textAlign: 'center',
+ marginRight: '1rem'
+ }
+})
diff --git a/src/routes/About/components/index.js b/src/routes/About/components/index.js
new file mode 100644
index 0000000..88b7afa
--- /dev/null
+++ b/src/routes/About/components/index.js
@@ -0,0 +1,3 @@
+import AboutPage from './AboutPage'
+
+export default AboutPage
diff --git a/src/routes/About/index.js b/src/routes/About/index.js
new file mode 100644
index 0000000..53473dd
--- /dev/null
+++ b/src/routes/About/index.js
@@ -0,0 +1,8 @@
+import AboutPage from './components/AboutPage'
+import { ABOUT_PATH } from 'constants/paths'
+
+// Sync route definition
+export default {
+ path: ABOUT_PATH,
+ component: AboutPage
+}
diff --git a/src/routes/Account/components/AccountEditor/AccountEditor.js b/src/routes/Account/components/AccountEditor/AccountEditor.js
index 5f22ff6..9e61e51 100644
--- a/src/routes/Account/components/AccountEditor/AccountEditor.js
+++ b/src/routes/Account/components/AccountEditor/AccountEditor.js
@@ -8,6 +8,8 @@ import { useNotifications } from 'modules/notification'
import defaultUserImageUrl from 'static/User.png'
import AccountForm from '../AccountForm'
import styles from './AccountEditor.styles'
+import { Avatar, Typography } from '@material-ui/core'
+import ProviderDataForm from '../ProviderDataForm'
const useStyles = makeStyles(styles)
@@ -37,11 +39,19 @@ function AccountEditor() {
return (
+
+ About GiveME.lk
+
+
+ + Our goal is to tell the sellers where the requirement exists for + their produce to make the home delivery more efficient for them and + more effective for people who are expecting goods and services. +
+ The project is run as an open-sourced{' '} + + project + + by CodeLanka. Codelanka is an initiative by GDG Sri Lanka to + code things that make sense to the public, irrespective of the + existence of a financial gain. +
+
+
+
+
+ Attributions
+
+
+
+
+
+
+
+ Linked Accounts
+
+ {!!profile && !!profile.providerData && (
+
- Accounts}>
+
- - Log In first - -
- - You can add your needs - -
- - Your needs will be visible to our autorized vendors - -
- - They will come and fulfill your needs - -
-
{providerData.map((providerAccount) => (
-
- e-Pola
-
-
-
-
-
- Welcome to the e-Pola!
-
-
- You can Log In and start adding your basic needs in this distressing times.
-
-
+
-
-
+
+
+
+
+ Worried about basic rations during the curfew?
+
+ GIVEME.lk is here to voice your needs. +
+
+
+
+ Developed By :
+
+
+
+
+
+
+ Welcome to GIVEME.lk!
+
+
+
+
+ Log-in and start adding your requirements to GiveME. This is how
+ you do that...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
)
}
diff --git a/src/routes/Home/components/HomePage/HomePage.styles.js b/src/routes/Home/components/HomePage/HomePage.styles.js
index e70981c..39ff89e 100644
--- a/src/routes/Home/components/HomePage/HomePage.styles.js
+++ b/src/routes/Home/components/HomePage/HomePage.styles.js
@@ -1,9 +1,54 @@
+import amber from '@material-ui/core/colors/amber'
export default (theme) => ({
root: {
- ...theme.flexColumnCenter
+ ...theme.flexColumnCenter,
+ flexGrow: 1
},
section: {
...theme.flexColumnCenter,
- padding: theme.spacing(2),
+ padding: theme.spacing(2)
+ },
+ mainContainer: {
+ padding: '2.5em'
+ },
+ leftSide: {
+ justifyContent: 'center',
+ textAlign: 'center',
+ display: 'flex',
+ flexDirection: 'column'
+ },
+ welcome: {
+ fontWeight: 'bold'
+ },
+ rightSide: {
+ textAlign: 'center'
+ },
+ strong: {
+ color: amber[300]
+ },
+ list: {
+ textAlign: 'left'
+ },
+ cardRoot: {
+ ...theme.flexColumnCenter,
+ flexGrow: 1,
+ flexDirection: 'row',
+ marginBottom: '1em',
+ boxShadow: 'none',
+ border: '5px solid',
+ borderColor: amber[300],
+ borderRadius: '5px'
+ },
+ cover: {
+ width: '10%',
+ marginLeft: '20px'
+ },
+ content: {
+ textAlign: 'left',
+ marginLeft: '10px'
+ },
+ checkmark: {
+ marginLeft: '20px',
+ color: '#4caf50'
}
})
diff --git a/src/routes/Login/components/LoginForm/LoginForm.js b/src/routes/Login/components/LoginForm/LoginForm.js
index 4aab08a..0c6a32d 100644
--- a/src/routes/Login/components/LoginForm/LoginForm.js
+++ b/src/routes/Login/components/LoginForm/LoginForm.js
@@ -6,6 +6,7 @@ import { makeStyles } from '@material-ui/core/styles'
import Button from '@material-ui/core/Button'
import { validateEmail } from 'utils/form'
import styles from './LoginForm.styles'
+import { Trans } from 'react-i18next'
const useStyles = makeStyles(styles)
@@ -25,8 +26,9 @@ function LoginForm({ onSubmit }) {
diff --git a/src/routes/Login/components/LoginPage/LoginPage.js b/src/routes/Login/components/LoginPage/LoginPage.js
index 5e1fd05..6dd5548 100644
--- a/src/routes/Login/components/LoginPage/LoginPage.js
+++ b/src/routes/Login/components/LoginPage/LoginPage.js
@@ -8,6 +8,9 @@ import { SIGNUP_PATH } from 'constants/paths'
import { useNotifications } from 'modules/notification'
import LoginForm from '../LoginForm'
import styles from './LoginPage.styles'
+import Image from 'material-ui-image'
+import logo from './logo.png'
+import { Trans } from 'react-i18next'
const useStyles = makeStyles(styles)
@@ -31,20 +34,50 @@ function LoginPage() {
}
return (
- + GIVEME.lk is here to voice your needs. +
+
+
+
+ Step 1
+
+ {authExists &&
+
+
+ You log in to GIVE
+ ME.
+
+
+
+
+
+
+
+ Step 2
+
+ {hasUserAddedItems &&
+
+ You request items that you need
+
+
+
+
+
+
+ Step 3
+
+
+ Authorized vendors see your requirements
+
+
+
+
+
+
+ Step 4
+
+
+ Vendors will come and fulfill your needs.
+
+
+
+
-
-
-
or
-
-
-
- Need an account?
-
- Sign Up
-
+
)
}
@@ -59,7 +56,7 @@ NeedTile.propTypes = {
needId: PropTypes.string.isRequired,
showDelete: PropTypes.bool,
name: PropTypes.string,
- amount: PropTypes.string,
+ amount: PropTypes.string
}
NeedTile.defaultProps = {
diff --git a/src/routes/Needs/components/NeedTile/NeedTile.styles.js b/src/routes/Needs/components/NeedTile/NeedTile.styles.js
index dd0cf8a..7e23b17 100644
--- a/src/routes/Needs/components/NeedTile/NeedTile.styles.js
+++ b/src/routes/Needs/components/NeedTile/NeedTile.styles.js
@@ -1,12 +1,14 @@
+import amber from '@material-ui/core/colors/amber'
export default (theme) => ({
root: {
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start',
- height: '200px',
+ height: '150px',
width: '300px',
margin: theme.spacing(0.5),
- padding: theme.spacing(1.3)
+ padding: theme.spacing(1.3),
+ backgroundColor: amber[300]
},
top: {
display: 'flex',
@@ -14,13 +16,15 @@ export default (theme) => ({
width: '100%'
},
name: {
- fontSize: '1.5rem',
+ marginTop: '1rem',
+ fontSize: '2.5rem',
cursor: 'pointer',
textDecoration: 'none',
transition: 'all 800ms cubic-bezier(0.25,0.1,0.25,1) 0ms',
textOverflow: 'ellipsis',
overflow: 'hidden',
whiteSpace: 'nowrap',
+ color: '#363636',
'&:hover': {
color: ''
},
@@ -30,10 +34,14 @@ export default (theme) => ({
},
amount: {
fontSize: '1.5rem',
- fontColor: '#333',
+ color: '#363636',
textDecoration: 'none',
textOverflow: 'ellipsis',
overflow: 'hidden',
- whiteSpace: 'nowrap',
+ whiteSpace: 'nowrap'
+ },
+ qty: {
+ marginTop: '0.5rem',
+ color: '#363636'
}
})
diff --git a/src/routes/Needs/components/NeedsHero/NeedsHero.js b/src/routes/Needs/components/NeedsHero/NeedsHero.js
new file mode 100644
index 0000000..ee86e3e
--- /dev/null
+++ b/src/routes/Needs/components/NeedsHero/NeedsHero.js
@@ -0,0 +1,30 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import Paper from '@material-ui/core/Paper'
+import { makeStyles } from '@material-ui/core/styles'
+import styles from './NeedsHero.styles'
+import { Typography } from '@material-ui/core'
+import { Trans } from 'react-i18next'
+
+const useStyles = makeStyles(styles)
+
+function NeedsHero({ onClick }) {
+ const classes = useStyles()
+
+ return (
+
+
+ Hello User !
+
+
+ Your Needs List
+
+
+ )
+}
+
+NeedsHero.propTypes = {
+ onClick: PropTypes.func
+}
+
+export default NeedsHero
diff --git a/src/routes/Needs/components/NeedsHero/NeedsHero.styles.js b/src/routes/Needs/components/NeedsHero/NeedsHero.styles.js
new file mode 100644
index 0000000..86d6ae3
--- /dev/null
+++ b/src/routes/Needs/components/NeedsHero/NeedsHero.styles.js
@@ -0,0 +1,12 @@
+export default (theme) => ({
+ root: {
+ display: 'flex',
+ flexDirection: 'column',
+ height: '150px',
+ alignItems: 'flex-start',
+ padding: theme.spacing(5),
+ background: 'linear-gradient(to right, #5B86E5, #36D1DC)',
+ margin: '1rem',
+ color: 'white'
+ }
+})
diff --git a/src/routes/Needs/components/NeedsHero/index.js b/src/routes/Needs/components/NeedsHero/index.js
new file mode 100644
index 0000000..e18a401
--- /dev/null
+++ b/src/routes/Needs/components/NeedsHero/index.js
@@ -0,0 +1,3 @@
+import NeedsHero from './NeedsHero'
+
+export default NeedsHero
diff --git a/src/routes/Needs/components/NeedsPage/NeedsPage.js b/src/routes/Needs/components/NeedsPage/NeedsPage.js
index ea64a19..4758123 100644
--- a/src/routes/Needs/components/NeedsPage/NeedsPage.js
+++ b/src/routes/Needs/components/NeedsPage/NeedsPage.js
@@ -4,15 +4,27 @@ import { Route, Switch } from 'react-router-dom'
import NeedRoute from 'routes/Needs/routes/Need'
import { renderChildren } from 'utils/router'
import NeedsList from '../NeedsList'
+import Image from 'material-ui-image'
+import NeedsHero from '../NeedsHero'
function NeedsPage({ match }) {
return (
-
- {/* Child routes */}
- {renderChildren([NeedRoute], match)}
- {/* Main Route */}
-
+
+
)
}
diff --git a/src/routes/Login/components/LoginPage/LoginPage.styles.js b/src/routes/Login/components/LoginPage/LoginPage.styles.js
index d600f39..6a4a2b8 100644
--- a/src/routes/Login/components/LoginPage/LoginPage.styles.js
+++ b/src/routes/Login/components/LoginPage/LoginPage.styles.js
@@ -1,3 +1,4 @@
+import amber from '@material-ui/core/colors/amber'
export default (theme) => ({
root: {
...theme.flexColumnCenter,
@@ -5,19 +6,26 @@ export default (theme) => ({
height: '100%',
width: '100%',
fontWeight: 400,
- paddingTop: '1.5rem'
+ paddingTop: '1.5rem',
+ backgroundColor: 'white'
},
panel: {
...theme.flexColumnCenter,
justifyContent: 'center',
flexGrow: 1,
- padding: '1.25rem',
- minWidth: '250px',
- minHeight: '270px'
+ padding: '2rem',
+ minWidth: '450px',
+ minHeight: '270px',
+ border: '5px solid',
+ boxShadow: 'none',
+ borderColor: amber[300],
+ zIndex: 10
},
orLabel: {
marginTop: '1rem',
- marginBottom: '.5rem'
+ marginBottom: '.5rem',
+ fontSize: '13px',
+ fontWeight: 'bold'
},
signup: {
...theme.flexColumnCenter,
@@ -29,9 +37,15 @@ export default (theme) => ({
fontWeight: 'bold'
},
signupLink: {
- fontSize: '1.2rem'
+ fontSize: '1.2rem',
+ fontWeight: 'bold',
+ color: '#363636'
},
providers: {
marginTop: '1rem'
+ },
+ hr: {
+ width: '300px',
+ backhroundColor: 'lightgrey'
}
})
diff --git a/src/routes/Login/components/LoginPage/logo.png b/src/routes/Login/components/LoginPage/logo.png
new file mode 100644
index 0000000..0272e1a
Binary files /dev/null and b/src/routes/Login/components/LoginPage/logo.png differ
diff --git a/src/routes/Needs/components/NeedTile/NeedTile.js b/src/routes/Needs/components/NeedTile/NeedTile.js
index 354dca6..6a84e05 100644
--- a/src/routes/Needs/components/NeedTile/NeedTile.js
+++ b/src/routes/Needs/components/NeedTile/NeedTile.js
@@ -1,27 +1,27 @@
import React from 'react'
import PropTypes from 'prop-types'
-import { useHistory } from 'react-router-dom'
import { useFirestore } from 'react-redux-firebase'
import Paper from '@material-ui/core/Paper'
import IconButton from '@material-ui/core/IconButton'
import Tooltip from '@material-ui/core/Tooltip'
import DeleteIcon from '@material-ui/icons/Delete'
import { makeStyles } from '@material-ui/core/styles'
-import { NEEDS_PATH } from 'constants/paths'
import useNotifications from 'modules/notification/useNotifications'
import styles from './NeedTile.styles'
+// import { useHistory } from 'react-router-dom'
+// import { NEEDS_PATH } from 'constants/paths'
const useStyles = makeStyles(styles)
function NeedTile({ name, needId, amount, showDelete }) {
const classes = useStyles()
- const history = useHistory()
const firestore = useFirestore()
const { showError, showSuccess } = useNotifications()
+ // const history = useHistory()
- function goToNeed() {
- return history.push(`${NEEDS_PATH}/${needId}`)
- }
+ // function goToNeed() {
+ // return history.push(`${NEEDS_PATH}/${needId}`)
+ // }
function deleteNeed() {
return firestore
@@ -37,9 +37,7 @@ function NeedTile({ name, needId, amount, showDelete }) {
return (
+
+
+
+
+ {/*
+
+ Not Registered Yet?
+
+
+ Sign Up
+
+
+ +
+ Use your Google Account to Sign In
+
+
+
+
-
- {name || 'No Name'}
-
+ {name || 'No Name'}
{showDelete ? (
@@ -48,9 +46,8 @@ function NeedTile({ name, needId, amount, showDelete }) {
) : null}
-
- {amount || ''}
-
+ Qty:
+ {amount || ''}
+
+ {/* Child routes */}
+ {renderChildren([NeedRoute], match)}
+ {/* Main Route */}
+
+
)
}
diff --git a/src/routes/Needs/components/NewNeedDialog/NewNeedDialog.js b/src/routes/Needs/components/NewNeedDialog/NewNeedDialog.js
index 1fea1d4..c723e24 100644
--- a/src/routes/Needs/components/NewNeedDialog/NewNeedDialog.js
+++ b/src/routes/Needs/components/NewNeedDialog/NewNeedDialog.js
@@ -15,12 +15,13 @@ import MenuItem from '@material-ui/core/MenuItem'
import FormControl from '@material-ui/core/FormControl'
import { useSelector } from 'react-redux'
import { useFirestoreConnect, isEmpty } from 'react-redux-firebase'
+import { Trans } from 'react-i18next'
const useStyles = makeStyles(styles)
function NewNeedDialog({ onSubmit, open, onRequestClose }) {
const classes = useStyles()
- const [catagory, setCatagory] = React.useState('')
+ const [category, setCategory] = React.useState('')
const [product, setProduct] = React.useState('')
const {
control,
@@ -31,13 +32,13 @@ function NewNeedDialog({ onSubmit, open, onRequestClose }) {
useFirestoreConnect({
collection: 'products',
- where: ['catagory', '==', catagory]
+ where: ['category', '==', category]
})
const products = useSelector(({ firestore: { ordered } }) => ordered.products)
const handleChange = (event) => {
- setCatagory(event.target.value)
+ setCategory(event.target.value)
setProduct('')
}
@@ -55,33 +56,72 @@ function NewNeedDialog({ onSubmit, open, onRequestClose }) {
return (
+
+