Merge pull request #127 from zuzokim/master

[client] done directory change , conflict solved

Author: zuzokim

.eslintrc.json

@@ -16,14 +16,17 @@
 			"sourceType": "module"
 	},
 	"plugins": [
-			"react"  
+			"react"
 	],
 	"rules": {
 			"quotes": ["error", "single"],
 			"no-multi-spaces": ["error"],
-			"indent": ["error", "tab"],
+	"indent": ["error", "tab", { "SwitchCase": 1 }],
+			"no-mixed-spaces-and-tabs": ["error","smart-tabs"],
 			"eqeqeq": ["error"],
-			"react/prop-types": "off"
-
+			"react/prop-types": "off",
+			"react/react-in-jsx-scope": "off",
+			"react/jsx-uses-react": "off"
 	}
+	
 }

.github/ISSUE_TEMPLATE/-retrospect--n----------.md

@@ -0,0 +1,20 @@
+---
+name: "[Retrospect] N주차 회고 - 이름"
+about: Fact, Feeling, Finding, Future action 방식으로 기록하는 프로젝트 리팩토링 회고 템플릿
+title: "[Retrospect] N주차 회고 - 이름"
+labels: ''
+assignees: ''
+
+---
+
+### Fact (사실) : 진행한 리팩토링에 대해 객관적으로 서술
+- 
+
+### Feeling(느낌) : 그때 느꼈던 기분 간략히 정리
+-
+
+### Finding(알게 된 것) : 리팩토링하며 알게 된 것을 정리
+-
+
+### Future Action(앞으로 할 것) : 앞으로 할 것에 대한 계획이나 다짐 작성
+-

src/App.js

@@ -1,5 +1,5 @@
 import './App.scss'
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import Landing from './pages/Landing';
 import SetNewPwd from './pages/SetNewPwd';
 import Collect from './pages/Collect';

src/components/BigBookmark.js

@@ -1,5 +1,3 @@
-/* eslint-disable react/prop-types */
-import React from 'react';
 import { addVisitCount } from '../redux/actions/addVisitCount';
 import { useDispatch } from 'react-redux';
 

src/components/BookmarksContainer.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import CategoryBox from './CategoryBox';
 import CollectBookmark from './CollectBookmark';
 import { getBookmark, getGuestBookmark } from '../redux/actions/getBookmark';

src/components/BottomPopup.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { editEnd } from '../redux/actions/editBookmark';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

src/components/CategoryBox.js

@@ -1,5 +1,3 @@
-/* eslint-disable react/prop-types */
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { useDispatch } from 'react-redux';

src/components/CollectBookmark.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { useDispatch } from 'react-redux';
 import { editStart } from '../redux/actions/editBookmark';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -16,14 +15,14 @@ export default function CollectBookmark(props) {
 
 	const handleElipsisHoverColor = (color) => {
 		switch (color) {
-		case '#214bc8':
-			return 'blue';
-		case '#f24626':
-			return 'red';
-		case '#0eae61':
-			return 'green';
-		default:
-			return 'blue';
+			case '#214bc8':
+				return 'blue';
+			case '#f24626':
+				return 'red';
+			case '#0eae61':
+				return 'green';
+			default:
+				return 'blue';
 		}
 	};
 

src/components/CollectInputBox.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import Creatable from 'react-select/creatable';
 import { addBookmark, addGuestBookmark } from '../redux/actions/addBookmark'
 import { editBookmark, editGuestBookmark, editEnd } from '../redux/actions/editBookmark'
@@ -146,14 +146,14 @@ function CollectInputBox(props) {
 		}
 
 		switch (mode) {
-		case 'edit':
-			handleEditBookmark();
-			break;
-		case 'add':
-			handleAddBookmark();
-			break;
-		default:
-			return;
+			case 'edit':
+				handleEditBookmark();
+				break;
+			case 'add':
+				handleAddBookmark();
+				break;
+			default:
+				return;
 		}
 	};
 

src/components/Error.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link } from 'react-router-dom';
 
 function Error() {

src/components/ExploreProfileList.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faLaptop } from '@fortawesome/free-solid-svg-icons';
 import { faUserCircle } from '@fortawesome/free-regular-svg-icons';

