From 09d0a3f134e7a8c52ad71d16bdbb2b84f15c17c1 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Mon, 20 Nov 2023 17:50:12 -0800 Subject: [PATCH 1/2] Add Sign up page --- frontend/src/pages/Authentication/SignIn.tsx | 4 +- frontend/src/pages/Authentication/SignUp.tsx | 147 +++++++++++------- .../src/pages/Authentication/SystemSetup.tsx | 4 +- .../pages/SystemSettings/Settings/index.tsx | 3 +- 4 files changed, 92 insertions(+), 66 deletions(-) diff --git a/frontend/src/pages/Authentication/SignIn.tsx b/frontend/src/pages/Authentication/SignIn.tsx index 97249f0..ef7f352 100644 --- a/frontend/src/pages/Authentication/SignIn.tsx +++ b/frontend/src/pages/Authentication/SignIn.tsx @@ -167,12 +167,12 @@ function LoginForm({ handleSubmit }: { handleSubmit: any }) { />
- Login to + Log in to VectorAdmin
- Welcome back, please login to your account. + Welcome back, please log in to your account.
diff --git a/frontend/src/pages/Authentication/SignUp.tsx b/frontend/src/pages/Authentication/SignUp.tsx index 0d0c799..4fcfe07 100644 --- a/frontend/src/pages/Authentication/SignUp.tsx +++ b/frontend/src/pages/Authentication/SignUp.tsx @@ -2,6 +2,7 @@ import { Link } from 'react-router-dom'; import LogoDark from '../../images/logo/logo-dark.png'; import Logo from '../../images/logo/logo-light.png'; import ManageSvg from '../../images/undraws/manage.svg'; +import SignInImg from '../../images/undraws/sign-in.png'; import DefaultLayout from '../../layout/DefaultLayout'; import { useState } from 'react'; import PreLoader from '../../components/Preloader'; @@ -59,7 +60,30 @@ const SignUp = () => { return ( -
+
+
+
+
+ Sign In +
+
+ +
+
+ {stage !== 'ready' ? ( + + ) : ( + + )} +
+
+
+
+ {/*
@@ -99,7 +123,7 @@ const SignUp = () => {
-
+
*/} ); }; @@ -153,69 +177,72 @@ function ShowStatus({ function LoginForm({ handleSubmit }: { handleSubmit: any }) { return ( <> - New account -

- Sign Up for {APP_NAME} -

- - -
- -
- - - - - +
+
+
+ Sign Up for + {APP_NAME} +
+ +
+
+ +
-
-
- -
- - - - - +
+
+ +
-
-
- -
+
+ +
-
-

- Already have an account?{' '} - - Sign in - -

-
- +
+

+ Already have an account?{' '} + + Log In + +

+
+ +
); } diff --git a/frontend/src/pages/Authentication/SystemSetup.tsx b/frontend/src/pages/Authentication/SystemSetup.tsx index dcce784..3cf2d6e 100644 --- a/frontend/src/pages/Authentication/SystemSetup.tsx +++ b/frontend/src/pages/Authentication/SystemSetup.tsx @@ -165,8 +165,8 @@ function LoginForm({ handleSubmit }: { handleSubmit: any }) {

By default {APP_NAME} creates a temporary root account so you can set up a system admin account. After creation of this account the root account - will no longer be accessible and you will use these credentials to login - going forward. + will no longer be accessible and you will use these credentials to log + in going forward.

If you lose your password you will never be able to recover it - so keep diff --git a/frontend/src/pages/SystemSettings/Settings/index.tsx b/frontend/src/pages/SystemSettings/Settings/index.tsx index 2c60e07..1997eaa 100644 --- a/frontend/src/pages/SystemSettings/Settings/index.tsx +++ b/frontend/src/pages/SystemSettings/Settings/index.tsx @@ -149,8 +149,7 @@ function DebugCredentials({ settings }: { settings: {} }) { Database Debug Credentials

- Use these credentials to login for direct application database - access. + Use these credentials to for direct application database access.
Changes done via the database admin UI will not impact connected vector databases. From 739205ec1c8e11518685a7df724f996237d17cd2 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Mon, 20 Nov 2023 17:51:00 -0800 Subject: [PATCH 2/2] remove unused imports --- frontend/src/pages/Authentication/SignUp.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/pages/Authentication/SignUp.tsx b/frontend/src/pages/Authentication/SignUp.tsx index 4fcfe07..0106ec5 100644 --- a/frontend/src/pages/Authentication/SignUp.tsx +++ b/frontend/src/pages/Authentication/SignUp.tsx @@ -1,12 +1,9 @@ import { Link } from 'react-router-dom'; -import LogoDark from '../../images/logo/logo-dark.png'; -import Logo from '../../images/logo/logo-light.png'; -import ManageSvg from '../../images/undraws/manage.svg'; import SignInImg from '../../images/undraws/sign-in.png'; import DefaultLayout from '../../layout/DefaultLayout'; import { useState } from 'react'; import PreLoader from '../../components/Preloader'; -import { CheckCircle, Key, Mail, XCircle } from 'react-feather'; +import { CheckCircle, XCircle } from 'react-feather'; import User from '../../models/user'; import { APP_NAME, STORE_TOKEN, STORE_USER } from '../../utils/constants'; import paths from '../../utils/paths';