From 76d8eb11f550bc6849db9734ad01bdaa87b9cfed Mon Sep 17 00:00:00 2001 From: Radhika Malpani Date: Sun, 23 Jun 2024 16:18:23 +0530 Subject: [PATCH 1/6] update footer.js --- src/Components/Footer.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Components/Footer.js b/src/Components/Footer.js index 52948f7c..9546fefd 100644 --- a/src/Components/Footer.js +++ b/src/Components/Footer.js @@ -4,11 +4,17 @@ import logo from '../img/apple-touch-icon.png'; const Footer = () => { return ( +
logo -
Unicollab
+
+
Unicollab
+
+ UniCollab is more than just a platform;
it's a gateway to a world where students from different universities/colleges converge to collaborate, innovate, and
elevate their projects. +
+
From 3d6f2eeb322bd408b521cc3c5aa0fd738fbf5a85 Mon Sep 17 00:00:00 2001 From: Radhika Malpani Date: Sun, 23 Jun 2024 16:18:36 +0530 Subject: [PATCH 2/6] update footer.css --- src/Components/Footer.css | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/Components/Footer.css b/src/Components/Footer.css index 2f8df069..fd715652 100644 --- a/src/Components/Footer.css +++ b/src/Components/Footer.css @@ -19,10 +19,28 @@ width: 40%; } +.footer-1 > div { + display: flex; + flex-direction: column; +} + .footer-1 img { height: 3rem; } +.footer-title { + text-transform: uppercase; + font-size: 2rem; +} + +.footer-description { + margin-top: 0.8rem; + font-size: 0.999rem; + color: #fff; + + +} + .footer-half { width: 60%; display: flex; @@ -33,11 +51,6 @@ width: 20%; } -.footer-title { - text-transform: uppercase; - font-size: 2rem; -} - .footer-section-title { color: white; font-weight: bold; From a6eaf6addf57f76413fecbcd44be7ee4bb50a235 Mon Sep 17 00:00:00 2001 From: MinavKaria Date: Wed, 3 Jul 2024 19:37:50 +0530 Subject: [PATCH 3/6] chore: Update react-router-dom to version 6.24.1 and refactor router configuration --- src/App.js | 44 +++++++++------------------------- src/configs/router.js | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 33 deletions(-) create mode 100644 src/configs/router.js diff --git a/src/App.js b/src/App.js index 8a91495e..1fb0c675 100644 --- a/src/App.js +++ b/src/App.js @@ -1,10 +1,10 @@ import "./App.css"; import Container from "./Components/Container"; import Footer from "./Components/Footer"; -import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; +import { createBrowserRouter, RouterProvider } from "react-router-dom"; import Settings from "./Components/Settings/SettingsPage"; import About_us from "./Components/footer_section/about_us/About_us"; -import BlogPage from "./Components/footer_section/BlogPage/BlogPage" +import BlogPage from "./Components/footer_section/BlogPage/BlogPage"; import FAQPage from "./Components/footer_section/FAQPage/FAQPage"; import Services from "./Components/footer_section/services/Services"; import ContactUs from "./Components/footer_section/ContactUs/contact_us"; @@ -24,42 +24,20 @@ import EmailVerification from "./Components/auth/resetPassword/EmailVerification import OTPVerification from "./Components/auth/resetPassword/OTPVerification"; import ResetPassword from "./Components/auth/resetPassword/ResetPassword"; import Freelancer from "./Components/FreeLancer/Freelancer"; +import router from "./configs/router"; +// Define the routes function App() { return ( - -
-
- - } /> - } /> - }/> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - }/> - }/> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - - -
+
+
+
+
- + +
+
); } diff --git a/src/configs/router.js b/src/configs/router.js new file mode 100644 index 00000000..e1df4e22 --- /dev/null +++ b/src/configs/router.js @@ -0,0 +1,55 @@ + +import Container from "../Components/Container"; +import Footer from "../Components/Footer"; +import { createBrowserRouter, RouterProvider } from "react-router-dom"; +import Settings from "../Components/Settings/SettingsPage"; +import About_us from "../Components/footer_section/about_us/About_us"; +import BlogPage from "../Components/footer_section/BlogPage/BlogPage"; +import FAQPage from "../Components/footer_section/FAQPage/FAQPage"; +import Services from "../Components/footer_section/services/Services"; +import ContactUs from "../Components/footer_section/ContactUs/contact_us"; +import Readmore from "../Components/Readmore"; +import Login from "../Components/Login"; +import Pricing from "../Components/footer_section/Pricing/pricing"; +import MyProjects from "../Components/menu_section/my_projects/MyProjects"; +import NewProject from "../Components/menu_section/new_project/NewProject"; +import Error from "../Components/404_page/Error"; +import Profiles from "../Components/Profiles"; +import Profile from "../Components/Profile/profile"; +import Licensing from "../Components/footer_section/Legal/Licensing"; +import TermsConditions from "../Components/footer_section/Legal/TermsandConditions"; +import PrivacyPolicy from "../Components/footer_section/Legal/PrivacyPolicy"; +import Careers from "../Components/Careers/CareersPage"; +import EmailVerification from "../Components/auth/resetPassword/EmailVerification"; +import OTPVerification from "../Components/auth/resetPassword/OTPVerification"; +import ResetPassword from "../Components/auth/resetPassword/ResetPassword"; +import Freelancer from "../Components/FreeLancer/Freelancer"; + + +const router = createBrowserRouter([ + { path: "*", element: }, + { path: "/", element: }, + { path: "/login", element: }, + { path: "/settings", element: }, + { path: "/about", element: }, + { path: "/blogs", element: }, + { path: "/faq", element: }, + { path: "/services", element: }, + { path: "/contacts", element: }, + { path: "/termsandconditions", element: }, + { path: "/privacypolicy", element: }, + { path: "/licensing", element: }, + { path: "/readmore/:id", element: }, + { path: "/profile/:id", element: }, + { path: "/pricing", element: }, + { path: "/projects", element: }, + { path: "/new/project", element: }, + { path: "/profile", element: }, + { path: "/careers", element: }, + { path: "/verifyEmail", element: }, + { path: "/otpVerification/:email", element: }, + { path: "/resetPassword/:email", element: }, + { path: "/freelancer", element: }, + ]); + + export default router; \ No newline at end of file From 0b344497c8ae51cc6a5a020893322a617d5a72ab Mon Sep 17 00:00:00 2001 From: MinavKaria Date: Wed, 3 Jul 2024 19:45:06 +0530 Subject: [PATCH 4/6] refactor: Remove absolute positioning from panels-container in Login.css --- src/Components/Login.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Components/Login.css b/src/Components/Login.css index 67ec2161..9a47af9b 100644 --- a/src/Components/Login.css +++ b/src/Components/Login.css @@ -204,7 +204,6 @@ form.sign-in-form { } .panels-container { - position: absolute; width: 100%; height: 100%; top: 0; @@ -337,7 +336,6 @@ form.sign-in-form { @media (max-width: 870px) { .container { min-height: 800px; - height: 100vh; } .signin-signup { width: 100%; From 1326130345677e902b89906344bf071a17b69bc6 Mon Sep 17 00:00:00 2001 From: Ojas Arora <127867874+Ojas-Arora@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:56:23 +0530 Subject: [PATCH 5/6] Alignment issue --- src/Components/Footer.css | 7 ++-- src/Components/Footer.js | 12 +++++++ src/Components/FreeLancer/Freelancer.css | 28 ++++++++++----- src/Components/Login.css | 13 +++++-- src/Components/Login.js | 36 ++++++++++++------- .../footer_section/FAQPage/FAQPage.css | 8 +++-- 6 files changed, 75 insertions(+), 29 deletions(-) diff --git a/src/Components/Footer.css b/src/Components/Footer.css index e3c376ed..e4b6a3bf 100644 --- a/src/Components/Footer.css +++ b/src/Components/Footer.css @@ -2,9 +2,12 @@ background-color: #19162c; color: white; padding: 2.5rem 2.5rem 1rem 2.5rem; - z-index: 1000; + z-index: 900; + height: 55vh;; +} +.scrolltop{ + size: 20px; } - .footer-container { display: flex; z-index: 1000; diff --git a/src/Components/Footer.js b/src/Components/Footer.js index d9431c40..b06fe16f 100644 --- a/src/Components/Footer.js +++ b/src/Components/Footer.js @@ -2,6 +2,10 @@ import React from 'react'; import './Footer.css'; import logo from '../img/apple-touch-icon.png'; +const scrollToTop = () => { + window.scrollTo({ top: 0, behavior: 'smooth' }); +}; + const Footer = () => { return (
@@ -59,8 +63,16 @@ const Footer = () => { © 2024 UniCollab. All rights reserved.
+
+
+ +
+
); } export default Footer; + diff --git a/src/Components/FreeLancer/Freelancer.css b/src/Components/FreeLancer/Freelancer.css index 7aec613c..bbddc196 100644 --- a/src/Components/FreeLancer/Freelancer.css +++ b/src/Components/FreeLancer/Freelancer.css @@ -1,20 +1,29 @@ .box1Freelancer { width: 100vw; height: 420px; - margin-bottom: 100px; + margin-bottom: 2px; +} +.home-icon { + position: absolute; + top: 1.8rem; + left: 1.5rem; + width: 2.5rem; + cursor: pointer; } - .freelancer { margin: 50px 0px; + height: 4000px; +} +.footer{ + margin-bottom: 0px; } - .heading1freelancerbox1 { font-size: 80px; font-weight: 600; width: 1000px; margin: auto; text-align: center; - margin-bottom: 30px; + margin-bottom: 20px; color: #ff21bc; font-weight: bold; } @@ -22,7 +31,7 @@ .desc1freelancerbox1 { font-size: 27px; text-align: center; - margin-bottom: 65px; + margin-bottom: 45px; } .btnFreelancer { @@ -32,6 +41,7 @@ font-weight: 500; font-size: 22px; border-radius: 20px; + background-color: darkturquoise; } .box2Freelancer { @@ -43,7 +53,7 @@ margin: auto; justify-items: center; align-items: center; - margin-bottom: 200px; + margin-bottom: 100px; } .containerFreelancer { @@ -104,7 +114,7 @@ height: 620px; margin: auto; display: flex; - margin-bottom: 150px; + margin-bottom: 50px; } .firstBox3 { @@ -128,7 +138,7 @@ .desc1box3{ font-size: 26px; - margin-bottom: 75px; + margin-bottom: 55px; } .desc2box3{ @@ -249,7 +259,7 @@ } .locationContent{ - color: green; + color: darkturquoise; } .locationofFreelancer{ diff --git a/src/Components/Login.css b/src/Components/Login.css index 67ec2161..38e53fe6 100644 --- a/src/Components/Login.css +++ b/src/Components/Login.css @@ -1,11 +1,17 @@ @import url("https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700;800&display=swap"); * { - margin: 0; + margin: 100px; padding: 0; box-sizing: border-box; } - +.home-icon { + position: absolute; + top: 1.9rem; + left: 1.5rem; + width: 2.5rem; + cursor: pointer; +} body, input { font-family: "Poppins", sans-serif; @@ -157,6 +163,9 @@ form.sign-in-form { transform: scale(1.1); /* Slightly enlarges the icon */ box-shadow: 0 4px 8px darkturquoise !important; /* Adds a shadow on hover */ } +.home-link.no-margin-right { + margin-right: 0px; +} .btn { width: 150px; diff --git a/src/Components/Login.js b/src/Components/Login.js index 43e8454b..75a78c73 100644 --- a/src/Components/Login.js +++ b/src/Components/Login.js @@ -1,10 +1,10 @@ import React, { useState } from 'react'; -import { Link } from 'react-router-dom'; +import { Link, useNavigate } from 'react-router-dom'; import './Login.css'; import '@fortawesome/fontawesome-free/css/all.min.css'; import logImg from './Profile/log.svg'; import registerImg from './Profile/register.svg'; -import { useNavigate } from 'react-router-dom'; +import homeIcon from './FreeLancer/homeicon.png' const LogIn = () => { const [email, setEmail] = useState(''); @@ -44,12 +44,12 @@ const LogIn = () => { console.log('Login successful', data); displayAlert('Logged in'); - // Store the username and email in local storage - localStorage.setItem('username', data.user.username); - localStorage.setItem('email', data.user.email); + // Store the username and email in local storage + localStorage.setItem('username', data.user.username); + localStorage.setItem('email', data.user.email); setTimeout(() => { - navigate('/'); + navigate('/'); }, 1000); // Handle successful login @@ -95,7 +95,7 @@ const LogIn = () => { const data = await response.json(); if (response.ok) { console.log('Signup successful', data); - displayAlert('signed-in. Now login') + displayAlert('Signed up. Now login'); // Handle successful signup } else { displayAlert(data.message || 'Signup failed'); @@ -128,10 +128,15 @@ const LogIn = () => { return (
+ {/* Home Link */}
-
+ + + Home +

Step into UniCollab! Log In

+
{
-
+ +

Start Journey with UniCollab

+ + Home +
{ Explore our platform and unlock a realm of personalized experiences.


- + +
Login illustration
@@ -248,7 +258,7 @@ const LogIn = () => { Embark on a journey through UniCollab for personalized experiences.


-
diff --git a/src/Components/footer_section/FAQPage/FAQPage.css b/src/Components/footer_section/FAQPage/FAQPage.css index 654fc3f2..90ab7d0d 100644 --- a/src/Components/footer_section/FAQPage/FAQPage.css +++ b/src/Components/footer_section/FAQPage/FAQPage.css @@ -15,9 +15,9 @@ padding: 20px; max-width: 800px; margin: 0 auto; - margin-top: 50px; + margin-top: 30px; border-radius: 10px; - box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3); + } .page-container h1 { @@ -31,6 +31,7 @@ flex-direction: column; gap: 20px; max-width: 800px; + } .faq-item { @@ -42,7 +43,7 @@ width: 100%; position: relative; overflow: hidden; - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + box-shadow: 7px 7px 32px 0 #6052ff; } .faq-item::before { @@ -56,6 +57,7 @@ z-index: 1; opacity: 0; transition: opacity 0.3s; + } .faq-item:hover::before { From 7085ff7a44673ced1fe0edbe8d45acc47f68a18f Mon Sep 17 00:00:00 2001 From: Ojas Arora <127867874+Ojas-Arora@users.noreply.github.com> Date: Fri, 5 Jul 2024 01:11:57 +0530 Subject: [PATCH 6/6] Alignment Issue --- src/Components/FreeLancer/Freelancer.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/FreeLancer/Freelancer.css b/src/Components/FreeLancer/Freelancer.css index cb92b3f4..0f29fd1c 100644 --- a/src/Components/FreeLancer/Freelancer.css +++ b/src/Components/FreeLancer/Freelancer.css @@ -12,7 +12,7 @@ } .freelancer { margin: 50px 0px; - height: 4000px; + height: 3300px; } .footer{ margin-bottom: 0px; @@ -56,7 +56,7 @@ justify-items: center; justify-content: center; align-items: center; - margin-bottom: 175px; + margin-bottom: 200px; gap: 1vw; }