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.

Sign up for GitHub

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

Jump to bottom

fixed donate button #50

Merged
merged 6 commits into from
Mar 15, 2024
Merged

fixed donate button #50

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b887d95
fixed donate button
charleenschen Feb 3, 2024
2020f30
fixed donate button
charleenschen Feb 8, 2024
841d027
fixed donate button
charleenschen Feb 21, 2024
c9c5609
Merge branch 'dev' into charleen/donateButton
charleenschen Feb 21, 2024
3771224
Merge branch 'dev' of https://github.com/acm-ucr/hsp-website into cha…
rfairooz Mar 15, 2024
4167f1e
fixed small changes
rfairooz Mar 15, 2024
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
7 changes: 7 additions & 0 deletions hsp-website.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you try pushing again? I think you pushed the workspace accidentally.

"folders": [
{
"path": "."
}
]
}
11 changes: 7 additions & 4 deletions src/app/donate/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ import Image1 from "@/public/assets/donate/donate1.svg";
import Image2 from "@/public/assets/donate/donate2.svg";
import PageTitle from "@/components/PageTitle";
import Contact from "@/components/donate/Contact";
import Table from "@/components/donate/Table";

const page = () => {
const first = texts[0];
const last = texts[texts.length - 1];
const newTexts = texts.slice(1, texts.length - 1);

return (
<div className="flex justify-center flex-col items-center">
<div className="flex justify-center flex-col items-center font-sans">
<PageTitle title="SPONSORS" />
<div className=" w-8/12">
<div className="grid grid-cols-3 my-8">
<div className="flex justify-start">
<div className=" w-7/12">
<div className="grid grid-cols-3 my-8 gap-4">
<div className="flex justify-center">
<Image src={Image1} alt="building rocket" />
</div>

Expand Down Expand Up @@ -46,6 +48,7 @@ const page = () => {
</div>
</div>

<Table />
<Donate />
<Contact />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/donate/Descriptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Descriptions = ({ title, texts }) => {
</div>

{texts.map((text, index) => (
<div key={index} className="font-sans text-xl leading-9">
<div key={index} className="font-sans text-lg mb-3 leading-9">
<p>{text}</p>
</div>
))}
Expand Down
2 changes: 1 addition & 1 deletion src/components/donate/Donate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Donate = () => {
return (
<Link
href="#"
className="bg-green-600 text-white text-2xl font-bold text-decoration-line: underline flex justify-center items-center rounded-3xl min-w-fit px-4 min-h-fit py-1 hover:scale-110"
className="bg-hsp-green text-white text-6xl font-urbanist font-black underline flex justify-center items-center rounded-[40.5rem] min-w-fit h-20 my-7 px-2.5 py-0 decoration-1 underline-offset-4 hover:scale-110"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rounded-40.5 rem cannot be hard coded. Change to 2xl or whichever value matches the most.

>
Donate Here
</Link>
Expand Down
110 changes: 109 additions & 1 deletion src/components/donate/Table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,115 @@
import React from "react";

const Table = () => {
return <div>Table</div>;
return (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the table should not be part of your commit. Check and push again

<div className="text-center w-full flex flex-col justify-center items-center font-sans">
<div className="text-3xl w-full mt-10 mb-6">BENEFITS TIER TABLE</div>

<table className="table-auto border border-black mb-4 text-xl w-7/12 ">
<thead>
<tr>
<th className="border-3 border-black w-56">BENEFITS</th>
<th className="border-3 border-black w-28">Tier 4 $3000</th>
<th className="border-3 border-black w-28">Tier 3 $1500</th>
<th className="border-3 border-black w-28">Tier 2 $1000</th>
<th className="border-3 border-black w-28">Tier 1 $500</th>
</tr>
</thead>

<tbody>
<tr>
<td className="border border-black">
Advertised During Recruitment/General Meeting
</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
</tr>
<tr>
<td className="border border-black">Logo on Website</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
</tr>
<tr>
<td className="border border-black">Social Media Posts</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
</tr>
<tr>
<td className="border border-black">
Logo on Launch Vehicle/Test Stand
</td>
<td className="border border-black">Large</td>
<td className="border border-black">Medium</td>
<td className="border border-black">Small</td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">Logo on Team Apparel</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">
Advertised on Technical Presentation Slides
</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">Complimentary Merch</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">Shop Tour</td>
<td className="border border-black">X</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">
Resume Packet of HSP Students
</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
<td className="border border-black"></td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">
Speaking and Tabling Opportunities
</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
<td className="border border-black"></td>
<td className="border border-black"></td>
</tr>
<tr>
<td className="border border-black">
Promote Internships/Job Opportunities to Members
</td>
<td className="border border-black">X</td>
<td className="border border-black"></td>
<td className="border border-black"></td>
<td className="border border-black"></td>
</tr>
</tbody>
</table>
</div>
);
};

export default Table;
Loading