Skip to content

Commit

Permalink
Merge pull request #261 from boostcampwm-2022/main
Browse files Browse the repository at this point in the history 
FIX: timer 동작 중에는 activeTodo의 elapsedTime과 맞추지 않도록 수정
  • Loading branch information
@kumsil1006
kumsil1006 authored Dec 16, 2022
2 parents 091d23b + f230935 commit 71621a2
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 3 deletions.
62 changes: 61 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,63 @@
# OAO!

## 첫 번째 릴리즈 성공 기원 ጿ ኈ ቼ ዽ ጿ
<div style="text-align: center;">
<img src="https://user-images.githubusercontent.com/39304306/207286994-3cbeaec4-9d80-4101-94e4-706b656bb516.png" />
</div>

## 😎 팀원 소개

| 전대성 | 유능 | 윤수빈 | 박나경 |
| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
| <img width="200" src="https://user-images.githubusercontent.com/39304306/207283188-ba32537a-fef1-4528-8c0c-785eb97dc360.png" /> | <img width="200" src="https://user-images.githubusercontent.com/39304306/207281463-52daa4ab-6bbf-4dc7-81b6-0109a270ec47.png"/> | <img width="200" src="https://user-images.githubusercontent.com/39304306/207283335-95733896-d7a2-4a3a-96a0-b3d78ffe330d.jpeg" /> | <img width="200" src="https://user-images.githubusercontent.com/39304306/207283471-6284544d-d195-4eeb-ae66-466f57e7866c.png" /> |
| |
| 개발자, 팀장, 회의록 담당 | 개발자, 이슈, 일정 담당 | 개발자, 위키, 칭찬 담당 | 개발자, 총무, 비품, 전화 담당 |
| 버그 슬레이어 | 마우스 그림 마에스트로 | 깃 보헤미안 | 아이솔레이션 마스터 |
| [daeseong9388](https://github.com/daeseong9388) | [n-ryu](https://github.com/n-ryu) | [kumsil1006](https://github.com/kumsil1006) | [NaGyeong-Park](https://github.com/NaGyeong-Park) |

## ⭐️ 배포 주소

- dev: http://27.96.131.169/
- production: https://www.oneatonce.com/

## 🔥 프로젝트 소개

<div style="text-align: center;">
<img src="https://user-images.githubusercontent.com/39304306/207285754-cac822db-da7b-46d0-aaa4-f4da9cb9d034.png" />
</div>

<br>

```
계획 세우는 데에 힘을 다 쓰고 포기하신 분?!
할 일이 너무 많아서 하나에 집중이 안 되는 분?!
```

#### OaO는 계획에 대한 부담과 집중 분산 문제를 해결하는 서비스입니다.

- 계획에는 최소한의 에너지만, 눈앞에 일에만 몰입 할 수 있게 해주는 스마트 일정관리 서비스
- 중요도, 마감일에 따라 우선순위를 정해주는 정렬 알고리즘을 통해 가장 중요한 한 가지 일만을 보여주고 집중할 수 있는 서비스

## 🥑 프로젝트 문서

- 💡 [아이디에이션](https://github.com/boostcampwm-2022/web20-OAO/wiki/%EC%95%84%EC%9D%B4%EB%94%94%EC%96%B4-%ED%9A%8C%EC%9D%98)
- 🛠 [테크 스펙](https://windy-armchair-4e7.notion.site/Tech-Spec-e9152d8e1700425b956e10c2141b2e89)
- 🍒 [기술스택](https://github.com/boostcampwm-2022/web20-OAO/wiki/%EA%B8%B0%EC%88%A0%EC%8A%A4%ED%83%9D)
- 🖥 [TodoList API](https://github.com/boostcampwm-2022/web20-OAO/wiki/TodoList-API)

- 📒 [회의록](https://github.com/boostcampwm-2022/web20-OAO/wiki/%ED%9A%8C%EC%9D%98%EB%A1%9D)

- 📌 [백로그](https://docs.google.com/spreadsheets/d/1IsMoLRbD9a499RHvGCJFB5nYUGpIubCbo0_lI6JONGU/edit#gid=0)

## 📌 기술스택

<div style="text-align: center;">
<img src="https://img.shields.io/badge/React-61DAFB?style=for-the-badge&logo=React&logoColor=white"/>
<img src="https://img.shields.io/badge/TypeScript-3178C6?style=for-the-badge&logo=TypeScript&logoColor=white"> <img src="https://img.shields.io/badge/Yarn-2C8EBB?style=for-the-badge&logo=Yarn&logoColor=white"> <img src="https://img.shields.io/badge/Jotai-35BDB2?style=for-the-badge&logo=Jotai&logoColor=white">
<br/>
<img src="https://img.shields.io/badge/styledcomponents-DB7093?style=for-the-badge&logo=styled-components&logoColor=white"/> <img src="https://img.shields.io/badge/Vite-646CFF?style=for-the-badge&logo=Vite&logoColor=white"/>
<img src="https://img.shields.io/badge/Jest-C21325?style=for-the-badge&logo=Jest&logoColor=white"/>
<br/>
<img src="https://img.shields.io/badge/GitHubActions-2088FF?style=for-the-badge&logo=github-actions&logoColor=white" />
<img src="https://img.shields.io/badge/docker-2496ED?style=for-the-badge&logo=docker&logoColor=white" />
</div>
5 changes: 3 additions & 2 deletions client/src/components/main/TodoInteractionButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Button from '@components/Button';
import Postpone from '@images/Postpone';
import Done from '@images/Done';

import { asyncActiveTodo, elapsedTimeAtom, postponeClicked } from '@util/GlobalState.js';
import { asyncActiveTodo, elapsedTimeAtom, isOnProgress, postponeClicked } from '@util/GlobalState.js';

import useDone from '@hooks/useDone.js';
import StartPauseButton from '@components/StartPauseButton';
Expand All @@ -23,9 +23,10 @@ const TodoInteractionButton = (imageButtonStyle: ImageButtonStyle): ReactElement
const [setDone] = useDone();
const [elapsedTime, setElapsedTime] = useAtom(elapsedTimeAtom);
const activeTodo = useAtomValue(asyncActiveTodo);
const progressState = useAtomValue(isOnProgress);

useEffect(() => {
if (activeTodo !== undefined && activeTodo.elapsedTime !== elapsedTime) {
if (activeTodo !== undefined && activeTodo.elapsedTime !== elapsedTime && progressState !== 'working') {
setElapsedTime(activeTodo.elapsedTime);
}
}, [activeTodo]);
Expand Down

0 comments on commit 71621a2

Please sign in to comment.