Skip to content
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.

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

Auth page #19

Merged
merged 4 commits into from
Aug 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/pages/Home/home.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import MockDate from 'mockdate'
import '@testing-library/jest-dom';
import { fireEvent, render, screen } from '@testing-library/react';

import Home from '.';
import Home from './index';

import { UserContext } from '../../contexts/User';
import { FrequencyContext } from '../../contexts/Frequency';
Expand Down
2 changes: 2 additions & 0 deletions src/pages/auth/components/Container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const Wrapper = styled.div`
width: 90%;
max-width: 400px;
align-items: center;
min-height: 100vh;
justify-content: center;
`;

const Logo = styled.img`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import SignInBtn from "./SignInBtn";
import SignInBtn from "./signin-btn";

const EmailSignIn = (props: any) => {
return <SignInBtn text="Sign in with Email" icon="@" {...props} />;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import SignInBtn from "./SignInBtn";
import SignInBtn from "./signin-btn";


const GoogleSignIn = (props: any) => {
Expand Down
12 changes: 6 additions & 6 deletions src/pages/auth/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { default as Container } from "./Container";
export { default as Form } from "./Form";
export { default as H2 } from "./H2";
export { default as H4 } from "./H4";
export { default as GoogleSignIn } from './GoogleSignIn';
export { default as EmailSignIn } from './EmailSignIn';
export { default as Form } from "./form";
export { default as H2 } from "./h2";
export { default as H4 } from "./h4";
export { default as GoogleSignIn } from './google-signin';
export { default as EmailSignIn } from './email-signin';
export { default as Container } from "./container";
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { Text } from "../../../components";
import { Colors } from "../../../config";
import styled from "styled-components";
import H2 from "./H2";
import H2 from "./h2";


export interface SignInBtnProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import * as React from "react";
import * as Yup from "yup";
import { useFormik } from "formik";
import { Input, Button, Spacing } from "../../../../components";
import { Input, Button, Spacing } from "../../../components";
import {
Container,
Form,
H4,
GoogleSignIn,
EmailSignIn,
} from "..";
import { AuthContext, LoginDetails } from "../../../../contexts/Auth";
} from "../components";
import { AuthContext, LoginDetails } from "../../../contexts/Auth";
import { useNavigate } from "react-router-dom";
import { useGoogleLogin } from '@react-oauth/google';
import styled from "styled-components";
import { Colors } from "../../../../config";
import { Colors } from "../../../config";

const CreateNewAccountBtn = styled(Button) <{ transparent: boolean }>`
margin-top: 10px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Login from '.';
import Login from './index'
import { fireEvent, render, screen } from '@testing-library/react';
import '@testing-library/jest-dom'
import * as React from 'react';
Expand Down
4 changes: 2 additions & 2 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { SettingsProvider } from "../contexts/Settings";

import { Layout } from "../components";

import Home from "./Home";
import Home from "./home";

import Login from "./auth/components/Login";
import Login from "./auth/login";
import SignUp from "./auth/sign-up";
import ForgotPassword from "./auth/forgot-password";
import ChangePassword from "./auth/change-password";
Expand Down
Loading