Skip to content

Revert "Admin Login" #17

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
hashcoder-deepanshi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Admin Login" #17

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
21 changes: 0 additions & 21 deletions how-to-project/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: 0 additions & 1 deletion how-to-project/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions how-to-project/public/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ font-size: 16px;
color: white;
}

.admin-login-failed{
color: white;
}

/* .arrow {
border: solid white;
border-width: 0 3px 3px 0;
Expand Down
16 changes: 6 additions & 10 deletions how-to-project/src/Elements/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -25,13 +24,10 @@ function Navbar () {
<li><a href="/">Home</a></li>
<li><a href="/feed">My Feed</a></li>
<li><a href="/searchpage">Search</a></li>
{
// (user.providerData[0].providerId === 'google.com')
// ? <li><a href="/my-activity">Dashboard</a></li>
// : <li><a href="/admin">Dashboard</a></li>
<li><a href="/my-activity">Dashboard</a></li>
}

<li><a href="/my-activity">Dashboard</a></li>
{/* <li><a href="feed">Feed</a></li>
<li><a href="My-Activity">My Activity</a></li>
<li><a href="SearchPage">Search</a></li> */}

<li>
<div class="dropdown">
Expand Down
6 changes: 2 additions & 4 deletions how-to-project/src/Pages/Feeds.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
{/* <div class="bar">
Expand All @@ -33,7 +31,7 @@ function Feeds() {
</nav>
<hr/>
</div> */}
<NavBar/>
<NavBar />

<div class="Admin-section">
{/*} {Blogs.map((blog) => (
Expand Down
11 changes: 3 additions & 8 deletions how-to-project/src/Pages/LoginPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';



Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -120,7 +116,6 @@ function LoginPage() {
sx={{ marginTop: "20px" ,width:"323px", backgroundColor:"#8152BD", marginLeft:"37px", height:"42px"}}
type="submit" onClick={handleAdminSignIn}> Sign In</Button>

<ToastContainer />

</div>
</div>
Expand Down