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

Updates to UI design #54

Merged
merged 23 commits into from
Mar 21, 2024
Merged

Updates to UI design #54

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d61c9a9
Installed next-nprogress-bar and react-icons
YewoMhango Mar 8, 2024
3c17cb8
Added new logo
YewoMhango Mar 8, 2024
01462ce
Added dark mode and loading bar
YewoMhango Mar 8, 2024
c1cb2f3
Added AdminTable to replace antd table
YewoMhango Mar 8, 2024
3286c0f
Made some improvements to landing page
YewoMhango Mar 8, 2024
9e6da3c
Improved layout of admin pages
YewoMhango Mar 8, 2024
d3fe0fa
Improved courses page in admin
YewoMhango Mar 8, 2024
6340883
Added admin, courses, and dashboard to i18next
YewoMhango Mar 8, 2024
eecc579
Finished admin list view pagges
YewoMhango Mar 11, 2024
0bacd43
Finalized admin pages
YewoMhango Mar 12, 2024
e72b0e7
Fixed lint error
YewoMhango Mar 12, 2024
6654c83
Added ability to display asterisk for required admin form fields
YewoMhango Mar 12, 2024
87ab850
Fixed build error
YewoMhango Mar 12, 2024
2c83704
Wrote AdminTableButtonGroup as a proper component
YewoMhango Mar 13, 2024
f6ab620
Ensured table doesn't overflow horizontally
YewoMhango Mar 13, 2024
b96dcad
Updated landing page
YewoMhango Mar 14, 2024
84af462
Added admin create and edit pages to modals
YewoMhango Mar 14, 2024
7c980e5
Fixed build error
YewoMhango Mar 14, 2024
85ca8f8
Edited types to conform to "T_" style
YewoMhango Mar 15, 2024
47bf3de
Renamed interfaces to match "I_" style
YewoMhango Mar 15, 2024
4a51be0
Improved signup and login pages
YewoMhango Mar 15, 2024
e471ae4
Uploaded updates to library page
YewoMhango Mar 17, 2024
3d2f418
Fixed navbar URL
YewoMhango Mar 17, 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
13,308 changes: 13,308 additions & 0 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
"mongodb": "^6.1.0",
"next": "13.4.17",
"next-auth": "^4.23.1",
"next-nprogress-bar": "^2.3.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-icons": "^5.0.1",
"realm": "^12.1.0",
"styled-components": "^6.1.8",
"typescript": "5.1.6",
Expand Down
81 changes: 81 additions & 0 deletions public/alternate-logo-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions public/alternate-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 66 additions & 0 deletions public/landing-page-feature-image-2.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 25 additions & 25 deletions src/app/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
.logo {
margin-top: -20px !important;
}
.admin-logo {
/* .admin-logo {
height: 100px;
background-color: #264463 !important;
}
} */

.landing-page-container {
background-color: #faf8f4 !important;
/* background-color: #faf8f4 !important; */
background-image: url('https://img.freepik.com/free-vector/handdrawn-style-line-doodle-pattern_1409-3949.jpg?t=st=1708706966~exp=1708710566~hmac=20506a50dab787eeb4d62c1e106d3995e7e0367db13f7d86fcd31ce2045dabbe&w=1800');
background-position: center;
}

.nav-bar {
/* .nav-bar {
background-color: #031525 !important;
color: white;
}
} */

.landing-page-main-card-container {
margin-top: 120px;
Expand Down Expand Up @@ -55,9 +55,9 @@
margin: 0 auto;
}

.active-menu-item {
/* .active-menu-item {
background-color: white;
}
} */

.table-action-item {
margin: 10px;
Expand All @@ -67,7 +67,7 @@
margin: 20px 0 20px 0 !important;
width: 99%;
}

/*
.ant-table-thead > tr > th {
background-color: #031525 !important;
color: white !important;
Expand All @@ -88,27 +88,27 @@
.ant-table-row.ant-table-row-selected
> .ant-table-cell {
background: #1b68b5;
}
} */

.ant-table-tbody > tr:nth-child(2n) {
/* .ant-table-tbody > tr:nth-child(2n) {
background-color: #031525 !important;
color: white !important;
}
} */

.table-action-buttons {
/*.table-action-buttons {
margin: 0 10px 10px 0;
background-color: #264463 !important;
color: white;
}
}*/

.admin-table {
/* .admin-table {
margin: 0 10px 10px 0;
}
} */

.admin-menu {
/* .admin-menu {
background-color: #264463 !important;
padding: 10px;
}
} */

.sidebar-menu-item {
color: white !important;
Expand All @@ -120,24 +120,24 @@
background-color: gray !important;
}

.navbar-menu-item {
/* .navbar-menu-item {
color: white !important;
font-size: 15px;
margin: 10px;
}

} */
/*
.admin-breadcrumbs {
margin: 10px;
color: white !important;
}
} */

.admin-active-breadcrumb-item {
color: gray !important;
}

/*
.admin-breadcrumb-item {
color: white !important;
}
} */

.form-card {
background-color: #031525 !important;
Expand Down Expand Up @@ -191,13 +191,13 @@
opacity: 0;
}

.admin-content-page {
/* .admin-content-page {
background-color: #264463;
}

.admin-page-title {
color: white !important;
}
} */

.library-container {
background-color: #264463;
Expand Down
Binary file modified src/app/favicon.ico
View file
Open in desktop
Binary file not shown.
38 changes: 22 additions & 16 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
"use client";
'use client';

import { SessionProvider } from "next-auth/react";
import { Inter } from "next/font/google";
import "./custom.css";
import "./globals.css";
import "utils/intl";
import {ConfirmDialog} from "@components/modals";
import { Session } from "next-auth";
import { ReactNode } from "react";
import { SessionProvider } from 'next-auth/react';
import { Inter } from 'next/font/google';
import './custom.css';
import './globals.css';
import 'utils/intl';
import { Session } from 'next-auth';
import { ReactNode } from 'react';
import { Flowbite, ThemeModeScript } from 'flowbite-react';
import { AppProgressBar as ProgressBar } from 'next-nprogress-bar';

const inter = Inter({ subsets: ["latin"] });
const inter = Inter({ subsets: ['latin'] });

interface RootLayoutProps {
children: ReactNode;
Expand All @@ -21,14 +22,19 @@ interface RootLayoutProps {
const RootLayout = ({ children, pageProps }: RootLayoutProps) => {
return (
<html lang="en">
<body className={inter.className}>
<SessionProvider session={pageProps?.session}>
<ConfirmDialog />
{children}
</SessionProvider>
<head>
<ThemeModeScript />
</head>
<body className={`${inter.className} dark:bg-gray-800 dark:text-white`}>
<Flowbite>
<SessionProvider session={pageProps?.session}>
{children}
<ProgressBar color="#3584e4" height="4px" options={{ showSpinner: false }} />
</SessionProvider>
</Flowbite>
</body>
</html>
);
};

export default RootLayout;
export default RootLayout;
7 changes: 3 additions & 4 deletions src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
"use client";
'use client';

import WelcomePage from "@components/welcomePage";
import React from "react";
import WelcomePage from '@components/welcomePage';
import React from 'react';

const Home: React.FC = (props) => {

return <WelcomePage />;
};

Expand Down
Loading