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

release branch #58

Merged
merged 65 commits into from
Dec 9, 2023
Merged
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
0a217d8
:truck: panda.config.ts ์ˆ˜์ • ๋ฐ ์ ˆ๋Œ€๊ฒฝ๋กœ ์„ค์ •
wade3420 Nov 28, 2023
ee89099
:truck: styled-system/ src ํŒŒ์ผ์•ˆ์œผ๋กœ ๋ณ€๊ฒฝ ๋ฐ gitignore ์ œ๊ฑฐ
wade3420 Nov 28, 2023
d0daad5
:truck: ๊ธฐ๋ณธ ๋””๋ ‰ํ† ๋ฆฌ ํŒŒ์ผ ์ƒ์„ฑ
wade3420 Nov 28, 2023
592796c
Merge pull request #4 from depromeet/fix/panda-css-import
wade3420 Nov 29, 2023
356f3dd
chore: vscode ์„ค์ • ์ถ”๊ฐ€
sumi-0011 Nov 29, 2023
06b340f
chore: sytled-system ํด๋” eslint ์—์„œ ๋ฌด์‹œ
sumi-0011 Nov 29, 2023
5988056
feat: layout header view ๊ตฌํ˜„
sumi-0011 Nov 29, 2023
a9346fb
feat: timer ํŽ˜์ด์ง€ step์— ๋”ฐ๋ฅธ title, desc ์ถ”๊ฐ€
sumi-0011 Nov 29, 2023
ec37fc5
feat: timer view ๊ตฌํ˜„ ์ค‘.
sumi-0011 Nov 29, 2023
c29cecb
Merge pull request #6 from depromeet/chore/vscode-setting-
sumi-0011 Nov 30, 2023
cd76c6e
:bricks: Git workflow ์ถ”๊ฐ€
woobottle Nov 30, 2023
af9c254
Merge branch 'develop' into feat/timer
sumi-0011 Nov 30, 2023
8e8525a
:bug: Pr ์‹คํŒจ ์ˆ˜์ •์šฉ
woobottle Nov 30, 2023
426cfb1
โœจ๊ทธ๋ผ๋ฐ์ด์…˜ ํ…์ŠคํŠธ ๋งŒ๋“ค๊ธฐ (ํƒ€์ด๋จธ ์•ˆ ํ…์ŠคํŠธ)
sumi-0011 Nov 30, 2023
7bfb2ef
Merge pull request #11 from depromeet/chore/git-workflow-setting
woobottle Nov 30, 2023
8ca3a8a
:zap: Nvmrc ์ถ”๊ฐ€
woobottle Nov 30, 2023
4c0bcf2
Merge pull request #12 from depromeet/chore/add-nvmrc
woobottle Nov 30, 2023
a42b229
โœจstep status ์ถ”๊ฐ€
sumi-0011 Dec 1, 2023
a2100a6
โ™ป๏ธ timer layout ์ˆ˜์ •
sumi-0011 Dec 1, 2023
3699d96
๐Ÿ’„ ์ผ์‹œ์ •์ง€ ์ƒํƒœ์ด๋ฉด gray๋กœ ๋ณ€๊ฒฝ
sumi-0011 Dec 1, 2023
bbed18e
โœจ ํƒ€์ด๋จธ ์ถ”๊ฐ€
sumi-0011 Dec 1, 2023
efa00da
๐Ÿ› 0์ดˆ ๊นŒ์ง€๋งŒ ์นด์šดํŠธ
sumi-0011 Dec 1, 2023
17661b0
โ™ป๏ธ step to timer status ๋„ค์ด๋ฐ ์ˆ˜์ •
sumi-0011 Dec 1, 2023
53b5047
โœจIcon Component ์ƒ์„ฑ
sumi-0011 Dec 1, 2023
23bc782
Merge branch 'develop' into feat/timer
sumi-0011 Dec 1, 2023
a7bac8f
โ™ป๏ธmerge confilct solve
sumi-0011 Dec 1, 2023
ec90357
:coffin: ๋ถˆํ•„์š”ํ•œ Css ํŒŒ์ผ ์ œ๊ฑฐ
wade3420 Dec 2, 2023
4b14053
:lipstick: ๋ฉ”์ธ(๋กœ๊ทธ์ธ)ํŽ˜์ด์ง€ ์Šคํƒ€์ผ๋ง
wade3420 Dec 2, 2023
12ee9a1
:sparkles: link ์ปดํฌ๋„ŒํŠธ ์ถ”๊ฐ€
wade3420 Dec 2, 2023
3af2d3b
feat: maxWitdth 475px๋กœ ๋ณ€๊ฒฝ
sumi-0011 Dec 2, 2023
d5e1611
Merge pull request #7 from depromeet/feat/timer
sumi-0011 Dec 2, 2023
738b3bd
Merge pull request #17 from depromeet/feat/timer-logic
sumi-0011 Dec 2, 2023
dbe5dd6
:twisted_rightwards_arrows: Merge develop branch
wade3420 Dec 2, 2023
9dc7c4b
:sparkles: Button.tsx ์ถ”๊ฐ€
JUNOSHON Dec 2, 2023
b1f7d89
:truck: styled-system ํŒŒ์ผ ์žฌ์ƒ์„ฑ
wade3420 Dec 3, 2023
a8caedd
:truck: styled-system ํŒŒ์ผ ์ƒ์„ฑ
wade3420 Dec 3, 2023
003943d
:bug: styled-system ํŒŒ์ผ eslint ignore ์•ˆ๋˜๋Š” ๋ฒ„๊ทธ ์ˆ˜์ •
wade3420 Dec 3, 2023
9212701
Merge pull request #28 from depromeet/fix/lint-ignore
wade3420 Dec 3, 2023
ec3001e
:adhesive_bandage: css ์ปดํฌ๋„ŒํŠธ ์ž‘์„ฑ๋ฃฐ styled ๊ฐ€ ์•„๋‹Œ css ์ด์šฉ์œผ๋กœ ํ†ต์ผ
wade3420 Dec 4, 2023
f4d6dab
Merge pull request #21 from depromeet/feat/login-page
wade3420 Dec 4, 2023
d1a14db
Merge pull request #27 from depromeet/feat/button
JUNOSHON Dec 4, 2023
475297e
๐Ÿ“ issue template ์ƒ์„ฑ
JUNOSHON Dec 5, 2023
f53b1bb
Merge pull request #29 from depromeet/docs/issue-template
JUNOSHON Dec 5, 2023
94b6bae
Update issue templates
sumi-0011 Dec 5, 2023
c3e2cb5
Update issue templates
sumi-0011 Dec 5, 2023
83848a8
Pretendard ํฐํŠธ ์ถ”๊ฐ€
woobottle Dec 5, 2023
e0155ec
typography ์ถ”๊ฐ€
woobottle Dec 5, 2023
36d9238
์Šคํ† ๋ฆฌ๋ถ ์„ธํŒ… ์™„๋ฃŒ (#46)
woobottle Dec 6, 2023
55936c3
chromatic ์„ธํŒ… (#49)
woobottle Dec 6, 2023
fb76110
Merge pull request #44 from depromeet/design/pretendard-font
woobottle Dec 6, 2023
d0e388a
Merge pull request #45 from depromeet/design/addTypography
woobottle Dec 6, 2023
e14da7f
merge ๋˜์—ˆ์„๋•Œ๋„ workflow ๋™์ž‘์œผ๋กœ ์ˆ˜์ •
woobottle Dec 6, 2023
39117d3
Merge pull request #53 from depromeet/task/editChromaticDeployWorkflow
woobottle Dec 7, 2023
f2bc4d3
chore: merge confict
sumi-0011 Dec 7, 2023
c557e7e
Merge branch 'develop' into feat/icon
sumi-0011 Dec 7, 2023
b9723f6
Merge pull request #18 from depromeet/feat/icon
sumi-0011 Dec 7, 2023
cf45c7e
:heavy_plus_sign: React-portal dependency ์ถ”๊ฐ€
JUNOSHON Dec 7, 2023
b37e6eb
:sparkles: Modal.tsx ์ถ”๊ฐ€
JUNOSHON Dec 7, 2023
17538bf
:recycle: UseModal Hook ์ถ”๊ฐ€
JUNOSHON Dec 7, 2023
56c37a4
:wrench: color theme ์ถ”๊ฐ€
wade3420 Dec 7, 2023
8cde393
Merge pull request #57 from depromeet/feat/color-theme
wade3420 Dec 9, 2023
069a2a3
:lipstick: ModalConstant.ts ์ถ”๊ฐ€
JUNOSHON Dec 9, 2023
3161578
:heavy_minus_sign: ๋ฏธ์‚ฌ์šฉ ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์ œ๊ฑฐ
JUNOSHON Dec 9, 2023
6b82d38
Merge pull request #56 from depromeet/feat/modal
JUNOSHON Dec 9, 2023
8900e9a
:recycle: Fix conflict with release
woobottle Dec 9, 2023
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
ignorePatterns: ['.next/', 'node_modules/', 'public', '@types', 'src/styled-system/'],
ignorePatterns: ['.next/', 'node_modules/', 'public', '@types', 'src/styled-system'],
plugins: ['simple-import-sort', 'testing-library'],
extends: [
'next/core-web-vitals',
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/10mm-client-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: 10mm-client-issue-template
about: 10mm ํ”„๋ก ํŠธ์—”๋“œ ๋ ˆํฌ์ง€ํ„ฐ๋ฆฌ์˜ ์ด์Šˆ ํ…œํ”Œ๋ฆฟ์ž…๋‹ˆ๋‹ค.
title: "[Task] "
labels: ''
assignees: ''

---

## โš ๏ธ Issue
- ์ด์Šˆ ๋‚ด์šฉ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”
## โœ๏ธ To Do List
- [ ] Todo 1
- [ ] Todo 2
59 changes: 59 additions & 0 deletions .github/workflows/deploy-chromatic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: deploy-chromatic

on:
pull_request:
types: [opened, closed]
branches:
- 'develop'

jobs:
build:
name: deploy-chromatic
if: github.event_name == 'pull_request' && (github.event.action == 'closed' && github.event.pull_request.merged == true) || (github.event.action == 'opened')
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

# node ์„ธํŒ…
- name: Init node
uses: actions/setup-node@v2.4.1
with:
node-version: '18.17.1'
cache: 'yarn'

- name: Set Yarn Version
id: set-version
run: |
yarn set version 4.0.2
echo "YARN_VERSION=$(yarn -v)" >> $GITHUB_OUTPUT

- name: Yarn Cache - PnP
uses: actions/cache@v2
with:
path: |
.yarn/cache
.pnp.*
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ steps.set-version.outputs.YARN_VERSION }}
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-

- name: Install dependencies
run: yarn install

- name: publish to chromatic
id: chromatic
uses: chromaui/action@v1
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}

