Skip to content

google auth #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IvanDavydenkov wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

google auth #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"homepage": ".",
"dependencies": {
"@react-oauth/google": "^0.12.1",
"@reduxjs/toolkit": "^1.9.7",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
Expand Down
39 changes: 21 additions & 18 deletions src/components/App/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import './App.css';
import { useEffect } from 'react';
import { Route, Routes, useNavigate } from 'react-router-dom'; // Импортируйте Outlet для вложенных маршрутов
import { useDispatch } from 'react-redux';
import { GoogleOAuthProvider } from '@react-oauth/google';
import DraftsTemplates from '../../pages/DraftsTemplates';
import LoginPage from '../../pages/AuthPages/LoginPage';
import LogupPage from '../../pages/AuthPages/LogupPage';
Expand Down Expand Up @@ -40,24 +41,26 @@ function App() {
}, []);

return (
<Routes>
<Route element={<TemplatesMain />} path="/templates">
<Route path=":id" element={<FormPage />} />
</Route>
<Route element={<FavoriteTemplates />} path="favorite">
<Route path=":id" element={<FormPage />} />
</Route>
<Route element={<DraftsTemplates />} path="drafts">
<Route path=":id" element={<FormPage />} />
</Route>
<Route element={<Landing />} path="/" />
<Route element={<LoginPage />} path="/signin" exact />
<Route element={<LogupPage />} path="/signup" exact />
<Route element={<CheckAccountPage />} path="/check-account" exact />
<Route element={<ForgotPwPage />} path="/forgot-password" exact />
<Route element={<ChangePassword />} path="/change-password" exact />
<Route path="*" element={<NotFound />} />
</Routes>
<GoogleOAuthProvider clientId="530694045954-brqr228ph8n0ljt1i7qekec9dblhvie2.apps.googleusercontent.com">
<Routes>
<Route element={<TemplatesMain />} path="/templates">
<Route path=":id" element={<FormPage />} />
</Route>
<Route element={<FavoriteTemplates />} path="favorite">
<Route path=":id" element={<FormPage />} />
</Route>
<Route element={<DraftsTemplates />} path="drafts">
<Route path=":id" element={<FormPage />} />
</Route>
<Route element={<Landing />} path="/" />
<Route element={<LoginPage />} path="/signin" exact />
<Route element={<LogupPage />} path="/signup" exact />
<Route element={<CheckAccountPage />} path="/check-account" exact />
<Route element={<ForgotPwPage />} path="/forgot-password" exact />
<Route element={<ChangePassword />} path="/change-password" exact />
<Route path="*" element={<NotFound />} />
</Routes>
</GoogleOAuthProvider>
);
}

