diff --git a/back_end/django_server/RiceEats/__pycache__/__init__.cpython-310.pyc b/back_end/django_server/RiceEats/__pycache__/__init__.cpython-310.pyc index 44573c49..21686dc6 100644 Binary files a/back_end/django_server/RiceEats/__pycache__/__init__.cpython-310.pyc and b/back_end/django_server/RiceEats/__pycache__/__init__.cpython-310.pyc differ diff --git a/back_end/django_server/RiceEats/__pycache__/settings.cpython-310.pyc b/back_end/django_server/RiceEats/__pycache__/settings.cpython-310.pyc index b1e48272..bcc9255b 100644 Binary files a/back_end/django_server/RiceEats/__pycache__/settings.cpython-310.pyc and b/back_end/django_server/RiceEats/__pycache__/settings.cpython-310.pyc differ diff --git a/back_end/django_server/RiceEats/__pycache__/urls.cpython-310.pyc b/back_end/django_server/RiceEats/__pycache__/urls.cpython-310.pyc index ee80a545..afd2268c 100644 Binary files a/back_end/django_server/RiceEats/__pycache__/urls.cpython-310.pyc and b/back_end/django_server/RiceEats/__pycache__/urls.cpython-310.pyc differ diff --git a/back_end/django_server/RiceEats/__pycache__/wsgi.cpython-310.pyc b/back_end/django_server/RiceEats/__pycache__/wsgi.cpython-310.pyc index b8b8094b..141bccff 100644 Binary files a/back_end/django_server/RiceEats/__pycache__/wsgi.cpython-310.pyc and b/back_end/django_server/RiceEats/__pycache__/wsgi.cpython-310.pyc differ diff --git a/back_end/django_server/db.sqlite3 b/back_end/django_server/db.sqlite3 index 4a649288..9d17938f 100644 Binary files a/back_end/django_server/db.sqlite3 and b/back_end/django_server/db.sqlite3 differ diff --git a/back_end/django_server/main/__pycache__/__init__.cpython-310.pyc b/back_end/django_server/main/__pycache__/__init__.cpython-310.pyc index 2dea7e70..b6d819f2 100644 Binary files a/back_end/django_server/main/__pycache__/__init__.cpython-310.pyc and b/back_end/django_server/main/__pycache__/__init__.cpython-310.pyc differ diff --git a/back_end/django_server/main/__pycache__/admin.cpython-310.pyc b/back_end/django_server/main/__pycache__/admin.cpython-310.pyc index cb8adc30..9a30f5ab 100644 Binary files a/back_end/django_server/main/__pycache__/admin.cpython-310.pyc and b/back_end/django_server/main/__pycache__/admin.cpython-310.pyc differ diff --git a/back_end/django_server/main/__pycache__/apps.cpython-310.pyc b/back_end/django_server/main/__pycache__/apps.cpython-310.pyc index 59b3f1a8..d68be2ca 100644 Binary files a/back_end/django_server/main/__pycache__/apps.cpython-310.pyc and b/back_end/django_server/main/__pycache__/apps.cpython-310.pyc differ diff --git a/back_end/django_server/main/__pycache__/models.cpython-310.pyc b/back_end/django_server/main/__pycache__/models.cpython-310.pyc index b83baab6..09d8db33 100644 Binary files a/back_end/django_server/main/__pycache__/models.cpython-310.pyc and b/back_end/django_server/main/__pycache__/models.cpython-310.pyc differ diff --git a/back_end/django_server/main/__pycache__/urls.cpython-310.pyc b/back_end/django_server/main/__pycache__/urls.cpython-310.pyc index ae039631..7e51498b 100644 Binary files a/back_end/django_server/main/__pycache__/urls.cpython-310.pyc and b/back_end/django_server/main/__pycache__/urls.cpython-310.pyc differ diff --git a/back_end/django_server/main/__pycache__/views.cpython-310.pyc b/back_end/django_server/main/__pycache__/views.cpython-310.pyc index 35f30213..4852d109 100644 Binary files a/back_end/django_server/main/__pycache__/views.cpython-310.pyc and b/back_end/django_server/main/__pycache__/views.cpython-310.pyc differ diff --git a/back_end/django_server/main/migrations/__pycache__/0001_initial.cpython-310.pyc b/back_end/django_server/main/migrations/__pycache__/0001_initial.cpython-310.pyc index ac188743..510420f2 100644 Binary files a/back_end/django_server/main/migrations/__pycache__/0001_initial.cpython-310.pyc and b/back_end/django_server/main/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/back_end/django_server/main/migrations/__pycache__/__init__.cpython-310.pyc b/back_end/django_server/main/migrations/__pycache__/__init__.cpython-310.pyc index 5cbf4d5e..3fa04f6b 100644 Binary files a/back_end/django_server/main/migrations/__pycache__/__init__.cpython-310.pyc and b/back_end/django_server/main/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/front_end/rice-eats/package-lock.json b/front_end/rice-eats/package-lock.json index 0d106cd8..6af3f21d 100644 --- a/front_end/rice-eats/package-lock.json +++ b/front_end/rice-eats/package-lock.json @@ -22,6 +22,7 @@ "react": "^18.2.0", "react-bootstrap": "^2.5.0", "react-dom": "^18.2.0", + "react-redux": "^8.0.4", "react-router": "^6.4.0", "react-router-dom": "^6.4.1", "react-scripts": "^5.0.1", @@ -3835,6 +3836,15 @@ "@types/node": "*" } }, + "node_modules/@types/hoist-non-react-statics": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "dependencies": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "node_modules/@types/html-minifier-terser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", @@ -4237,6 +4247,11 @@ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz", "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==" }, + "node_modules/@types/use-sync-external-store": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", + "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" + }, "node_modules/@types/warning": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz", @@ -8666,6 +8681,19 @@ "he": "bin/he" } }, + "node_modules/hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "dependencies": { + "react-is": "^16.7.0" + } + }, + "node_modules/hoist-non-react-statics/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, "node_modules/hoopy": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", @@ -14236,6 +14264,49 @@ "react-dom": "^16.8.0 || ^17 || ^18" } }, + "node_modules/react-redux": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.4.tgz", + "integrity": "sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ==", + "dependencies": { + "@babel/runtime": "^7.12.1", + "@types/hoist-non-react-statics": "^3.3.1", + "@types/use-sync-external-store": "^0.0.3", + "hoist-non-react-statics": "^3.3.2", + "react-is": "^18.0.0", + "use-sync-external-store": "^1.0.0" + }, + "peerDependencies": { + "@types/react": "^16.8 || ^17.0 || ^18.0", + "@types/react-dom": "^16.8 || ^17.0 || ^18.0", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0", + "react-native": ">=0.59", + "redux": "^4" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + }, + "react-dom": { + "optional": true + }, + "react-native": { + "optional": true + }, + "redux": { + "optional": true + } + } + }, + "node_modules/react-redux/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, "node_modules/react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", @@ -16134,6 +16205,14 @@ "requires-port": "^1.0.0" } }, + "node_modules/use-sync-external-store": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", + "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -19700,6 +19779,15 @@ "@types/node": "*" } }, + "@types/hoist-non-react-statics": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "requires": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "@types/html-minifier-terser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", @@ -20049,6 +20137,11 @@ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz", "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==" }, + "@types/use-sync-external-store": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", + "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" + }, "@types/warning": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz", @@ -23251,6 +23344,21 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + } + } + }, "hoopy": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", @@ -27102,6 +27210,26 @@ "warning": "^4.0.2" } }, + "react-redux": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.4.tgz", + "integrity": "sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ==", + "requires": { + "@babel/runtime": "^7.12.1", + "@types/hoist-non-react-statics": "^3.3.1", + "@types/use-sync-external-store": "^0.0.3", + "hoist-non-react-statics": "^3.3.2", + "react-is": "^18.0.0", + "use-sync-external-store": "^1.0.0" + }, + "dependencies": { + "react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + } + } + }, "react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", @@ -28495,6 +28623,12 @@ "requires-port": "^1.0.0" } }, + "use-sync-external-store": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", + "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", + "requires": {} + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/front_end/rice-eats/package.json b/front_end/rice-eats/package.json index 0a8109ca..d5873854 100644 --- a/front_end/rice-eats/package.json +++ b/front_end/rice-eats/package.json @@ -17,6 +17,7 @@ "react": "^18.2.0", "react-bootstrap": "^2.5.0", "react-dom": "^18.2.0", + "react-redux": "^8.0.4", "react-router": "^6.4.0", "react-router-dom": "^6.4.1", "react-scripts": "^5.0.1", diff --git a/front_end/rice-eats/src/components/MealPicker.js b/front_end/rice-eats/src/components/MealPicker.js index d9ff9447..42b924d1 100644 --- a/front_end/rice-eats/src/components/MealPicker.js +++ b/front_end/rice-eats/src/components/MealPicker.js @@ -5,7 +5,9 @@ import { getCurrentMeal, getMealString1, getMealString2, getNextMeal, getPrevMea export default function MealPicker(props) { // TODO: make this do something lol - const [dateMeal, setDateMeal] = useState(getCurrentMeal()); + const dateMeal = props.dateMeal; + const setDateMeal = props.setDateMeal; + // const [dateMeal, setDateMeal] = useState(getCurrentMeal()); const [mealString1, setMealString1] = useState("Friday, Dinner"); const [mealString2, setMealString2] = useState("5:30 PM - 7:30 PM"); diff --git a/front_end/rice-eats/src/components/Text.js b/front_end/rice-eats/src/components/Text.js index dc676c58..ab99e97b 100644 --- a/front_end/rice-eats/src/components/Text.js +++ b/front_end/rice-eats/src/components/Text.js @@ -5,11 +5,12 @@ export default function Text(props) { const white = props.white ?? false; const bold = props.bold ?? false; const large = props.large ?? false; + const customFontSize = props.customFontSize ?? 16; return (
, }, + { + path: "*", + element: , + } ]); const root = ReactDOM.createRoot(document.getElementById('root')); diff --git a/front_end/rice-eats/src/pages/ErrorPage.js b/front_end/rice-eats/src/pages/ErrorPage.js new file mode 100644 index 00000000..9c31d19a --- /dev/null +++ b/front_end/rice-eats/src/pages/ErrorPage.js @@ -0,0 +1,18 @@ +import React from 'react'; +import Button from "../components/Button"; +import Text from "../components/Text"; +import { useNavigate } from "react-router-dom"; + +export default function ErrorPage() { + const navigate = useNavigate(); + const onButtonClick = () => { + navigate("/"); + }; + return ( +
+ + Uh Oh! It looks like our website broke :( + +
+ ) +} \ No newline at end of file diff --git a/front_end/rice-eats/src/pages/LandingPage.js b/front_end/rice-eats/src/pages/LandingPage.js index 67853dfa..e32a7f75 100644 --- a/front_end/rice-eats/src/pages/LandingPage.js +++ b/front_end/rice-eats/src/pages/LandingPage.js @@ -2,6 +2,7 @@ import React, { useState,useEffect } from 'react'; import { serveryName, serveryUrl, serveryMapUrl, getOrderedServeryList, setOrderedServeryList, getScreenSize } from '../config/config'; import { realRetrieveMenus, RetrieveMenus } from '../utils/APICalls'; +import { getCurrentMeal } from '../utils/Meals'; import ServeryCard from '../components/ServeryCard'; import TopBar from '../components/TopBar'; @@ -10,7 +11,10 @@ import MealPicker from '../components/MealPicker'; export default function LandingPage() { const [menus, setMenus] = useState(RetrieveMenus()); const [serveries, setServeries] = useState(getOrderedServeryList()); - useEffect(() => realRetrieveMenus((response) => setMenus(response.data)), [setMenus]); + const [dateMeal, setDateMeal] = useState(getCurrentMeal()); + console.log(dateMeal[0]); + console.log(dateMeal[1]); + useEffect(() => realRetrieveMenus((response) => setMenus(response.data), dateMeal[0], dateMeal[1]), [setMenus, dateMeal]); // PostReview(); const moveServeryToTop = (serveryName) => { @@ -20,7 +24,6 @@ export default function LandingPage() { setServeries(newServeries); setOrderedServeryList(newServeries); }; - const screenSize = getScreenSize(); const gridTemplateColumns = screenSize === "large" ? "1fr 1fr 1fr" : screenSize === "medium" ? "1fr 1fr" : "1fr"; @@ -34,7 +37,7 @@ export default function LandingPage() {
- +
{ + console.log(data); + func(data); + }); } export function RetrieveMenus() { diff --git a/front_end/rice-eats/src/utils/Meals.js b/front_end/rice-eats/src/utils/Meals.js index 463b3813..5a22b2a3 100644 --- a/front_end/rice-eats/src/utils/Meals.js +++ b/front_end/rice-eats/src/utils/Meals.js @@ -24,12 +24,12 @@ export const getNextMeal = (date, mealType) => { const d = createDateFromDateString(date); const newD = addDays(d, 1); const dateString = newD.toISOString().split('T')[0]; - return [dateString, "Breakfast"]; + return [dateString, "Lunch"]; } }; export const getPrevMeal = (date, mealType) => { - if (mealType === "Breakfast") { + if (mealType === "Lunch") { const d = createDateFromDateString(date); const newD = subDays(d, 1); const dateString = newD.toISOString().split('T')[0];