gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'main'

Browse Source 
develop

See merge request witapp/aura-webapp!767
This commit is contained in:
Daniil Chemerkin 2025-05-07 08:20:25 +00:00
commit 0e86df12dc
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth/AuthContext.ts
View File

@ -6,7 +6,7 @@ export interface AuthContextValue {
user: User.User | null
token: AuthToken
logout: () => void
signUp: (token: AuthToken, user: User.User, newUser?: IUser) => AuthToken
signUp: (token: AuthToken, user: User.User, newUser?: IUser, isAnonymous?: boolean) => AuthToken
}
export const AuthContext = createContext<AuthContextValue>({} as AuthContextValue)

22
src/auth/AuthProvider.tsx
View File

@ -11,8 +11,10 @@ export function AuthProvider({
const dispatch = useDispatch();
const token = useSelector(selectors.selectToken);
const user = useSelector(selectors.selectUser);
const { gender, partnerGender, birthdate, partnerBirthdate, birthPlace, partnerBirthPlace } = useSelector(selectors.selectQuestionnaire);
const signUp = useCallback(
(token: AuthToken, user: User.User, newUser?: IUser): AuthToken => {
(token: AuthToken, user: User.User, newUser?: IUser, isAnonymous?: boolean): AuthToken => {
dispatch(actions.token.update(token));
dispatch(actions.user.update(user));
dispatch(actions.form.addEmail(user.email));
@ -24,23 +26,23 @@ export function AuthProvider({
)
);
}
if (newUser) {
if (newUser && !isAnonymous) {
dispatch(actions.questionnaire.update({
gender: newUser.profile.gender ?? undefined,
birthPlace: newUser.profile.birthplace?.address ?? undefined,
birthdate: newUser.profile.birthdate ?? undefined,
partnerBirthPlace: newUser.partner?.birthplace?.address ?? undefined,
partnerBirthdate: newUser.partner?.birthdate ?? undefined,
partnerGender: newUser.partner?.gender ?? undefined,
gender: newUser.profile?.gender || gender || undefined,
birthPlace: newUser.profile?.birthplace?.address || birthPlace || undefined,
birthdate: newUser.profile?.birthdate || birthdate || undefined,
partnerBirthPlace: newUser.partner?.birthplace?.address || partnerBirthPlace || undefined,
partnerBirthdate: newUser.partner?.birthdate || partnerBirthdate || undefined,
partnerGender: newUser.partner?.gender || partnerGender || undefined,
}))
dispatch(actions.user.update({
username: newUser.profile.name ?? undefined,
username: newUser.profile?.name ?? undefined,
}));
}
return token;
},
[dispatch]
[dispatch, gender, partnerGender, birthdate, partnerBirthdate, birthPlace, partnerBirthPlace]
);
const logout = useCallback(() => dispatch(actions.reset()), [dispatch]);
const auth = useMemo(

1
src/components/CompatibilityV4/pages/Birthplace/index.tsx
View File

@ -31,6 +31,7 @@ function Birthplace() {
birthplace,
})
);
dispatch(actions.questionnaire.update({ birthPlace: birthplace }));
}
setIsValidBirthplace(true);
};

1
src/components/CompatibilityV4/pages/BirthplacePartner/index.tsx
View File

@ -33,6 +33,7 @@ function BirthplacePartner() {
birthplacePartner,
})
);
dispatch(actions.questionnaire.update({ partnerBirthPlace: birthplace }));
}
setIsValidBirthplace(true);
};

1
src/components/CompatibilityV4/pages/Birthtime/index.tsx
View File

@ -22,6 +22,7 @@ function Birthtime() {
const handleClick = () => {
dispatch(actions.compatibilityV4Answers.update({ birthtime }));
dispatch(actions.questionnaire.update({ birthtime }));
navigate(routes.client.compatibilityV4YourAnalysis());
}

13
src/components/CompatibilityV4/pages/WhatAddToAnalysis/index.tsx
View File

@ -4,7 +4,7 @@ import { useTranslations } from "@/hooks/translations";
import { ELocalesPlacement } from "@/locales";
import Answer from "../../components/Answer";
import { IAnswersSessionCompatibilityV4 } from "@/api/resources/Session";
import { useMemo } from "react";
import { useEffect, useMemo } from "react";
import { actions, selectors } from "@/store";
import { useDispatch, useSelector } from "react-redux";
import { useSession } from "@/hooks/session/useSession";
@ -132,6 +132,17 @@ function WhatAddToAnalysis() {
[translate, isSingle]
);
useEffect(() => {
if (!whatAddToAnalysis?.length) return;
const currentAnswers = whatAddToAnalysis.split(",")
.filter(item => item)
.filter(item => answers.some(answer => answer.id === item));
dispatch(actions.compatibilityV4Answers.update({
whatAddToAnalysis: currentAnswers.join(","),
}));
}, [whatAddToAnalysis, answers])
const handleClick = async (id: IAnswersSessionCompatibilityV4["what_add_to_analysis"]) => {
if (!whatAddToAnalysis) {
dispatch(actions.compatibilityV4Answers.update({

4
src/hooks/authentication/use-authentication.ts
View File

@ -185,7 +185,7 @@ export const useAuthentication = () => {
})
metricService.setUserID(userId);
}
signUp(token, user, userMe);
signUp(token, user, userMe, isAnonymous);
setToken(token);
dispatch(actions.userConfig.setAuthCode(authCode || ""));
dispatch(actions.personalVideo.updateStatus({ generatingVideo: generatingVideo || false, videoId: videoId || "" }));
@ -222,7 +222,7 @@ export const useAuthentication = () => {
})
metricService.setUserID(userId);
}
signUp(token, user, userMe);
signUp(token, user, userMe, true);
setToken(token);
dispatch(actions.userConfig.setAuthCode(authCode || ""));
dispatch(actions.personalVideo.updateStatus({ generatingVideo: generatingVideo || false, videoId: videoId || "" }));