Skip to content
Merged
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
5 changes: 4 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,7 @@ services:
container_name: cloudflare
restart: unless-stopped
image: cloudflare/cloudflared:latest
command: tunnel --no-autoupdate --protocol http2 run --token eyJhIjoiM2FhNmJmMjU1NzdmMDQ1OThhMjYyMGEwMzg4OWVkMzYiLCJ0IjoiM2EzNTk5MTItNmZhYi00OGM0LWIxMDktODRhOTFjMzVmN2MwIiwicyI6Ik9UVm1NV1l3TW1RdE9XWTNOQzAwWkdRd0xXRTJZalV0TldSaFpESTBZek01TjJGbSJ9
command: tunnel --no-autoupdate --protocol http2 run --token eyJhIjoiM2FhNmJmMjU1NzdmMDQ1OThhMjYyMGEwMzg4OWVkMzYiLCJ0IjoiM2EzNTk5MTItNmZhYi00OGM0LWIxMDktODRhOTFjMzVmN2MwIiwicyI6Ik9UVm1NV1l3TW1RdE9XWTNOQzAwWkdRd0xXRTJZalV0TldSaFpESTBZek01TjJGbSJ9
networks:
lpilogue-network:
external: true
6 changes: 6 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import Mypage from './pages/Mypage';
import Details from './pages/Details';
import Voice from './pages/Voice';
import Onboarding from './pages/Onboarding';
import Todayprofile from './pages/Todayprofile';
import Monthly from './pages/Monthly';
import Recap from './pages/Recap';

function App() {
return (
Expand All @@ -22,6 +25,7 @@ function App() {
<Route path="/signup" element={<Signup />} />
<Route path="/signup/profile" element={<Profile />} />
<Route path="/onboarding" element={<Onboarding />} />
<Route path="/onboarding/today" element={<Todayprofile />} />
<Route path="/login" element={<Login />} />
<Route path="/home" element={<Home />} />
<Route path="/write" element={<Write />} />
Expand All @@ -31,6 +35,8 @@ function App() {
<Route path="/recommend/result" element={<Result />} />
<Route path="/chat" element={<Chat />} />
<Route path="/mypage" element={<Mypage />} />
<Route path="/mypage/recap" element={<Recap />} />
<Route path="/mypage/monthly" element={<Monthly />} />
<Route path="/diary/:diaryDate" element={<Details />} />
<Route path="/voice" element={<Voice />} />
</Routes>
Expand Down
9 changes: 9 additions & 0 deletions src/assets/images/angry.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/complaint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/confusion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/joy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/images/sad.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 63 additions & 0 deletions src/components/onboarding/TodayMood.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import styled from 'styled-components';
import Button from '../Button';

const Container = styled.div`
display: flex;
flex-direction: column;
gap: 80px;
`;

const Question = styled.div`
font-size: 28px;
margin-top: 50px;
`;

const ButtonWrapper = styled.div`
display: flex;
flex-direction: column;
gap: 20px;
`;

const ToMood = ({ onNext }) => {
return (
<Container>
<Question>오늘의 기분은 어떤가요?</Question>
<ButtonWrapper>
<Button
type="onboarding"
onClick={() => {
onNext();
}}
>
행복해😊
</Button>
<Button
type="onboarding"
onClick={() => {
onNext();
}}
>
슬 퍼😢
</Button>
<Button
type="onboarding"
onClick={() => {
onNext();
}}
>
짜증나🤬
</Button>
<Button
type="onboarding"
onClick={() => {
onNext();
}}
>
우울해😔
</Button>
</ButtonWrapper>
</Container>
);
};

export default ToMood;
63 changes: 63 additions & 0 deletions src/components/onboarding/TodayRecommend.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import styled from 'styled-components';
import Button from '../Button';
import { useNavigate } from 'react-router-dom';

const Container = styled.div`
display: flex;
flex-direction: column;
gap: 80px;
`;

const Question = styled.div`
font-size: 28px;
margin-top: 50px;
`;

const ButtonWrapper = styled.div`
display: flex;
flex-direction: column;
gap: 20px;
`;

const ToRecom = ({ onNext }) => {
const navigate = useNavigate();

const handleWriteClick = () => {
navigate('/onboarding');
};

const handleOnboardingClick = () => {
navigate('/write');
};
return (
<Container>
<Question>
오늘의 노래 추천은
<br />
어떻게 해드릴까요?
</Question>
<ButtonWrapper>
<Button
type="onboarding"
onClick={() => {
handleWriteClick();
onNext();
}}
>
오늘은 좀 달라.
</Button>
<Button
type="onboarding"
onClick={() => {
handleOnboardingClick();
onNext();
}}
>
평소대로 해줘.
</Button>
</ButtonWrapper>
</Container>
);
};

export default ToRecom;
8 changes: 4 additions & 4 deletions src/mockData/diary.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const diary = [
{
createdAt: '2024-11-20T23:09:45',
createdAt: '2025-04-20T23:09:45',
content:
'오늘은 너무 슬픈 날이었다. 아무것도 하기 싫어! 언젠간 행복해지는 날이 오겠지?',
songName: '한 페이지가 될 수 있게',
Expand All @@ -13,7 +13,7 @@ const diary = [
'https://lpilogue-cocktail.s3.us-east-2.amazonaws.com/Old_Fashioned.png',
},
{
createdAt: '2024-12-01T23:09:45',
createdAt: '2025-05-01T23:09:45',
content:
'오늘은 너무 슬픈 날이었다. 아무것도 하기 싫어! 언젠간 행복해지는 날이 오겠지?',
songName: '한 페이지가 될 수 있게',
Expand All @@ -26,7 +26,7 @@ const diary = [
'https://lpilogue-cocktail.s3.us-east-2.amazonaws.com/Old_Fashioned.png',
},
{
createdAt: '2024-12-03T23:09:45',
createdAt: '2025-05-03T23:09:45',
content: '행복한 하루~~~~',
songName: 'BIG BANK (feat. 2 Chainz, Big Sean, Nicki Minaj)',
songURI: 'https://www.youtube.com/watch?v=z61GFxVD8K4',
Expand All @@ -38,7 +38,7 @@ const diary = [
'https://lpilogue-cocktail.s3.us-east-2.amazonaws.com/Old_Fashioned.png',
},
{
createdAt: '2024-12-05T23:09:45',
createdAt: '2025-05-05T23:09:45',
content: '친구들을 만났다. 항상 고마운 친구들! 우리 오래오래 친구하자❤️',
songName: '너와의 모든 지금',
songURI: 'https://www.youtube.com/watch?v=z61GFxVD8K4',
Expand Down
Loading