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

Feature/jenny/final finishes #49

Merged
merged 3 commits into from
Jul 1, 2024
Merged

Feature/jenny/final finishes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20d3ce1
small css fixes
jennymar Jul 1, 2024
9d4f0c2
minor settings page deletion
jennymar Jul 1, 2024
5a57c96
favicon
jennymar Jul 1, 2024
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
Binary file modified frontend/src/app/(web app)/favicon.ico
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion frontend/src/app/admin/dashboard/page.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}

.gridContainer {
display: grid;
display: flex;
flex-wrap: wrap;
grid-template-columns: repeat(2, minmax(0, 1fr));
grid-gap: 50px;
Expand Down
Binary file added frontend/src/app/admin/favicon.ico
View file
Open in desktop
Binary file not shown.
12 changes: 5 additions & 7 deletions frontend/src/app/admin/page-editor/page.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
.page {
display: flex;
flex-direction: column;
justify-content: center;
margin-left: 234px;
margin-top: 50px;
padding-left: 90px;
padding-top: 50px;
}

.gridContainer {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
grid-template-columns: repeat(2, minmax(0, 1fr));
grid-gap: 50px;
max-width: 100%;
margin-top: 50px;
margin-left: 140px;
margin-left: 200px;
margin-bottom: 50px;
gap: 50px;
}
Binary file added frontend/src/app/favicon.ico
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions frontend/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Inter, Open_Sans, Roboto_Slab } from "next/font/google";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
title: "Future Leaders of Tomorrow",
description: "4FLOT",
};

const openSans = Open_Sans({
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/NavigationBar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

.navBar {
background-color: var(--color-primary-purple);
width: 243px;
width: 250px;
height: 100%;
position: fixed;
top: 0;
Expand Down
13 changes: 0 additions & 13 deletions frontend/src/components/NavigationBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ const NavigationBar = () => {
return "Newsletter Creator";
} else if (url === "/admin/mailing-list") {
return "Mailing List";
} else if (url === "/admin/settings") {
return "Settings";
} else {
return url;
}
Expand Down Expand Up @@ -156,17 +154,6 @@ const NavigationBar = () => {
Mailing List
</Link>
</div>
<div className={activeMenu === "Settings" ? styles.menuActive : styles.menuDiv}>
<Image width={18} height={18} src="/settingsIcon.svg" alt="Settings Icon" />
<Link
href="/admin/settings"
onClick={() => {
handleOnClick("Settings");
}}
>
Settings
</Link>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/UserIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function UserIcon() {
alt="Profile Picture"
/>

<h1 className="ml-4 cursor-default">John Doe</h1>
<h1 className="ml-4 cursor-default">4FLOT Admin</h1>
<IconButton
onClick={handleClick}
size="small"
Expand Down
Loading