From 6bd3a9595f6c9e3d94be80b984ef635a06a88714 Mon Sep 17 00:00:00 2001 From: pikiou Date: Wed, 8 Dec 2021 11:09:33 +0100 Subject: [PATCH] Fix names still in french --- src/components/RegisterForm/RegisterForm.tsx | 12 +++++------ src/server/gsheets/preVolunteers.ts | 20 +++++++++++------- src/server/gsheets/volunteers.ts | 4 ++-- src/server/index.ts | 4 ++-- src/server/userManagement/login.ts | 8 +++---- src/services/preVolunteers.ts | 20 +++++++++--------- src/services/volunteers.ts | 6 +++--- src/store/preVolunteerAdd.ts | 22 ++++++++++---------- src/store/rootReducer.ts | 4 ++-- 9 files changed, 52 insertions(+), 48 deletions(-) diff --git a/src/components/RegisterForm/RegisterForm.tsx b/src/components/RegisterForm/RegisterForm.tsx index 60fe327..043af7f 100644 --- a/src/components/RegisterForm/RegisterForm.tsx +++ b/src/components/RegisterForm/RegisterForm.tsx @@ -4,7 +4,7 @@ import { toast } from "react-toastify" import _ from "lodash" import styles from "./styles.module.scss" -import { fetchPreMemberAdd } from "../../store/preVolunteerAdd" +import { fetchPreVolunteerAdd } from "../../store/preVolunteerAdd" import { AppDispatch, AppState } from "../../store" interface Props { @@ -36,7 +36,7 @@ const RegisterForm = ({ dispatch }: Props): JSX.Element => { const onSubmit = () => { if (firstname && lastname && email && mobile && !sending) { dispatch( - fetchPreMemberAdd({ + fetchPreVolunteerAdd({ firstname, lastname, email, @@ -60,13 +60,13 @@ const RegisterForm = ({ dispatch }: Props): JSX.Element => { } } - const { error, entities: preMember } = useSelector( - (state: AppState) => state.preMemberAdd, + const { error, entities: preVolunteer } = useSelector( + (state: AppState) => state.preVolunteerAdd, shallowEqual ) let sendSuccess - if (!_.isEmpty(preMember)) { + if (!_.isEmpty(preVolunteer)) { if (sending) { setSending(false) } @@ -74,7 +74,7 @@ const RegisterForm = ({ dispatch }: Props): JSX.Element => { } let sendError - if (error && _.isEmpty(preMember)) { + if (error && _.isEmpty(preVolunteer)) { if (sending) { setSending(false) } diff --git a/src/server/gsheets/preVolunteers.ts b/src/server/gsheets/preVolunteers.ts index 1a01661..e1fce08 100644 --- a/src/server/gsheets/preVolunteers.ts +++ b/src/server/gsheets/preVolunteers.ts @@ -1,16 +1,20 @@ import getExpressAccessors from "./expressAccessors" import { sheetNames } from "./accessors" -import { PreMember, PreMemberWithoutId, translationPreMember } from "../../services/preVolunteers" +import { + PreVolunteer, + PreVolunteerWithoutId, + translationPreVolunteer, +} from "../../services/preVolunteers" const { listGetRequest, getRequest, setRequest, addRequest } = getExpressAccessors< - PreMemberWithoutId, - PreMember ->(sheetNames.PreVolunteers, new PreMember(), translationPreMember) + PreVolunteerWithoutId, + PreVolunteer +>(sheetNames.PreVolunteers, new PreVolunteer(), translationPreVolunteer) -export const preMemberListGet = listGetRequest() +export const preVolunteerListGet = listGetRequest() -export const preMemberGet = getRequest() +export const preVolunteerGet = getRequest() -export const preMemberAdd = addRequest() +export const preVolunteerAdd = addRequest() -export const preMemberSet = setRequest() +export const preVolunteerSet = setRequest() diff --git a/src/server/gsheets/volunteers.ts b/src/server/gsheets/volunteers.ts index 685c88a..583a2a1 100644 --- a/src/server/gsheets/volunteers.ts +++ b/src/server/gsheets/volunteers.ts @@ -1,11 +1,11 @@ import getExpressAccessors from "./expressAccessors" import { sheetNames } from "./accessors" -import { Volunteer, VolunteerWithoutId, translationMember } from "../../services/volunteers" +import { Volunteer, VolunteerWithoutId, translationVolunteer } from "../../services/volunteers" const { listGetRequest, getRequest, setRequest, addRequest } = getExpressAccessors< VolunteerWithoutId, Volunteer ->(sheetNames.Volunteers, new Volunteer(), translationMember) +>(sheetNames.Volunteers, new Volunteer(), translationVolunteer) export const volunteerListGet = listGetRequest() diff --git a/src/server/index.ts b/src/server/index.ts index 4f88249..2dfa449 100755 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -18,7 +18,7 @@ import certbotRouter from "../routes/certbot" import { secure } from "./secure" import { javGameListGet } from "./gsheets/javGames" import { wishListGet, wishAdd } from "./gsheets/wishes" -import { preMemberAdd } from "./gsheets/preVolunteers" +import { preVolunteerAdd } from "./gsheets/preVolunteers" import { volunteerGet, volunteerSet } from "./gsheets/volunteers" import loginHandler from "./userManagement/login" import config from "../config" @@ -57,7 +57,7 @@ app.post("/api/user/login", loginHandler) app.get("/JavGameListGet", javGameListGet) app.get("/WishListGet", wishListGet) app.post("/WishAdd", wishAdd) -app.post("/PreMemberAdd", preMemberAdd) +app.post("/PreVolunteerAdd", preVolunteerAdd) // Secured APIs app.get("/VolunteerGet", secure as RequestHandler, volunteerGet) diff --git a/src/server/userManagement/login.ts b/src/server/userManagement/login.ts index 6f2773b..d36e36d 100644 --- a/src/server/userManagement/login.ts +++ b/src/server/userManagement/login.ts @@ -2,10 +2,10 @@ import { Request, Response, NextFunction } from "express" import bcrypt from "bcrypt" import { Volunteer, - MemberLogin, + VolunteerLogin, emailRegexp, passwordMinLength, - translationMember, + translationVolunteer, } from "../../services/volunteers" import { getAccessors, sheetNames } from "../gsheets/accessors" import { getJwt } from "../secure" @@ -30,8 +30,8 @@ export default async function loginHandler( } } -export async function login(rawEmail: string, rawPassword: string): Promise { - const { listGet } = getAccessors(sheetNames.Volunteers, new Volunteer(), translationMember) +export async function login(rawEmail: string, rawPassword: string): Promise { + const { listGet } = getAccessors(sheetNames.Volunteers, new Volunteer(), translationVolunteer) const email = rawEmail.replace(/^\s*/, "").replace(/\s*$/, "") if (!emailRegexp.test(email)) { diff --git a/src/services/preVolunteers.ts b/src/services/preVolunteers.ts index e3c61e5..14d9cad 100644 --- a/src/services/preVolunteers.ts +++ b/src/services/preVolunteers.ts @@ -1,6 +1,6 @@ import getServiceAccessors from "./accessors" -export class PreMember { +export class PreVolunteer { id = 0 firstname = "" @@ -16,7 +16,7 @@ export class PreMember { comment = "" } -export const translationPreMember: { [k in keyof PreMember]: string } = { +export const translationPreVolunteer: { [k in keyof PreVolunteer]: string } = { id: "id", firstname: "prenom", lastname: "nom", @@ -26,16 +26,16 @@ export const translationPreMember: { [k in keyof PreMember]: string } = { comment: "commentaire", } -const elementName = "PreMember" +const elementName = "PreVolunteer" -export type PreMemberWithoutId = Omit +export type PreVolunteerWithoutId = Omit -const { listGet, get, set, add } = getServiceAccessors( +const { listGet, get, set, add } = getServiceAccessors( elementName, - translationPreMember + translationPreVolunteer ) -export const preMemberListGet = listGet() -export const preMemberGet = get() -export const preMemberAdd = add() -export const preMemberSet = set() +export const preVolunteerListGet = listGet() +export const preVolunteerGet = get() +export const preVolunteerAdd = add() +export const preVolunteerSet = set() diff --git a/src/services/volunteers.ts b/src/services/volunteers.ts index d84c029..1ea0dbe 100644 --- a/src/services/volunteers.ts +++ b/src/services/volunteers.ts @@ -28,7 +28,7 @@ export class Volunteer { password = "" } -export const translationMember: { [k in keyof Volunteer]: string } = { +export const translationVolunteer: { [k in keyof Volunteer]: string } = { id: "id", lastname: "nom", firstname: "prenom", @@ -50,7 +50,7 @@ export const emailRegexp = /^(([^<>()[\].,;:\s@"]+(\.[^<>()[\].,;:\s@"]+)*)|(".+"))@(([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{2,})$/i export const passwordMinLength = 4 -export interface MemberLogin { +export interface VolunteerLogin { volunteer?: { firstname: string } @@ -62,7 +62,7 @@ export type VolunteerWithoutId = Omit const { listGet, get, set, add } = getServiceAccessors( elementName, - translationMember + translationVolunteer ) export const volunteerListGet = listGet() diff --git a/src/store/preVolunteerAdd.ts b/src/store/preVolunteerAdd.ts index a847944..d9610c2 100644 --- a/src/store/preVolunteerAdd.ts +++ b/src/store/preVolunteerAdd.ts @@ -1,22 +1,22 @@ import { PayloadAction, createSlice, createEntityAdapter } from "@reduxjs/toolkit" import { StateRequest, elementAddFetch } from "./utils" -import { PreMember, preMemberAdd } from "../services/preVolunteers" +import { PreVolunteer, preVolunteerAdd } from "../services/preVolunteers" -const preMemberAdapter = createEntityAdapter() +const preVolunteerAdapter = createEntityAdapter() -const preMemberAddSlice = createSlice({ - name: "addPreMember", - initialState: preMemberAdapter.getInitialState({ +const preVolunteerAddSlice = createSlice({ + name: "addPreVolunteer", + initialState: preVolunteerAdapter.getInitialState({ readyStatus: "idle", } as StateRequest), reducers: { getRequesting: (state) => { state.readyStatus = "request" }, - getSuccess: (state, { payload }: PayloadAction) => { + getSuccess: (state, { payload }: PayloadAction) => { state.readyStatus = "success" - preMemberAdapter.addOne(state, payload) + preVolunteerAdapter.addOne(state, payload) }, getFailure: (state, { payload }: PayloadAction) => { state.readyStatus = "failure" @@ -25,11 +25,11 @@ const preMemberAddSlice = createSlice({ }, }) -export default preMemberAddSlice.reducer -export const { getRequesting, getSuccess, getFailure } = preMemberAddSlice.actions +export default preVolunteerAddSlice.reducer +export const { getRequesting, getSuccess, getFailure } = preVolunteerAddSlice.actions -export const fetchPreMemberAdd = elementAddFetch( - preMemberAdd, +export const fetchPreVolunteerAdd = elementAddFetch( + preVolunteerAdd, getRequesting, getSuccess, getFailure, diff --git a/src/store/rootReducer.ts b/src/store/rootReducer.ts index e094546..2c0a3f5 100644 --- a/src/store/rootReducer.ts +++ b/src/store/rootReducer.ts @@ -8,7 +8,7 @@ import volunteer from "./volunteer" import volunteerAdd from "./volunteerAdd" import volunteerList from "./volunteerList" import volunteerSet from "./volunteerSet" -import preMemberAdd from "./preVolunteerAdd" +import preVolunteerAdd from "./preVolunteerAdd" // Use inferred return type for making correctly Redux types // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types @@ -20,7 +20,7 @@ export default (history: History) => ({ volunteerAdd, volunteerList, volunteerSet, - preMemberAdd, + preVolunteerAdd, router: connectRouter(history) as any, // Register more reducers... })