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.

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

Jump to bottom

#444-seperate navbar component #490

Merged
merged 4 commits into from
Jun 18, 2023
Merged

#444-seperate navbar component #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eabdff
#444-navbar component
Soulpurr Jun 17, 2023
1cddba8
Merge branch 'master' into issue-444
narayan954 Jun 18, 2023
5ddcaa7
removed unused imports, formatting and cleanup
narayan954 Jun 18, 2023
0f80523
refactored component
narayan954 Jun 18, 2023
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
159 changes: 12 additions & 147 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
import {
Box,
Button,
ClickAwayListener,
Divider,
Modal,
Typography,
} from "@mui/material";
import { FaArrowCircleUp, FaUserCircle } from "react-icons/fa";
import React, { useEffect, useState } from "react";
import { Route, Routes, useNavigate } from "react-router-dom";
import { auth, db } from "./lib/firebase";

import { AiOutlineInsertRowAbove } from "react-icons/ai";
import AnimatedButton from "./components/AnimatedButton";
import { FaArrowCircleUp } from "react-icons/fa";
import Favorite from "./components/Favorite";
import Loader from "./components/Loader";
import LoginScreen from "./pages/Login";
import Modal from "@mui/material/Modal";
import Navbar from "./components/Navbar";
import NotFoundPage from "./components/NotFound";
import Post from "./components/Post";
import PostView from "./pages/PostView";
import Profile from "./pages/Profile";
import ShareModal from "./components/ShareModal";
import SideBar from "./components/SideBar";
import SignupScreen from "./pages/Signup";
import logo from "./assets/logo.png";
import { makeStyles } from "@mui/styles";
import { useSnackbar } from "notistack";

