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

feat: 사이프 디자인 시스템 적용 #112

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ dist-ssr

# google spreadsheet data
src/db/*.json

# playwright
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
491 changes: 473 additions & 18 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .yarn/cache/fsevents-patch-19706e7e35-10.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ compressionLevel: mixed

enableGlobalCache: false

npmScopes:
sipe-team:
npmRegistryServer: 'https://npm.pkg.github.com'

supportedArchitectures:
cpu:
- x64
Expand Down
45 changes: 45 additions & 0 deletions e2e/screenshot.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { expect, test } from '@playwright/test';

test('메인 페이지', async ({ page }) => {
await page.goto('/', { waitUntil: 'networkidle' });

await expect(page).toHaveScreenshot({
fullPage: true,
});
});

test('사이프 소개 페이지', async ({ page }) => {
await page.goto('/about', { waitUntil: 'networkidle' });

await expect(page).toHaveScreenshot({
fullPage: true,
maxDiffPixelRatio: 0.2,
});
});

test('사이퍼 모집 페이지', async ({ page }) => {
await page.goto('/recruit', { waitUntil: 'networkidle' });

await expect(page).toHaveScreenshot({
fullPage: true,
maxDiffPixelRatio: 0.2,
});
});

test('사이퍼 소개 페이지', async ({ page }) => {
await page.goto('/people', { waitUntil: 'networkidle' });

await expect(page).toHaveScreenshot({
fullPage: true,
maxDiffPixelRatio: 0.2,
});
});

test('사이퍼 활동 페이지', async ({ page }) => {
await page.goto('/activity', { waitUntil: 'networkidle' });

await expect(page).toHaveScreenshot({
fullPage: true,
maxDiffPixelRatio: 0.2,
});
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"dependencies": {
"@channel.io/channel-web-sdk-loader": "^2.0.0",
"@next/third-parties": "^14.2.11",
"@sipe-team/side": "^0.2.2",
"@vercel/analytics": "^1.3.1",
"@vercel/speed-insights": "^1.0.12",
"clsx": "^2.1.1",
Expand All @@ -27,6 +28,7 @@
},
"devDependencies": {
"@next/eslint-plugin-next": "^14.2.11",
"@playwright/test": "^1.49.1",
"@svgr/webpack": "8.1.0",
"@types/node": "^20.12.2",
"@types/react": "^18.3.4",
Expand Down
32 changes: 32 additions & 0 deletions playwright.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { defineConfig, devices } from '@playwright/test';

export default defineConfig({
testDir: './e2e',
fullyParallel: true,
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 0,
workers: process.env.CI ? 1 : undefined,
reporter: 'html',
use: {
baseURL: 'http://localhost:6100',
trace: 'on-first-retry',
},
projects: [
{
name: 'chromium',
use: devices['Desktop Chrome'],
},
{
name: 'webkit',
use: devices['Desktop Safari'],
},
{
name: 'mobile chrome',
use: devices['Pixel 5'],
},
{
name: 'mobile safari',
use: devices['iPhone 12'],
},
],
});
7 changes: 1 addition & 6 deletions src/components/atoms/ContentWithTitle/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@
width: 100%;
margin-top: 100px;
margin-bottom: 160px;
display: flex;
flex-direction: column;
align-items: center;

@include mobile {
margin-bottom: 100px;
}
}

.title {
font-size: 36px;
font-weight: 800;
line-height: 50px;
margin-bottom: 40px;
color: color('white');
line-height: 50px;
}
10 changes: 7 additions & 3 deletions src/components/atoms/ContentWithTitle/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { color, Flex, Typography } from '@sipe-team/side';

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

type ContentWithTitleProps = {
Expand All @@ -7,10 +9,12 @@ type ContentWithTitleProps = {

function ContentWithTitle({ title, children }: ContentWithTitleProps) {
return (
<div className={styles.wrapper}>
<div className={styles.title}>{title}</div>
<Flex align="center" className={styles.wrapper} direction="column">
<Typography color={color.white} className={styles.title} size={36}>
{title}
</Typography>
{children}
</div>
</Flex>
);
}

Expand Down
3 changes: 0 additions & 3 deletions src/components/atoms/Layout/index.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
.wrapper {
display: flex;
justify-content: center;
align-items: center;
width: 100%;

.layout {
Expand Down
10 changes: 8 additions & 2 deletions src/components/atoms/Layout/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ReactNode } from 'react';

import { Flex } from '@sipe-team/side';
import clsx from 'clsx';

import styles from './index.module.scss';
Expand All @@ -12,9 +13,14 @@ function Layout({
children: ReactNode;
}) {
return (
<div className={styles.wrapper}>
<Flex
align="center"
className={styles.wrapper}
direction="row"
justify="center"
>
<div className={clsx(styles.layout, className)}>{children}</div>
</div>
</Flex>
);
}

Expand Down
11 changes: 0 additions & 11 deletions src/components/atoms/Timer/index.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
.wrapper {
display: flex;
gap: 8px;
align-items: center;
font-size: 20px;
font-weight: 700;
line-height: 28px;
Expand All @@ -13,12 +10,4 @@
background-color: rgba(255, 255, 255, 0.16);
border: 1px solid color('primary');
border-radius: 12px;
display: flex;
align-items: center;
justify-content: center;
@include text('h4/bold', 'white');
}

.text {
@include text('h5/semibold', 'white');
}
46 changes: 28 additions & 18 deletions src/components/atoms/Timer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
import { ComponentProps } from 'react';

import { color, Flex, Typography } from '@sipe-team/side';

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

function Time(props: ComponentProps<typeof Typography>) {
return (
<Flex align="center" asChild className={styles.time} justify="center">
<Typography color={color.white} size={24} weight="bold" {...props} />
</Flex>
);
}

function Text(props: ComponentProps<typeof Typography>) {
return (
<Typography color={color.white} size={20} weight="semiBold" {...props} />
);
}

type Props = {
dates: number;
hours: number;
Expand All @@ -12,24 +30,16 @@ function Timer({ dates, hours, minutes, seconds, isRecruiting }: Props) {
const formattedTime = (number: number) => String(number).padStart(2, '0');

return (
<div className={styles.wrapper}>
<div className={styles.time}>
{isRecruiting ? formattedTime(dates) : 0}
</div>
<div className={styles.text}>일</div>
<div className={styles.time}>
{isRecruiting ? formattedTime(hours) : 0}
</div>
<div className={styles.text}>시간</div>
<div className={styles.time}>
{isRecruiting ? formattedTime(minutes) : 0}
</div>
<div className={styles.text}>분</div>
<div className={styles.time}>
{isRecruiting ? formattedTime(seconds) : 0}
</div>
<div className={styles.text}>초</div>
</div>
<Flex align="center" className={styles.wrapper} direction="row" gap="8px">
<Time>{isRecruiting ? formattedTime(dates) : 0}</Time>
<Text>일</Text>
<Time>{isRecruiting ? formattedTime(hours) : 0}</Time>
<Text>시간</Text>
<Time>{isRecruiting ? formattedTime(minutes) : 0}</Time>
<Text>분</Text>
<Time>{isRecruiting ? formattedTime(seconds) : 0}</Time>
<Text>초</Text>
</Flex>
);
}

Expand Down
14 changes: 0 additions & 14 deletions src/components/global/Footer/index.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.wrapper {
width: 100%;
display: flex;
justify-content: center;
position: relative;
}

Expand All @@ -21,15 +19,3 @@
gap: 0;
}
}

.copyright {
font-size: 12px;
font-weight: 500;
line-height: 17px;
color: color('white');
}

.logos {
display: flex;
gap: 8px;
}
51 changes: 30 additions & 21 deletions src/components/global/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@
import { color, Flex, Typography } from '@sipe-team/side';

import Layout from '@/components/atoms/Layout';
import SocialIconLink from '@/components/molecules/SocialIconLink';

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

function Footer() {
return (
<footer className={styles.wrapper}>
<Layout>
<div className={styles.group}>
<div className={styles.copyright}>All rights reserved ⓒ SIPE</div>
<div className={styles.logos}>
<SocialIconLink
type="INSTAGRAM"
url="https://www.instagram.com/sipe_team"
/>
<SocialIconLink type="GITHUB" url="https://github.com/sipe-team" />
<SocialIconLink
type="YOUTUBE"
url="https://www.youtube.com/@sipe_team"
/>
<SocialIconLink
type="LINKEDIN"
url="https://www.linkedin.com/company/sipe.team"
/>
<Flex asChild className={styles.wrapper} direction="row" justify="center">
<footer>
<Layout>
<div className={styles.group}>
<Typography color={color.white} size={12} weight="medium">
All rights reserved ⓒ SIPE
</Typography>
<Flex direction="row" gap="8px">
<SocialIconLink
type="INSTAGRAM"
url="https://www.instagram.com/sipe_team"
/>
<SocialIconLink
type="GITHUB"
url="https://github.com/sipe-team"
/>
<SocialIconLink
type="YOUTUBE"
url="https://www.youtube.com/@sipe_team"
/>
<SocialIconLink
type="LINKEDIN"
url="https://www.linkedin.com/company/sipe.team"
/>
</Flex>
</div>
</div>
</Layout>
</footer>
</Layout>
</footer>
</Flex>
);
}

Expand Down
11 changes: 0 additions & 11 deletions src/components/global/Navigation/index.module.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
.wrapper {
background-color: color('black');
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
position: fixed;
top: 0;
left: 0;
Expand All @@ -20,10 +17,6 @@

.header {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 64px;

@include desktop {
Expand All @@ -32,8 +25,6 @@
}

.menuWrapper {
display: flex;
align-items: center;
width: initial;

@include mobile-and-tablet {
Expand All @@ -52,10 +43,8 @@

.menuList {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
gap: 12px;
padding-bottom: 20px;

@include mobile-and-tablet {
Expand Down
Loading
Loading