수정완료

useProject 88번째줄에 잘못된점 수정
buildyourteam · Feb 3, 2020 · e74e123 · e74e123
1 parent 6fe2c62
commit e74e123
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 72 deletions.
diff --git a/src/hooks/useProject.js b/src/hooks/useProject.js
@@ -1,13 +1,13 @@
-import { useEffect, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import { getProjectData } from "../reducers/Project";
+import { useEffect, useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { getProjectData } from '../reducers/Project';
 
 export function useProjectLoading() {
   const dispatch = useDispatch();
   const { isLoading, isError } = useSelector(state => state.Project);
   const [loadState, setLoadState] = useState({
     open: false,
-    text: "로딩 중..."
+    text: '로딩 중...',
   }); // 메시지 상태메시지
 
   useEffect(() => {
@@ -29,29 +29,29 @@ export const useProjectData = () => {
   const { projectCard } = useSelector(state => state.Project);
   const [projectState, setProjectState] = useState([
     {
-      projectId: "",
-      imgUrl: "",
-      projectName: "",
-      teamName: "",
+      projectId: '',
+      imgUrl: '',
+      projectName: '',
+      teamName: '',
       currentMember: {
         developer: 0,
         planner: 0,
         other: 0,
-        designer: 0
+        designer: 0,
       },
       needMember: {
         developer: 0,
         planner: 0,
         other: 0,
-        designer: 0
+        designer: 0,
       },
-      Dday: 0
-    }
+      Dday: 0,
+    },
   ]);
   const [navState, setNavState] = useState({
-    field: "",
-    jobGroup: "",
-    area: ""
+    field: '',
+    jobGroup: '',
+    area: '',
   });
   useEffect(() => {
     dispatch(getProjectData());
@@ -62,31 +62,31 @@ export const useProjectData = () => {
   }, [projectCard]);
 
   useEffect(() => {
-    let tempData = [];
+    const tempData = [];
     if (navState.field) {
       projectCard.forEach(value => {
         let Flag = false;
         value.field.forEach(value2 => {
           if (value2 === navState.field) Flag = true;
         });
-        if (navState.jobGroup !== "") {
-          if (navState.jobGroup === "developer")
+        if (navState.jobGroup !== '') {
+          if (navState.jobGroup === 'developer')
             if (
               value.needMember.developer - value.currentMember.developer ===
               0
             )
               Flag = false;
-          if (navState.jobGroup === "designer")
+          if (navState.jobGroup === 'designer')
             if (value.needMember.designer - value.currentMember.designer === 0)
               Flag = false;
-          if (navState.jobGroup === "planner")
+          if (navState.jobGroup === 'planner')
             if (value.needMember.planner - value.currentMember.planner === 0)
               Flag = false;
         }
         if (Flag) tempData.push(value);
       });
+      setProjectState(tempData); // 인호 : 이게 조건문 안에 있어야하는데 밖으로 빼놨음
     }
-    setProjectState(tempData);
   }, [navState.field, navState.jobGroup, projectCard]);
 
   return [{ projectState, navState }, setProjectState, setNavState];

diff --git a/src/pages/Project.js b/src/pages/Project.js
@@ -1,32 +1,32 @@
-import React from "react";
-import { useProjectLoading, useProjectData } from "../hooks";
-import { TmpBox } from "../components";
-import Button from "@material-ui/core/Button";
-import { makeStyles } from "@material-ui/core/styles";
-import AppBar from "@material-ui/core/AppBar";
-import Toolbar from "@material-ui/core/Toolbar";
-import Typography from "@material-ui/core/Typography";
-import MuiCircularProgress from "@material-ui/core/CircularProgress";
-import MuiDialogContent from "@material-ui/core/DialogContent";
-import Dialog from "@material-ui/core/Dialog";
-import Grid from "@material-ui/core/Grid";
-import Menu from "@material-ui/core/Menu";
-import MenuItem from "@material-ui/core/MenuItem";
-import FormControl from "@material-ui/core/FormControl";
-import Select from "@material-ui/core/Select";
-import InputLabel from "@material-ui/core/InputLabel";
+import React from 'react';
+import Button from '@material-ui/core/Button';
+import { makeStyles } from '@material-ui/core/styles';
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import Typography from '@material-ui/core/Typography';
+import MuiCircularProgress from '@material-ui/core/CircularProgress';
+import MuiDialogContent from '@material-ui/core/DialogContent';
+import Dialog from '@material-ui/core/Dialog';
+import Grid from '@material-ui/core/Grid';
+import Menu from '@material-ui/core/Menu';
+import MenuItem from '@material-ui/core/MenuItem';
+import FormControl from '@material-ui/core/FormControl';
+import Select from '@material-ui/core/Select';
+import InputLabel from '@material-ui/core/InputLabel';
+import { TmpBox } from '../components';
+import { useProjectLoading, useProjectData } from '../hooks';
 
 const useStyles = makeStyles(theme => ({
   appbar: {
-    margin: "0px"
+    margin: '0px',
   },
   select: {
-    width: "100%",
-    borderColor: "#000000"
+    width: '100%',
+    borderColor: '#000000',
   },
   formcontrol: {
-    width: "25%"
-  }
+    width: '25%',
+  },
 }));
 
 const ProjectPage = () => {
@@ -35,7 +35,7 @@ const ProjectPage = () => {
   const [
     { projectState, navState },
     setProjectState,
-    setNavState
+    setNavState,
   ] = useProjectData();
   const handleClickNav = event => {
     setNavState({ ...navState, [event.target.name]: event.target.value });
@@ -45,9 +45,9 @@ const ProjectPage = () => {
       <AppBar
         position="static"
         color="inherit"
-        style={{ boxShadow: "none", textAlign: "center" }}
+        style={{ boxShadow: 'none', textAlign: 'center' }}
       >
-        <Toolbar style={{ textAlign: "center" }}>
+        <Toolbar style={{ textAlign: 'center' }}>
           <Typography variant="h6" align="center" display="inline">
             ESKIMO
           </Typography>
@@ -56,7 +56,7 @@ const ProjectPage = () => {
       <Grid>
         <FormControl className={classes.formcontrol}>
           <InputLabel shrink={false} id="fieldLabel">
-            {navState.field === "" ? "분야" : ""}
+            {navState.field === '' ? '분야' : ''}
           </InputLabel>
           <Select
             className={classes.select}
@@ -80,7 +80,7 @@ const ProjectPage = () => {
         </FormControl>
         <FormControl className={classes.formcontrol}>
           <InputLabel shrink={false} id="jobGroupLabel">
-            {navState.jobGroup === "" ? "직군" : ""}
+            {navState.jobGroup === '' ? '직군' : ''}
           </InputLabel>
           <Select
             className={classes.select}
@@ -101,7 +101,7 @@ const ProjectPage = () => {
         </FormControl>
         <FormControl className={classes.formcontrol}>
           <InputLabel shrink={false} id="areaLabel">
-            {navState.area === "" ? "지역" : ""}
+            {navState.area === '' ? '지역' : ''}
           </InputLabel>
           <Select
             className={classes.select}
@@ -126,7 +126,7 @@ const ProjectPage = () => {
       <Grid container>
         {projectState.map((value, i) => (
           <span
-            style={{ margin: "20px" }}
+            style={{ margin: '20px' }}
             id={value.title + i}
             onClick={() => (window.location = `/project/${value.projectId}`)}
           >
@@ -137,14 +137,14 @@ const ProjectPage = () => {
       <Dialog open={loadState.open}>
         <MuiDialogContent
           style={{
-            background: "white",
-            width: "160px",
-            minHeight: "80px",
-            textAlign: "center"
+            background: 'white',
+            width: '160px',
+            minHeight: '80px',
+            textAlign: 'center',
           }}
         >
-          <MuiCircularProgress style={{ width: "20%", height: "20%" }} />
-          <div style={{ marginTop: "12px" }}>{loadState.text}</div>
+          <MuiCircularProgress style={{ width: '20%', height: '20%' }} />
+          <div style={{ marginTop: '12px' }}>{loadState.text}</div>
           <Button
             onClick={() => {
               setLoadState({ ...loadState, open: false });
@@ -156,12 +156,12 @@ const ProjectPage = () => {
       </Dialog>
       <footer
         style={{
-          backgroundColor: "#eeeeee",
-          height: "100px",
-          textAlign: "center"
+          backgroundColor: '#eeeeee',
+          height: '100px',
+          textAlign: 'center',
         }}
       >
-        <Typography variant="h4" align="center" style={{ padding: "10px" }}>
+        <Typography variant="h4" align="center" style={{ padding: '10px' }}>
           ESKIMO
         </Typography>
         <Typography variant="h6" align="center">

diff --git a/src/pages/ProjectDetail.js b/src/pages/ProjectDetail.js
@@ -7,12 +7,6 @@ import Typography from '@material-ui/core/Typography';
 import MuiCircularProgress from '@material-ui/core/CircularProgress';
 import MuiDialogContent from '@material-ui/core/DialogContent';
 import Dialog from '@material-ui/core/Dialog';
-import Grid from '@material-ui/core/Grid';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import FormControl from '@material-ui/core/FormControl';
-import Select from '@material-ui/core/Select';
-import InputLabel from '@material-ui/core/InputLabel';
 import ReactMarkdown from 'react-markdown/with-html';
 import TextField from '@material-ui/core/TextField';
 import { useProjectDetailLoading, useProjectDetailData } from '../hooks';
@@ -57,8 +51,6 @@ const ProjectPageDetail = () => {
     await dispatch(setProjectDetail(projectDetailState));
   };
 
-  console.log(projectDetailState.projectName);
-
   return (
     <div>
       <AppBar

diff --git a/src/sagas/index.js b/src/sagas/index.js
@@ -1,8 +1,6 @@
 import { all } from 'redux-saga/effects';
-import defaultSaga from "./defaultSaga";
+import defaultSaga from './defaultSaga';
 
 export default function* rootSaga() {
-  yield all([
-    defaultSaga()
-  ]);
+  yield all([defaultSaga()]);
 }