-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #39 from ozaharsh95/project-section-with-search-pa…
…gination feat:Project Page with Pagination and Responsiveness
- Loading branch information
Showing
14 changed files
with
564 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| import Collaboration from "./components/Collaboration"; | ||
| import Empowerment from "./components/Empowerment"; | ||
| import Enhancement from "./components/Enhancement"; | ||
| import Footer from "./components/Footer"; | ||
| import Navbar from "./components/Navbar"; | ||
| import Newsletter from "./components/Newsletter"; | ||
| import Projects from "./components/Projects"; | ||
| import Hero from "./components/Hero"; | ||
|
|
||
| import { BrowserRouter as Router,Routes, Route , Navigate } from "react-router-dom"; | ||
| import Home from "./pages/Home"; | ||
| import ProjectPage from "./pages/Project"; | ||
| function App() { | ||
| return ( | ||
| <div> | ||
| <Navbar /> | ||
| <Hero /> | ||
| <Projects /> | ||
| <Empowerment /> | ||
| <Collaboration /> | ||
| <Enhancement /> | ||
| <Newsletter /> | ||
| <Footer /> | ||
| </div> | ||
| ); | ||
| return ( | ||
| <div> | ||
| <Router> | ||
| <Routes> | ||
| {/* This route is for home component | ||
| with exact path "/" */} | ||
| <Route path="/" exact element={<Home />} /> | ||
| {/* This route is for projectPage component | ||
| with exact path "/projects" */} | ||
| <Route path="/projects" element={<ProjectPage />} /> | ||
| {/* If any route mismatches the upper | ||
| route endpoints then, redirect triggers | ||
| and redirects app to home component with to="/" */} | ||
| {/* <Redirect to="/" /> */} | ||
| <Route path="*" element={<Navigate to="/" />} /> | ||
| </Routes> | ||
| </Router> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default App; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,38 @@ | ||
| function ProjectCards({ | ||
| image, | ||
| title, | ||
| description, | ||
| project_link, | ||
| category | ||
| }) { | ||
| return ( | ||
| <div className="w-full py-7 md:py-10 px-5 rounded-xl border-[1px] border-[#ecea8a] bg-[#ffffe3]"> | ||
| {/* Project Logo */} | ||
| <div className="h-36 flex justify-center items-center bg-[#f6f3c3] border-[1px] border-[#E6E76D] rounded-xl"> | ||
| <img className=" rounded-t-xl" src={image} alt={title} /> | ||
| function ProjectCards({ image, title, description, project_link, category }) { | ||
| return ( | ||
| <div className="w-full py-7 md:py-10 px-5 rounded-xl border-[1px] border-[#ecea8a] bg-[#ffffe3]"> | ||
| {/* Project Logo */} | ||
| <div className="h-36 flex justify-center items-center bg-[#f6f3c3] border-[1px] border-[#E6E76D] rounded-xl overflow-hidden"> | ||
| <img className=" rounded-t-xl" src={image} alt={title} /> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| {/* Card Content */} | ||
| <div className="pt-6 h-52 overflow-hidden"> | ||
|
|
||
| {/* Category */} | ||
| <div className="flex gap-2 items-center my-4"> | ||
| <div className="text-sm font-sans px-2 py-1 text-gray-600 font-medium bg-[#F1EEA6] rounded-md"> | ||
| Category - {category} | ||
| </div> | ||
| </div> | ||
|
|
||
| {/* Description */} | ||
| <div className="my-4"> | ||
| <div className="text-base text-gray-600 font-medium"> | ||
| {description.length < 200 ? description : description.substring(0, 200) + "..."} | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| {/* Card Content */} | ||
| <div className="pt-6 h-52 overflow-hidden"> | ||
| {/* Category */} | ||
| <div className="flex gap-2 items-center my-4"> | ||
| <div className="text-sm font-sans px-2 py-1 text-gray-600 font-medium bg-[#F1EEA6] rounded-md"> | ||
| Category - {category} | ||
| </div> | ||
| </div> | ||
|
|
||
| {/* View Project Button */} | ||
| <a href={project_link} | ||
| target="_blank" | ||
| rel="noreferrer" | ||
| > | ||
| <button className=" bg-[#323200] hover:bg-[#323200da] font-semibold text-[#ffffe3] w-full p-3 rounded-lg"> | ||
| View Project | ||
| </button> | ||
| </a> | ||
| {/* Description */} | ||
| <div className="my-4"> | ||
| <div className="text-base text-gray-600 font-medium"> | ||
| {description.length < 200 | ||
| ? description | ||
| : description.substring(0, 200) + "..."} | ||
| </div> | ||
| </div> | ||
| ); | ||
| </div> | ||
|
|
||
| {/* View Project Button */} | ||
| <a href={project_link} target="_blank" rel="noreferrer"> | ||
| <button className=" bg-[#323200] hover:bg-[#323200da] font-semibold text-[#ffffe3] w-full p-3 rounded-lg"> | ||
| View Project | ||
| </button> | ||
| </a> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default ProjectCards; |
Oops, something went wrong.