Skip to content

Commit

Permalink
Run Prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
gregorbg committed Jan 6, 2024
1 parent c6cfe2e commit 10e61e8
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 35 deletions.
6 changes: 4 additions & 2 deletions client/src/main/components/EventPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ const EventPicker = ({ wcaEvent, wcifEvent }: EventPickerProps) => {
)
}
disabled={
!isManualSelection || generatingScrambles
!isManualSelection ||
generatingScrambles
}
>
{wcaEvent.format_ids.map((format) => (
Expand All @@ -422,7 +423,8 @@ const EventPicker = ({ wcaEvent, wcifEvent }: EventPickerProps) => {
min={1}
required
disabled={
!isManualSelection || generatingScrambles
!isManualSelection ||
generatingScrambles
}
/>
</td>
Expand Down
3 changes: 2 additions & 1 deletion client/src/main/components/EventPickerTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ const EventPickerTable = () => {
// This filters events to show only those in the competition.
let filteredEvents = wcaEvents.filter(
(wcaEvent) =>
isManualSelection || wcif.events.find((item) => item.id === wcaEvent.id)
isManualSelection ||
wcif.events.find((item) => item.id === wcaEvent.id)
);

let eventChunks = chunk(filteredEvents, EVENTS_PER_LINE);
Expand Down
16 changes: 13 additions & 3 deletions client/src/main/components/FmcTranslationsDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,22 @@ const FmcTranslationsDetail = ({
);

useEffect(() => {
const wcifExtension = findExtension(fmcWcifEvent, fmcTranslationsExtensionId);
const wcifExtension = findExtension(
fmcWcifEvent,
fmcTranslationsExtensionId
);

if (wcifExtension === undefined && suggestedFmcTranslations !== undefined) {
if (
wcifExtension === undefined &&
suggestedFmcTranslations !== undefined
) {
updateEventSelectedTranslations(suggestedFmcTranslations);
}
}, [fmcWcifEvent, updateEventSelectedTranslations, suggestedFmcTranslations]);
}, [
fmcWcifEvent,
updateEventSelectedTranslations,
suggestedFmcTranslations,
]);

const handleTranslation = (id: string, status: boolean) => {
let newSelectedTranslations = selectedTranslations.filter(
Expand Down
5 changes: 4 additions & 1 deletion client/src/main/components/MbldDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ const MbldDetail = ({ mbldWcifEvent }: MbldDetailProps) => {
);

useEffect(() => {
const wcifExtension = findExtension(mbldWcifEvent, mbldCubesExtensionId);
const wcifExtension = findExtension(
mbldWcifEvent,
mbldCubesExtensionId
);

if (wcifExtension === undefined && bestMbldAttempt !== undefined) {
updateEventMbld(bestMbldAttempt);
Expand Down
5 changes: 4 additions & 1 deletion client/src/main/components/SchemeColorPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ const SchemeColorPicker = ({
>
<span
className={"color-bubble"}
style={{ backgroundColor: colorValue, pointerEvents: generatingScrambles ? 'none' : 'inherit' }}
style={{
backgroundColor: colorValue,
pointerEvents: generatingScrambles ? "none" : "inherit",
}}
>
{colorKey}
</span>
Expand Down
62 changes: 38 additions & 24 deletions client/src/main/components/SideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import tnoodleApi from "../api/tnoodle.api";
import wcaApi from "../api/wca.api";
import logo from "../assets/tnoodle_logo.svg";
import RootState from "../model/RootState";
import { addCachedObject, setIsManualSelection } from "../redux/slice/InformationSlice";
import {
addCachedObject,
setIsManualSelection,
} from "../redux/slice/InformationSlice";
import {
setBestMbldAttempt,
setSuggestedFmcTranslations,
} from "../redux/slice/EventDataSlice";
import { setFileZip } from "../redux/slice/ScramblingSlice";
import {
setCompetitionName,
setWcif,
} from "../redux/slice/WcifSlice";
import { setCompetitionName, setWcif } from "../redux/slice/WcifSlice";
import { getDefaultCompetitionName } from "../util/competition.name.util";
import {
deleteParameter,
Expand All @@ -37,9 +37,7 @@ const SideBar = () => {
const cachedObjects = useSelector(
(state: RootState) => state.informationSlice.cachedObjects
);
const wcif = useSelector(
(state: RootState) => state.wcifSlice.wcif
);
const wcif = useSelector((state: RootState) => state.wcifSlice.wcif);
const generatingScrambles = useSelector(
(state: RootState) => state.scramblingSlice.generatingScrambles
);
Expand All @@ -48,16 +46,20 @@ const SideBar = () => {
);

const [me, setMe] = useState<Person>();
const [upcomingCompetitions, setUpcomingCompetitions] = useState<Competition[]>();
const [upcomingCompetitions, setUpcomingCompetitions] =
useState<Competition[]>();

const [isOpen, setIsOpen] = useState(true);

const handleIsOpen = useCallback(() => setIsOpen(window.innerWidth > 992), [setIsOpen]);
const handleIsOpen = useCallback(
() => setIsOpen(window.innerWidth > 992),
[setIsOpen]
);

useEffect(() => {
window.addEventListener("resize", handleIsOpen);

return () => window.removeEventListener("resize", handleIsOpen)
return () => window.removeEventListener("resize", handleIsOpen);
}, [handleIsOpen]);

useEffect(() => {
Expand Down Expand Up @@ -85,7 +87,10 @@ const SideBar = () => {
}, [upcomingCompetitions, me]);

const competitions = useMemo(() => {
if (wcif.id === defaultWcif.id || wcif.name === getDefaultCompetitionName()) {
if (
wcif.id === defaultWcif.id ||
wcif.name === getDefaultCompetitionName()
) {
return upcomingCompetitions || [];
}

Expand All @@ -94,15 +99,14 @@ const SideBar = () => {
}

const queryParamId = getQueryParameter("competitionId");
const isUpcoming = upcomingCompetitions.some((comp) => comp.id === queryParamId);
const isUpcoming = upcomingCompetitions.some(
(comp) => comp.id === queryParamId
);

if (isUpcoming) {
return upcomingCompetitions;
} else {
return [
...upcomingCompetitions,
{ id: wcif.id, name: wcif.name }
]
return [...upcomingCompetitions, { id: wcif.id, name: wcif.name }];
}
}, [wcif, upcomingCompetitions]);

Expand Down Expand Up @@ -184,8 +188,11 @@ const SideBar = () => {
if (!!cachedObject) {
updateWcif(cachedObject.wcif);

let cachedSuggestedFmcTranslations = cachedObject.suggestedFmcTranslations;
dispatch(setSuggestedFmcTranslations(cachedSuggestedFmcTranslations));
let cachedSuggestedFmcTranslations =
cachedObject.suggestedFmcTranslations;
dispatch(
setSuggestedFmcTranslations(cachedSuggestedFmcTranslations)
);

let cachedBestMbldAttempt = cachedObject.bestMbldAttempt;
dispatch(setBestMbldAttempt(cachedBestMbldAttempt));
Expand Down Expand Up @@ -227,10 +234,13 @@ const SideBar = () => {
}
}, [loadCompetition, wcif.id]);

const handleCompetitionSelection = useCallback((competitionId: string) => {
setQueryParameter("competitionId", competitionId);
loadCompetition(competitionId);
}, [loadCompetition]);
const handleCompetitionSelection = useCallback(
(competitionId: string) => {
setQueryParameter("competitionId", competitionId);
loadCompetition(competitionId);
},
[loadCompetition]
);

const logInButton = () => {
return (
Expand Down Expand Up @@ -355,7 +365,11 @@ const SideBar = () => {
type="button"
className="btn btn-primary btn-lg btn-block m-1"
disabled={generatingScrambles}
onClick={() => handleCompetitionSelection(competition.id)}
onClick={() =>
handleCompetitionSelection(
competition.id
)
}
>
{competition.name}
</button>
Expand Down
3 changes: 2 additions & 1 deletion client/src/main/redux/slice/InformationSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ export const informationSlice = createSlice({
},
});

export const { addCachedObject, setIsManualSelection } = informationSlice.actions;
export const { addCachedObject, setIsManualSelection } =
informationSlice.actions;
4 changes: 2 additions & 2 deletions client/src/test/mock/wca.api.test.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ export const wcifs: Record<string, Wcif> = {
},
id: "org.worldcubeassociation.tnoodle.FmcLanguages",
specUrl: "",
}
},
],
},
{
Expand Down Expand Up @@ -724,7 +724,7 @@ export const wcifs: Record<string, Wcif> = {
},
id: "org.worldcubeassociation.tnoodle.MultiScrambleCount",
specUrl: "",
}
},
],
},
],
Expand Down

0 comments on commit 10e61e8

Please sign in to comment.