From 84913b0c5645071615cc113011d5696548905ef9 Mon Sep 17 00:00:00 2001 From: xAlpharax <42233094+xAlpharax@users.noreply.github.com> Date: Sun, 10 Dec 2023 08:39:32 +0200 Subject: Merged the front-end and back-end dev environments into master. Massive W for the team. Full Google Auth + other Prisma quirks and functionalities. Changes to be committed: new file: .gitattributes new file: backend/index.js new file: backend/login_pages/index.js new file: backend/package-lock.json new file: backend/package.json new file: backend/populate_prisma.js new file: backend/prisma/schema.prisma new file: backend/views/pages/auth.ejs new file: backend/views/pages/success.ejs new file: frontend/README.md new file: frontend/package-lock.json new file: frontend/package.json new file: frontend/public/favicon.ico new file: frontend/public/index.html new file: frontend/public/logo192.png new file: frontend/public/logo1922.png new file: frontend/public/logo512.png new file: frontend/public/manifest.json new file: frontend/public/robots.txt new file: frontend/src/App.css new file: frontend/src/App.js new file: frontend/src/App.test.js new file: frontend/src/Footer.css new file: frontend/src/Footer.js new file: frontend/src/components/Navbar.js new file: frontend/src/components/NavbarElements.js new file: frontend/src/components/logo192.png new file: frontend/src/index.css new file: frontend/src/index.js new file: frontend/src/logo.svg new file: frontend/src/pages/about.js new file: frontend/src/pages/contact.css new file: frontend/src/pages/contact.js new file: frontend/src/pages/courses.css new file: frontend/src/pages/courses.js new file: frontend/src/pages/index.css new file: frontend/src/pages/index.js new file: frontend/src/reportWebVitals.js new file: frontend/src/setupTests.js --- frontend/src/components/Navbar.js | 72 ++++++++++++++++++++++++++++++ frontend/src/components/NavbarElements.js | 40 +++++++++++++++++ frontend/src/components/logo192.png | Bin 0 -> 115893 bytes 3 files changed, 112 insertions(+) create mode 100644 frontend/src/components/Navbar.js create mode 100644 frontend/src/components/NavbarElements.js create mode 100644 frontend/src/components/logo192.png (limited to 'frontend/src/components') diff --git a/frontend/src/components/Navbar.js b/frontend/src/components/Navbar.js new file mode 100644 index 0000000..e7b4c58 --- /dev/null +++ b/frontend/src/components/Navbar.js @@ -0,0 +1,72 @@ +import React from 'react'; +import { NavLink} from "./NavbarElements"; +import '@popperjs/core'; +import 'bootstrap/dist/css/bootstrap.min.css'; +import { Navbar, Nav, Button, Badge, Dropdown } from 'react-bootstrap'; + +function NavbarApp() { + return ( + +
+ + + + Logo + + +
+ + + + + + + + 69 + + + + Some news + Another news + Something else here + + + + + Poza de profil + + + Profilul meu + Setari + Logout + + +
+
+
+ ); +} + +export default NavbarApp; diff --git a/frontend/src/components/NavbarElements.js b/frontend/src/components/NavbarElements.js new file mode 100644 index 0000000..99d8223 --- /dev/null +++ b/frontend/src/components/NavbarElements.js @@ -0,0 +1,40 @@ +// Filename - ./components/Navbar.js + +import { NavLink as Link } from "react-router-dom"; +import styled from "styled-components"; + +export const Nav = styled.nav` + background: #ffb3ff; + height: 85px; + display: flex; + justify-content: space-between; + padding: 0.2rem calc((100vw - 1000px) / 2); + z-index: 12; +`; + +export const NavLink = styled(Link)` + color: #808080; + display: flex; + align-items: center; + text-decoration: none; + padding: 0 1rem; + height: 100%; + cursor: pointer; + &.active { + color: #9400FF; + } +`; + +export const NavMenu = styled.div` + display: flex; + align-items: center; + margin-right: -24px; + /* Second Nav */ + /* margin-right: 24px; */ + /* Third Nav */ + /* width: 100vw; +white-space: nowrap; */ + @media screen and (max-width: 768px) { + display: none; + } +`; diff --git a/frontend/src/components/logo192.png b/frontend/src/components/logo192.png new file mode 100644 index 0000000..e14da01 Binary files /dev/null and b/frontend/src/components/logo192.png differ -- cgit v1.2.3