Expand Down
15 changes: 13 additions & 2 deletions src/pages/AuthPages/LoginPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* eslint-disable react-hooks/exhaustive-deps */
import { useState, useEffect } from 'react';
import { useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
import { useForm } from 'react-hook-form';
import { Link, useNavigate } from 'react-router-dom';
import { GoogleLogin } from '@react-oauth/google';
import Modal from '../../components/Modal/Modal';
import AuthForm from '../../components/AuthForm/AuthTemplate';
import InputForm from '../../components/UI/AuthInputForm/InputForm';
Expand All @@ -12,8 +13,8 @@ import styles from './index.module.scss';
import Button from '../../components/UI/AuthButton/Button';
import { signIn } from '../../store/auth/authSlice';
import {
useLazyLoginQuery,
useLazyGetUserDataQuery,
useLazyLoginQuery,
} from '../../store/auth-api/auth.api';
import { useActions } from '../../hooks/useActions';

Expand Down Expand Up @@ -147,6 +148,16 @@ export default function LoginPage() {
<Link to={{ pathname: '/signup' }} className={styles.largeLink}>
Регистрация
</Link>
<div className={styles.googleWrapper}>
<GoogleLogin
onSuccess={(credentialResponse) => {
console.log(credentialResponse);
}}
onError={() => {
console.log('Login Failed');
}}
/>
</div>
</form>
</AuthForm>
</Modal>
Expand Down
197 changes: 103 additions & 94 deletions src/pages/AuthPages/index.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,140 +2,149 @@ $color-link: rgba(4, 21, 175, 1);
$color-link-l: rgba(0, 25, 255, 1);

@keyframes preloader-spin {
0% {
transform: rotate(0deg);
}
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(360deg);
}
100% {
transform: rotate(360deg);
}
}

.back {
font-size: 24px;
line-height: 29px;
color: $color-link;
position: absolute;
top: 32px;
left: 32px;
text-decoration: none;
font-size: 24px;
line-height: 29px;
color: $color-link;
position: absolute;
top: 32px;
left: 32px;
text-decoration: none;
}

.form {
display: flex;
flex-direction: column;
gap: 16px;
position: relative;
display: flex;
flex-direction: column;
gap: 16px;
position: relative;
}

.title {
font-size: 35px;
font-weight: 500;
line-height: 39px;
font-size: 35px;
font-weight: 500;
line-height: 39px;
}

.checkboxContainer {
margin: 0;
display: flex;
align-items: center;
margin: 0;
display: flex;
align-items: center;
}

.checkbox {
width: 24px;
height: 24px;
border: 1px solid black;
border-radius: 4px;
margin-right: 9px;
background-color: inherit;
padding: 0;
cursor: pointer;
text-align: center;
&Checked {
background-color: rgba(0, 0, 0, 1);
}
width: 24px;
height: 24px;
border: 1px solid black;
border-radius: 4px;
margin-right: 9px;
background-color: inherit;
padding: 0;
cursor: pointer;
text-align: center;

&Checked {
background-color: rgba(0, 0, 0, 1);
}
}

.link {
color: $color-link;
font-size: 14px;
line-height: 19px;
text-decoration: none;
margin-left: auto;
color: $color-link;
font-size: 14px;
line-height: 19px;
text-decoration: none;
margin-left: auto;
}

.password {
margin: 0;
font-size: 14px;
margin: 0;
font-size: 14px;
}

.largeLink {
border-radius: 24px;
text-align: center;
padding: 14px;
border: 1px solid #a48dd3;
color: #550fda;
font-size: 24px;
line-height: 28px;
overflow: hidden;
font-family: 'SF-Pro', 'Inter', sans-serif;
font-size: 24px;
line-height: 28px;
text-decoration: none;
text-align: center;
margin: 14px 0 18px 0;
border-radius: 24px;
text-align: center;
padding: 14px;
border: 1px solid #a48dd3;
color: #550fda;
font-size: 24px;
line-height: 28px;
overflow: hidden;
font-family: 'SF-Pro', 'Inter', sans-serif;
font-size: 24px;
line-height: 28px;
text-decoration: none;
text-align: center;
margin: 14px 0 18px 0;
}

.orPar {
margin: 0;
font-size: 16px;
line-height: 19.36px;
text-align: center;
margin-top: 8px;
position: relative;
margin: 0;
font-size: 16px;
line-height: 19.36px;
text-align: center;
margin-top: 8px;
position: relative;
}

.orPar span {
position: relative;
background-color: white;
padding: 0 8px;
z-index: 2;
position: relative;
background-color: white;
padding: 0 8px;
z-index: 2;
}

.orPar:after {
content: '';
width: 100%;
border-bottom: 1px solid rgba(234, 234, 234, 1);
position: absolute;
left: 0;
top: 50%;
z-index: 1;
content: '';
width: 100%;
border-bottom: 1px solid rgba(234, 234, 234, 1);
position: absolute;
left: 0;
top: 50%;
z-index: 1;
}

.parCheck {
width: 507px;
margin: 0 0 12px 0;
font-size: 20px;
line-height: 24px;
&:last-of-type {
margin: 0;
}
& span {
color: $color-link-l;
}
width: 507px;
margin: 0 0 12px 0;
font-size: 20px;
line-height: 24px;

&:last-of-type {
margin: 0;
}

& span {
color: $color-link-l;
}
}

.parForget {
margin: 12px 0 28px 0;
font-size: 16px;
line-height: 19px;
width: 449px;
margin: 12px 0 28px 0;
font-size: 16px;
line-height: 19px;
width: 449px;
}

.preloader {
width: 35px;
height: 28px;
background-image: url('../../images/preloader.svg');
background-size: cover;
background-repeat: no-repeat;
background-position: center;
animation: preloader-spin 1.5s linear infinite;
width: 35px;
height: 28px;
background-image: url('../../images/preloader.svg');
background-size: cover;
background-repeat: no-repeat;
background-position: center;
animation: preloader-spin 1.5s linear infinite;
}

.googleWrapper {
display: flex;
justify-content: center;
}