Skip to content

Commit b9fa4c9

Browse files
CreatorDodoCreatorDodo
authored
Merge branch 'main' into 19-옵션-기능-구현
2 parents 6a354d1 + 28c8d85 commit b9fa4c9

File tree

79 files changed

+9526
-7487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+9526
-7487
lines changed

‎.github/release-drafter.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name-template: 'v$RESOLVED_VERSION 🌈'
2+
tag-template: 'v$RESOLVED_VERSION'
3+
categories:
4+
- title: '🚀 Features'
5+
labels:
6+
- 'feature'
7+
- 'enhancement'
8+
- title: '🐛 Bug Fixes'
9+
labels:
10+
- 'fix'
11+
- 'bugfix'
12+
- 'bug'
13+
- title: '🧰 Maintenance'
14+
label: 'chore'
15+
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
16+
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
17+
template: |
18+
## Changes
19+
20+
$CHANGES

‎.github/workflows/release-drafter.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
# branches to consider in the event; optional, defaults to all
6+
branches:
7+
- main
8+
# pull_request event is required only for autolabeler
9+
pull_request:
10+
# Only following types are handled by the action, but one can default to all as well
11+
types: [closed]
12+
# pull_request_target event is required for autolabeler to support PRs from forks
13+
# pull_request_target:
14+
# types: [opened, reopened, synchronize]
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
update_release_draft:
21+
permissions:
22+
# write permission is required to create a github release
23+
contents: write
24+
# write permission is required for autolabeler
25+
# otherwise, read permission is required at least
26+
pull-requests: write
27+
runs-on: ubuntu-latest
28+
steps:
29+
# (Optional) GitHub Enterprise requires GHE_HOST variable set
30+
#- name: Set GHE_HOST
31+
# run: |
32+
# echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
33+
34+
# Drafts your next Release notes as Pull Requests are merged into "master"
35+
- uses: release-drafter/release-drafter@v6
36+
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
37+
with:
38+
config-name: release-drafter.yml
39+
# disable-autolabeler: true
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎README.md‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
11
# DateLeaf
22

