Skip to content

Commit 7013069

Browse files
KIMSEUNGGYUKIMSEUNGGYU
committed
Merge branch 'main' of https://github.com/Zicdding/zicdding-class into feat/class-list-api-mock
2 parents 1f155b3 + 2f34aaa commit 7013069

File tree

10 files changed

+541
-81
lines changed

10 files changed

+541
-81
lines changed

‎.github/workflows/build-check.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: build-check
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
build-check:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-node@v4
12+
with:
13+
node-version: 20
14+
- name: Install Dependencies
15+
working-directory: ./frontend
16+
run: yarn
17+
- name: Build Check
18+
working-directory: ./frontend
19+
run: |
20+
yarn workspace @zicdding-web/zicdding-class-com run build

‎frontend/packages/ui/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"react": "^18.3.1",
5757
"react-day-picker": "^8.10.1",
5858
"react-dom": "^18",
59+
"rollup": "^4.27.3",
5960
"tailwind-merge": "^2.3.0",
6061
"tailwindcss": "^3.4.4",
6162
"tailwindcss-animate": "^1.0.7"

‎frontend/yarn.lock

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3751,111 +3751,237 @@ __metadata:
37513751
languageName: node
37523752
linkType: hard
37533753

3754+
"@rollup/rollup-android-arm-eabi@npm:4.27.3":
3755+
version: 4.27.3
3756+
resolution: "@rollup/rollup-android-arm-eabi@npm:4.27.3"
3757+
conditions: os=android & cpu=arm
3758+
languageName: node
3759+
linkType: hard
3760+
37543761
"@rollup/rollup-android-arm64@npm:4.18.0":
37553762
version: 4.18.0
37563763
resolution: "@rollup/rollup-android-arm64@npm:4.18.0"
37573764
conditions: os=android & cpu=arm64
37583765
languageName: node
37593766
linkType: hard
37603767

3768+
"@rollup/rollup-android-arm64@npm:4.27.3":
3769+
version: 4.27.3
3770+
resolution: "@rollup/rollup-android-arm64@npm:4.27.3"
3771+
conditions: os=android & cpu=arm64
3772+
languageName: node
3773+
linkType: hard
3774+
37613775
"@rollup/rollup-darwin-arm64@npm:4.18.0":
37623776
version: 4.18.0
37633777
resolution: "@rollup/rollup-darwin-arm64@npm:4.18.0"
37643778
conditions: os=darwin & cpu=arm64
37653779
languageName: node
37663780
linkType: hard
37673781

3782+
"@rollup/rollup-darwin-arm64@npm:4.27.3":
3783+
version: 4.27.3
3784+
resolution: "@rollup/rollup-darwin-arm64@npm:4.27.3"
3785+
conditions: os=darwin & cpu=arm64
3786+
languageName: node
3787+
linkType: hard
3788+
37683789
"@rollup/rollup-darwin-x64@npm:4.18.0":
37693790
version: 4.18.0
37703791
resolution: "@rollup/rollup-darwin-x64@npm:4.18.0"
37713792
conditions: os=darwin & cpu=x64
37723793
languageName: node
37733794
linkType: hard
37743795

3796+
"@rollup/rollup-darwin-x64@npm:4.27.3":
3797+
version: 4.27.3
3798+
resolution: "@rollup/rollup-darwin-x64@npm:4.27.3"
3799+
conditions: os=darwin & cpu=x64
3800+
languageName: node
3801+
linkType: hard
3802+
3803+
"@rollup/rollup-freebsd-arm64@npm:4.27.3":
3804+
version: 4.27.3
3805+
resolution: "@rollup/rollup-freebsd-arm64@npm:4.27.3"
3806+
conditions: os=freebsd & cpu=arm64
3807+
languageName: node
3808+
linkType: hard
3809+
3810+
"@rollup/rollup-freebsd-x64@npm:4.27.3":
3811+
version: 4.27.3
3812+
resolution: "@rollup/rollup-freebsd-x64@npm:4.27.3"
3813+
conditions: os=freebsd & cpu=x64
3814+
languageName: node
3815+
linkType: hard
3816+
37753817
"@rollup/rollup-linux-arm-gnueabihf@npm:4.18.0":
37763818
version: 4.18.0
37773819
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.18.0"
37783820
conditions: os=linux & cpu=arm & libc=glibc
37793821
languageName: node
37803822
linkType: hard
37813823