- name: comment PR
uses: thollander/actions-comment-pull-request@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
message: '๐Ÿš€storybook: ${{ steps.chromatic.outputs.storybookUrl }}'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -43,3 +43,6 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

# chromatic
build-storybook.log
444 changes: 351 additions & 93 deletions .pnp.cjs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/styled-system
30 changes: 25 additions & 5 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
import type { StorybookConfig } from '@storybook/nextjs';
import { join, dirname } from 'path';
import path from 'path';

/**
* This function is used to resolve the absolute path of a package.
* It is needed in projects that use Yarn PnP or are set up within a monorepo.
*/
function getAbsolutePath(value: string): any {
return dirname(require.resolve(join(value, 'package.json')));
}
const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-onboarding',
'@storybook/addon-interactions',
getAbsolutePath('@storybook/addon-links'),
getAbsolutePath('@storybook/addon-essentials'),
getAbsolutePath('@storybook/addon-onboarding'),
getAbsolutePath('@storybook/addon-interactions'),
],
framework: {
name: '@storybook/nextjs',
name: getAbsolutePath('@storybook/nextjs'),
options: {},
},
docs: {
autodocs: 'tag',
},
staticDirs: ['../public'],
async webpackFinal(config, { configType }) {
if (config?.resolve?.alias) {
config.resolve.alias = {
...config.resolve.alias,
'@': path.resolve(__dirname, '../src'),
'@styled-system': path.resolve(__dirname, '../src/styled-system'),
};
}
return config;
},
};
export default config;
1 change: 1 addition & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Preview } from '@storybook/react';
import '../src/app/globals.css';

