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/pages/about.js | 34 ++++++++++++ frontend/src/pages/contact.css | 3 + frontend/src/pages/contact.js | 50 +++++++++++++++++ frontend/src/pages/courses.css | 45 +++++++++++++++ frontend/src/pages/courses.js | 89 ++++++++++++++++++++++++++++++ frontend/src/pages/index.css | 10 ++++ frontend/src/pages/index.js | 122 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 353 insertions(+) create mode 100644 frontend/src/pages/about.js create mode 100644 frontend/src/pages/contact.css create mode 100644 frontend/src/pages/contact.js create mode 100644 frontend/src/pages/courses.css create mode 100644 frontend/src/pages/courses.js create mode 100644 frontend/src/pages/index.css create mode 100644 frontend/src/pages/index.js (limited to 'frontend/src/pages') diff --git a/frontend/src/pages/about.js b/frontend/src/pages/about.js new file mode 100644 index 0000000..4c239f6 --- /dev/null +++ b/frontend/src/pages/about.js @@ -0,0 +1,34 @@ +// Filename - pages/about.js + +import React from "react"; +import './index.css'; +import { Container, Row, Col } from 'react-bootstrap'; +const About = () => { + return ( + +

About us

+
+ + + + Logo + + +

Who are we?

+

+ Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ad porro dolorem eveniet mollitia ipsum minus ex corporis ut. Nihil voluptatem exercitationem quaerat assumenda! Provident neque, minima quod voluptatum tenetur ducimus! +

+ + +

Blah Blah

+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Minima velit deleniti perferendis impedit rerum possimus dolorum eligendi similique, vero odit sed consectetur officiis iusto nisi culpa ex delectus illo sequi? +

+ + + + + ); +}; + +export default About; diff --git a/frontend/src/pages/contact.css b/frontend/src/pages/contact.css new file mode 100644 index 0000000..e22a888 --- /dev/null +++ b/frontend/src/pages/contact.css @@ -0,0 +1,3 @@ +#contact .card:hover i,#contact .card:hover h4{ + color: #9400FF; +} \ No newline at end of file diff --git a/frontend/src/pages/contact.js b/frontend/src/pages/contact.js new file mode 100644 index 0000000..195aa12 --- /dev/null +++ b/frontend/src/pages/contact.js @@ -0,0 +1,50 @@ +// Contact.js + +import React from 'react'; +import 'bootstrap/dist/css/bootstrap.min.css'; +import './contact.css'; +const Contact = () => { + return ( +
+
+

Contact us

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris interdum purus at sem ornare sodales. Morbi + leo nulla, pharetra vel felis nec, ullamcorper condimentum quam. +

+
+
+
+
+ +

Call us

+

+8801683615582

+
+
+
+
+
+
+ +

Office location

+
New York, NY 10012, US
+
+
+
+
+
+
+ +

Email

+

info@example.com

+
+
+
+
+
+
+ ); +}; + +export default Contact; diff --git a/frontend/src/pages/courses.css b/frontend/src/pages/courses.css new file mode 100644 index 0000000..053ac91 --- /dev/null +++ b/frontend/src/pages/courses.css @@ -0,0 +1,45 @@ + +/* Culorile săgeților active */ +.carousel-control-prev-icon, +.carousel-control-next-icon { + background-color: black; +} + +/* Culorile săgeților la hover */ +.carousel-control-prev:hover, +.carousel-control-next:hover { + background-color: darkgrey; +} + +/* Culorile săgeților inactive */ +.carousel-control-prev, +.carousel-control-next { + background-color: grey; +} +/* Adaugă acest cod CSS în fișierul tău de stiluri (de exemplu, App.css) */ + +/* Sageti de parcurgere - pozitionare mai in exterior */ +.carousel-control-prev, .carousel-control-next { + transform: translateY(250%); + } + + /* Sageti de parcurgere - setare distanta intre sageti si marginea carousel-ului */ + .carousel-control-prev { + margin-left: -3rem; /* Ajusteaza distanta pe orizontala la stanga */ + } + + .carousel-control-next { + margin-right: -3rem; /* Ajusteaza distanta pe orizontala la dreapta */ + } + /* Adaugă acest cod CSS în fișierul tău de stiluri (de exemplu, App.css) */ + +/* Stilizare dimensiune sageti de parcurgere */ +.carousel-control-prev, .carousel-control-next { + width: 50px; /* Lățimea săgeților */ + height: 50px; /* Înălțimea săgeților */ + font-size: 24px; /* Dimensiunea textului săgeților (dacă sunt utilizate iconițe) */ + line-height: 3rem; /* Ajustează înălțimea liniei pentru a centra textul (dacă sunt utilizate iconițe) */ + } + + /* Alte stilizari pot fi adaugate aici */ + \ No newline at end of file diff --git a/frontend/src/pages/courses.js b/frontend/src/pages/courses.js new file mode 100644 index 0000000..ffa7adb --- /dev/null +++ b/frontend/src/pages/courses.js @@ -0,0 +1,89 @@ +import React from 'react'; +import { Carousel, Container, Row, Col } from 'react-bootstrap'; +import './courses.css'; +function CourseCard({ imageUrl, title, text }) { + return ( +
+
+ + ... + +
+
{title}
+

{text}

+ + Go somewhere + +
+
+
+ ); + } +const MyCarousel = () => { + return ( + +

Courses

+
+ +

Top Rated Courses

+ + +
+ + + + +
+ + + +
+ + + + +
+ + +
+ + + + +
+ + + +

Recommended courses

+ + +
+ + + + +
+ + + +
+ + + + +
+ + +
+ + + + +
+ + + + ); +}; + +export default MyCarousel; diff --git a/frontend/src/pages/index.css b/frontend/src/pages/index.css new file mode 100644 index 0000000..d80b5e3 --- /dev/null +++ b/frontend/src/pages/index.css @@ -0,0 +1,10 @@ +@import '~@fortawesome/fontawesome-free/css/all.css'; +.background{ + background-color: #010001 !important; +} +.background2{ + background-color: #9400FF !important; +} +.text-logo{ + color: #9400FF !important; +} \ No newline at end of file diff --git a/frontend/src/pages/index.js b/frontend/src/pages/index.js new file mode 100644 index 0000000..ac0e470 --- /dev/null +++ b/frontend/src/pages/index.js @@ -0,0 +1,122 @@ +// Filename - pages/index.js + +import React from "react"; +import './index.css'; +function CourseCard({ imageUrl, title, text }) { + return ( +
+
+ + ... + +
+
{title}
+

{text}

+ + Go somewhere + +
+
+
+ ); +} +function PersonCard({ imageUrl, name, username, socialLinks, websites }) { + return ( +
+
+
+
+ ... +
+

{name}

+

@{username} | {websites}

+
+ {socialLinks.map((link, index) => ( + + ))} +
+ +
+
+

8471

+

Interactions

+
+
+

8512

+

Prepared Students

+
+
+

4751

+

Something

+
+
+
+
+
+ ); +} + +// Componenta principală +function Home() { + return ( +
+

Dashboard

+
+ {/* Cursurile tale */} +
+

Your courses

+
+ + + + + +
+
+
+

Connect with people

+
+ + + +
+
+
+ ); +} + +export default Home; -- cgit v1.2.3