Changeset bc20307 for sources/client/src/components/Auth

Timestamp:

02/14/22 01:41:41 (2 years ago)

Author:

Tasevski2 <39170279+Tasevski2@…>

Branches:

master

Children:

747e0ab

Parents:

e8b1076

Message:

Push before video

Location:

sources/client/src/components/Auth

Files:

• Login/index.js (moved) (moved from sources/client/src/components/Login/index.js ) (6 diffs)
• Login/styles.js (moved) (moved from sources/client/src/components/Login/styles.js ) (6 diffs)
• LoginGuest/index.js (added)
• LoginGuest/styles.js (added)
• Register/index.js (added)
• Register/styles.js (added)
• index.js (added)
• styles.js (added)

sources/client/src/components/Auth/Login/index.js

@@ -1 @@
-import { Link } from 'react-router-dom';
-import useForm from '../../hooks/useForm';
+import { Link, useHistory } from 'react-router-dom';
+import useForm from '../../../hooks/useForm';
+import useLogin from '../../../hooks/useLogin';
 
 import {
@@ -15 +16 @@
 
 const Login = () => {
+  const { loginUser } = useLogin();
   const { data, onFormChange } = useForm({
     email: '',
     password: '',
   });
+  let history = useHistory();
   const handleSignIn = () => {
-    console.log(`Email: ${data.email}`);
-    console.log(`Password: ${data.password}`);
+    loginUser({ email: data.email, password: data.password });
   };
   return (
@@ -28 +30 @@
         <Input
           name='email'
+          placeholder='Емаил'
           value={data.email}
           onChange={onFormChange}
@@ -37 +40 @@
           name='password'
           value={data.password}
+          placeholder='Лозинка'
           onChange={onFormChange}
           InputProps={{
@@ -49 +53 @@
           <DividerText>ИЛИ</DividerText>
         </DividerButtons>
-        <SignInButton>НАЈАВА КАКО ГОСТИН</SignInButton>{' '}
+        <SignInButton onClick={() => history.push('/login-guest')}>
+          НАЈАВА КАКО ГОСТИН
+        </SignInButton>
         {/* TODO Neka nosi do '/login-guest'*/}
       </ButtonsWrapper>
@@ -55 +61 @@
         {' '}
         {/* TODO Neka nosi do '/register' */}
-        Немате Сметка?
-        <Link to='#'>Регистрирај се!</Link>
+        Немате Профил?
+        <Link to='/register'>Регистрирај се!</Link>
       </RegisterText>
     </>

sources/client/src/components/Auth/Login/styles.js

@@ -16 +16 @@
   fullWidth: true,
   sx: {
-    marginTop: '35px',
+    marginTop: '25px',
   },
 })`
@@ -26 +26 @@
     font-size: 1.2rem;
     padding-left: 10px;
+
+    ::placeholder {
+      opacity: 0.6;
+    }
   }
 
   fieldset {
     border: 0;
-    border-bottom: 2px solid white;
+    border-bottom: 4px solid white;
     border-radius: 25px;
     padding: 0 10px;
@@ -53 +57 @@
   display: flex;
   flex-direction: column;
-  padding: 30px 25px;
+  margin-top: 10px;
+  padding: 30px 0px;
 `;
 export const SignInButton = styled(Button).attrs((props) => ({
@@ -77 +82 @@
   sx: {},
 })`
-  align-items: flex-start;
-  margin-bottom: 15px;
+  align-items: center;
+  // margin-bottom: 15px;
   ::before,
   ::after {
@@ -92 +97 @@
   position: absolute;
   bottom: 0;
-  align-self: cetner;
   width: 100%;
   text-align: center;
@@ -100 +104 @@
     margin-left: 10px;
     text-decoration: none;
-    color: #f65026;
+    color: ${(props) => props.theme.palette.third.main};
     font-weight: bold;
     font-size: 1.2rem;