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

ChallengeCard overflow repaired #36

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ChallengeCard overflow repaired #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2379cce
ChallengeCard overflow repaired
K1fight Jul 20, 2023
48b1c61
Merge branch 'main' into lee-landing-page-style-repaire
aradhyas8 Jul 20, 2023
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
141 changes: 4 additions & 137 deletions package-lock.json
View file
Open in desktop

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

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"@types/node": "20.2.5",
"@types/react": "18.2.7",
"@types/react-dom": "18.2.4",
"apollo-client": "^2.6.10",
"autoprefixer": "10.4.14",
"crypto-js": "^4.1.1",
"eslint": "8.41.0",
Expand Down
11 changes: 5 additions & 6 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import './globals.css'
import { client } from '@/utils/apolloClient';
// const inter = Inter({ subsets: ['latin'] })

export const metadata = {
title: 'yuHacks(2023) - Create, connect, code',
description: 'yuHacks is the premiere hackathon at York University.',
}
// export const metadata = {
// title: 'yuHacks(2023) - Create, connect, code',
// description: 'yuHacks is the premiere hackathon at York University.',
// }

export function ApolloClientProvider({ children }: { children: React.ReactNode }) {
return (
Expand All @@ -28,9 +28,8 @@ export default function RootLayout({
return (
<html lang="en">
<body className={`bg-[#202020]`}>
<ApolloClientProvider children={children} />
{/* DO NOT DELETE!!! */}

{ children }
</body>
</html>
)
Expand Down
8 changes: 4 additions & 4 deletions src/components/common/ChallengeCard.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const Card: FC<Props> = ({ deg, index, text, right, bottom, handleClick }) => {

return (
<motion.div
className={`absolute rounded-lg inset-0
shadow-md xl:w-72 xl:h-[400px] md:w-60 md:h-[380px] w-44 h-[250px] bg-[#FEFFFC] flex items-center`}
className={` absolute rounded-lg inset-0
shadow-md xl:w-72 xl:h-[400px] lg:w-72 lg:h-[400px] md:w-60 md:h-[330px] w-44 h-[250px] sm:w-52 sm:h-[280px] bg-[#FEFFFC] flex items-center`}
style={{
// right: `${right}`,
// bottom: `${bottom}`,
Expand All @@ -111,8 +111,8 @@ const Card: FC<Props> = ({ deg, index, text, right, bottom, handleClick }) => {


<div className='h-[90%] w-5/6 mx-auto border-t-[3px] border-b-[3px] border-t-[#c95656] border-b-[#58A0D4] border-opacity-75'>
<Image src={bugImg} alt={'bug'} className='xl:w-28 xl:h-28 md:w-16 md:h-16 w-10 h-10 mx-auto md:my-10 my-5' />
<div className="flex flex-col w-5/6 mx-auto my-5 font-HindMadurai text-center text-black md:text-xl text-sm">
<Image src={bugImg} alt={'bug'} className='xl:w-28 xl:h-28 lg:w-28 lg:h-28 md:w-16 md:h-16 w-10 h-10 mx-auto md:my-10 my-5' />
<div className="flex justify-center w-5/6 mx-auto my-5 font-HindMadurai text-center text-black md:text-xl text-sm">
Bug-hunting challenge
</div>
<div className="flex flex-col w-[90%] mx-auto font-Inconsolata text-center text-black text-opacity-50 md:text-[14px] text-xs leading-none">
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/HackerForm.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ export const HackerForm: FC<HackerFormProps> = ({ isHacker }) => {
</label>
</fieldset>
<fieldset className={`flex justify-between mt-14`}>
{!isHacker && <Button bgColor='bg-[#DE4F30]' color='text-white' type="reset" name="Reject" />}
{!isHacker && <Button bg-Color='bg-[#DE4F30]' color='text-white' type="reset" name="Reject" />}
<div className={`flex justify-end ${isHacker && 'w-full'}`}>
<div className="mr-8">
<Button bgColor='bg-transparent' color='text-black' type="reset" name="Clear" />
<Button bg-Color='bg-transparent' color='text-black' type="reset" name="Clear" />
</div>

<div className="mr-8">
<Button bgColor='bg-[#4F4F4F]' color='text-white' type="submit" name="Submit" />
<Button bg-Color='bg-[#4F4F4F]' color='text-white' type="submit" name="Submit" />
</div>
</div>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/LoginRegistration.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const LoginRegistration = () => {

<div>
<button onClick={signUpView} className='sign-up text-black text' type="reset">Sign Up</button>
<Button className='main-button' name={"Login"} type="submit"/>
<Button className='main-button' name="Login" type="submit"/>
</div>
</form>

Expand Down
6 changes: 3 additions & 3 deletions src/pages/AboutPage2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ const AboutPage2 = () => {
}, []);

return (
<div className={`h-screen flex justify-center items-center bg-[#202020]`}>
<div className={`flex lg:flex-row flex-col shrink-0 h-3/6 w-11/12 items-center justify-between bg-white bg-opacity-[0.13] rounded-[32px] shadow-lg backdrop-blur-md`}>
<div className={` h-screen flex justify-center items-center bg-[#202020]`}>
<div className={`flex lg:flex-row flex-col shrink-0 md:h-[90%] h-5/6 w-11/12 items-center justify-between bg-white bg-opacity-[0.13] rounded-[32px] shadow-lg backdrop-blur-md`}>
<article className='md:ml-16 ml-9 mt-10 sm:mt-0 pr-11 lg:h-full lg:w-[40%] h-[40%] w-full flex flex-col justify-evenly'>
<div>
<IoIosArrowForward className='text-[#58A0D4] sm:w-10 sm:h-10 xl:w-16 xl:h-16 md:w-12 md:h-12 h-9 w-9' />
Expand All @@ -50,7 +50,7 @@ const AboutPage2 = () => {
backgroundPosition: 'center',
}}
className={`flex items-center justify-center lg:h-full lg:w-[45%] h-[50%] w-full`}>
<div className='relative 2xl:w-[40%] 2xl:h-1/2 xl:h-[60%] lg:w-[60%] md:h-3/4 md:w-[40%] sm:h-1/2 h-2/3 w-[50%] sm:w-[44%]'>
<div className=' relative justify-end 2xl:w-[40%] 2xl:h-1/6 xl:h-[60%] lg:h-[60%] lg:w-[50%] md:h-[380px] md:w-[25%] sm:h-[300px] sm:w-[30%] w-40 h-60'>
<ChallengeCard />
</div>
</div>
Expand Down
Loading