Skip to content

Commit

Permalink
Merge branch 'main' into feature/251
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeong-Ag authored Jan 3, 2025
2 parents 0fc5e37 + 3db54fd commit 343a2a0
Show file tree
Hide file tree
Showing 64 changed files with 1,612 additions and 453 deletions.
5 changes: 5 additions & 0 deletions .changeset/thirty-olives-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clab-platforms/member": patch
---

feat(member): 커뮤니티 인기 게시물, 게시글 및 댓글에 대한 반응 기능 추가
25 changes: 0 additions & 25 deletions .commitlintrc.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
export default {
extends: ['@commitlint/config-conventional'],
rules: {
'scope-empty': [2, 'never'], // 반드시 scope를 포함해야 합니다.
'scope-case': [2, 'always', 'lower-case'], // scope는 항상 소문자여야 합니다.
'scope-enum': [
2,
'always',
[
// scope는 이 목록에 있는 값 중 하나여야 합니다.
'*',
'root',
'auth',
'land',
'member',
'time',
'config',
'design-system',
'icon',
'utils',
'ci',
'changeset',
'husky',
'github',
],
],
},
};
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: '🐞 Bug'
name: 'Bug'
description: '버그가 발생했나요?'
title: '[Bug]: '
labels: '🐞 bug'
labels: 'bug'
body:
- type: textarea
attributes:
label: 버그 설명
description: 버그에 대한 설명을 작성해 주세요
description: 버그에 대한 설명을 작성해 주세요.
validations:
required: true
- type: textarea
attributes:
label: 예상 결과
description: 예상한 결과를 작성해 주세요
description: 예상한 결과를 작성해 주세요.
validations:
required: true
- type: textarea
attributes:
label: 실제 결과
description: 실제 결과를 작성해 주세요
description: 실제 결과를 작성해 주세요.
validations:
required: true
- type: textarea
attributes:
label: 시뮬레이션
description: 버그를 발견하게 된 상황을 단계별로 적어주세요
description: 버그를 발견하게 된 상황을 단계별로 적어주세요.
validations:
required: true
- type: textarea
attributes:
label: ETC
description: 전달할 내용이 있다면 여기에 작성해주세요
label: To Assignees
description: 담당자에게 전달할 내용이 있다면 여기에 작성해 주세요.
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
name: 'Feature'
name: 'Feature'
description: '새로운 기능 또는 명세가 있나요?'
title: '[Feature]: '
labels: 'feature'
labels: 'feature'
body:
- type: textarea
attributes:
label: Describe
description: 새로운 기능에 대한 설명을 작성해 주세요
placeholder: 자세히 적을수록 좋아요.
label: Description
description: 새로운 기능에 대한 설명을 작성해 주세요.
placeholder: 자세히 적을수록 좋습니다.
validations:
required: true
- type: textarea
attributes:
label: Tasks
description: 해야 하는 일에 대한 Tasks를 작성해 주세요
description: 해야 하는 일에 대한 Tasks를 작성해 주세요.
placeholder: 최대한 세분화 해서 적어주세요.
validations:
required: true
- type: textarea
attributes:
label: ETC
description: 전달할 내용이 있다면 여기에 작성해 주세요
label: To Assignees
description: 담당자에게 전달할 내용이 있다면 여기에 작성해 주세요.
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/refactor.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
name: '🔨 Refactor'
name: 'Refactor'
description: '리팩터링을 해야할 부분이 있나요?'
title: '[Refactor]: '
labels: '🔨 refactor'
labels: 'refactor'
body:
- type: textarea
attributes:
label: Describe
description: 왜 리팩터링을 해야하는지 설명해 주세요
placeholder: 자세히 적을수록 좋아요.
label: Description
description: 왜 리팩터링을 해야하는지 설명해 주세요.
placeholder: 자세히 적을수록 좋습니다.
validations:
required: true
- type: textarea
attributes:
label: Tasks
description: 리팩터링에 대한 Tasks를 작성해 주세요
description: 리팩터링을 할 부분에 대해서 자세히 작성해 주세요.
placeholder: 최대한 세분화 해서 적어주세요.
validations:
required: true
- type: textarea
attributes:
label: ETC
description: 전달할 내용이 있다면 여기에 작성해 주세요
label: To Assignees
description: 담당자에게 전달할 내용이 있다면 여기에 작성해 주세요.
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/suggestion.yml

This file was deleted.

