Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit meal request form #83

Merged
merged 24 commits into from
Aug 6, 2023
Merged

Edit meal request form #83

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5ad7801
updating form
hannahxdu May 30, 2023
b52653e
updated form
hannahxdu May 30, 2023
905bf3b
made rest of form
hannahxdu Jun 4, 2023
48d070f
updated form
sophie-wjyang Jun 6, 2023
4c0ed83
added styling
hannahxdu Jun 6, 2023
031a270
making final changes
sophie-wjyang Jun 6, 2023
c3b4780
new icon
hannahxdu Jun 6, 2023
84c0c40
fixed margins and bolded text
sophie-wjyang Jun 6, 2023
971b31c
fixed margins and bolded text
sophie-wjyang Jun 6, 2023
5fefe58
fixed colours
hannahxdu Jun 7, 2023
80302c4
Merge branch 'meal-request-form' of https://github.com/uwblueprint/fe…
hannahxdu Jun 7, 2023
2619b08
linters
hannahxdu Jun 13, 2023
f4cc488
added responsiveness
hannahxdu Jun 13, 2023
ab821d2
Remvoed unused vars lint rule
shahanneda Jun 13, 2023
d96a041
Comment test
shahanneda Jun 13, 2023
4a14dbd
Renamed file
shahanneda Jun 13, 2023
a113235
Merge remote-tracking branch 'origin/main' into meal-request-form
sophie-wjyang Jul 27, 2023
db30537
fixed import error
sophie-wjyang Jul 27, 2023
020fa34
extracted onsite staff component
sophie-wjyang Jul 28, 2023
5573f18
deleted old section
sophie-wjyang Jul 28, 2023
b5e7853
fixed lint errors
sophie-wjyang Jul 28, 2023
7d280fa
Made some minor adjustments and cleanup
shahanneda Aug 5, 2023
ebfc356
Fixed issue with tests
shahanneda Aug 5, 2023
0752520
Removed heading change from shared component
shahanneda Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions frontend/src/components/pages/Dashboard.tsx
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should lint before making the PR. Linting should fix easy formatting issues.

You can lint by following the instructions here:
https://github.com/uwblueprint/feeding-canadian-kids#linting--formatting

Mainly run docker exec -it fck_frontend /bin/bash -c "yarn fix" in a seperate terminal.

Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import { Button as ChakraButton, Wrap } from "@chakra-ui/react";

import React, { useContext } from "react";

import { useNavigate } from "react-router-dom";

import MealRequestForm from "./MealRequestForm";

import BackgroundImage from "../../assets/background.png";

import * as Routes from "../../constants/Routes";

import SampleContext from "../../contexts/SampleContext";

import Logout from "../auth/Logout";

import RefreshCredentials from "../auth/RefreshCredentials";

type ButtonProps = { text: string; path: string };
Expand Down Expand Up @@ -67,6 +75,7 @@ const Default = (): React.ReactElement => {
/>
<Button text="Edit Team" path={Routes.EDIT_TEAM_PAGE} />
<Button text="Hooks Demo" path={Routes.HOOKS_PAGE} />
<MealRequestForm />
</Wrap>
<div style={{ height: "2rem" }} />

Expand Down
Loading