const preview: Preview = {
parameters: {
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 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.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@
"@storybook/blocks": "^7.5.3",
"@storybook/nextjs": "^7.5.3",
"@storybook/react": "^7.5.3",
"@storybook/test": "^7.6.3",
"@storybook/testing-library": "^0.2.2",
"@tanstack/react-query-devtools": "^5.8.4",
"@testing-library/jest-dom": "^6.1.4",
@@ -44,6 +45,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"chromatic": "^10.0.0",
"eslint": "^8",
"eslint-config-next": "14.0.3",
"eslint-config-prettier": "^9.0.0",
@@ -58,7 +60,8 @@
"lint-staged": "^15.1.0",
"prettier": "^3.1.0",
"storybook": "^7.5.3",
"typescript": "^5"
"typescript": "^5",
"webpack": "^5.89.0"
},
"packageManager": "yarn@4.0.2"
}
13 changes: 12 additions & 1 deletion panda.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { colorList, semanticColorList } from '@/styles/color';
import { defineConfig } from '@pandacss/dev';

import { typographyList } from './src/styles/typography';

export default defineConfig({
// Whether to use css reset
preflight: true,
jsxFramework: 'react',
// Where to look for your css declarations
include: ['./src/**/*.{js,jsx,ts,tsx}', './src/app/**/*.{ts,tsx,js,jsx}'],
include: ['./src/**/*.{js,jsx,ts,tsx}', './src/app/**/*.{ts,tsx,js,jsx}', './stories/**/*.{js,jsx,ts,tsx}'],

// Files to exclude
exclude: [],
@@ -20,7 +23,15 @@ export default defineConfig({
'100%': { transform: 'rotate(0deg)', backgroundPositionX: '0%', backgroundPositionY: '0%' },
},
},
textStyles: typographyList,
tokens: {
fonts: {
pretendard: { value: 'var(--pretendard)' },
},
...colorList,
},
},
semanticTokens: semanticColorList,
},

