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

[7주차] Team 커피딜 송유선 & 최지원 미션 제출합니다. #6

Open
wants to merge 107 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
8b69870
init: Project setting
jiwonnchoi Jan 1, 2025
4196555
feat: Add Theme.ts
jiwonnchoi Jan 1, 2025
bb73d6f
[Init] Project Setting, Add theme.ts
jiwonnchoi Jan 1, 2025
0413b61
Feat: Add custom theme to tailwind.config.ts (delete theme.ts)
s-uxun Jan 1, 2025
7a08b68
Feat: Add svgr feature
s-uxun Jan 1, 2025
c91beca
Merge pull request #2 from Onedwo-Punch/s-uxun
s-uxun Jan 1, 2025
7d51037
feat: Add font components
jiwonnchoi Jan 1, 2025
72a54b4
feat: Header component
jiwonnchoi Jan 1, 2025
4d1caa8
Feat: Create sidebar component & update theme in tailwind.config
s-uxun Jan 2, 2025
3a01397
Merge pull request #3 from Onedwo-Punch/s-uxun
s-uxun Jan 2, 2025
12d0b58
Refactor: Modify Sidebar component by using map
s-uxun Jan 2, 2025
6864a68
Feat: Add Logo component
s-uxun Jan 2, 2025
cf0980f
Chore: Move logo, header, sidebar into app/layout
s-uxun Jan 2, 2025
c545367
Feat: Add link into logo & add onClick function into sidebar
s-uxun Jan 3, 2025
3b0ec30
Feat: Create basic structure & design for voting page
s-uxun Jan 3, 2025
d0b436b
Merge pull request #4 from Onedwo-Punch/s-uxun
s-uxun Jan 3, 2025
3d1a3b2
chore: resolve conflict
jiwonnchoi Jan 3, 2025
8015f46
feat: compolete login, signup api
jiwonnchoi Jan 3, 2025
2680ccd
feat: Add determining login
jiwonnchoi Jan 3, 2025
39766b6
[Feat] Complete Login, Signup api
jiwonnchoi Jan 3, 2025
daa1439
Refactor: Add layout to voting page
s-uxun Jan 3, 2025
bb5f34c
feat: login UI publishing
jiwonnchoi Jan 3, 2025
53f451d
Feat: Add memberData.ts
s-uxun Jan 3, 2025
70a6c86
Feat: Create basic structure of leader voting page
s-uxun Jan 3, 2025
2f3902f
feat: add userPart, whether voted when Logged in
jiwonnchoi Jan 3, 2025
8e3efbd
[Feat] Add userPart & whether voted when user logged in / Login UI
jiwonnchoi Jan 3, 2025
e50c40d
Feat: Create basic structure of demoday voting page
s-uxun Jan 3, 2025
a4838b2
Chore: Add id into member, team data
s-uxun Jan 3, 2025
d8ae63f
Merge branch 'master' of https://github.com/Onedwo-Punch/next-vote-20…
s-uxun Jan 3, 2025
228c610
Docs: Add type files of memberData and teamData
s-uxun Jan 3, 2025
bded1e2
feat: signup UI
jiwonnchoi Jan 3, 2025
112ae4c
feat: onboarding UI
jiwonnchoi Jan 3, 2025
b89f87f
feat: add validation logic in signup
jiwonnchoi Jan 3, 2025
3626f05
Feat: Implement blur effect & basic Api logic in leader voting page
s-uxun Jan 3, 2025
ec1cbc6
feat: add login error logic
jiwonnchoi Jan 3, 2025
f69f1f8
Feat: Implement blur effect & basic Api logic in demoday voting page
s-uxun Jan 3, 2025
e8046c8
Merge pull request #7 from Onedwo-Punch/s-uxun
s-uxun Jan 3, 2025
e8e4fa9
feat: hide password input by type
jiwonnchoi Jan 3, 2025
f229971
Merge branch 'master' into jiwonnchoi
jiwonnchoi Jan 3, 2025
76dac2a
[Feat] Signup UI / Onboarding UI / Validation & error logic in auth
jiwonnchoi Jan 3, 2025
41a44d6
Merge branch 'master' of https://github.com/Onedwo-Punch/next-vote-20…
s-uxun Jan 3, 2025
45e5057
Feat: Implement voting result api feature (result.ts)
s-uxun Jan 3, 2025
2fe7b51
Feat: Add authentication token interceptor
s-uxun Jan 3, 2025
19af43d
Feat: Implement result component with initial structure and api integ…
s-uxun Jan 3, 2025
e5bdf08
Feat: Complete result component with final design and API integration
s-uxun Jan 4, 2025
8434826
Fix: Resolve API error in team voting results & update related design
s-uxun Jan 4, 2025
3313e9f
feat: complete members page
jiwonnchoi Jan 4, 2025
9478a2f
Refactor: Modify next.config.ts into next.config.js
s-uxun Jan 4, 2025
5c60ec5
feat: increase expiration of cookie
jiwonnchoi Jan 4, 2025
48aceda
[Feat] Complete members page
jiwonnchoi Jan 4, 2025
b67108c
fix: Sidebar z-index & relative
jiwonnchoi Jan 4, 2025
38ac9e5
feat: resolve any type error
jiwonnchoi Jan 4, 2025
1426a55
feat: members pc ver.
jiwonnchoi Jan 4, 2025
95eb033
feat: signup, login pc ver.
jiwonnchoi Jan 4, 2025
ea8a4c4
Feat: Create middleware to restrict access for users not logged in
s-uxun Jan 4, 2025
79009c0
Merge branch 's-uxun' of https://github.com/Onedwo-Punch/next-vote-20…
s-uxun Jan 4, 2025
784e999
Merge branch 'master' into s-uxun
s-uxun Jan 4, 2025
7ab2ce6
Merge pull request #10 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 2025
6816531
feat: onboarding pc ver.
jiwonnchoi Jan 4, 2025
58e645e
Merge branch 'master' of https://github.com/Onedwo-Punch/next-vote-20…
jiwonnchoi Jan 4, 2025
4588045
feat: render message in onboarding
jiwonnchoi Jan 4, 2025
0d8d96f
Fix: Resolve sidebar error (login <-> logout)
s-uxun Jan 4, 2025
d39461e
[Feat] PC version publishing (login/signup/onboarding/members)
jiwonnchoi Jan 4, 2025
7d3cbd7
Fix: Resolve logo + sidebar error by modify z-index in members page
s-uxun Jan 4, 2025
db7225a
Fix: Resolve hydration error in home page
s-uxun Jan 4, 2025
d2d2931
Merge pull request #12 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 2025
52ebf2f
Docs: Modify memberData
s-uxun Jan 4, 2025
e839f53
fix: resolve onboarding message error
jiwonnchoi Jan 4, 2025
790014d
Fix: Resolve conflict between SSR and CSR in voting page
s-uxun Jan 4, 2025
5a95d28
Design: Modify layout of member card & members page
s-uxun Jan 4, 2025
1c50359
Merge pull request #13 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 2025
8d6c089
Merge branch 'master' of https://github.com/Onedwo-Punch/next-vote-20…
jiwonnchoi Jan 4, 2025
830db32
fix: change ls using csr
jiwonnchoi Jan 4, 2025
1d7a0b3
[Fix] Resolve onboarding message error / use csr
jiwonnchoi Jan 4, 2025
0455927
fix: Resolve ls error in /voting/leader
jiwonnchoi Jan 4, 2025
27a988e
[Fix] Resolve ls error in /voting/leader
jiwonnchoi Jan 4, 2025
9df6250
fix: Resolve ls error in Voting, Result by csr
jiwonnchoi Jan 4, 2025
e33e533
[Fix] Resolve ls error in Voting, Result by csr
jiwonnchoi Jan 4, 2025
c0c5914
feat: add dropdown component for signup
jiwonnchoi Jan 4, 2025
1f692ed
feat: aboutus UI
jiwonnchoi Jan 4, 2025
47426c0
[Feat] Add dropdown component for signup / AboutUs mobile UI
jiwonnchoi Jan 4, 2025
b263540
style: add font render setting
jiwonnchoi Jan 4, 2025
7c817dc
Feat: Header.tsx (PC)
s-uxun Jan 4, 2025
a62acfd
Merge branch 'master' of https://github.com/Onedwo-Punch/next-vote-20…
s-uxun Jan 4, 2025
8af712e
style: title absolute to OnboardingStars
jiwonnchoi Jan 4, 2025
3bac0fb
Design: Add PC design in voting page
s-uxun Jan 4, 2025
c70f0a8
Design: Modify mobile design of about us page
s-uxun Jan 4, 2025
9515568
feat: members pc ver.
jiwonnchoi Jan 4, 2025
e00656c
[Feat] Members pc ver. / Title absolute to OnboardingStars
jiwonnchoi Jan 4, 2025
1036abe
Design: Add pc design into about us page
s-uxun Jan 4, 2025
9cf1e2d
Merge branch 'master' into s-uxun
s-uxun Jan 4, 2025
ed85b28
Merge pull request #19 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 2025
7e6d59d
Design: Modify pc design of members page
s-uxun Jan 4, 2025
fe8fb4d
Design: Modify pc design of about us page
s-uxun Jan 4, 2025
862a97f
Design: Add pc design into result component
s-uxun Jan 4, 2025
c22bbf3
Chore: Modify login page
s-uxun Jan 4, 2025
6d3d91e
Merge pull request #20 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 2025
177e2df
fix: remove response in handleLogin
jiwonnchoi Jan 4, 2025
cf1db82
[Fix] Remove response in handleLogin
jiwonnchoi Jan 4, 2025
38a81ca
Docs: Add ReadMe.md
s-uxun Jan 4, 2025
d0b1a7e
Merge pull request #22 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 2025
61004ea
Update README.md
s-uxun Jan 4, 2025
3f0d3f1
Chore: Api test & add deco
s-uxun Jan 4, 2025
55c7ef4
Chore: Test API & add deco
s-uxun Jan 4, 2025
f561df8
Merge branch 'master' of https://github.com/Onedwo-Punch/next-vote-20…
s-uxun Jan 4, 2025
485a85a
Chore: Test
s-uxun Jan 4, 2025
2d986a8
Merge pull request #23 from Onedwo-Punch/s-uxun
s-uxun Jan 4, 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
Prev Previous commit
Next Next commit
feat: onboarding pc ver.
jiwonnchoi committed Jan 4, 2025
commit 681653163373f7a036e120e991a9e9bc41c8ae3a
11 changes: 5 additions & 6 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -11,15 +11,14 @@ export default function Home() {

return (
<div className="relative w-screen h-screen overflow-hidden">
<OnboardingStars className="absolute w-[16.75rem] top-[12.13rem] right-[-1.3rem]" />
<div className="Headline_1 absolute top-[10.75rem] left-[5.06rem]">
2024
<br />
세오스 어워즈
<OnboardingStars className="absolute w-[16.75rem] top-[12.13rem] right-[-1.3rem] md:w-[44.3125rem] md:right-[-6rem]" />
<div className="Headline_1 absolute top-[10.75rem] left-[5.06rem] md:right-auto md:text-7xl md:font-black">
<span className="block md:inline">2024</span>
<span className="block md:inline">&nbsp;세오스 어워즈</span>
</div>
<Link
href="/voting"
className="Headline_5 absolute top-[22.37rem] right-[1rem]"
className="Headline_5 absolute top-[22.37rem] right-[1rem] md:top-[40rem] md:text-5xl md:right-[5.06rem]"
>
{isComplete ? "결과보러 가기" : "투표하러 가기"} &nbsp;&gt;
</Link>