15 changes: 9 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
## Summary

> 관련 있는 Issue를 태그해주세요.
> 관련 있는 Issue를 태그해주세요. (e.g. closed, fixed, resolved, related, #100)
**해당 PR에 대한 요약을 작성해주세요.**
_해당 PR에 대한 작업 요약을 작성해주세요._

## Tasks

- 해당 PR에 포함된 작업을 작성해주세요.
- 해당 PR에 포함된 작업을 작성해주세요.
- _해당 PR에 수행한 작업을 작성해주세요._

<!--
## To Reviewer
_(없을 경우 삭제) 더 전달할 내용이 있다면 여기에 작성해주세요._
(기재 내용 없을 경우 섹션 삭제) 더 전달할 내용이 있다면 여기에 작성해주세요.
-->

<!--
## Screenshot
_(없을 경우 삭제) 작업한 내용에 대한 스크린샷을 첨부해주세요._
(기재 내용 없을 경우 섹션 삭제) 작업한 내용에 대한 스크린샷을 첨부해주세요.
-->
14 changes: 7 additions & 7 deletions .github/workflows/pnpm-ci.yml → .github/workflows/app-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pnpm CI
name: App CI

env:
HUSKY: 0
Expand All @@ -14,11 +14,11 @@ concurrency:
cancel-in-progress: true

jobs:
quality-and-build:
Pipelines:
runs-on: ubuntu-latest
strategy:
matrix:
command: ['lint', 'test', 'build']
command: [lint, test, build]

steps:
- name: Checkout
Expand All @@ -27,15 +27,15 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
cache-dependency-path: 'pnpm-lock.yaml'
node-version: 20
cache: pnpm
cache-dependency-path: pnpm-lock.yaml

- name: Install dependencies
run: pnpm install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codecov-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
cache-dependency-path: 'pnpm-lock.yaml'
node-version: 20
cache: pnpm
cache-dependency-path: pnpm-lock.yaml

- name: Install dependencies
run: pnpm install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
cache-dependency-path: 'pnpm-lock.yaml'
node-version: 20
cache: pnpm
cache-dependency-path: pnpm-lock.yaml

- name: Install dependencies
run: pnpm install
Expand Down
Binary file removed apps/land/app/favicon.ico
Binary file not shown.
27 changes: 0 additions & 27 deletions apps/land/app/globals.css

This file was deleted.

23 changes: 0 additions & 23 deletions apps/land/app/layout.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions apps/land/app/page.tsx

This file was deleted.

22 changes: 14 additions & 8 deletions apps/land/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,32 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"dev": "next dev --port 6003",
"build": "next build",
"start": "next start",
"lint": "next lint"
},
"dependencies": {
"@clab-platforms/design-system": "workspace:*",
"@clab-platforms/icon": "workspace:*",
"@clab-platforms/utils": "workspace:*",
"next": "14.0.4",
"react": "^18",
"react-dom": "^18"
"@tanstack/react-query": "^5.59.20",
"next": "15.0.0-rc.1",
"react": "19.0.0-rc-ed15d500-20241110",
"react-dom": "19.0.0-rc-ed15d500-20241110"
},
"devDependencies": {
"@clab-platforms/config": "workspace:*",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"autoprefixer": "^10.0.1",
"eslint": "^8",
"eslint-config-next": "14.0.4",
"eslint": "^8.57.0",
"eslint-config-next": "14.1.4",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-tailwindcss": "^3.15.1",
"postcss": "^8",
"tailwindcss": "^3.3.0",
"typescript": "^5"
Expand Down
Binary file added apps/land/public/font/NanumSquareB.ttf
Binary file not shown.
Binary file added apps/land/public/font/NanumSquareR.ttf
Binary file not shown.
1 change: 1 addition & 0 deletions apps/land/public/github-mark-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions apps/land/src/app/PageLayout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { cn } from '@clab-platforms/utils';

import { Footer, Nav } from '@/components';

interface PageProps {
nav?: boolean;
footer?: boolean;
className?: string;
children: React.ReactNode;
}

export default function Page({
nav = false,
footer = false,
className,
children,
}: PageProps) {
return (
<>
{nav && <Nav />}
<div className={cn('m-auto pt-12', className)}>{children}</div>
{footer && <Footer />}
</>
);
}
Binary file added apps/land/src/app/favicon.ico
Binary file not shown.
Loading

0 comments on commit 343a2a0

Please sign in to comment.