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

Deployment 120623 #199

Merged
merged 13 commits into from
Dec 7, 2023
Merged

Deployment 120623 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
49b9223
feat : logo try
mehsheed Dec 4, 2023
df6072d
fix : update logo
mehsheed Dec 4, 2023
28532e3
Resolution test
rmgutierrez Dec 4, 2023
734a6b6
Merge branch 'logo-update' of https://github.com/uofa-cmput404/404f23…
mehsheed Dec 4, 2023
bee3bc0
feat : update favicon.ico
mehsheed Dec 4, 2023
21faa22
logo margin
rmgutierrez Dec 6, 2023
0b07313
Added headbar for the the 404 page
nluu175 Dec 6, 2023
a945162
remove build failing
kaynzhel Dec 6, 2023
03975b2
Fixed logo issue
nluu175 Dec 7, 2023
5253a46
Removed unused imports
nluu175 Dec 7, 2023
b8ebcba
Merge branch 'main' into logo-update
nluu175 Dec 7, 2023
8752f36
feat : logo try (#179)
nluu175 Dec 7, 2023
4b56d8d
Merge remote-tracking branch 'origin/deployment-heroku-1' into logo-d…
rmgutierrez Dec 7, 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
38 changes: 38 additions & 0 deletions client/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.

2 changes: 2 additions & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"@types/react": "^18.2.31",
"@types/react-dom": "^18.2.14",
"@types/uuid": "^9.0.7",
"@types/mui-image": "^1.0.5",
"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
33 changes: 16 additions & 17 deletions client/src/components/template/AppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
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 {
Expand Down Expand Up @@ -46,25 +45,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 +72,7 @@ const HeadBar = () => {
alignSelf: "center",
marginRight: 1,
borderRadius: 20,
paddingX: 2
paddingX: 2,
}}
onClick={handleSignOut}
endIcon={<LogoutIcon />}
Expand Down
22 changes: 11 additions & 11 deletions client/src/components/template/NotFoundAppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box } from "@mui/material";
import AppBar from "@mui/material/AppBar";
import { Link } from "react-router-dom";
import Typography from "@mui/material/Typography";

const NotFoundHeadBar = () => {
return (
Expand All @@ -24,17 +24,17 @@ const NotFoundHeadBar = () => {
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>
</AppBar>
);
Expand Down