Merge branch 'dev' into issue-114

sfbrigade · Sep 18, 2024 · 80f53d9 · 80f53d9
2 parents 7ddd3fd + 2187380
commit 80f53d9
Show file tree

Hide file tree

Showing 6 changed files with 709 additions and 3,077 deletions.
diff --git a/client/index.html b/client/index.html
@@ -3,7 +3,10 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/logo.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+    />
     <title>SF Life line</title>
   </head>
   <body>

diff --git a/client/package.json b/client/package.json
@@ -32,16 +32,16 @@
   },
   "devDependencies": {
     "@chromatic-com/storybook": "^1.6.1",
-    "@storybook/addon-essentials": "^8.2.9",
-    "@storybook/addon-interactions": "^8.2.9",
-    "@storybook/addon-links": "^8.2.9",
-    "@storybook/addon-mdx-gfm": "^8.2.9",
-    "@storybook/addon-onboarding": "^8.2.9",
-    "@storybook/blocks": "^8.2.9",
-    "@storybook/preview-api": "^8.2.9",
-    "@storybook/react": "^8.2.9",
-    "@storybook/react-vite": "^8.2.9",
-    "@storybook/test": "^8.2.9",
+    "@storybook/addon-essentials": "^8.3.1",
+    "@storybook/addon-interactions": "^8.3.1",
+    "@storybook/addon-links": "^8.3.1",
+    "@storybook/addon-mdx-gfm": "^8.3.1",
+    "@storybook/addon-onboarding": "^8.3.1",
+    "@storybook/blocks": "^8.3.1",
+    "@storybook/preview-api": "^8.3.1",
+    "@storybook/react": "^8.3.1",
+    "@storybook/react-vite": "^8.3.1",
+    "@storybook/test": "^8.3.1",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react-swc": "^3.7.0",
@@ -54,7 +54,7 @@
     "eslint-plugin-storybook": "^0.8.0",
     "prettier": "^3.3.3",
     "prop-types": "^15.8.1",
-    "storybook": "^8.2.9",
+    "storybook": "^8.3.1",
     "storybook-dark-mode": "^4.0.2",
     "vite": "^5.4.0"
   },

diff --git a/client/src/pages/auth/login/LoginForm.jsx b/client/src/pages/auth/login/LoginForm.jsx
@@ -52,6 +52,7 @@ export function LoginForm({
         <Container size="25rem">
           <TextInput
             className={classes.email}
+            type="email"
             label="Email"
             placeholder="user@email.com"
             value={email}

diff --git a/client/src/pages/auth/password-forgot/PasswordForgotForm.jsx b/client/src/pages/auth/password-forgot/PasswordForgotForm.jsx
@@ -34,6 +34,7 @@ export function PasswordForgotForm({
         <TextInput
           disabled={isLoading || formState == 2}
           name="email"
+          type="email"
           label="Email"
           placeholder="user@email.com"
           value={email}

diff --git a/client/src/pages/auth/register/RegisterForm.jsx b/client/src/pages/auth/register/RegisterForm.jsx
@@ -124,6 +124,7 @@ export function RegisterForm({
               <TextInput
                 disabled={isLoading}
                 name="email"
+                type="email"
                 label="Email"
                 placeholder="Email"
                 value={user.email}