From 8252130fb13a9d7b9bee9a39d9fa7455135fa245 Mon Sep 17 00:00:00 2001 From: hashcoder-deepanshi <105001468+hashcoder-deepanshi@users.noreply.github.com> Date: Sat, 4 Mar 2023 02:08:36 +0530 Subject: [PATCH] Revert "Admin Login" --- how-to-project/package-lock.json | 21 --------------------- how-to-project/package.json | 1 - how-to-project/public/index.css | 4 ---- how-to-project/src/Elements/Navbar.jsx | 16 ++++++---------- how-to-project/src/Pages/Feeds.jsx | 6 ++---- how-to-project/src/Pages/LoginPage.jsx | 11 +++-------- 6 files changed, 11 insertions(+), 48 deletions(-) diff --git a/how-to-project/package-lock.json b/how-to-project/package-lock.json index 8351162..1ae8815 100644 --- a/how-to-project/package-lock.json +++ b/how-to-project/package-lock.json @@ -29,7 +29,6 @@ "react-share": "^4.4.1", "react-slick": "^0.29.0", "react-ticker": "^1.3.2", - "react-toastify": "^9.1.1", "slick-carousel": "^1.8.1", "styled-components": "^5.3.5", "web-vitals": "^2.1.4" @@ -15409,18 +15408,6 @@ "react-dom": "^17.0.2" } }, - "node_modules/react-toastify": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.1.tgz", - "integrity": "sha512-pkFCla1z3ve045qvjEmn2xOJOy4ZciwRXm1oMPULVkELi5aJdHCN/FHnuqXq8IwGDLB7PPk2/J6uP9D8ejuiRw==", - "dependencies": { - "clsx": "^1.1.1" - }, - "peerDependencies": { - "react": ">=16", - "react-dom": ">=16" - } - }, "node_modules/react-transition-group": { "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", @@ -29470,14 +29457,6 @@ "integrity": "sha512-9sLgc9gFx/EMNxn2QcwUJAOf3jdEROKRyXZGbWrEbfJG/MTkHwR+WRrVtypv3iFXPpcrKmPD91+vatHq0BgR0Q==", "requires": {} }, - "react-toastify": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.1.tgz", - "integrity": "sha512-pkFCla1z3ve045qvjEmn2xOJOy4ZciwRXm1oMPULVkELi5aJdHCN/FHnuqXq8IwGDLB7PPk2/J6uP9D8ejuiRw==", - "requires": { - "clsx": "^1.1.1" - } - }, "react-transition-group": { "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", diff --git a/how-to-project/package.json b/how-to-project/package.json index 200e284..798bf8a 100644 --- a/how-to-project/package.json +++ b/how-to-project/package.json @@ -24,7 +24,6 @@ "react-share": "^4.4.1", "react-slick": "^0.29.0", "react-ticker": "^1.3.2", - "react-toastify": "^9.1.1", "slick-carousel": "^1.8.1", "styled-components": "^5.3.5", "web-vitals": "^2.1.4" diff --git a/how-to-project/public/index.css b/how-to-project/public/index.css index 6992a34..45a8511 100644 --- a/how-to-project/public/index.css +++ b/how-to-project/public/index.css @@ -93,10 +93,6 @@ font-size: 16px; color: white; } -.admin-login-failed{ - color: white; -} - /* .arrow { border: solid white; border-width: 0 3px 3px 0; diff --git a/how-to-project/src/Elements/Navbar.jsx b/how-to-project/src/Elements/Navbar.jsx index e37f4c6..2d7f7c9 100644 --- a/how-to-project/src/Elements/Navbar.jsx +++ b/how-to-project/src/Elements/Navbar.jsx @@ -1,13 +1,12 @@ import Logo from "../Images/Logo.png"; import Down_arrow from "../Images/down-arrow.png"; import LoginIcon from "./login"; -import {auth } from "../Firebase/firebase"; import { UserAuth } from "../Firebase/AuthContext"; function Navbar () { - const {user, logOut} = UserAuth(auth); - + const {user, logOut} = UserAuth(); + const handleSignOut = async()=>{ try{ await logOut() @@ -25,13 +24,10 @@ function Navbar () {
  • Home
  • My Feed
  • Search
    • - { - // (user.providerData[0].providerId === 'google.com') - // ?
  • Dashboard
    • - // :
  • Dashboard
    • -
  • Dashboard
    • - } - +
  • Dashboard
    • + {/*
  • Feed
    • +
  • My Activity
    • +
  • Search
    • */}
  • diff --git a/how-to-project/src/Pages/Feeds.jsx b/how-to-project/src/Pages/Feeds.jsx index 9b443c5..f1d2e9f 100644 --- a/how-to-project/src/Pages/Feeds.jsx +++ b/how-to-project/src/Pages/Feeds.jsx @@ -3,11 +3,9 @@ import BlogCard from "../BlogCards"; import LoginIcon from "../Elements/login"; import Logo from "../Images/Logo.png"; import NavBar from "../Elements/Navbar"; -import {auth } from "../Firebase/firebase"; -import { UserAuth } from "../Firebase/AuthContext"; function Feeds() { - + return ( <> {/*
    @@ -33,7 +31,7 @@ function Feeds() {
    */} - +
    {/*} {Blogs.map((blog) => ( diff --git a/how-to-project/src/Pages/LoginPage.jsx b/how-to-project/src/Pages/LoginPage.jsx index 1b18c46..3d3354d 100644 --- a/how-to-project/src/Pages/LoginPage.jsx +++ b/how-to-project/src/Pages/LoginPage.jsx @@ -13,8 +13,6 @@ import {GoogleButton } from 'react-google-button' import './contribute.css'; import Logo from "../Images/Logo.png"; import {signInWithEmailAndPassword} from "firebase/auth"; -import { ToastContainer, toast } from 'react-toastify'; -import 'react-toastify/dist/ReactToastify.css'; @@ -54,19 +52,17 @@ function LoginPage() { const handleAdminSignIn = async (e) =>{ e.preventDefault(); try{ - await signInWithEmailAndPassword(auth, adminEmail, adminPass) + await signInWithEmailAndPassword(auth, email, password) .then((userCredential) => { // Signed in - // user = userCredential.user; + user = userCredential.user; // ... - navigate('/admin'); }) .catch((error) => { const errorCode = error.code; const errorMessage = error.message; - toast.error(errorMessage, {position: toast.POSITION.TOP_RIGHT, className: 'admin-login-failed'}); }); - + navigate('/admin'); }catch(error){ console.log(error); } @@ -120,7 +116,6 @@ function LoginPage() { sx={{ marginTop: "20px" ,width:"323px", backgroundColor:"#8152BD", marginLeft:"37px", height:"42px"}} type="submit" onClick={handleAdminSignIn}> Sign In -