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

Updated logo #977

Merged
merged 2 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 0 additions & 2 deletions .github/Architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,7 @@
| | | | |- 📜 pytorch-logo.png
| | | |- 📜 demo_video.gif : GIF tutorial of a simple classification training session
| | |- 📜 dlp-logo.ico : DLP Logo
| | |- 📜 dlp-logo.svg : DLP Logo, duplicate of files in public, but essential as the frontend can't read public
| | |- 📜 index.html : Base HTML file that will be initially rendered
| | |- 📜 dlp-logo.png : DLP Logo, duplicate of files in public, but essential as the frontend can't read public
| | |- 📜 manifest.json : Default React file for choosing icon based on
| | |- 📜 robots.txt
| |- 📂 layer_docs:
Expand Down
Binary file modified frontend/public/dlp-logo.ico
Binary file not shown.
Binary file removed frontend/public/dlp-logo.png
Binary file not shown.
1 change: 0 additions & 1 deletion frontend/public/dlp-logo.svg

This file was deleted.

Binary file modified frontend/public/images/logos/dlp_branding/dlp-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 16 additions & 1 deletion frontend/public/images/logos/dlp_branding/dlp-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 15 additions & 26 deletions frontend/src/common/components/NavBarMain.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
import AppBar from "@mui/material/AppBar";
import { useAppDispatch, useAppSelector } from "@/common/redux/hooks";
import { isSignedIn, signOutUser } from "@/common/redux/userLogin";
import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
import { FormControlLabel, Icon, Switch } from "@mui/material";
import Toolbar from "@mui/material/Toolbar";
import Typography from "@mui/material/Typography";
import MenuList from "@mui/material/Menu";
import Container from "@mui/material/Container";
import AppBar from "@mui/material/AppBar";
import Button from "@mui/material/Button";
import MenuItem from "@mui/material/MenuItem";
import Container from "@mui/material/Container";
import Grid from "@mui/material/Grid";
import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
import MenuList from "@mui/material/Menu";
import MenuItem from "@mui/material/MenuItem";
import Stack from "@mui/material/Stack";
import Toolbar from "@mui/material/Toolbar";
import Typography from "@mui/material/Typography";
import storage from "local-storage-fallback";
import Image from "next/image";
import Link from "next/link";
import React, { useEffect, useState } from "react";
import { ThemeProvider } from "styled-components";
import { URLs } from "../../constants";
import DSGTLogo from "/public/images/logos/dlp_branding/dlp-logo.png";
import { useAppDispatch, useAppSelector } from "@/common/redux/hooks";
import {
UserType,
isSignedIn,
setCurrentUser,
signOutUser,
} from "@/common/redux/userLogin";
import Image from "next/image";
import Link from "next/link";

const NavbarMain = () => {
const user = useAppSelector((state) => state.currentUser.user);
Expand Down Expand Up @@ -79,24 +74,19 @@ const NavbarMain = () => {
<Image
src={DSGTLogo}
alt="DSGT Logo"
width={40}
height={40}
width={100}
height={100}
/>
</Icon>
<Typography
noWrap
className="d-flex align-items-center logo-title"
sx={{

mr: 2,
display: { xs: "none", md: "flex" },
textDecoration: "none",

mr: 2,
display: { xs: "none", md: "flex" },
fontWeight: "500",
textDecoration: "none",
fontSize: "17px"
fontWeight: "500",
fontSize: "17px",
}}
>
Deep Learning Playground
Expand Down Expand Up @@ -174,7 +164,6 @@ const NavbarMain = () => {
</MenuItem>
<MenuItem divider>
<Link href="/learn" id="basic-nav-dropdown">

Learn
</Link>
</MenuItem>
Expand Down
Loading