Skip to content

Commit

Permalink
style : prettier printwidth 변경
Browse files Browse the repository at this point in the history
- 80 -> 120으로 수정
  • Loading branch information
gomster96 committed Nov 24, 2021
1 parent a00445b commit 91e6146
Show file tree
Hide file tree
Showing 65 changed files with 584 additions and 1,072 deletions.
36 changes: 18 additions & 18 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"arrowParens": "avoid",
"bracketSpacing": true,
"htmlWhitespaceSensitivity": "css",
"insertPragma": false,
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 80,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "none",
"useTabs": false,
"vueIndentScriptAndStyle": false
}
{
"arrowParens": "avoid",
"bracketSpacing": true,
"htmlWhitespaceSensitivity": "css",
"insertPragma": false,
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 120,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "none",
"useTabs": false,
"vueIndentScriptAndStyle": false
}
34 changes: 19 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fboostcampwm-2021%2FWEB19-sajagachi&count_bg=%23FF7777&title_bg=%23784242&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)

# 사자같이 sajagachi - 공동구매 플랫폼
## 소개
buy 사자 together 같이 라는 의미로, 최근 음식 배달비의 증가, C사의 빠른 배송을 위한 최소 구매 등 1인으로서 서비스를 이용할 때 생기는 부담을 덜어주기 위해 이 프로젝트를 기획하였습니다.

## 소개

buy 사자 together 같이 라는 의미로, 최근 음식 배달비의 증가, C사의 빠른 배송을 위한 최소 구매 등 1인으로서 서비스를 이용할 때 생기는 부담을 덜어주기 위해 이 프로젝트를 기획하였습니다.

## 참여자