// The output directory for your css system
Binary file added public/images/login_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions src/app/LogoIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// TODO : Icon ์ปดํฌ๋„ŒํŠธ๋กœ ๋ณ€๊ฒฝ
const LogoIcon = () => {
return (
<svg width="201" height="76" viewBox="0 0 201 76" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clipPath="url(#clip0_189_2661)">
<g filter="url(#filter0_d_189_2661)">
<path d="M10.5 25.22V14.9672H28.3617V62.0397H16.8838V25.22H10.5Z" fill="white" />
<path
d="M35.9047 37.8586C35.9047 30.4646 37.3233 24.6397 40.1606 20.3838C43.0408 16.1279 47.662 14 54.0243 14C60.3867 14 64.9864 16.1279 67.8237 20.3838C70.7039 24.6397 72.144 30.4646 72.144 37.8586C72.144 45.3386 70.7039 51.2066 67.8237 55.4624C64.9864 59.7183 60.3867 61.8462 54.0243 61.8462C47.662 61.8462 43.0408 59.7183 40.1606 55.4624C37.3233 51.2066 35.9047 45.3386 35.9047 37.8586ZM61.3109 37.8586C61.3109 33.5168 60.838 30.1852 59.8923 27.8638C58.9465 25.4994 56.9906 24.3172 54.0243 24.3172C51.0581 24.3172 49.1022 25.4994 48.1564 27.8638C47.2107 30.1852 46.7378 33.5168 46.7378 37.8586C46.7378 40.7818 46.9098 43.2107 47.2537 45.1452C47.5976 47.0367 48.2854 48.5843 49.3171 49.7879C50.3918 50.9486 51.9609 51.529 54.0243 51.529C56.0878 51.529 57.6354 50.9486 58.6671 49.7879C59.7418 48.5843 60.4511 47.0367 60.795 45.1452C61.1389 43.2107 61.3109 40.7818 61.3109 37.8586Z"
fill="white"
/>
<path
d="M130.33 16.7728V62.0397H119.303V34.8924L109.179 62.0397H100.281L90.0924 34.8279V62.0397H79.0658V16.7728H92.0913L104.794 48.1114L117.369 16.7728H130.33Z"
fill="white"
/>
<path
d="M189.523 16.7728V62.0397H178.496V34.8924L168.372 62.0397H159.474L149.286 34.8279V62.0397H138.259V16.7728H151.285L163.988 48.1114L176.562 16.7728H189.523Z"
fill="white"
/>
</g>
</g>
<defs>
<filter
id="filter0_d_189_2661"
x="0.5"
y="4"
width="199.023"
height="68.0397"
filterUnits="userSpaceOnUse"
colorInterpolationFilters="sRGB"
>
<feFlood floodOpacity="0" result="BackgroundImageFix" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
/>
<feOffset />
<feGaussianBlur stdDeviation="5" />
<feComposite in2="hardAlpha" operator="out" />
<feColorMatrix type="matrix" values="0 0 0 0 0.121492 0 0 0 0 0.133128 0 0 0 0 0.237856 0 0 0 0.08 0" />
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_189_2661" />
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_189_2661" result="shape" />
</filter>
<clipPath id="clip0_189_2661">
<rect width="200" height="76" fill="white" transform="translate(0.5)" />
</clipPath>
</defs>
</svg>
);
};

