Merge pull request #361 from ChildMindInstitute/dev2.5

Dev2.5
ChildMindInstitute · Feb 1, 2024 · 416d584 · 416d584
2 parents c2a0da2 + 09f9796
commit 416d584
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,13 @@
+name: Automated tests
+on: [pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          npm install -g yarn
+          yarn
+      - name: Running tests
+        run: yarn test
diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
@@ -179,7 +179,7 @@
       "failed": "Failed",
       "backToLogin": "Back to Log in",
       "backToSettings": "Back to Settings",
-      "invalidLink": "Link is invalid"
+      "invalidLink": "This link is invalid or expired. Please click <a href='/forgotpassword'>here</a> to reset your password."
     },
     "Landing": {
       "title": "Welcome to MindLogger",

diff --git a/src/i18n/fr/translation.json b/src/i18n/fr/translation.json
@@ -179,7 +179,7 @@
       "password": "le mot de passe",
       "backToLogin": "Back to Log in",
       "backToSettings": "Back to Settings",
-      "invalidLink": "Link is invalid"
+      "invalidLink": "Ce lien est invalide ou expiré. Veuillez cliquer <a href='/forgotpassword'>ici</a> pour réinitialiser votre mot de passe."
     },
     "Landing": {
       "title": "Bienvenue dans MindLogger",

diff --git a/src/pages/RecoveryPassword/index.tsx b/src/pages/RecoveryPassword/index.tsx
@@ -3,8 +3,8 @@ import { useSearchParams } from "react-router-dom"
 
 import { useRecoveryPasswordLinkHealthcheckQuery } from "~/entities/user"
 import { RecoveryPasswordForm, useRecoveryPasswordTranslation } from "~/features/RecoveryPassword"
-import { PageMessage } from "~/shared/ui"
 import Loader from "~/shared/ui/Loader"
+import { Text } from "~/shared/ui/Text"
 
 export default function RecoveryPasswordPage() {
   const [searchParams] = useSearchParams()
@@ -13,14 +13,20 @@ export default function RecoveryPasswordPage() {
   const key = searchParams.get("key")
   const email = searchParams.get("email")
 
-  const { isError, isLoading, error } = useRecoveryPasswordLinkHealthcheckQuery({ email: email!, key: key! })
+  const { isError, isLoading } = useRecoveryPasswordLinkHealthcheckQuery({ email: email!, key: key! })
 
   if (isLoading) {
     return <Loader />
   }
 
   if (isError) {
-    return <PageMessage message={error.evaluatedMessage!} />
+    return (
+      <Box display="flex" flex={1} justifyContent="center" alignItems="center" textAlign="center">
+        <Text variant="body1" fontSize="24px" margin="16px 0px">
+          <Box dangerouslySetInnerHTML={{ __html: t("invalidLink") }} />
+        </Text>
+      </Box>
+    )
   }
 
   return (

diff --git a/src/shared/api/services/axios.ts b/src/shared/api/services/axios.ts
@@ -13,6 +13,7 @@ const axiosService = axios.create({
 })
 
 axiosService.defaults.headers.common["Content-Type"] = "application/json"
+axiosService.defaults.headers.common["Mindlogger-Content-Source"] = "web"
 
 axiosService.interceptors.request.use(
   config => {