|![](https://github.com/gintooooonic.png)|![](https://github.com/gomster96.png)|![](https://github.com/JaeseokWoo.png)|![](https://github.com/FloralLife.png)|
|:---:|:---:|:---:|:---:|
|__J113 신우진__|__J119 안병웅__|__J127 우재석__|__J152 이유노__|
| ![](https://github.com/gintooooonic.png) | ![](https://github.com/gomster96.png) | ![](https://github.com/JaeseokWoo.png) | ![](https://github.com/FloralLife.png) |
| :--------------------------------------: | :-----------------------------------: | :------------------------------------: | :------------------------------------: |
| **J113 신우진** | **J119 안병웅** | **J127 우재석** | **J152 이유노** |

## 기술스택

| division | stack |
| --------------- | --------------------------------- |
| Web | ![socket.io](https://img.shields.io/badge/socket.io-lightgray?logo=socket.io&colorA=gray) ![](http://img.shields.io/badge/-SSE-3776AB()?style=()) |
| Front-end | ![TypeScript](https://img.shields.io/badge/TypeScript-blue?logo=TypeScript&colorA=gray) ![React](https://img.shields.io/badge/React-lightblue?logo=React&colorA=gray) ![](https://i.imgur.com/0l2c3Fe.png)|
| Back-end | ![NodeJS](https://img.shields.io/badge/node.js-green?logo=node.js&colorA=gray) ![Express](https://img.shields.io/badge/Express-9cf?logo=express&colorA=gray) ![TypeScript](https://img.shields.io/badge/TypeScript-blue?logo=TypeScript&colorA=gray) ![](http://img.shields.io/badge/TypeORM-()?style=())
| Production | ![NGINX](https://img.shields.io/badge/NGINX-green?logo=NginX&colorA=gray) ![Naver Cloud Platform](https://img.shields.io/badge/NCP-compact_server-9cf&color=brightgreen) ![Git](https://img.shields.io/badge/GitHub_Actions-purple?logo=github&colorA=gray) |
| Code Management | ![Git](https://img.shields.io/badge/Git-red?logo=Git&colorA=gray) ![github](https://img.shields.io/badge/GitHub-lightgray?logo=github&colorA=gray) |
| Formatting | ![prettier](https://img.shields.io/badge/prettier-yellow?logo=prettier&colorA=gray) |
| DB | ![redis](https://img.shields.io/badge/redis-red?logo=redis&colorA=gray) ![mysql](https://img.shields.io/badge/mysql-blue?logo=mySQL&colorA=gray) |
| division | stack |
| --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Web | ![socket.io](https://img.shields.io/badge/socket.io-lightgray?logo=socket.io&colorA=gray) ![](<http://img.shields.io/badge/-SSE-3776AB()?style=()>) |
| Front-end | ![TypeScript](https://img.shields.io/badge/TypeScript-blue?logo=TypeScript&colorA=gray) ![React](https://img.shields.io/badge/React-lightblue?logo=React&colorA=gray) ![](https://i.imgur.com/0l2c3Fe.png) |
| Back-end | ![NodeJS](https://img.shields.io/badge/node.js-green?logo=node.js&colorA=gray) ![Express](https://img.shields.io/badge/Express-9cf?logo=express&colorA=gray) ![TypeScript](https://img.shields.io/badge/TypeScript-blue?logo=TypeScript&colorA=gray) ![](<http://img.shields.io/badge/TypeORM-()?style=()>) |
| Production | ![NGINX](https://img.shields.io/badge/NGINX-green?logo=NginX&colorA=gray) ![Naver Cloud Platform](https://img.shields.io/badge/NCP-compact_server-9cf&color=brightgreen) ![Git](https://img.shields.io/badge/GitHub_Actions-purple?logo=github&colorA=gray) |
| Code Management | ![Git](https://img.shields.io/badge/Git-red?logo=Git&colorA=gray) ![github](https://img.shields.io/badge/GitHub-lightgray?logo=github&colorA=gray) |
| Formatting | ![prettier](https://img.shields.io/badge/prettier-yellow?logo=prettier&colorA=gray) |
| DB | ![redis](https://img.shields.io/badge/redis-red?logo=redis&colorA=gray) ![mysql](https://img.shields.io/badge/mysql-blue?logo=mySQL&colorA=gray) |

## 기획서

[Figma Link](https://www.figma.com/file/vzFbuNGcSRxpvG7Zma7rQx/%EB%B6%80%EC%8A%A4%ED%8A%B8%EC%BA%A0%ED%94%84-%EA%B7%B8%EB%A3%B9-%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8?node-id=0%3A1)

## 백로그
[벡로그 Link](https://docs.google.com/spreadsheets/d/1cXYQpNHGweEUXEMGLWghVJOcbHzv6ascIwQowCPS3Ys/edit#gid=0)

[벡로그 Link](https://docs.google.com/spreadsheets/d/1cXYQpNHGweEUXEMGLWghVJOcbHzv6ascIwQowCPS3Ys/edit#gid=0)
6 changes: 1 addition & 5 deletions client/config-overrides.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/* eslint-disable react-hooks/rules-of-hooks */
const {
useBabelRc,
removeModuleScopePlugin,
override
} = require('customize-cra');
const { useBabelRc, removeModuleScopePlugin, override } = require('customize-cra');

module.exports = override(useBabelRc(), removeModuleScopePlugin());
124 changes: 62 additions & 62 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
{
"name": "client",
"version": "0.1.0",
"private": true,
"dependencies": {
"@babel/plugin-transform-react-jsx": "^7.14.9",
"@emotion/babel-plugin-jsx-pragmatic": "^0.1.5",
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.5",
"@mui/lab": "^5.0.0-alpha.54",
"@mui/material": "^5.0.6",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"@types/jest": "^26.0.24",
"@types/navermaps": "^3.0.10",
"@types/react-router-dom": "^5.3.2",
"customize-cra": "^1.0.0",
"date-fns": "^2.25.0",
"dotenv": "^10.0.0",
"react": "^17.0.2",
"react-app-rewired": "^2.1.8",
"react-cookie": "^4.1.1",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3",
"recoil": "^0.4.1",
"socket.io": "^4.3.2",
"socket.io-client": "^4.3.2",
"swr": "^1.0.1",
"typescript": "^4.4.4",
"web-vitals": "^1.1.2"
},
"scripts": {
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/node": "^12.20.36",
"@types/react": "^17.0.33",
"@types/react-dom": "^17.0.10"
}
"name": "client",
"version": "0.1.0",
"private": true,
"dependencies": {
"@babel/plugin-transform-react-jsx": "^7.14.9",
"@emotion/babel-plugin-jsx-pragmatic": "^0.1.5",
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.5",
"@mui/lab": "^5.0.0-alpha.54",
"@mui/material": "^5.0.6",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"@types/jest": "^26.0.24",
"@types/navermaps": "^3.0.10",
"@types/react-router-dom": "^5.3.2",
"customize-cra": "^1.0.0",
"date-fns": "^2.25.0",
"dotenv": "^10.0.0",
"react": "^17.0.2",
"react-app-rewired": "^2.1.8",
"react-cookie": "^4.1.1",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3",
"recoil": "^0.4.1",
"socket.io": "^4.3.2",
"socket.io-client": "^4.3.2",
"swr": "^1.0.1",
"typescript": "^4.4.4",
"web-vitals": "^1.1.2"
},
"scripts": {
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/node": "^12.20.36",
"@types/react": "^17.0.33",
"@types/react-dom": "^17.0.10"
}
}
56 changes: 27 additions & 29 deletions client/public/index.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1, minimum-scale=1"
/>
<meta name="theme-color" content="#000000" />
<meta name="description" content="🦁 온라인 공동구매 플랫폼 🦁" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/apple-touch-icon.png" />
<!--
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, minimum-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="🦁 온라인 공동구매 플랫폼 🦁" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/apple-touch-icon.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -24,22 +21,22 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>사자같이</title>
</head>
<title>사자같이</title>
</head>

<body>
<script
type="text/javascript"
src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=18xtsqd76h"
></script>
<script
type="text/javascript"
src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=18xtsqd76h&submodules=geocoder"
></script>
<script src="https://unpkg.com/event-source-polyfill/src/eventsource.min.js"></script>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<body>
<script
type="text/javascript"
src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=18xtsqd76h"
></script>
<script
type="text/javascript"
src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=18xtsqd76h&submodules=geocoder"
></script>
<script src="https://unpkg.com/event-source-polyfill/src/eventsource.min.js"></script>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand All @@ -48,5 +45,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
--></body>
-->
</body>
</html>
13 changes: 2 additions & 11 deletions client/src/common/alert/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import React from 'react';
import { css } from '@emotion/react';
import {
Button,
Dialog,
DialogActions,
DialogContent,
DialogContentText,
DialogTitle
} from '@mui/material';
import { Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from '@mui/material';

type AlertParamType = {
on: boolean;
Expand All @@ -26,9 +19,7 @@ export default function Alert(props: AlertParamType) {
>
<DialogTitle>{props.title}</DialogTitle>
<DialogContent>
<DialogContentText id="alert-dialog-description">
{props.children}
</DialogContentText>
<DialogContentText id="alert-dialog-description">{props.children}</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={() => props.onClose()}>확인</Button>
Expand Down
13 changes: 2 additions & 11 deletions client/src/common/confirm/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import React from 'react';
import { css } from '@emotion/react';
import {
Button,
Dialog,
DialogActions,
DialogContent,
DialogContentText,
DialogTitle
} from '@mui/material';
import { Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from '@mui/material';

type ConfirmParamType = {
on: boolean;
Expand All @@ -27,9 +20,7 @@ export default function Confirm(props: ConfirmParamType) {
>
<DialogTitle>{props.title}</DialogTitle>
<DialogContent>
<DialogContentText id="alert-dialog-description">
{props.children}
</DialogContentText>
<DialogContentText id="alert-dialog-description">{props.children}</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={() => props.onCancel()}>취소</Button>
Expand Down
10 changes: 2 additions & 8 deletions client/src/common/gnb/component/BackButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@ function BackButton({ location, history }: RouteComponentProps) {
};

return location.pathname !== '/' ? (
<IconButton
aria-label="go back"
onClick={goBack}
sx={{ width: '2.43rem', height: '2.43rem' }}
>
<ArrowBackIosNewIcon
sx={{ color: 'white', width: '1.9rem', height: '1.9rem' }}
/>
<IconButton aria-label="go back" onClick={goBack} sx={{ width: '2.43rem', height: '2.43rem' }}>
<ArrowBackIosNewIcon sx={{ color: 'white', width: '1.9rem', height: '1.9rem' }} />
</IconButton>
) : null;
}
Expand Down
Loading

0 comments on commit 91e6146

Please sign in to comment.