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

Backend with accounts and province ranking system #50

Open
wants to merge 77 commits into
base: backend+accounts+rankings
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
b07895d
initial docker-compose
AlexandreOndet Apr 28, 2023
b0a59ba
added nginx and mysql
AlexandreOndet Apr 28, 2023
f9edbce
small fix depends_on
AlexandreOndet Apr 28, 2023
18eb34c
two new empty pages for the future
AlexandreOndet Apr 28, 2023
44ca464
Merge branch 'main' into docker
AlexandreOndet May 23, 2023
bf2292a
root gitignore
AlexandreOndet May 23, 2023
3c68d0a
fix docker-compose new project structure
AlexandreOndet May 23, 2023
c1d7f23
update readme for docker-compose
AlexandreOndet May 23, 2023
f53e1fc
starting auth based on what scramble-matcher is doing
AlexandreOndet May 23, 2023
5d20075
update in how the environment variables are used
AlexandreOndet May 24, 2023
5cd2e20
fix env
AlexandreOndet May 24, 2023
b1e207e
start db connection
AlexandreOndet May 24, 2023
bb6a234
from wcaid to id to match everyone
AlexandreOndet May 24, 2023
4251a4e
Merge branch 'main' of github.com:AlexandreOndet/speedcubing-canada-w…
AlexandreOndet Jun 23, 2023
b185ed2
update in how environment variable are dealt with
AlexandreOndet Jun 23, 2023
cbea314
oauth does not nork and I don't kown why
AlexandreOndet Jun 25, 2023
3e5881c
start backend python (merci cubingUSA :D)
AlexandreOndet Jun 27, 2023
a82644a
the backend is running
AlexandreOndet Jun 28, 2023
bef4eed
the start of the login works but it crashes during callback
AlexandreOndet Jun 28, 2023
8a5cc5c
oauth is working :)
AlexandreOndet Jul 2, 2023
8bffbb9
Can log in and out from the frontend
AlexandreOndet Jul 3, 2023
d03fcbd
province storing is working
AlexandreOndet Jul 4, 2023
1386347
some frontend, it's not much but it's honest work
AlexandreOndet Jul 4, 2023
bf48664
frenchc translations for the new pages
AlexandreOndet Jul 4, 2023
06e79b1
db load updated for this project
AlexandreOndet Jul 4, 2023
053a6f8
fix path
AlexandreOndet Jul 5, 2023
68448ab
loi 101
AlexandreOndet Jul 6, 2023
bb142b0
fix startup script
AlexandreOndet Jul 18, 2023
68f70cf
update comput vm scripts
AlexandreOndet Jul 18, 2023
66425d0
Revert "update comput vm scripts"
AlexandreOndet Jul 18, 2023
832b109
moved requirements ouside package
AlexandreOndet Jul 18, 2023
b7726ad
fix path
AlexandreOndet Jul 18, 2023
972164f
fix legacy env variable name + switch state to province in rank model
AlexandreOndet Jul 19, 2023
c4c3537
fix env for staging
AlexandreOndet Jul 20, 2023
fc0ec71
fix staging env, again
AlexandreOndet Jul 20, 2023
506a2ef
logs in db loading
AlexandreOndet Jul 20, 2023
9127c76
vm setup and start of ranking api
AlexandreOndet Jul 21, 2023
6ccfe0b
staging website is norw working
AlexandreOndet Jul 29, 2023
1d37df1
more info on the profile
AlexandreOndet Aug 2, 2023
f967606
api for province rankings is now working
AlexandreOndet Aug 2, 2023
94c718b
profile with all the info (but still ugly)
AlexandreOndet Aug 3, 2023
658c87e
start of the ranking page
AlexandreOndet Aug 3, 2023
a432c65
alert to confirm update of the profile
AlexandreOndet Aug 3, 2023
e4dbc49
update readme and .env.dev
AlexandreOndet Aug 4, 2023
7e7dead
loading screen on profile
AlexandreOndet Aug 4, 2023
539b002
translation everywhere, even in Autocomplete :)
AlexandreOndet Aug 4, 2023
631f4cb
province rankings without event selection
AlexandreOndet Aug 9, 2023
921af77
no display when no Province selected
AlexandreOndet Aug 9, 2023
f11a539
fix forgotten translation
AlexandreOndet Aug 9, 2023
3e527bb
minor visual fixes
AlexandreOndet Aug 9, 2023
33acfe2
fixes from Kevin's suggestions
AlexandreOndet Aug 13, 2023
2d06d06
roles translations
AlexandreOndet Aug 13, 2023
2bc5811
2nd of Kevin's suggestion + small fix in french translation to be mov…
AlexandreOndet Aug 13, 2023
ec47999
removed unused default file
AlexandreOndet Aug 13, 2023
c60a5e1
if simplification
AlexandreOndet Aug 13, 2023
db8642c
changes since last code review: admin section, load db auto, frontend…
AlexandreOndet Sep 2, 2023
bf49653
Merge branch 'main' into account
AlexandreOndet Sep 2, 2023
db92c54
renaming frontend directory to app to ease the merging process
AlexandreOndet Sep 6, 2023
95932b4
removed axios from the project
AlexandreOndet Sep 6, 2023
26e151f
updated deploy script to reflect change in dir name
AlexandreOndet Sep 6, 2023
d9f3408
fixed error when not logged in
AlexandreOndet Sep 7, 2023
91f87ba
Merge branch 'main' into account
AlexandreOndet Sep 9, 2023
c6697c1
formatting with prettier
AlexandreOndet Sep 9, 2023
9a33b78
removing web-vitals package (already removed from the code a while ago)
AlexandreOndet Sep 9, 2023
9786fcb
changes from review (front part)
AlexandreOndet Sep 9, 2023
cf11637
method renaming
AlexandreOndet Sep 9, 2023
23002c5
better requirements
AlexandreOndet Sep 9, 2023
9da98ea
review changes part 1
AlexandreOndet Sep 10, 2023
079985f
review changes part 2
AlexandreOndet Sep 10, 2023
9bd2b48
update project name in deploy script
AlexandreOndet Sep 10, 2023
8d46357
better URL handling
AlexandreOndet Sep 13, 2023
73b9ee9
renamed round property
AlexandreOndet Sep 13, 2023
74d41b6
fix display bug in case of tie
AlexandreOndet Sep 20, 2023
1af8cbd
fixes and improvements from Kevin's review
AlexandreOndet Sep 26, 2023
8b29af8
Merge branch 'main' into account
AlexandreOndet Nov 8, 2023
b2189c9
fix variable name after merge
AlexandreOndet Nov 8, 2023
757d071
small docker config changes
AlexandreOndet Dec 29, 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
Prev Previous commit
Next Next commit
two new empty pages for the future
AlexandreOndet committed Apr 28, 2023
commit 18eb34cac5014c3fecd060f6a98c5069442f96b6
7 changes: 6 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -9,6 +9,9 @@ import { Home } from "./pages/Home";
import { About } from "./pages/About";
import { Organization } from "./pages/Organization";
import { FAQ } from "./pages/FAQ";
import { Rankings } from "./pages/Rankings";
import { Account } from "./pages/Account";


