Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Images to Webp #83

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7247200
news.ts outline created
BananazrCRAZY Jan 20, 2025
9a44f6e
created news layout
BananazrCRAZY Jan 20, 2025
046f0a5
news layout updated
BananazrCRAZY Jan 20, 2025
09834a0
Added triangle svgs, course data, and dropdown component under education
bgarcia11 Feb 3, 2025
273c44c
Merge branch 'dev' of https://github.com/acm-ucr/CSE-AI-resources int…
BananazrCRAZY Feb 3, 2025
cf319ca
updating branch
BananazrCRAZY Feb 3, 2025
79969b7
Merge branch 'dev' of https://github.com/acm-ucr/CSE-AI-resources int…
BananazrCRAZY Feb 3, 2025
c6b0b04
added comp
stormyy00 Feb 4, 2025
4a3c6fa
Created footer component
terryzhw Feb 4, 2025
fae4b20
Fix error
BananazrCRAZY Feb 4, 2025
149d618
Run format and lint
BananazrCRAZY Feb 4, 2025
5749fad
fixed footer componenety
terryzhw Feb 4, 2025
e3d203a
fixed *updated
terryzhw Feb 4, 2025
0873dbb
Merge pull request #64 from acm-ucr/terryzhw
stormyy00 Feb 4, 2025
91fe5b0
fixed svg
stormyy00 Feb 4, 2025
80d715d
fixes
stormyy00 Feb 4, 2025
967a10e
changed colors when users are on a different page and color change wh…
rachel-chan1 Feb 5, 2025
4c88919
Merge pull request #67 from acm-ucr/rachel-chan1/navigation_component…
stormyy00 Feb 5, 2025
c915ffe
Merge branch 'dev' of https://github.com/acm-ucr/CSE-AI-resources int…
bgarcia11 Feb 5, 2025
9815258
Merge pull request #20 from acm-ucr/bananazrCRAZY/RecentNewsDataMapping
stormyy00 Feb 5, 2025
b35857a
Added animation to triangles and used shad cn for dropdown
bgarcia11 Feb 5, 2025
9376d79
clean up
stormyy00 Feb 5, 2025
f0b7c01
Merge pull request #56 from acm-ucr/bgarcia11/DropDown
stormyy00 Feb 7, 2025
3d2025b
cleaned up code
stormyy00 Feb 7, 2025
42f9608
fixed nav
stormyy00 Feb 8, 2025
244ca2b
fixed margin/spacing
Feb 9, 2025
cb4c405
fixed external resources
Feb 9, 2025
612aa35
edited
Feb 10, 2025
f27c15f
edited
Feb 10, 2025
82d4db3
add
stormyy00 Feb 10, 2025
d76446b
Merge pull request #70 from acm-ucr/yubinzhen/marginAndSpacingFix
stormyy00 Feb 10, 2025
81a5542
Merge 0b6463882e05f842a32591f428a9d259fbe0329d into d76446b8badcc9e3b…
Raiden-Griff Feb 10, 2025
c6eecc4
convert images to webp
Feb 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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": "^15.1.6",
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.webp
Binary file not shown.
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
@@ -1,12 +1,14 @@
import Professionals from "@/components/projects/professionals";
import Research from "@/components/projects/research";
import Medical from "@/components/projects/medical";
import Business from "@/components/projects/business";

const page = () => {
return (
<div>
<Research />
<Professionals />
<Business />
<Medical />
</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