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

Ae10u/what is fight team #84

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
15 changes: 9 additions & 6 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"eslint": "^9.8.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.35.0",
"globals": "^15.9.0",
"husky": "^9.1.4",
"postcss": "^8.4.40",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.5",
"tailwindcss": "^3.4.7",
"tailwindcss": "^3.4.14",
"tailwindcss-textshadow": "^2.1.3",
"typescript": "^5.5.4",
"typescript-eslint": "^8.0.0"
Expand Down
40 changes: 39 additions & 1 deletion src/components/fight-team/FightTeam.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,45 @@
import React from "react";
import Header from "@/components/Header";
import Photo from "@/components/Photo";
import coach from "@/public/fight-team/coach.webp";

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

Choose a reason for hiding this comment

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

unneeded div

<div className="flex flex-col justify-center md:gap-10 md:text-2xl">
<div className="flex justify-center text-xl md:justify-start md:text-2xl">
<div className="border-l-4 md:border-l-0"></div>
Copy link
Contributor

Choose a reason for hiding this comment

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

self closing tag

<Header position="left" title="WHAT IS FIGHT TEAM?" />
</div>
<div className="flex text-center md:text-left md:text-2xl">
<div className="flex w-full flex-col md:flex-row">
<div className="flex flex-col items-center justify-center md:w-3/5">
<div className="w-4/6">
<div className="font-anek-tekygu flex flex-col font-thin">
Fight team is UCR's competitive boxing team that is a branch
of highlander Gloves They have their own training and program
seperate from the general members of Highlander Gloves. Fight
team practices throughout the year in preperation for the
United States intercollegiate boxing association competition
(USIBA) in the winter. Anyone can join this team and tryouts
are held throughout the year. For more information ask any of
our staff during practice. This team is led by Coach Israel
and our Womens' and Mens' Captains.
</div>
<div className="flex w-2/3 flex-col font-archivo-narrow font-medium md:my-8">
#2 Men's Team and #3 Women's Team USIBA '24 #1 Women's Team
USIBA 23'
</div>
</div>
</div>
<div className="flex justify-end md:items-center">
<Photo width={"w-2/3"} image={coach} alt="Coach Israel Salgado" />
</div>
</div>
</div>
</div>
</div>
);
};

export default FightTeam;
Loading