Skip to content

Commit

Permalink
fix(fe): change login modal and main page contests (#1552)
Browse files Browse the repository at this point in the history
* fix(fe): change to comment

* fix: comment

* fix: change problemcards

* fix: comment

* fix: comment
  • Loading branch information
jihorobert authored Mar 11, 2024
1 parent a76bce0 commit 34f36f1
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
5 changes: 2 additions & 3 deletions apps/frontend/app/(main)/_components/ProblemCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ const getProblems = async () => {
const { problems }: { problems: WorkbookProblem[] } = await fetcher
.get('problem', {
searchParams: {
take: 3,
workbookId: 1
take: 3
// workbookId: 1
}
})
.json()

return problems
}

Expand Down
6 changes: 3 additions & 3 deletions apps/frontend/app/(main)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { Route } from 'next'
import Link from 'next/link'
import { Suspense } from 'react'
import Carousel from './_components/Carousel'
import ContestCards from './_components/ContestCards'
// import ContestCards from './_components/ContestCards'
import ProblemCards from './_components/ProblemCards'

// FIXME: Build error occurs when using static routes
Expand Down Expand Up @@ -49,7 +49,7 @@ export default function Home() {
return (
<div className="flex w-full flex-col gap-12 lg:items-center">
<Carousel slides={slides} />
<div className="flex w-full flex-col gap-3">
{/* <div className="flex w-full flex-col gap-3">
<div className="flex w-full items-center justify-between text-gray-700">
<p className="text-xl font-bold">Contest</p>
<Link href="/contest">
Expand All @@ -67,7 +67,7 @@ export default function Home() {
<ContestCards />
</Suspense>
</div>
</div>
</div> */}
<div className="flex w-full flex-col gap-3">
<div className="flex w-full items-center justify-between text-gray-700">
<p className="text-xl font-bold">Professor’s Recommendation</p>
Expand Down
16 changes: 8 additions & 8 deletions apps/frontend/components/auth/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Separator } from '@/components/ui/separator'
// import { Separator } from '@/components/ui/separator'
import CodedangLogo from '@/public/codedang.svg'
import KakaotalkLogo from '@/public/kakaotalk.svg'
// import KakaotalkLogo from '@/public/kakaotalk.svg'
import useAuthModalStore from '@/stores/authModal'
import { signIn } from 'next-auth/react'
import Image from 'next/image'
import { useRouter } from 'next/navigation'
import { useState } from 'react'
import type { SubmitHandler } from 'react-hook-form'
import { useForm } from 'react-hook-form'
import { FaGithub } from 'react-icons/fa'
import { FcGoogle } from 'react-icons/fc'
// import { FaGithub } from 'react-icons/fa'
// import { FcGoogle } from 'react-icons/fc'
import { toast } from 'sonner'

interface Inputs {
Expand Down Expand Up @@ -68,14 +68,14 @@ export default function SignIn() {
Log In
</Button>
</form>
<div className="flex items-center justify-center gap-5">
{/* <div className="flex items-center justify-center gap-5">
<Separator className="flex-1" />
<p className="w-fit flex-none text-center text-xs text-gray-500">
OR continue with
</p>
<Separator className="flex-1" />
</div>
<div className="flex w-full items-center justify-center gap-5">
</div> */}
{/* <div className="flex w-full items-center justify-center gap-5">
<div className="flex aspect-square w-12 cursor-pointer items-center justify-center rounded-full bg-[#FEE500] hover:opacity-80">
<Image src={KakaotalkLogo} alt="카카오톡" width={20} />
</div>
Expand All @@ -85,7 +85,7 @@ export default function SignIn() {
<div className="flex aspect-square w-12 cursor-pointer items-center justify-center rounded-full bg-[#212528] hover:opacity-80">
<FaGithub className="text-white" size="22" />
</div>
</div>
</div> */}
</div>
<div className="flex items-center justify-between">
<Button
Expand Down
19 changes: 10 additions & 9 deletions apps/frontend/components/auth/SignUpWelcome.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
'use client'

import { Button } from '@/components/ui/button'
import { Separator } from '@/components/ui/separator'
import KakaotalkLogo from '@/public/kakaotalk.svg'
// import { Separator } from '@/components/ui/separator'
// import KakaotalkLogo from '@/public/kakaotalk.svg'
import useSignUpModalStore from '@/stores/signUpModal'
import Image from 'next/image'
import { FaGithub } from 'react-icons/fa'
import { FcGoogle } from 'react-icons/fc'

// import Image from 'next/image'
// import { FaGithub } from 'react-icons/fa'
// import { FcGoogle } from 'react-icons/fc'

export default function SignUpWelcome() {
const { nextModal } = useSignUpModalStore((state) => state)
Expand All @@ -18,14 +19,14 @@ export default function SignUpWelcome() {
<Button className="w-full" onClick={() => nextModal()}>
Sign up with Email
</Button>
<div className="flex items-center justify-center gap-5">
{/* <div className="flex items-center justify-center gap-5">
<Separator className="flex-1" />
<p className="w-fit flex-none text-center text-xs text-gray-500">
continue with
</p>
<Separator className="flex-1" />
</div>
<div className="flex w-full items-center justify-center gap-5">
</div> */}
{/* <div className="flex w-full items-center justify-center gap-5">
<div className="flex aspect-square w-12 cursor-pointer items-center justify-center rounded-full bg-[#FEE500] hover:opacity-80">
<Image src={KakaotalkLogo} alt="카카오톡" width={20} />
</div>
Expand All @@ -35,7 +36,7 @@ export default function SignUpWelcome() {
<div className="flex aspect-square w-12 cursor-pointer items-center justify-center rounded-full bg-[#212528] hover:opacity-80">
<FaGithub className="text-white" size="22" />
</div>
</div>
</div> */}
</div>
)
}

0 comments on commit 34f36f1

Please sign in to comment.