Expand Down Expand Up @@ -194,142 +186,15 @@ function App() {

return (
<div className="app">
<div className="app__header">
<img
src={logo}
alt="dummygram"
className="app__header__img"
onClick={() => {
if (
location.pathname !== "/dummygram/login" &&
location.pathname !== "/dummygram/signup"
) {
navigate("/dummygram/");
}
window.scrollTo({ top: 0, left: 0, behavior: "smooth" });
}}
style={{
cursor: "pointer",
}}
/>

{user ? (
<>
<div
style={{
display: "flex",
flexDirection: "row",
justifyContent: "center",
}}
>
<div
className="rowConvert"
onClick={() => {
setRowMode(!rowMode);
}}
>
<AiOutlineInsertRowAbove style={{ margin: "auto" }} size={30} />
</div>
<ClickAwayListener onClickAway={() => setOpen(false)}>
<Button
onClick={() => setOpen((cur) => !cur)}
color="secondary"
variant="contained"
sx={{ ...buttonStyle, marginRight: "10px" }}
>
<FaUserCircle fontSize="large" />
{open && (
<Box
backgroundColor="#fff"
color="black"
padding="2px"
width="80px"
position="absolute"
borderRadius="4px"
marginTop={16}
marginRight={3}
sx={{
width: "fit-content",
mt: "10rem",
mr: "4rem",
vertical: "top",
border: "1px solid black",
}}
>
<Box
display="flex"
padding="0.5rem"
sx={{ cursor: "pointer" }}
onClick={() =>
navigate("/dummygram/profile", {
state: {
name: user.toJSON().displayName,
email: user.toJSON().email,
avatar: user.toJSON().photoURL,
},
})
}
>
<Typography fontFamily="Poppins" fontSize="1rem">
Profile
</Typography>
</Box>
<Divider />
<Box
display="flex"
padding="0.5rem"
sx={{ cursor: "pointer" }}
onClick={() => navigate("/dummygram/favourites")}
>
<Typography fontFamily="serif" fontSize="1rem">
Favourites
</Typography>
</Box>
<Divider />
<Box
display="flex"
padding="0.5rem"
sx={{ cursor: "pointer" }}
onClick={() => setLogout(true)}
>
<Typography fontFamily="Poppins" fontSize="0.9rem">
Log Out
</Typography>
</Box>
</Box>
)}
</Button>
</ClickAwayListener>
</div>
</>
) : (
<div className="login__container">
<Button
onClick={() => {
navigate("/dummygram/login");
}}
color="primary"
variant="contained"
style={{ margin: 5 }}
sx={buttonStyle}
>
Log In
</Button>

<Button
onClick={() => {
navigate("/dummygram/signup");
}}
color="primary"
variant="contained"
style={{ margin: 5 }}
sx={buttonStyle}
>
Sign Up
</Button>
</div>
)}
</div>
<Navbar
row={rowMode}
setRow={setRowMode}
user={user}
setUser={setUser}
open={open}
setOpen={setOpen}
setLogout={setLogout}
/>

<ShareModal
openShareModal={openShareModal}
Expand Down
20 changes: 20 additions & 0 deletions src/components/Navbar/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.app__header__img {
object-fit: contain;
width: 150px;
}

.app__header {
position: fixed;
width: 100%;
top: 0;
z-index: 1;
padding-top: 10px;
padding-bottom: 10px;
object-fit: contain;
border-bottom: 1px solid rgb(219, 219, 219);
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
background-color: var(--bg-color);
}
160 changes: 160 additions & 0 deletions src/components/Navbar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
import "./index.css";

import {
Box,
Button,
ClickAwayListener,
Divider,
Typography,
} from "@mui/material";
import React, { useEffect } from "react";

import { AiOutlineInsertRowAbove } from "react-icons/ai";
import { FaUserCircle } from "react-icons/fa";
import { auth } from "../../lib/firebase";
import logo from "../../assets/logo.png";
import { useNavigate } from "react-router-dom";

function Navbar({ setRow, row, open, setOpen, user, setUser, setLogout }) {
const navigate = useNavigate();

const buttonStyle = {
background: "linear-gradient(40deg, #e107c1, #59afc7)",
borderRadius: "20px",
margin: "10px",
":hover": {
background: "linear-gradient(-40deg, #59afc7, #e107c1)",
},
};

useEffect(() => {
const unsubscribe = auth.onAuthStateChanged((authUser) => {
if (authUser) {
setUser(authUser);
navigate("/dummygram/");
} else {
setUser(null);
navigate("/dummygram/login");
}
});

return () => {
unsubscribe();
};
}, [user]);

return (
<div className="app__header">
<img
src={logo}
alt="dummygram"
className="app__header__img"
onClick={() => {
if (
location.pathname !== "/dummygram/login" &&
location.pathname !== "/dummygram/signup"
) {
navigate("/dummygram/");
}
window.scrollTo({ top: 0, left: 0, behavior: "smooth" });
}}
style={{
cursor: "pointer",
}}
/>

{user && (
<>
<div
style={{
display: "flex",
flexDirection: "row",
justifyContent: "center",
}}
>
<div
className="rowConvert"
onClick={() => {
setRow(!row);
}}
>
<AiOutlineInsertRowAbove style={{ margin: "auto" }} size={30} />
</div>
<ClickAwayListener onClickAway={() => setOpen(false)}>
<Button
onClick={() => setOpen((cur) => !cur)}
color="secondary"
variant="contained"
sx={{ ...buttonStyle, marginRight: "10px" }}
>
<FaUserCircle fontSize="large" />
{open && (
<Box
backgroundColor="#fff"
color="black"
padding="2px"
width="80px"
position="absolute"
borderRadius="4px"
marginTop={16}
marginRight={3}
sx={{
width: "fit-content",
mt: "10rem",
mr: "4rem",
vertical: "top",
border: "1px solid black",
}}
>
<Box
display="flex"
padding="0.5rem"
sx={{ cursor: "pointer" }}
onClick={() =>
navigate("/dummygram/profile", {
state: {
name: user.toJSON().displayName,
email: user.toJSON().email,
avatar: user.toJSON().photoURL,
},
})
}
>
<Typography fontFamily="Poppins" fontSize="1rem">
Profile
</Typography>
</Box>
<Divider />
<Box
display="flex"
padding="0.5rem"
sx={{ cursor: "pointer" }}
onClick={() => navigate("/dummygram/favourites")}
>
<Typography fontFamily="serif" fontSize="1rem">
Favourites
</Typography>
</Box>
<Divider />
<Box
display="flex"
padding="0.5rem"
sx={{ cursor: "pointer" }}
onClick={() => setLogout(true)}
>
<Typography fontFamily="Poppins" fontSize="0.9rem">
Log Out
</Typography>
</Box>
</Box>
)}
</Button>
</ClickAwayListener>
</div>
</>
)}
</div>
);
}

export default Navbar;
2 changes: 1 addition & 1 deletion src/components/ShareModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Dialog, IconButton, Input } from "@mui/material";
import React, { useState } from "react";

import React from "react";
import logo from "../assets/logo.png";
import { useSnackbar } from "notistack";

Expand Down
Loading
Loading