Skip to content

Commit

Permalink
Merge pull request #885 from woowacourse-teams/develop
Browse files Browse the repository at this point in the history
[release] v1.1.5
  • Loading branch information
jhy979 authored Oct 21, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 37883dd + 94dafd0 commit b4c098a
Showing 50 changed files with 371 additions and 200 deletions.
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div align="center">
<img src="https://user-images.githubusercontent.com/11745691/185735071-5eb23eaa-745b-4d69-a336-b64e5a6f011e.png" />

달력이 기록을 공유할 때, 달록 🌙
### 달력이 기록을 공유할 때, 달록 🌙

[<img src="https://img.shields.io/badge/-dallog.me-important?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.me) [<img src="https://img.shields.io/badge/-tech blog-blue?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.github.io) [<img src="https://img.shields.io/badge/release-v1.1.3-critical?style=flat&logo=google-chrome&logoColor=white" />](https://github.com/woowacourse-teams/2022-dallog/releases/tag/v1.1.3)
[<img src="https://img.shields.io/badge/-dallog.me-important?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.me) [<img src="https://img.shields.io/badge/-tech blog-blue?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.github.io) [<img src="https://img.shields.io/badge/release-v1.1.5-critical?style=flat&logo=google-chrome&logoColor=white" />](https://github.com/woowacourse-teams/2022-dallog/releases/tag/v1.1.5)

[](https://dallog.me)

@@ -13,6 +13,8 @@

달록은 우아한테크코스 공유 캘린더입니다. 우아한테크코스 공식 일정, 데일리 팀, 스터디 등 파편화된 여러 일정을 모아 달록에서 관리할 수 있습니다. 사용자는 관심있는 일정 카테고리를 구독하여 개인화된 캘린더를 사용할 수 있습니다.

**[달록을 더 자세히 알아보고 싶다면, 여기로!](https://sites.google.com/woowahan.com/woowacourse-demo-4th/%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8/%EB%8B%AC%EB%A1%9D)**

## 🖥 서비스 화면

![](https://user-images.githubusercontent.com/11745691/194251748-1a5f5819-7ae8-4648-a45e-6c02399af812.png)
@@ -21,15 +23,19 @@

### Front-end

![](https://user-images.githubusercontent.com/11745691/188255671-080e1818-dadc-43d1-91f0-911f7b12add5.png)
![](https://user-images.githubusercontent.com/11745691/197112888-c634aecc-fe5b-4087-94f9-cd4d0c4ab553.png)

### Back-end

![](https://user-images.githubusercontent.com/11745691/188255703-966c55f6-b868-49c2-a915-8e6fc84ce287.png)
![](https://user-images.githubusercontent.com/11745691/197112828-fd63411d-f7be-4501-b13e-5b450ccf0c40.png)

## ⚙️ Infrastructure

![](https://user-images.githubusercontent.com/11745691/185746996-8c2ec104-95a4-472e-9ad0-27a2a22ce821.png)
![](https://user-images.githubusercontent.com/11745691/197112936-d3b80ed4-f0fb-477a-8099-2600f36e9061.png)

## 🔀 CI/CD Pipeline

![](https://user-images.githubusercontent.com/11745691/197113000-dc562bfa-c1ad-4500-91d9-908b2d7c7014.png)

## 🌈 알록달록하게 일을 더 잘하는 9가지 방법

15 changes: 11 additions & 4 deletions frontend/src/@types/emotion.d.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
import { SerializedStyles } from '@emotion/react';

interface Colors {
interface ColorsType {
[key: string]: string;
}

type Flex = Record<'row' | 'column', SerializedStyles>;
type FlexType = Record<'row' | 'column', SerializedStyles>;

interface MQType {
laptop: string;
tablet: string;
mobile: string;
}

declare module '@emotion/react' {
export interface Theme {
colors: Colors;
flex: Flex;
colors: ColorsType;
flex: FlexType;
mq?: MQType;
}
}
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ const inputStyle = ({ colors }: Theme, isValid?: boolean) => css`
padding: 3rem;
width: 100%;
border-radius: 8px;
border-radius: 7px;
border: 1px solid ${isValid === false ? colors.RED_400 : colors.GRAY_400};
font-family: inherit;
11 changes: 7 additions & 4 deletions frontend/src/components/@common/PageLayout/PageLayout.styles.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { css } from '@emotion/react';
import { css, Theme } from '@emotion/react';

const pageLayout = (isSideBarOpen: boolean) => css`
const pageLayout = ({ mq }: Theme, isSideBarOpen: boolean) => css`
overflow-y: auto;
position: relative;
height: calc(100vh - 16rem);
margin-top: 16rem;
margin-left: ${isSideBarOpen ? '64rem' : '0'};
transition: margin-left 0.3s;
${mq?.laptop} {
margin-left: ${isSideBarOpen ? '64rem' : '0'};
transition: margin-left 0.3s;
}
`;

export { pageLayout };
5 changes: 4 additions & 1 deletion frontend/src/components/@common/PageLayout/PageLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useTheme } from '@emotion/react';
import { useRecoilValue } from 'recoil';

import { sideBarState } from '@/recoil/atoms';
@@ -9,9 +10,11 @@ interface PageLayoutProps {
}

function PageLayout({ children }: PageLayoutProps) {
const theme = useTheme();

const isSideBarOpen = useRecoilValue(sideBarState);

return <div css={pageLayout(isSideBarOpen)}>{children}</div>;
return <div css={pageLayout(theme, isSideBarOpen)}>{children}</div>;
}

export default PageLayout;
26 changes: 26 additions & 0 deletions frontend/src/components/@common/Responsive/Responsive.styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { css, Theme } from '@emotion/react';

const layoutStyle = ({ mq }: Theme, type: string) => css`
display: none;
width: 100%;
height: 100%;
${type === 'laptop' && mq?.laptop} {
display: block;
}
${type === 'tablet' && mq?.tablet} {
display: block;
}
${type === 'mobile' && mq?.mobile} {
display: block;
}
${type === 'all'} {
display: block;
}
`;

export { layoutStyle };
16 changes: 16 additions & 0 deletions frontend/src/components/@common/Responsive/Responsive.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { useTheme } from '@emotion/react';

import { layoutStyle } from './Responsive.styles';

interface ResponsiveProps {
type: string;
children: JSX.Element | JSX.Element[];
}

function Responsive({ type = 'all', children }: ResponsiveProps) {
const theme = useTheme();

return <div css={layoutStyle(theme, type)}>{children}</div>;
}

export default Responsive;
4 changes: 2 additions & 2 deletions frontend/src/components/@common/Select/Select.styles.ts
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ const dimmerStyle = (isSelectOpen: boolean) => css`
const selectStyle = ({ colors }: Theme) => css`
width: 100%;
height: 11.75rem;
border-radius: 8px;
border-radius: 7px;
border: 1px solid ${colors.GRAY_400};
font-size: 4rem;
@@ -47,7 +47,7 @@ const optionLayoutStyle = ({ colors }: Theme, isSelectOpen: boolean) => css`
width: 100%;
max-height: ${isSelectOpen ? '50rem' : 0};
border: ${isSelectOpen && `1px solid ${colors.GRAY_400}`};
border-radius: 8px;
border-radius: 7px;
background: ${colors.WHITE};
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ const skeletonStyle = ({ colors }: Theme, width: string, height: string) => css`
width: ${width};
height: ${height};
border-radius: 4px;
border-radius: 7px;
animation: skeleton 2s infinite ease-out;
`;
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ const closeModalButtonStyle = css`

const deleteButtonStyle = ({ colors }: Theme) => css`
padding: 2rem;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.RED_400};
@@ -29,7 +29,7 @@ const headerStyle = css`

const forgiveButtonStyle = ({ colors }: Theme) => css`
padding: 2rem;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.RED_400};
@@ -48,7 +48,7 @@ const layoutStyle = ({ flex, colors }: Theme) => css`
max-height: 100vh;
padding: 12.5rem;
border-radius: 12px;
border-radius: 7px;
background: ${colors.WHITE};
`;
@@ -76,7 +76,7 @@ const listSectionStyle = ({ flex }: Theme) => css`
const renameButtonStyle = ({ colors }: Theme) => css`
height: 8rem;
padding: 2rem;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.YELLOW_500};
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ const categoryAddModal = ({ colors, flex }: Theme) => css`
width: 120rem;
height: 90rem;
padding: 12.5rem;
border-radius: 12px;
border-radius: 7px;
justify-content: space-between;
background: ${colors.WHITE};
@@ -46,7 +46,7 @@ const cancelButtonStyle = ({ colors }: Theme) => css`
padding: 2rem 3rem;
box-sizing: border-box;
border: 1px solid ${colors.GRAY_500};
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.WHITE};
@@ -58,7 +58,7 @@ const cancelButtonStyle = ({ colors }: Theme) => css`
const saveButtonStyle = ({ colors }: Theme) => css`
padding: 2rem 3rem;
box-sizing: border-box;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.YELLOW_500};
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ const modal = ({ colors, flex }: Theme) => css`
width: 120rem;
height: 90rem;
padding: 12.5rem;
border-radius: 12px;
border-radius: 7px;
justify-content: space-between;
background: ${colors.WHITE};
@@ -46,7 +46,7 @@ const cancelButton = ({ colors }: Theme) => css`
width: 22.5rem;
height: 10rem;
border: 2px solid ${colors.GRAY_500};
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.WHITE};
@@ -58,7 +58,7 @@ const cancelButton = ({ colors }: Theme) => css`
const saveButton = ({ colors }: Theme) => css`
width: 22.5rem;
height: 10rem;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.YELLOW_500};
2 changes: 1 addition & 1 deletion frontend/src/components/Footer/Footer.styles.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { css, Theme } from '@emotion/react';

const footerStyle = ({ colors, flex }: Theme) => css`
${flex.column}
${flex.column};
width: 100%;
height: 40rem;
4 changes: 2 additions & 2 deletions frontend/src/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@ function Footer() {
};

return (
<div css={footerStyle}>
<footer css={footerStyle}>
<p>우아한테크코스 4기 달록</p>
<p>서울특별시 송파구 올림픽로35다길 42, 14층 (한국루터회관)</p>
<p>Copyright © 2022 달록 - All rights reserved.</p>
<Button cssProp={privacyPolicyButtonStyle} onClick={handleClickPrivacyPolicyButton}>
개인정보처리방침
</Button>
</div>
</footer>
);
}

Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ const closeModalButtonStyle = css`

const deleteButtonStyle = ({ colors }: Theme) => css`
padding: 2rem;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.RED_400};
@@ -33,15 +33,15 @@ const layoutStyle = ({ flex, colors }: Theme) => css`
max-height: 100vh;
padding: 12.5rem;
border-radius: 12px;
border-radius: 7px;
background: ${colors.WHITE};
`;

const renameButtonStyle = ({ colors }: Theme) => css`
height: 8rem;
padding: 2rem;
border-radius: 8px;
border-radius: 7px;
box-shadow: 0 2px 2px ${colors.GRAY_400};
background: ${colors.YELLOW_500};
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ const layoutStyle = ({ colors, flex }: Theme) => css`
width: 120rem;
height: 120rem;
padding: 12.5rem;
border-radius: 12px;
border-radius: 7px;
background: ${colors.WHITE};
Loading

0 comments on commit b4c098a

Please sign in to comment.