Skip to content

Commit 49abb0d

Browse files
authored
Merge pull request #118 from sipe-team/develop
4기 모집을 위한 수정사항 배포
2 parents eb69c6a + 1b14a53 commit 49abb0d

File tree

12 files changed

+90
-54
lines changed

12 files changed

+90
-54
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @froggy1014 @azure-553 @ProdMoon @frontman-git @saseungmin @danmin20 @tara-JSW @joel-jo-querypie @jiji-hoon96 @KimHunJin @hy57in @synuns @sudosubin

.github/auto_assign.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
addReviewers: true
2+
addAssignees: true
3+
4+
reviewers:
5+
- azure-553
6+
- ProdMoon
7+
- froggy1014
8+
- frontman-git
9+

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dist-ssr
2121
*.sln
2222
*.sw?
2323

24-
.env
24+
.env*
2525

2626
# Zero Install: https://yarnpkg.com/features/zero-installs
2727
.yarn/*
@@ -37,3 +37,5 @@ dist-ssr
3737

3838
# google spreadsheet data
3939
src/db/*.json
40+
.vercel
41+

next.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const nextConfig = {
88
},
99
output: 'standalone',
1010
images: {
11+
unoptimized: true,
1112
remotePatterns: [
1213
{
1314
protocol: 'https',

src/app/people/page.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ function Page({ searchParams }: { searchParams?: SearchParams }) {
3131
.sort((a, b) => sortDescending(a[0], b[0]))
3232
.map(([generation]) => generation);
3333

34-
const selectedPeopleGeneration = searchParams?.generation || '2';
34+
const selectedPeopleGeneration = searchParams?.generation || '3';
3535
const currentPeople = people[selectedPeopleGeneration];
3636

3737
const sortedCurrentPeople = [...currentPeople].sort((a, b) => {
38-
if (a.isOrganizer || b.isOrganizer) {
39-
return 1;
40-
}
41-
38+
if (a.isOrganizer && !b.isOrganizer) return -1;
39+
if (!a.isOrganizer && b.isOrganizer) return 1;
4240
return a.name.localeCompare(b.name);
4341
});
4442

src/components/organisms/home/RecruitmentStatusSection/index.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
'use client';
22

3-
import dynamic from 'next/dynamic';
4-
53
import { sendGAEvent } from '@next/third-parties/google';
64

75
import Button from '@/components/molecules/Button';
6+
import RecruitmentSummary from '@/components/organisms/home/RecruitmentSummary';
87
import useCopy from '@/hook/useCopyToClipboard';
98
import { displayApplication, getCurrentStatus } from '@/libs/utils/recruit';
109

1110
import styles from './index.module.scss';
1211

13-
const RecruitmentSummary = dynamic(
14-
() => import('@/components/organisms/home/RecruitmentSummary'),
15-
{ ssr: false },
16-
);
17-
1812
function RecruitmentStatusSection() {
1913
const now = Date.now();
2014
const currentStatus = getCurrentStatus(now);
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.timerWrapper {
2+
display: flex;
3+
flex-direction: column;
4+
align-items: center;
5+
gap: 1rem;
6+
7+
.timerDescription {
8+
font-size: 1.4rem;
9+
font-weight: 500;
10+
color: #fff;
11+
}
12+
}

src/components/organisms/home/RecruitmentSummary/index.tsx

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,48 @@ import SummaryCard from '@/components/organisms/home/SummaryCards';
33
import useTimer from '@/hook/useTimer';
44
import { displayApplication } from '@/libs/utils/recruit';
55

6+
import styles from './index.module.scss';
7+
68
type Props = {
79
currentStatus: 'before' | 'ongoing' | 'after';
810
};
911

1012
function RecruitmentSummary({ currentStatus }: Props) {
11-
const isRecruiting = currentStatus !== 'after';
1213
const currentApplicationDetail = displayApplication[currentStatus];
13-
1414
const { dates, hours, minutes, seconds } = useTimer(
1515
currentApplicationDetail?.dueDate,
16-
isRecruiting ? 1000 : null,
16+
1000,
1717
);
1818

19-
return (
20-
<>
21-
{currentStatus === 'after' ? (
22-
<SummaryCard />
23-
) : (
19+
const elements = {
20+
before: () => (
21+
<div className={styles.timerWrapper}>
22+
<div className={styles.timerDescription}>모집 시작까지</div>
2423
<Timer
2524
dates={dates}
2625
hours={hours}
2726
minutes={minutes}
2827
seconds={seconds}
29-
isRecruiting={isRecruiting}
28+
isRecruiting={true}
3029
/>
31-
)}
32-
</>
33-
);
30+
</div>
31+
),
32+
ongoing: () => (
33+
<div className={styles.timerWrapper}>
34+
<div className={styles.timerDescription}>모집 마감까지</div>
35+
<Timer
36+
dates={dates}
37+
hours={hours}
38+
minutes={minutes}
39+
seconds={seconds}
40+
isRecruiting={true}
41+
/>
42+
</div>
43+
),
44+
after: () => <SummaryCard />,
45+
};
46+
47+
return elements[currentStatus]();
3448
}
3549

3650
export default RecruitmentSummary;

src/components/organisms/home/SummaryCards/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import styles from './index.module.scss';
22

33
const summaryData = [
44
{ title: '누적 지원자 수', value: '400+' },
5-
{ title: '총 참여자 수', value: '60+' },
6-
{ title: '누적 미션 수', value: '30+' },
5+
{ title: '총 참여자 수', value: '101' },
6+
{ title: '누적 미션 수', value: '51' },
77
];
88

99
function SummaryCards() {

src/components/pages/Home/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Home() {
2121
Sharing Insights <br /> with People Everyday
2222
</h1>
2323
<h2 className={styles.subTitle}>
24-
개발자들이 함께 교류하며 성장하는 IT 커뮤니티
24+
다양한 활동으로 함께 성장하는 현직 개발자들의 커뮤니티
2525
</h2>
2626
</div>
2727
<RecruitmentStatusSection />

0 commit comments

Comments
 (0)