3824+
"@rollup/rollup-linux-arm-gnueabihf@npm:4.27.3":
3825+
version: 4.27.3
3826+
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.27.3"
3827+
conditions: os=linux & cpu=arm & libc=glibc
3828+
languageName: node
3829+
linkType: hard
3830+
37823831
"@rollup/rollup-linux-arm-musleabihf@npm:4.18.0":
37833832
version: 4.18.0
37843833
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.18.0"
37853834
conditions: os=linux & cpu=arm & libc=musl
37863835
languageName: node
37873836
linkType: hard
37883837

3838+
"@rollup/rollup-linux-arm-musleabihf@npm:4.27.3":
3839+
version: 4.27.3
3840+
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.27.3"
3841+
conditions: os=linux & cpu=arm & libc=musl
3842+
languageName: node
3843+
linkType: hard
3844+
37893845
"@rollup/rollup-linux-arm64-gnu@npm:4.18.0":
37903846
version: 4.18.0
37913847
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.18.0"
37923848
conditions: os=linux & cpu=arm64 & libc=glibc
37933849
languageName: node
37943850
linkType: hard
37953851

3852+
"@rollup/rollup-linux-arm64-gnu@npm:4.27.3":
3853+
version: 4.27.3
3854+
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.27.3"
3855+
conditions: os=linux & cpu=arm64 & libc=glibc
3856+
languageName: node
3857+
linkType: hard
3858+
37963859
"@rollup/rollup-linux-arm64-musl@npm:4.18.0":
37973860
version: 4.18.0
37983861
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.18.0"
37993862
conditions: os=linux & cpu=arm64 & libc=musl
38003863
languageName: node
38013864
linkType: hard
38023865

3866+
"@rollup/rollup-linux-arm64-musl@npm:4.27.3":
3867+
version: 4.27.3
3868+
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.27.3"
3869+
conditions: os=linux & cpu=arm64 & libc=musl
3870+
languageName: node
3871+
linkType: hard
3872+
38033873
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.18.0":
38043874
version: 4.18.0
38053875
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.18.0"
38063876
conditions: os=linux & cpu=ppc64 & libc=glibc
38073877
languageName: node
38083878
linkType: hard
38093879

3880+
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.3":
3881+
version: 4.27.3
3882+
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.27.3"
3883+
conditions: os=linux & cpu=ppc64 & libc=glibc
3884+
languageName: node
3885+
linkType: hard
3886+
38103887
"@rollup/rollup-linux-riscv64-gnu@npm:4.18.0":
38113888
version: 4.18.0
38123889
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.18.0"
38133890
conditions: os=linux & cpu=riscv64 & libc=glibc
38143891
languageName: node
38153892
linkType: hard
38163893

3894+
"@rollup/rollup-linux-riscv64-gnu@npm:4.27.3":
3895+
version: 4.27.3
3896+
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.27.3"
3897+
conditions: os=linux & cpu=riscv64 & libc=glibc
3898+
languageName: node
3899+
linkType: hard
3900+
38173901
"@rollup/rollup-linux-s390x-gnu@npm:4.18.0":
38183902
version: 4.18.0
38193903
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.18.0"
38203904
conditions: os=linux & cpu=s390x & libc=glibc
38213905
languageName: node
38223906
linkType: hard
38233907

3908+
"@rollup/rollup-linux-s390x-gnu@npm:4.27.3":
3909+
version: 4.27.3
3910+
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.27.3"
3911+
conditions: os=linux & cpu=s390x & libc=glibc
3912+
languageName: node
3913+
linkType: hard
3914+
38243915
"@rollup/rollup-linux-x64-gnu@npm:4.18.0":
38253916
version: 4.18.0
38263917
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.18.0"
38273918
conditions: os=linux & cpu=x64 & libc=glibc
38283919
languageName: node
38293920
linkType: hard
38303921

