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

feat : logo try #179

Merged
merged 10 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from 8 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
38 changes: 38 additions & 0 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@types/react": "^18.2.31",
"@types/react-dom": "^18.2.14",
"axios": "^1.5.1",
"mui-image": "^1.0.7",
"mui-markdown": "^1.1.11",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down Expand Up @@ -52,6 +53,7 @@
]
},
"devDependencies": {
"@types/mui-image": "^1.0.5",
"@types/uuid": "^9.0.7"
}
}
Binary file modified client/public/favicon.ico
Binary file not shown.
16 changes: 2 additions & 14 deletions client/src/components/NotFound.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
import { AppBar, Box, CssBaseline, Typography, Link } from "@mui/material";
import NotFoundHeadBar from "./template/NotFoundAppBar";

const NotFound = () => {
return (
<>
<CssBaseline />
<AppBar position="fixed" style={{ color: "#FFFFFF", height: 60 }}>
<Typography
variant="h4"
align="left"
style={{
marginLeft: 20,
color: "white",
marginTop: 10,
marginBottom: 10,
}}
>
socialdistribution
</Typography>
</AppBar>
<NotFoundHeadBar />
<Box
sx={{
display: "flex",
Expand Down
33 changes: 17 additions & 16 deletions client/src/components/template/AppBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { useContext } from "react";

import AppBar from "@mui/material/AppBar";
import Typography from "@mui/material/Typography";
import { Button } from "@mui/material";
import { Box, Button, Paper } from "@mui/material";
import { toast } from "react-toastify";
import Image from "mui-image";

import {
removeToken,
Expand Down Expand Up @@ -46,25 +47,25 @@ const HeadBar = () => {
borderBottom: "1px solid #dbd9d9",
}}
>
<Link to="/home-page"
style={{
textDecoration: "none" ,
<Link
to="/home-page"
style={{
textDecoration: "none",
marginLeft: "calc(15vw - 16px)",
}}
>
<Typography
variant="h4"
align="left"
color="primary"
style={{
marginTop: 10,
marginBottom: 10,
<Box
component="img"
sx={{
height: 55,
width: "auto",
maxHeight: 55,
maxWidth: "auto",
}}
>
distributed
</Typography>
alt="App Logo"
src="https://i.postimg.cc/Kvg7sSNK/logo-distributed.jpg"
/>
</Link>

<Button
size="small"
sx={{
Expand All @@ -73,7 +74,7 @@ const HeadBar = () => {
alignSelf: "center",
marginRight: 1,
borderRadius: 20,
paddingX: 2
paddingX: 2,
}}
onClick={handleSignOut}
endIcon={<LogoutIcon />}
Expand Down
44 changes: 44 additions & 0 deletions client/src/components/template/NotFoundAppBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { Box } from "@mui/material";
import AppBar from "@mui/material/AppBar";
import Image from "mui-image";
import { Link } from "react-router-dom";

const NotFoundHeadBar = () => {
return (
<AppBar
position="fixed"
style={{
height: 60,
display: "flex",
flexDirection: "row",
justifyContent: "space-between",
background: "transparent",
backdropFilter: "blur(15px)",
boxShadow: "none",
borderBottom: "1px solid #dbd9d9",
}}
>
<Link
to="/home-page"
style={{
textDecoration: "none",
marginLeft: "calc(15vw - 16px)",
}}
>
<Box
component="img"
sx={{
height: 55,
width: "auto",
maxHeight: 55,
maxWidth: "auto",
}}
alt="App Logo"
src="https://i.postimg.cc/Kvg7sSNK/logo-distributed.jpg"
/>
</Link>
</AppBar>
);
};

export default NotFoundHeadBar;