3-
‘날짜‘와 ‘잎사귀‘를 결합하여, 시간이 자연스럽게 흐르는 것을 나타내며, 각 일정이 잎사귀처럼 하나하나 소중함을 강조합니다.
3+
> **DateLeaf**는 다수의 사람들과의 **모임 시간**을 보다 **편리하게 계획**하기 위한 **스케줄러** 입니다.
4+
> <br><br>
5+
> 모임을 잡으면서 모든 인원의 일정을 일일이 맞추기 어려울 때,<br>
6+
> 매번 번거로운 투표와 생각지 못한 이중약속으로 난감할 때,<br>
7+
> 한 번에 너무 많은 스케쥴이 발생하여 나조차도 모든 일정을 기억하기 힘들 때,<br>
8+
> 서로의 일정을 입력만 하면 모두가 가능한 날짜와 시간을 자동으로 계산하여<br>
9+
> 보다 편리하게 모임 계획을 세울수 있도록 도와줍니다.
10+
11+
[-> Go to **Date Leaf** Site](https://www.date-leaf.com/)
12+
13+
![intro](https://github.com/imaginer-dev/DateLeaf/assets/81802112/57386410-3cda-438d-9368-9216991f607f)
14+
15+
## WHAT FOR?
16+
17+
현대사회에 불고 있는 자기계발 열풍은, 일시적인 유행을 넘어 하나의 사회 현상으로 자리매김하였습니다.<br>
18+
이러한 자기계발의 시대에 사람들은 규모도 종류도 다양한 모임 활동을 하게되는데<br>
19+
그때마다 수많은 일정들의 조율에서 오는 피로가 즐기고자 시작한 일이 되려 힘들어지는 이유가 되기도 합니다.<br>
20+
우리는 그러한 사람들의 불편함을 인지하였고, 이 부분을 자동화로 만들어서 보다 편리하게 모임 계획을 세울수 있도록 했습니다.
21+
22+
## YOU CAN DO.
23+
24+
![image](https://github.com/imaginer-dev/DateLeaf/assets/81802112/6663f95b-a2b0-4faa-830b-8e1ba1e7bf39)
25+
26+
![image](https://github.com/imaginer-dev/DateLeaf/assets/81802112/04b0f787-c0d4-4088-8978-0f9adf97604b)
27+
28+
## WHAT WE DO
29+
30+
## WE USED
31+
32+
![image](https://github.com/imaginer-dev/DateLeaf/assets/81802112/3cd4ee87-e28a-49d1-81ba-cef8bd8c46b7)
33+
34+
## HOW TO USE
35+
36+
### Development
37+
38+
Date Leaf를 사용하여 개발하기 위해서는 Node.js가 필요합니다.
39+
40+
- run:
41+
```
42+
pnpm install
43+
pnpm run dev
44+
```
45+
- to run the tests:
46+
47+
```
48+
pnpm run test
49+
```
50+
51+
- to run the tests in the UI storybook:
52+
```
53+
pnpm run storybook
54+
```
55+
56+
### Contributions
57+
58+
## OUR CHALLENGE
59+
60+
## WHO WE ARE
61+
62+
- 이예서
63+
- 이정아
64+
- 김도영
65+
- 한현정
66+
- 최기환

‎index.html‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,32 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<meta name="description" content="모임 가능한 날짜 및 시간을 자동으로 알려주는 스케줄러 서비스" />
8-
<meta name="keyword" content="Date Leaf, 모임, 자동, 스케줄러, meeting, auto, scheduler" />
9-
<meta name="author" content="Imaginer" />
5+
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
6+
<meta content="모임 가능한 날짜 및 시간을 자동으로 알려주는 스케줄러 서비스" name="description" />
7+
<meta content="Date Leaf, 모임, 자동, 스케줄러, meeting, auto, scheduler" name="keyword" />
8+
<meta content="Imaginer" name="author" />
109
<title>Date Leaf</title>
11-
<link rel="icon" type="image/png" href="/src/assets/Favicon.ico" />
10+
<link href="/Favicon.ico" rel="icon" type="image/png" />
11+
<link href="/apple-icon-57x57.png" rel="apple-touch-icon" sizes="57x57" />
12+
<link href="/apple-icon-60x60.png" rel="apple-touch-icon" sizes="60x60" />
13+
<link href="/apple-icon-72x72.png" rel="apple-touch-icon" sizes="72x72" />
14+
<link href="/apple-icon-76x76.png" rel="apple-touch-icon" sizes="76x76" />
15+
<link href="/apple-icon-114x114.png" rel="apple-touch-icon" sizes="114x114" />
16+
<link href="/apple-icon-120x120.png" rel="apple-touch-icon" sizes="120x120" />
17+
<link href="/apple-icon-144x144.png" rel="apple-touch-icon" sizes="144x144" />
18+
<link href="/apple-icon-152x152.png" rel="apple-touch-icon" sizes="152x152" />
19+
<link href="/apple-icon-180x180.png" rel="apple-touch-icon" sizes="180x180" />
20+
<link href="/android-icon-192x192.png" rel="icon" sizes="192x192" type="image/png" />
21+
<link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png" />
22+
<link href="/favicon-96x96.png" rel="icon" sizes="96x96" type="image/png" />
23+
<link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png" />
24+
<link href="/manifest.json" rel="manifest" />
25+
<meta content="#ffffff" name="msapplication-TileColor" />
26+
<meta content="/ms-icon-144x144.png" name="msapplication-TileImage" />
27+
<meta content="#ffffff" name="theme-color" />
1228
</head>
1329
<body>
1430
<div id="root"></div>
15-
<script type="module" src="/src/main.tsx"></script>
31+
<script src="/src/main.tsx" type="module"></script>
1632
</body>
1733
</html>

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@tanstack/react-query": "^5.29.0",
2525
"@vitejs/plugin-react-swc": "^3.5.0",
2626
"axios": "^1.6.8",
27+
"browser-image-compression": "^2.0.2",
2728
"daisyui": "^4.10.2",
2829
"react": "^18.2.0",
2930
"react-dom": "^18.2.0",
@@ -50,6 +51,7 @@
5051
"@testing-library/react": "^15.0.5",
5152
"@testing-library/user-event": "^14.5.2",
5253
"@types/node": "^20.12.7",
54+
"@types/randomcolor": "^0.5.9",
5355
"@types/react": "^18.2.66",
5456
"@types/react-dom": "^18.2.22",
5557
"@typescript-eslint/eslint-plugin": "^7.2.0",

0 commit comments

Comments
 (0)