3922+
"@rollup/rollup-linux-x64-gnu@npm:4.27.3":
3923+
version: 4.27.3
3924+
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.27.3"
3925+
conditions: os=linux & cpu=x64 & libc=glibc
3926+
languageName: node
3927+
linkType: hard
3928+
38313929
"@rollup/rollup-linux-x64-musl@npm:4.18.0":
38323930
version: 4.18.0
38333931
resolution: "@rollup/rollup-linux-x64-musl@npm:4.18.0"
38343932
conditions: os=linux & cpu=x64 & libc=musl
38353933
languageName: node
38363934
linkType: hard
38373935

3936+
"@rollup/rollup-linux-x64-musl@npm:4.27.3":
3937+
version: 4.27.3
3938+
resolution: "@rollup/rollup-linux-x64-musl@npm:4.27.3"
3939+
conditions: os=linux & cpu=x64 & libc=musl
3940+
languageName: node
3941+
linkType: hard
3942+
38383943
"@rollup/rollup-win32-arm64-msvc@npm:4.18.0":
38393944
version: 4.18.0
38403945
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.18.0"
38413946
conditions: os=win32 & cpu=arm64
38423947
languageName: node
38433948
linkType: hard
38443949

3950+
"@rollup/rollup-win32-arm64-msvc@npm:4.27.3":
3951+
version: 4.27.3
3952+
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.27.3"
3953+
conditions: os=win32 & cpu=arm64
3954+
languageName: node
3955+
linkType: hard
3956+
38453957
"@rollup/rollup-win32-ia32-msvc@npm:4.18.0":
38463958
version: 4.18.0
38473959
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.18.0"
38483960
conditions: os=win32 & cpu=ia32
38493961
languageName: node
38503962
linkType: hard
38513963

3964+
"@rollup/rollup-win32-ia32-msvc@npm:4.27.3":
3965+
version: 4.27.3
3966+
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.27.3"
3967+
conditions: os=win32 & cpu=ia32
3968+
languageName: node
3969+
linkType: hard
3970+
38523971
"@rollup/rollup-win32-x64-msvc@npm:4.18.0":
38533972
version: 4.18.0
38543973
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.18.0"
38553974
conditions: os=win32 & cpu=x64
38563975
languageName: node
38573976
linkType: hard
38583977

3978+
"@rollup/rollup-win32-x64-msvc@npm:4.27.3":
3979+
version: 4.27.3
3980+
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.27.3"
3981+
conditions: os=win32 & cpu=x64
3982+
languageName: node
3983+
linkType: hard
3984+
38593985
"@sinclair/typebox@npm:^0.27.8":
38603986
version: 0.27.8
38613987
resolution: "@sinclair/typebox@npm:0.27.8"
@@ -4892,6 +5018,13 @@ __metadata:
48925018
languageName: node
48935019
linkType: hard
48945020

5021+
"@types/estree@npm:1.0.6":
5022+
version: 1.0.6
5023+
resolution: "@types/estree@npm:1.0.6"
5024+
checksum: 10/9d35d475095199c23e05b431bcdd1f6fec7380612aed068b14b2a08aa70494de8a9026765a5a91b1073f636fb0368f6d8973f518a31391d519e20c59388ed88d
5025+
languageName: node
5026+
linkType: hard
5027+
48955028
"@types/estree@npm:^0.0.51":
48965029
version: 0.0.51
48975030
resolution: "@types/estree@npm:0.0.51"
@@ -5245,6 +5378,7 @@ __metadata:
52455378
react: "npm:^18.3.1"
52465379
react-day-picker: "npm:^8.10.1"
52475380
react-dom: "npm:^18"
5381+
rollup: "npm:^4.27.3"
52485382
storybook: "npm:^8.1.10"
52495383
tailwind-merge: "npm:^2.3.0"
52505384
tailwindcss: "npm:^3.4.4"
@@ -10110,6 +10244,75 @@ __metadata:
1011010244
languageName: node
1011110245
linkType: hard
1011210246