i18n.use(initReactI18next).init({
resources,
@@ -43,8 +46,10 @@ const App = () => {
<Route path="about" element={<About />} />
<Route path="organization" element={<Organization />} />
<Route path="faq" element={<FAQ />} />
<Route path="rankings" element={<Rankings />} />
<Route path="account" element={<Account />} />
</Route>
{["about", "organization", "faq"].map((route) => (
{["about", "organization", "faq", "rankins", "account"].map((route) => (
<Route
key={route}
path={route}
8 changes: 6 additions & 2 deletions src/components/Base.tsx
Original file line number Diff line number Diff line change
@@ -7,24 +7,28 @@ import {
BottomNavigation,
BottomNavigationAction,
} from "@mui/material";
import { Home, Info, CorporateFare, QuestionAnswer } from "@mui/icons-material";
import { Home, Info, CorporateFare, QuestionAnswer, AccountCircle, Leaderboard } from "@mui/icons-material";
import { Link, Outlet, useLocation, useParams } from "react-router-dom";
import { getLocaleOrFallback, SAVED_LOCALE } from "../locale";

const ROUTES = ["home", "about", "organization", "faq"] as const;
const ROUTES = ["home", "about", "organization", "faq","rankings", "account"] as const;

const ICONS = {
home: Home,
about: Info,
organization: CorporateFare,
faq: QuestionAnswer,
account: AccountCircle,
rankings: Leaderboard,
} as const;

const ROUTE_NAME_TO_ROUTE = {
home: "",
about: "about",
organization: "organization",
faq: "faq",
rankings: "rankings",
account: "account",
} as const;

export const Base = () => {
4 changes: 4 additions & 0 deletions src/locale.ts
Original file line number Diff line number Diff line change
@@ -27,6 +27,8 @@ export const resources = {
about: "About",
organization: "Organization",
faq: "FAQ",
account: "Account",
rankings: "Rankings",
},
about: {
title: "About",
@@ -111,6 +113,8 @@ export const resources = {
about: "À propos",
organization: "Organisation",
faq: "FAQ",
account: "Compte",
rankings: "Classement",
},
about: {
title: "À propos",
14 changes: 14 additions & 0 deletions src/pages/Account.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { useTranslation } from "react-i18next";
import {
Container,
} from "@mui/material";

export const Account = () => {
const { t } = useTranslation();

return (
<Container maxWidth="md">
<div>Account</div>
</Container>
);
};
14 changes: 14 additions & 0 deletions src/pages/Rankings.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { useTranslation } from "react-i18next";
import {
Container,
} from "@mui/material";

export const Rankings = () => {
const { t } = useTranslation();

return (
<Container maxWidth="md">
<div>Rankings</div>
</Container>
);
};