Skip to content
Open

Beta #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
030fdef
wip
coder13 Jul 10, 2023
64c2995
wip
coder13 Aug 14, 2023
3a0ddc1
WIP: wca-group-generator testing
coder13 Aug 19, 2023
eff1148
Steps and Recipes now in DD
coder13 Aug 19, 2023
f241a5f
Started Recipe Editor components
coder13 Aug 21, 2023
eaa8010
Merge branch 'main' into wca-group-generators
coder13 Aug 21, 2023
789583f
Merge branch 'main' into wca-group-generators
coder13 Aug 21, 2023
f76d70b
PATCH
coder13 Aug 21, 2023
91c7088
WIP: implementation of wca-group-generators
coder13 Aug 28, 2023
61abcff
Merge branch 'main' into wca-group-generators
coder13 Aug 29, 2023
8ddf73f
Can configure a recipe to a basic extent
coder13 Aug 30, 2023
13cc018
Expanded on editing step, can save edits to wcif and load them
coder13 Aug 31, 2023
8d8d21d
Updated wca-group-generators
coder13 Aug 31, 2023
e7d1ed1
Merge branch 'main' into wca-group-generators
coder13 Aug 31, 2023
2332f74
Fixed lint warning
coder13 Aug 31, 2023
be16da2
Merge branch 'main' into wca-group-generators
coder13 Sep 1, 2023
cf54c71
Merge branch 'beta' into wca-group-generators
coder13 Sep 1, 2023
2fc7230
wip
coder13 Sep 1, 2023
e2ed306
Merge branch 'main' into wca-group-generators
coder13 Sep 1, 2023
5980217
Updated steps
coder13 Sep 3, 2023
d102f3f
Merge branch 'main' into wca-group-generators
coder13 Sep 3, 2023
8cdf70d
Merge branch 'main' into wca-group-generators
coder13 Sep 3, 2023
781d77d
Added recipe to generate 1 group finals
coder13 Sep 3, 2023
deb3f6c
Will pick a default recipe
coder13 Sep 3, 2023
28c85ea
Merge branch 'main' into wca-group-generators
coder13 Sep 4, 2023
8fad344
Merge branch 'wca-group-generators' into beta
coder13 Sep 4, 2023
547e5f9
set title for comp pages
coder13 Sep 4, 2023
ea941fc
Fixed types error
coder13 Sep 4, 2023
8b409a3
Merge branch 'main' into wca-group-generators
coder13 Sep 6, 2023
3af8e92
Updated wca-group-generators
coder13 Sep 14, 2023
1a68edb
Merge branch 'wca-group-generators' into beta
coder13 Sep 14, 2023
5323504
Merge branch 'main' into wca-group-generators
coder13 Sep 14, 2023
5b964c7
Merge branch 'wca-group-generators' into beta
coder13 Sep 14, 2023
cf930b0
Updated wca-group-generators
coder13 Sep 14, 2023
105d55a
Started adding mca recipe
coder13 Sep 14, 2023
a434d4d
Finished MCA recipe
coder13 Sep 15, 2023
fb32eab
Merge branch 'wca-group-generators' into beta
coder13 Sep 15, 2023
6aaa192
Updated wca-group-generators
coder13 Sep 15, 2023
b8c83b3
Merge branch 'wca-group-generators' into beta
coder13 Sep 15, 2023
7f15f9c
Can switch recipes again
coder13 Sep 15, 2023
f48ccad
Merge branch 'main' into wca-group-generators
coder13 Sep 17, 2023
cf7a953
Added basic balanced recipe
coder13 Sep 17, 2023
4485030
Tweaked PNW recipe
coder13 Sep 17, 2023
7101bab
Merge branch 'main' into wca-group-generators
coder13 Sep 19, 2023
b4887e6
Refactored balanced groups generation
coder13 Sep 19, 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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"vite-plugin-pwa": "^0.16.4",
"vite-plugin-svgr": "^3.2.0",
"vite-tsconfig-paths": "^4.2.0",
"wca-group-generators": "^0.1.1",
"wca-group-generators": "^0.1.8",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
11 changes: 5 additions & 6 deletions src/App/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useEffect } from 'react';
import { Routes, Route, Outlet, Navigate, useNavigate, useParams } from 'react-router-dom';
import usePageTracking from '../hooks/usePageTracking';
import {
Expand Down Expand Up @@ -33,12 +32,12 @@ const AuthenticatedRoute = () => {
};

const Comp404 = () => {
const navigate = useNavigate();
const { competitionId } = useParams();
// const navigate = useNavigate();
// const { competitionId } = useParams();

useEffect(() => {
navigate(`/competitions/${competitionId}`, { replace: true });
}, [competitionId, navigate]);
// useEffect(() => {
// navigate(`/competitions/${competitionId}`, { replace: true });
// }, [competitionId, navigate]);

return null;
};
Expand Down
77 changes: 77 additions & 0 deletions src/components/RecipeEditor/EditRecipeDialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import { Round, activityCodeToName } from '@wca/helpers';
import { useState } from 'react';
import { Add, MoreVert } from '@mui/icons-material';
import {
Avatar,
Dialog,
DialogContent,
DialogTitle,
Divider,
IconButton,
List,
ListItem,
ListItemAvatar,
ListItemButton,
ListItemIcon,
ListItemText,
} from '@mui/material';
import { AssignmentStep, RecipeConfig, Step, StepLibrary } from '../../lib/recipes';
import { EditStepDialog } from './EditStepDialog';

interface EditRecipeDialogProps {
open: boolean;
onClose: () => void;
recipeConfig: RecipeConfig;
round: Round;
}

export const EditRecipeDialog = ({ open, onClose, recipeConfig, round }: EditRecipeDialogProps) => {
const [selectedStep, setSelectedStep] = useState<Step | undefined>(undefined);

return (
<>
<Dialog open={open} onClose={onClose} fullWidth maxWidth="lg">
<DialogTitle>
Editing Recipe {recipeConfig.name} for {activityCodeToName(round.id)}
</DialogTitle>
<DialogContent>
<List>
{recipeConfig.steps.map((step, index) => {
const stepDefinition = StepLibrary[step.id];
if (!stepDefinition) {
return null;
}

return (
<ListItem
key={step.id}
secondaryAction={
<IconButton edge="end" onClick={() => setSelectedStep(step)}>
<MoreVert />
</IconButton>
}>
<ListItemAvatar>
<Avatar>{index + 1}</Avatar>
</ListItemAvatar>
<ListItemText primary={stepDefinition.name} />
</ListItem>
);
})}
<ListItemButton>
<ListItemIcon>
<Add />
</ListItemIcon>
<ListItemText primary="Add step" />
</ListItemButton>
</List>
<Divider />
</DialogContent>
</Dialog>
<EditStepDialog
step={selectedStep as AssignmentStep}
onClose={() => setSelectedStep(undefined)}
round={round}
/>
</>
);
};
Loading