10247+
"rollup@npm:^4.27.3":
10248+
version: 4.27.3
10249+
resolution: "rollup@npm:4.27.3"
10250+
dependencies:
10251+
"@rollup/rollup-android-arm-eabi": "npm:4.27.3"
10252+
"@rollup/rollup-android-arm64": "npm:4.27.3"
10253+
"@rollup/rollup-darwin-arm64": "npm:4.27.3"
10254+
"@rollup/rollup-darwin-x64": "npm:4.27.3"
10255+
"@rollup/rollup-freebsd-arm64": "npm:4.27.3"
10256+
"@rollup/rollup-freebsd-x64": "npm:4.27.3"
10257+
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.27.3"
10258+
"@rollup/rollup-linux-arm-musleabihf": "npm:4.27.3"
10259+
"@rollup/rollup-linux-arm64-gnu": "npm:4.27.3"
10260+
"@rollup/rollup-linux-arm64-musl": "npm:4.27.3"
10261+
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.27.3"
10262+
"@rollup/rollup-linux-riscv64-gnu": "npm:4.27.3"
10263+
"@rollup/rollup-linux-s390x-gnu": "npm:4.27.3"
10264+
"@rollup/rollup-linux-x64-gnu": "npm:4.27.3"
10265+
"@rollup/rollup-linux-x64-musl": "npm:4.27.3"
10266+
"@rollup/rollup-win32-arm64-msvc": "npm:4.27.3"
10267+
"@rollup/rollup-win32-ia32-msvc": "npm:4.27.3"
10268+
"@rollup/rollup-win32-x64-msvc": "npm:4.27.3"
10269+
"@types/estree": "npm:1.0.6"
10270+
fsevents: "npm:~2.3.2"
10271+
dependenciesMeta:
10272+
"@rollup/rollup-android-arm-eabi":
10273+
optional: true
10274+
"@rollup/rollup-android-arm64":
10275+
optional: true
10276+
"@rollup/rollup-darwin-arm64":
10277+
optional: true
10278+
"@rollup/rollup-darwin-x64":
10279+
optional: true
10280+
"@rollup/rollup-freebsd-arm64":
10281+
optional: true
10282+
"@rollup/rollup-freebsd-x64":
10283+
optional: true
10284+
"@rollup/rollup-linux-arm-gnueabihf":
10285+
optional: true
10286+
"@rollup/rollup-linux-arm-musleabihf":
10287+
optional: true
10288+
"@rollup/rollup-linux-arm64-gnu":
10289+
optional: true
10290+
"@rollup/rollup-linux-arm64-musl":
10291+
optional: true
10292+
"@rollup/rollup-linux-powerpc64le-gnu":
10293+
optional: true
10294+
"@rollup/rollup-linux-riscv64-gnu":
10295+
optional: true
10296+
"@rollup/rollup-linux-s390x-gnu":
10297+
optional: true
10298+
"@rollup/rollup-linux-x64-gnu":
10299+
optional: true
10300+
"@rollup/rollup-linux-x64-musl":
10301+
optional: true
10302+
"@rollup/rollup-win32-arm64-msvc":
10303+
optional: true
10304+
"@rollup/rollup-win32-ia32-msvc":
10305+
optional: true
10306+
"@rollup/rollup-win32-x64-msvc":
10307+
optional: true
10308+
fsevents:
10309+
optional: true
10310+
bin:
10311+
rollup: dist/bin/rollup
10312+
checksum: 10/8f77edb47acf734ecb7a20232d655b0ffe610f2d82e515917f66516137d6f55fdff6fff78285ee1921229cedaa161d8554f2b3cb2424cf489b0963fe024ec65f
10313+
languageName: node
10314+
linkType: hard
10315+
1011310316
"run-parallel@npm:^1.1.9":
1011410317
version: 1.2.0
1011510318
resolution: "run-parallel@npm:1.2.0"

‎frontend/zicdding-class.com/app/(test)/test/ITNews/page.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
'use client';
2-
import ITNews from '@/app/_components/ITNews';
2+
import ITNews from '@/app/_components/ITNewsCard';
33

44
export default function TestPage() {
55
return (
66
<ITNews
7-
id={1}
7+
id="7b205a4d-f17f-4b65-a463-38a270d1ab39"
88
title="샘플 IT 뉴스 제목"
99
thumbnailSrc="https://via.placeholder.com/300x200"
1010
type="공모전"
11-
date={{
12-
start: '2024-01-01',
13-
end: '2024-12-31',
14-
}}
15-
likeCount={15}
16-
viewCount={99}
17-
commentCount={13}
11+
startedDate="2023-04-01"
12+
endDate="2023-04-30"
13+
likeCnt={15}
14+
viewCnt={99}
15+
commentCnt={13}
1816
myLike={false}
1917
/>
2018
);

0 commit comments

Comments
 (0)