From 18c6f75511a67510b12e51029fd7852b1c1ea081 Mon Sep 17 00:00:00 2001 From: pikiou Date: Fri, 29 Apr 2022 01:52:08 +0200 Subject: [PATCH] =?UTF-8?q?Add=20global=20variables=20for=20meeting=20date?= =?UTF-8?q?s=C2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Asks/AskDiscord.tsx | 11 ++- src/components/RegisterForm/index.tsx | 31 ++++++-- .../DayWishesForm/DayWishesForm.tsx | 14 ++-- src/components/index.ts | 3 +- src/pages/Register/Register.tsx | 4 +- src/server/gsheets/localDb.ts | 2 + src/server/gsheets/miscs.ts | 42 +++++++++++ src/server/gsheets/volunteers.ts | 2 +- src/server/index.ts | 3 + src/services/accessors.ts | 30 +++++++- src/services/miscs.ts | 32 +++++++++ src/services/miscsAccessors.ts | 12 ++++ src/services/volunteersAccessors.ts | 6 +- src/store/miscDiscordInvitation.ts | 72 +++++++++++++++++++ src/store/miscMeetingDateList.ts | 64 +++++++++++++++++ src/store/rootReducer.ts | 8 ++- 16 files changed, 311 insertions(+), 25 deletions(-) create mode 100644 src/server/gsheets/miscs.ts create mode 100644 src/services/miscs.ts create mode 100644 src/services/miscsAccessors.ts create mode 100644 src/store/miscDiscordInvitation.ts create mode 100644 src/store/miscMeetingDateList.ts diff --git a/src/components/Asks/AskDiscord.tsx b/src/components/Asks/AskDiscord.tsx index e8ea8b7..8d48e6d 100644 --- a/src/components/Asks/AskDiscord.tsx +++ b/src/components/Asks/AskDiscord.tsx @@ -8,10 +8,15 @@ import { fetchVolunteerDiscordIdIfNeed, selectVolunteerDiscordId, } from "../../store/volunteerDiscordId" +import { + fetchMiscDiscordInvitationIfNeed, + selectMiscDiscordInvitation, +} from "../../store/miscDiscordInvitation" export function AskDiscord(asks: JSX.Element[], id: number): void { const { dispatch, jwtToken, volunteerAsks } = useAskTools() const discordId: string | undefined = useSelector(selectVolunteerDiscordId) + const discordInvitation = useSelector(selectMiscDiscordInvitation) const onSubmit = useCallback((): void => { dispatch( @@ -38,8 +43,8 @@ export function AskDiscord(asks: JSX.Element[], id: number): void { totalement via la gestion des notifications.
Pour rejoindre le serveur PeL, voici le lien d'invitation à cliquer :{" "} - - https://discord.gg/eXhjKxSBB4 + + {discordInvitation} {" "} !

@@ -64,4 +69,4 @@ export function AskDiscord(asks: JSX.Element[], id: number): void { } // Fetch server-side data here -export const fetchFor = [fetchVolunteerDiscordIdIfNeed] +export const fetchFor = [fetchVolunteerDiscordIdIfNeed, fetchMiscDiscordInvitationIfNeed] diff --git a/src/components/RegisterForm/index.tsx b/src/components/RegisterForm/index.tsx index 0eaf8c1..d93899f 100644 --- a/src/components/RegisterForm/index.tsx +++ b/src/components/RegisterForm/index.tsx @@ -11,6 +11,10 @@ import { fetchVolunteerPartialAdd } from "../../store/volunteerPartialAdd" import FormButton from "../Form/FormButton/FormButton" import { validEmail } from "../../utils/standardization" import { toastError } from "../../store/utils" +import { + fetchMiscMeetingDateListIfNeed, + selectMiscMeetingDateList, +} from "../../store/miscMeetingDateList" interface Props { dispatch: AppDispatch @@ -43,6 +47,8 @@ const RegisterForm = ({ dispatch }: Props): JSX.Element => { const [sending, setSending] = useState(false) const [changingBackground, setChangingBackground] = useState(0) + const meetingDateList = useSelector(selectMiscMeetingDateList) + useEffect(() => { const timer = setInterval(() => { setChangingBackground((changingBackground + 1) % animations.length) @@ -456,6 +462,14 @@ const RegisterForm = ({ dispatch }: Props): JSX.Element => { > Street Food Market + , ou à une soirée festive à 2 pas du lieu du festival, aux{" "} + + apéros de la pétanque + .

@@ -469,13 +483,13 @@ const RegisterForm = ({ dispatch }: Props): JSX.Element => {
- {[ - { value: "13mai", desc: "Vendredi 13 mai" }, - { value: "24mai", desc: "Mardi 24 mai" }, - { value: "1juin", desc: "Mercredi 1er juin" }, - { value: "9juin", desc: "Jeudi 9 juin" }, - { value: "", desc: "Aucune date possible" }, - ].map((option) => ( + {_.concat( + meetingDateList.map((meetingDetails) => ({ + value: meetingDetails.meetingId, + desc: meetingDetails.meetingTitle, + })), + { value: "", desc: "Aucune date possible" } + ).map((option) => (