export default LogoIcon;
43 changes: 42 additions & 1 deletion src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1 +1,42 @@
@layer reset, base, tokens, recipes, utilities;
@layer reset, base, tokens, recipes, utilities;

/* ์•„๋ž˜ ํฐํŠธ๋“ค์€ safari์—์„œ์˜ ๋Œ€์‘์„ ์œ„ํ•œ css ๋ณ€์ˆ˜ ๋“ฑ๋ก์„ ์œ„ํ•œ ์ฝ”๋“œ ์ž…๋‹ˆ๋‹ค */
@font-face {
font-family: 'Pretendard';
font-weight: 400;
font-display: swap;
src:
local('Pretendard'),
url('../assets/fonts/PretendardVariable.woff2') format('woff2');
}

@font-face {
font-family: 'Pretendard';
font-weight: 500;
font-display: swap;
src:
local('Pretendard'),
url('../assets/fonts/PretendardVariable.woff2') format('woff2');
}

@font-face {
font-family: 'Pretendard';
font-weight: 600;
font-display: swap;
src:
local('Pretendard'),
url('../assets/fonts/PretendardVariable.woff2') format('woff2');
}

@font-face {
font-family: 'Pretendard';
font-weight: 700;
font-display: swap;
src:
local('Pretendard'),
url('../assets/fonts/PretendardVariable.woff2') format('woff2');
}

:root {
--pretendard: 'Pretendard', sans-serif;
}
3 changes: 2 additions & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Metadata } from 'next';
import { css } from '@/styled-system/css';
import { pretendardFont } from '@/styles/font';

import { QueryProvider } from '../hooks/query';

@@ -12,7 +13,7 @@ export const metadata: Metadata = {

export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<html lang="en" suppressHydrationWarning>
<html lang="en" suppressHydrationWarning className={pretendardFont.variable}>
<body>
<QueryProvider>
<div className={css(containerCss)}>{children}</div>
Loading