Skip to content

Commit

Permalink
Merge branch 'dev' into stricker1/Faculty
Browse files Browse the repository at this point in the history
  • Loading branch information
stricker1 authored Feb 11, 2025
2 parents 5f1b073 + d76446b commit c021af0
Show file tree
Hide file tree
Showing 30 changed files with 692 additions and 90 deletions.
206 changes: 202 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"prepare": "husky install"
},
"dependencies": {
"@radix-ui/react-collapsible": "^1.1.2",
"@tanstack/react-query": "~5.53.3",
"lucide-react": "~0.417.0",
"next": "~14.2.10",
Expand Down
3 changes: 3 additions & 0 deletions public/bluetriangle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/mock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/yellowtriangle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 4 additions & 8 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
import About from "@/components/home/about";
import Dropdowns from "@/components/home/dropdowns";
import Education from "@/components/home/education";
import Landing from "@/components/home/landing";
import News from "@/components/home/news";
import Welcome from "@/components/home/welcome";

const Home = () => {
return (
<div className="flex flex-col items-center justify-center">
<div className="flex flex-col items-center justify-center gap-5">
<Landing />
<Welcome />
<About />
<Education />
<News
title="TITLE"
pageLink="/"
imageLink="https://www.magnite.com/wp-content/uploads/2024/05/surface-xSiQBSq-I0M-unsplash.jpg"
imageAlt="alt test"
description="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
/>
<Dropdowns />
<News />
</div>
);
};
Expand Down
2 changes: 2 additions & 0 deletions src/app/projects/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ import Professionals from "@/components/projects/professionals";
import Research from "@/components/projects/research";
import Medical from "@/components/projects/medical";
import Faculty from "@/components/projects/faculty";
import Business from "@/components/projects/business";

const page = () => {
return (
<div>
<Research />
<Professionals />
<Business />
<Medical />
<Faculty />
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/app/resources/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import External from "@/components/resources/external";
import React from "react";
import Videos from "@/components/resources/videos";
import Articles from "@/components/resources/articles";
import Notes from "@/components/resources/notes";

const page = () => {
return (
<div className="flex flex-col items-center justify-center">
<Articles />
<External />
<Videos />
<Notes />
</div>
);
};
Expand Down
Loading

0 comments on commit c021af0

Please sign in to comment.