src/components/FavoriteBookmark.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 export default function FavoriteBookmark(props) {
 	const {favorite} = props;
 	return (

src/components/Footer.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 function Footer() {
 	return (
 		<div className="footer">

src/components/Loading.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 function Loading() {
 
 	return (

src/components/Modal/CategoryEditModal.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { editCategory, categoryEditEnd } from '../../redux/actions/editCategory';
 import { notify } from '../../redux/actions/notify';

src/components/Modal/CategoryReallyDeleteModal.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { useDispatch } from 'react-redux';
 import { deleteCategory } from '../../redux/actions/deleteCategory';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

src/components/Modal/DelAccountModal.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { useHistory } from 'react-router';
 import { useSelector, useDispatch } from 'react-redux';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

src/components/Modal/EditPwdModal.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { IsValidiatePassword } from '../../util/validation';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

src/components/Modal/ExploreModal.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { useDispatch } from 'react-redux';
 import { IsValidateEmail } from '../../util/validation';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

src/components/Modal/FindPwdModal.js

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { IsValidateEmail } from '../../util/validation';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';

src/components/Modal/LoginModal.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useHistory } from 'react-router';
 import { useSelector, useDispatch } from 'react-redux';
 import { loginInitialize, loginThunk } from '../../redux/actions/signInOut';

src/components/Modal/SentEmailModal.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';
 import { useDispatch } from 'react-redux';

src/components/Modal/SetNewPwdModal.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setNewPwd } from '../../redux/actions/findPwd';
 import { IsValidiatePassword } from '../../util/validation';

src/components/Modal/SignUpModal.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import {
 	signupInitialize,
@@ -113,47 +113,47 @@ function SignUpModal() {
 		setSignUpInfo((state) => {
 			state[name] = value;
 			switch (name) {
-			case 'pwd':
-				if (!IsValidiatePassword(state.pwd)) {
-					setMessage({
-						...message,
-						pwd: '8~16자 영문 대소문자, 숫자, 특수문자를 사용하세요.',
-					});
-				} else {
-					setMessage({
-						...message,
-						pwd: '',
-					});
-				}
-				break;
-			case 'pwdCheck':
-				if (state.pwd !== state.pwdCheck) {
-					setMessage({
-						...message,
-						pwdCheck: '비밀번호가 일치하지 않습니다.',
-					});
-				} else {
-					setMessage({
-						...message,
-						pwdCheck: '',
-					});
-				}
-				break;
-			case 'username':
-				if (!IsValidiateUsername(state.username)) {
-					setMessage({
-						...message,
-						username: '4~16자 영문 대 소문자, 숫자를 사용하세요.',
-					});
-				} else {
-					setMessage({
-						...message,
-						username: '',
-					});
-				}
-				break;
-			default:
-				break;
+				case 'pwd':
+					if (!IsValidiatePassword(state.pwd)) {
+						setMessage({
+							...message,
+							pwd: '8~16자 영문 대소문자, 숫자, 특수문자를 사용하세요.',
+						});
+					} else {
+						setMessage({
+							...message,
+							pwd: '',
+						});
+					}
+					break;
+				case 'pwdCheck':
+					if (state.pwd !== state.pwdCheck) {
+						setMessage({
+							...message,
+							pwdCheck: '비밀번호가 일치하지 않습니다.',
+						});
+					} else {
+						setMessage({
+							...message,
+							pwdCheck: '',
+						});
+					}
+					break;
+				case 'username':
+					if (!IsValidiateUsername(state.username)) {
+						setMessage({
+							...message,
+							username: '4~16자 영문 대 소문자, 숫자를 사용하세요.',
+						});
+					} else {
+						setMessage({
+							...message,
+							username: '',
+						});
+					}
+					break;
+				default:
+					break;
 			}
 			return state;
 		});

src/components/Modal/SuccessSignUpModal.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';
 import { useDispatch } from 'react-redux';

src/components/Nav.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { logoutThunk } from '../redux/actions/signInOut';
 import { Link, withRouter } from 'react-router-dom';

src/components/NotificationCenter.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelector } from 'react-redux';
 import Toast from './Toast';
 

src/components/Recollect.js

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import BigBookmark from './BigBookmark';
 import { useSelector, useDispatch } from 'react-redux';
 import { recollect } from '../redux/actions/getRecollect';
@@ -36,7 +36,6 @@ function Recollect() {
 					})
 				) : (
 					<div className='recollect__skeleton'>
-						<img src='logo_cut.png' className='logoPng' />
 						<p>리콜렉트할 북마크가 없어요!</p>
 					</div>
 				)}

src/components/ScrollToTop.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 function ScrollToTop() {
 	const [visible, setVisible] = useState(false);

src/components/SearchBar.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSearch } from '@fortawesome/free-solid-svg-icons';
 

src/components/SearchBookmark.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { useSelector } from 'react-redux';
 import BigBookmark from '../components/BigBookmark';
 

src/components/Sidebar.js

@@ -1,5 +1,5 @@
 import CollectInputBox from './CollectInputBox';
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { editEnd } from '../redux/actions/editBookmark';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

src/components/SlickArrow.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 //import { faArrowLeft, faArrowRight } from '@fortawesome/free-solid-svg-icons';
 

src/components/SuccessSetNewPwd.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link } from 'react-router-dom';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';

src/components/ToCollectBtn.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faArrowLeft } from '@fortawesome/free-solid-svg-icons';
 

src/components/Toast.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 export default function Toast({ text, dismissTime }) {
 	const [isFading, setIsFading] = useState(false);

src/components/UnreadAlarm.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faBell } from '@fortawesome/free-solid-svg-icons';
 import Jump from 'react-reveal/Jump';

src/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 import App from './App';
 import React from 'react';
 import ReactDOM from 'react-dom';

src/pages/Collect.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect} from 'react';
+import { useState, useEffect} from 'react';
 import { useSelector } from 'react-redux';
 import Sidebar from '../components/Sidebar';
 import SearchBar from '../components/SearchBar';