Skip to content

Commit

Permalink
Merge pull request #9 from cruz27r/revert-4-develop
Browse files Browse the repository at this point in the history 
Revert "Develop"
  • Loading branch information
@cruz27r
cruz27r authored Jan 9, 2024
2 parents 84b7002 + 39de441 commit 5f2637d
Show file tree
Hide file tree
Showing 43 changed files with 1,569 additions and 1,831 deletions.
45 changes: 1 addition & 44 deletions src/App.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@
background-color: #fcf7ff;
}

.navbar {
z-index: 1000; /* Any high number to ensure it's on top */;
}

/* Adjust padding to account for navbar height */
.Pages {
z-index: 1; /* Any high number to ensure it's on top */
padding-top: 120px; /* Use CSS variable for navbar height */
}

main {
width: 100%; /* Full width */
box-sizing: border-box; /* Padding and border are included in the width */
Expand Down Expand Up @@ -45,7 +35,7 @@ button:hover, .ticket-button:hover {
}

:root {
--navbar-height: 90px; /* Height of the navbar */
--navbar-height: 90px;
--navbar-padding: 15px;
}

Expand All @@ -57,36 +47,3 @@ button:hover, .ticket-button:hover {
.content-wrapper {
padding-top: var(--navbar-height);
}

/* Styles for mobile devices */
@media (max-width: 767px) {
.app-container, .App {
padding: 5px;
font-size: 14px;
}

/* Adjust navbar height for mobile */
:root {
--navbar-height: 60px; /* Adjusted height for mobile screens */
}

.Pages {
padding-top: var(--navbar-height); /* Adjust top padding for mobile navbar height */
}
}

/* Styles for tablets */
@media (min-width: 768px) and (max-width: 1024px) {
.app-container, .App {
padding: 10px;
font-size: 16px;
}
}

/* Styles for desktop and larger screens */
@media (min-width: 1025px) {
.app-container, .App {
padding: 20px;
font-size: 18px;
}
}
133 changes: 30 additions & 103 deletions src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,115 +1,42 @@
// App.js
import React from 'react';
import { BrowserRouter as Router, Route, Routes, useLocation } from 'react-router-dom';
import { BrowserRouter as Router, Route, Routes} from 'react-router-dom';
//import logoImage from './assets/images/P2E_Logo.png'; // Correct path to image
import HomePage from './pages/HomePage/homePage';
import UniversityPartners from './pages/UniversityPartners/UniversityPartners';
import CorporatePartners from './pages/CorporatePartners/CorporatePartners';
import LinkedInRebrand from './pages/Services/LinkedInRebrand/linkedInRebrand';
import ResumeRebrand from './pages/Services/ResumeRebrand/resumeRebrand';
import InterviewPrep from './pages/Services/InterviewPrep/interviewPrep';
import EventsForReadiness from './pages/Services/EventsForReadiness/eventsForReadiness';
import ApplyToCohort from './pages/ApplyToCohort/ApplyToCohort';
import EventsForReadiness from './pages/EventsForReadiness/eventsForReadiness';
import SubmitLinkedIn from './pages/SubmitLinkedIn/submitLinkedIn';
import BecomeP2E from './pages/BecomeP2E/becomeP2E';
import BecomeSpeaker from './pages/BecomeSpeaker/becomeSpeaker';
import BecomeSponsor from './pages/BecomeSponsor/becomeSponsor';
import InterviewPrep from './pages/InterviewPrep/interviewPrep';
import Partners from './pages/Partners/partners';
import Speakers from './pages/Speakers/speakers';
import FAQs from './pages/FAQs/faqs';
import UniversityPartnersApplication from './pages/UniversityPartners/UniversityPartnersApplication';
import CorporatePartnersApplication from './pages/CorporatePartners/CorporatePartnersApplication';
import SpeakerApplication from './pages/Speakers/SpeakersApplication';
import NavBar from './components/NavBar/navbar';
import './App.css';
import MaintenancePage from './pages/Maintenance/MaintenancePage'; // Path to your MaintenancePage component

const Layout = ({ children }) => {
const location = useLocation(); // Get the current location

// Check if the current path is not the maintenance page
const showNavBar = location.pathname !== "/";

return (
<>
{showNavBar && <NavBar />}
<div className="main-content">
{children}
</div>
</>
);
};
import NavBar from './components/NavBar/navbar';
import SubmitResume from './pages/SubmitResume/submitResume';

function App() {
return (
<Router>
<Routes>
<Route path="/" element={
<Layout>
<MaintenancePage />
</Layout>
} />
<Route path="/homepage" element={
<Layout>
<HomePage />
</Layout>
} />
<Route path="/university-partners" element={
<Layout>
<UniversityPartners />
</Layout>
} />
<Route path="/university-partners/application" element={
<Layout>
<UniversityPartnersApplication />
</Layout>
} />
<Route path="/corporate-partners" element={
<Layout>
<CorporatePartners />
</Layout>
} />
<Route path="/corporate-partners/application" element={
<Layout>
<CorporatePartnersApplication />
</Layout>
} />
<Route path="/linkedin-rebrand" element={
<Layout>
<LinkedInRebrand />
</Layout>
} />
<Route path="/resume-rebrand" element={
<Layout>
<ResumeRebrand />
</Layout>
} />
<Route path="/interview-prep" element={
<Layout>
<InterviewPrep />
</Layout>
} />
<Route path="/events-for-readiness" element={
<Layout>
<EventsForReadiness />
</Layout>
} />
<Route path="/apply-to-cohort" element={
<Layout>
<ApplyToCohort />
</Layout>
} />
<Route path="/speakers/application" element={
<Layout>
<SpeakerApplication />
</Layout>
} />
<Route path="/speakers" element={
<Layout>
<Speakers />
</Layout>
} />
<Route path="/faqs" element={
<Layout>
<FAQs />
</Layout>
} />
{/* Additional routes can be added here as needed */}
</Routes>
<div className="App">
<NavBar/>
<Routes>
<Route path="/" element={<HomePage />} />
<Route path="/home" element={<HomePage />} />
<Route path="/events-for-readiness" element={<EventsForReadiness />} />
<Route path="/submit-linkedin" element={<SubmitLinkedIn />} />
<Route path="/submit-resume" element={<SubmitResume />} />
<Route path="/become-p2e" element={<BecomeP2E />} />
<Route path="/become-speaker" element={<BecomeSpeaker />} />
<Route path="/become-sponsor" element={<BecomeSponsor />} />
<Route path="/interview-prep" element={<InterviewPrep />} />
<Route path="/partners" element={<Partners />} />
<Route path="/speakers" element={<Speakers />} />
<Route path="/faqs" element={<FAQs />} />
{/* Add additional routes if needed */}
</Routes>

</div>
</Router>
);
}
Expand Down
Loading

0 comments on commit 5f2637d

Please sign in to comment.