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.

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

Bhosseini/orders page #56

Merged
merged 64 commits into from
May 6, 2023
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
2bcb63c
The different componets of the Admin Page have been built. Just worki…
IsaiahA21 Feb 20, 2023
7df1e77
got the dashboard page up and running
IsaiahA21 Feb 20, 2023
eca6a43
added an Update section to the readMe page
IsaiahA21 Feb 20, 2023
7e5984d
Merge remote-tracking branch 'origin/main' into iasaolu/admin_dasboard
IsaiahA21 Feb 20, 2023
1df9c19
megered the changes from main
IsaiahA21 Feb 20, 2023
22b39c7
refactor: removed cloned kiwanis folder.
IsaiahA21 Feb 20, 2023
472cb04
Merge branch 'main' into iasaolu/admin_dasboard
IsaiahA21 Feb 22, 2023
f3104c6
refactor: cleaned up the look of the 4 grid boxes
IsaiahA21 Feb 22, 2023
3304b0a
install SheetJS
bahar-hosseini Feb 24, 2023
0a9f49b
install data-grid
bahar-hosseini Feb 24, 2023
f0adcab
set up orders page
bahar-hosseini Feb 27, 2023
a48572d
fix rowsState and searchResults type error
bahar-hosseini Feb 27, 2023
4c5bc2b
fix rowsState and searchResults type error
bahar-hosseini Feb 27, 2023
86532e6
use switch case statement instead of if-else statement
bahar-hosseini Feb 28, 2023
b01f058
change columns from dynamic to the static array
bahar-hosseini Feb 28, 2023
a60f6a9
fix style issue using renderCell and align them
bahar-hosseini Feb 28, 2023
165540d
refac: Added margin to pieChart.Tweaked admin Code
IsaiahA21 Mar 4, 2023
792748d
changed the dashboard title to 2023 Blueberry...
IsaiahA21 Mar 6, 2023
68a0b70
refactor: added documentation
IsaiahA21 Mar 9, 2023
e642c09
Removed on unnecessary imports
IsaiahA21 Mar 9, 2023
4c4acba
removed the no-mixed spaces and tab rule
IsaiahA21 Mar 11, 2023
20bffe7
delete the .hintrc file
IsaiahA21 Mar 11, 2023
d619732
Removed the updates section I added from README.md
IsaiahA21 Mar 11, 2023
9510ceb
refactor: added emtion/react and fix indentation
IsaiahA21 Mar 11, 2023
89c7f16
refactor: replaced piechart with chart.js
IsaiahA21 Mar 12, 2023
8d9daab
refactor: removed devexpress
IsaiahA21 Mar 12, 2023
7310529
refacto: Implemented the new set of comments
IsaiahA21 Mar 13, 2023
9833382
Merge branch 'main' into iasaolu/admin_dasboard
IsaiahA21 Mar 16, 2023
b282927
refactor: Merge changes
IsaiahA21 Mar 16, 2023
411947d
removed unused variables
IsaiahA21 Mar 20, 2023
f1de80d
Add new order button feature
bahar-hosseini Mar 22, 2023
7ea06bd
Merge branch 'main' into bhosseini/orders_page
bahar-hosseini Mar 22, 2023
8733fba
fix searcharea size and orders to dashboard
bahar-hosseini Mar 22, 2023
1a47447
Add calculator to step three
bahar-hosseini Mar 22, 2023
5ebceba
add 3 more steps
bahar-hosseini Mar 24, 2023
81cbceb
modify stepper container style
bahar-hosseini Mar 25, 2023
940697e
change some styles
bahar-hosseini Mar 25, 2023
388e64e
modify height of stepper
bahar-hosseini Mar 25, 2023
95c2c74
use theme colors in the Stepper
bahar-hosseini Mar 28, 2023
a44ea3d
use Formik for stepOne form
bahar-hosseini Mar 28, 2023
86e5408
use orderDetails in code to avoid error
bahar-hosseini Mar 28, 2023
e9de4c5
Fix line endings
ckthiessen Apr 1, 2023
253b1df
Update to MUI v5. Fix formatting
ckthiessen Apr 1, 2023
0ad7990
Fix formatting and naming on pie chart. rename file
ckthiessen Apr 1, 2023
48a944f
Fix chart imports
ckthiessen Apr 1, 2023
c7059c1
Rename files for clarity
ckthiessen Apr 2, 2023
9a858b0
Fix formatting. Fix styling
ckthiessen Apr 2, 2023
7b6e971
Fix dashboard usage
ckthiessen Apr 3, 2023
a29d96d
format admin components
ckthiessen Apr 3, 2023
5b8778b
Update styling on chart component
ckthiessen Apr 3, 2023
664701f
Refactor method. Reformat code
ckthiessen Apr 10, 2023
1e053e0
Whitespace
ckthiessen Apr 10, 2023
545b72c
Remove unused dep
ckthiessen Apr 10, 2023
37bb755
Unused dep
ckthiessen Apr 10, 2023
abe5a84
Merge pull request #58 from rubyforgood/iasaolu/admin_dasboard
ckthiessen Apr 10, 2023
0e4f823
Add routing. Add login page
ckthiessen Apr 23, 2023
8534621
Fix linting errors
ckthiessen Apr 23, 2023
3313445
refactor: optimze imports
SBrazzCode Apr 23, 2023
09c6749
Set up authentication for login
ckthiessen Apr 24, 2023
f1c120a
Add logout button
ckthiessen Apr 30, 2023
6339191
feat: rename orders pages
ckthiessen Apr 30, 2023
320b921
Merge branch 'bhosseini/orders_page' of github.com:rubyforgood/kiwani…
ckthiessen Apr 30, 2023
e567f95
Fix conflicts
ckthiessen Apr 30, 2023
908ff60
refactor: formatting
ckthiessen May 6, 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
23,942 changes: 23,223 additions & 719 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
"@emotion/styled": "latest",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.8",
"@mui/x-data-grid": "^5.17.25",
"formik": "^2.2.9",
"react": "latest",
"react-dom": "latest",
"react-hook-form": "^7.43.1",
"react-scripts": "latest",
"recharts": "^2.4.1",
"typescript": "^4.9.5"
"typescript": "^4.9.5",
"xlsx": "^0.18.5"
},
"scripts": {
"start": "react-scripts start",
Expand Down
5 changes: 5 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import * as React from "react";
import { Dashboard } from "./components/dashboard/Dashboard";
import Orders from "./components/dashboard/Orders";
import StepperProvider from "./providers/SteperProvider";

export default function App() {
return (
<Dashboard>
<StepperProvider>
<Orders />
</StepperProvider>
</Dashboard>
);
}
2 changes: 1 addition & 1 deletion src/components/dashboard/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { Copyright } from "../common/Copyright";
const drawerWidth = 240;

interface AppBarProps extends MuiAppBarProps {
open?: boolean;
open?: boolean;
}

const AppBar = styled(MuiAppBar, {
Expand Down
Loading