Merge pull request #379 from bluewave-labs/feat/hide-google-button

Removed google auth buttons
This commit is contained in:
Alexander Holliday
2024-07-18 15:06:00 -07:00
committed by GitHub
3 changed files with 16 additions and 42 deletions

View File

@@ -4,7 +4,6 @@ import { useNavigate } from "react-router-dom";
import "./index.css";
import Logomark from "../../assets/Images/bwl-logo-2.svg?react";
import Button from "../../Components/Button";
import Google from "../../assets/Images/Google.png";
import background from "../../assets/Images/background_pattern_decorative.png";
import axiosInstance from "../../Utils/axiosConfig";
import { credentials } from "../../Validation/validation";
@@ -12,13 +11,7 @@ import { login } from "../../Features/Auth/authSlice";
import { useDispatch } from "react-redux";
import { createToast } from "../../Utils/toastUtils";
import Field from "../../Components/Inputs/Field";
import {
Checkbox,
Divider,
FormControlLabel,
Stack,
Typography,
} from "@mui/material";
import { Checkbox, FormControlLabel, Stack, Typography } from "@mui/material";
import { useTheme } from "@emotion/react";
const Login = () => {
@@ -120,17 +113,13 @@ const Login = () => {
alt="background pattern"
/>
<form className="login-form" onSubmit={handleSubmit}>
<Stack gap={theme.gap.large} direction="column">
<Stack gap={theme.gap.small} alignItems="center">
<Logomark alt="BlueWave Uptime Icon" />
<Button
level="secondary"
label="Sign in with Google"
sx={{ fontWeight: "600", mt: theme.gap.xxl }}
img={<img className="google-enter" src={Google} alt="Google" />}
/>
<Divider>
<Typography>or</Typography>
</Divider>
<Typography component="h1" sx={{ mt: theme.gap.xl }}>
Login to Your Account
</Typography>
</Stack>
<Stack gap={theme.gap.large} sx={{ mt: `calc(${theme.gap.ml}*2)` }}>
<Field
type="email"
id="login-email-input"
@@ -178,7 +167,7 @@ const Login = () => {
<Button
type="submit"
level="primary"
label="Sign in"
label="Continue"
disabled={Object.keys(errors).length !== 0 && true}
/>
<Stack

View File

@@ -6,7 +6,6 @@ import background from "../../assets/Images/background_pattern_decorative.png";
import Logomark from "../../assets/Images/bwl-logo-2.svg?react";
import Check from "../../Components/Check/Check";
import Button from "../../Components/Button";
import Google from "../../assets/Images/Google.png";
import { credentials } from "../../Validation/validation";
import axiosInstance from "../../Utils/axiosConfig";
import { useDispatch } from "react-redux";
@@ -14,7 +13,7 @@ import { register } from "../../Features/Auth/authSlice";
import { createToast } from "../../Utils/toastUtils";
import Field from "../../Components/Inputs/Field";
import { useTheme } from "@emotion/react";
import { Divider, Stack, Typography } from "@mui/material";
import { Stack, Typography } from "@mui/material";
const Register = () => {
const dispatch = useDispatch();
@@ -130,17 +129,13 @@ const Register = () => {
alt="background pattern"
/>
<form className="register-form" onSubmit={handleSubmit} noValidate>
<Stack gap={theme.gap.large} direction="column">
<Stack gap={theme.gap.small} alignItems="center">
<Logomark alt="BlueWave Uptime Icon" />
<Button
level="secondary"
label="Sign up with Google"
sx={{ fontWeight: 600, mt: theme.gap.xxl }}
img={<img className="google-enter" src={Google} alt="Google" />}
/>
<Divider>
<Typography>or</Typography>
</Divider>
<Typography component="h1" sx={{ mt: theme.gap.xl }}>
Create admin account
</Typography>
</Stack>
<Stack gap={theme.gap.large} sx={{ mt: `calc(${theme.gap.ml}*2)` }}>
<Field
id="register-firstname-input"
label="Name"

View File

@@ -12,6 +12,7 @@
height: var(--env-var-height-1);
}
.register-page h1.MuiTypography-root,
.login-page h1.MuiTypography-root,
.set-new-password-page h1.MuiTypography-root,
.password-confirmed-page h1.MuiTypography-root,
.forgot-password-page h1.MuiTypography-root,
@@ -97,11 +98,6 @@
visibility: hidden;
}
/* REGISTER */
.register-page h1.MuiTypography-root {
opacity: 0.5;
}
/* ///// */
/* LOGIN */
/* ///// */
@@ -124,12 +120,6 @@
user-select: none;
}
.google-enter {
width: var(--env-var-img-width-1);
height: var(--env-var-img-width-1);
margin-right: 10px;
}
/* /////////// */
/* Check Email */
/* /////////// */