1.2.0 (#9)

* update whitebook ordering * change to jsx * use correct useEffect * whitebook database done * use correct useEffect * add alt prop * use correct useEffect
PoApper · Feb 18, 2022 · 83d4c98 · 83d4c98
1 parent d835686
commit 83d4c98
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 58 deletions.
diff --git a/components/equipment/equipment.table.jsx b/components/equipment/equipment.table.jsx
@@ -15,7 +15,7 @@ const EquipmentTable = () => {
   const [equipments, setEquipments] = useState([])
 
   // TODO: move out to caller component
-  useEffect(async () => {
+  useEffect(() => {
     axios
       .get(`${process.env.NEXT_PUBLIC_API}/equip`)
       .then((res) => setEquipments(res.data))

diff --git a/components/statistics/new-reservation.bar.jsx b/components/statistics/new-reservation.bar.jsx
@@ -8,20 +8,23 @@ const NewReservationBar = () => {
   const [rawData, setRawData] = useState([])
   const [barData, setBarData] = useState([])
 
-  useEffect(async () => {
-    const nextMonth = moment().add(1, 'M');
-    const res = await axios.get(`${process.env.NEXT_PUBLIC_API}/statistics/reservation?start=202101&end=${nextMonth}`)
-    setRawData(res.data.data)
+  useEffect(() => {
+    const nextMonth = moment().add(1, 'M')
+    axios.get(
+      `${process.env.NEXT_PUBLIC_API}/statistics/reservation?start=202101&end=${nextMonth}`).
+      then((res) => {
+        setRawData(res.data.data)
 
-    // process data format
-    const barData = []
-    for (const [key, value] of Object.entries(res.data.data)) {
-      barData.push({
-        'month': key,
-        'new-reservation': value
+        // process data format
+        const barData = []
+        for (const [key, value] of Object.entries(res.data.data)) {
+          barData.push({
+            'month': key,
+            'new-reservation': value,
+          })
+        }
+        setBarData(barData)
       })
-    }
-    setBarData(barData)
   }, [])
 
   return (

diff --git a/components/statistics/new-user.bar.jsx b/components/statistics/new-user.bar.jsx
@@ -8,20 +8,22 @@ const NewUserBar = () => {
   const [rawData, setRawData] = useState([])
   const [barData, setBarData] = useState([])
 
-  useEffect(async () => {
+  useEffect(() => {
     const nextMonth = moment().add(1, 'M');
-    const res = await axios.get(`${process.env.NEXT_PUBLIC_API}/statistics/user?start=202101&end=${nextMonth}`)
-    setRawData(res.data.data)
+    axios.get(`${process.env.NEXT_PUBLIC_API}/statistics/user?start=202101&end=${nextMonth}`).
+      then((res) => {
+        setRawData(res.data.data)
 
-    // process data format
-    const barData = []
-    for (const [key, value] of Object.entries(res.data.data)) {
-      barData.push({
-        'month': key,
-        'new-user': value
+        // process data format
+        const barData = []
+        for (const [key, value] of Object.entries(res.data.data)) {
+          barData.push({
+            'month': key,
+            'new-user': value
+          })
+        }
+        setBarData(barData)
       })
-    }
-    setBarData(barData)
   }, [])
 
   return (

diff --git a/pages/404.jsx b/pages/404.jsx
@@ -7,7 +7,7 @@ const ErrorPage = () => {
     <LoginLayout>
       <Image
         src={'/popo.svg'}
-      />
+        alt={'popo_logo'}/>
       <h2>
         잘못된 주소이거나 현재 개발중인 페이지 입니다 🙏
       </h2>

diff --git a/pages/_app.js → pages/_app.jsx b/pages/_app.js → pages/_app.jsx
diff --git a/pages/_document.js → pages/_document.jsx b/pages/_document.js → pages/_document.jsx
diff --git a/pages/board/whitebook.jsx b/pages/board/whitebook.jsx
@@ -9,7 +9,7 @@ const WhitebookPage = () => {
   const [whitebooks, setWhitebooks] = useState([])
 
   useEffect(() => {
-    axios.get(`${process.env.NEXT_PUBLIC_API}/whitebook`).
+    axios.get(`${process.env.NEXT_PUBLIC_API}/whitebook?orderBy=click_count`).
       then((res) => setWhitebooks(res.data)).
       catch((err) => {
         alert('생활백서 목록을 불러오는데 실패했습니다.')

diff --git a/pages/equipment/reservation.jsx b/pages/equipment/reservation.jsx
@@ -12,17 +12,19 @@ const EquipmentReservationPage = () => {
   const [total_count, setTotalCount] = useState(0)
   const page_size = 10
 
-  useEffect(async () => {
+  useEffect(() => {
     try {
-      const res = await axios.get(
+      axios.get(
         `${process.env.NEXT_PUBLIC_API}/reservation-equip?take=${page_size}`, {
           withCredentials: true,
-        })
-      setReservations(res.data)
-      const res2 = await axios.get(
+        }).then((res) => {
+        setReservations(res.data)
+      })
+      axios.get(
         `${process.env.NEXT_PUBLIC_API}/reservation-equip/count`,
-      )
-      setTotalCount(res2.data)
+      ).then((res) => {
+        setTotalCount(res.data)
+      })
     } catch (err) {
       alert('장비 예약 목록을 불러오는데 실패했습니다.')
       console.log(err)

diff --git a/pages/index.jsx b/pages/index.jsx
@@ -20,7 +20,6 @@ const HomePage = () => {
           <List as="ul">
             <List.Item as="li">게시판 기능</List.Item>
             <List.Item as="li">PoApper SSO 유저 정보 이전</List.Item>
-            <List.Item as="li">생활백서 데이터베이스화</List.Item>
             <List.Item as="li">Full Responsive Web</List.Item>
           </List>
         </Grid.Column>

diff --git a/pages/login.jsx b/pages/login.jsx
@@ -28,7 +28,7 @@ const LoginPage = () => {
     <LoginLayout>
       <Image
         src={'/popo.svg'}
-      />
+        alt={'popo-logo'}/>
       <SubTitle>관리자 페이지</SubTitle>
       <LoginFormDiv>
         <Form>

diff --git a/pages/place/reservation.jsx b/pages/place/reservation.jsx
@@ -12,17 +12,19 @@ const PlaceReservationPage = () => {
   const [total_count, setTotalCount] = useState(0)
   const page_size = 10
 
-  useEffect(async () => {
+  useEffect(() => {
     try {
-      const res = await axios.get(
+      axios.get(
         `${process.env.NEXT_PUBLIC_API}/reservation-place?take=${page_size}`, {
           withCredentials: true,
-        })
-      setReservations(res.data)
-      const res2 = await axios.get(
+        }).then((res) => {
+        setReservations(res.data)
+      })
+      axios.get(
         `${process.env.NEXT_PUBLIC_API}/reservation-place/count`,
-      )
-      setTotalCount(res2.data)
+      ).then((res) => {
+        setTotalCount(res.data)
+      })
     } catch (err) {
       alert('장소 예약 목록을 불러오는데 실패했습니다.')
       console.log(err)

diff --git a/pages/reservation/index.jsx b/pages/reservation/index.jsx
@@ -10,22 +10,24 @@ const ReservationPage = () => {
   const [place_reservations, setPlaceReservations] = useState([])
   const [equip_reservations, setEquipReservations] = useState([])
 
-  useEffect(async () => {
-    const res1 = await axios.get(
+  useEffect(() => {
+    axios.get(
       `${process.env.NEXT_PUBLIC_API}/reservation-place?status=심사중`,
-    )
-    setPlaceReservations(res1.data)
-    const res2 = await axios.get(
+    ).then((res) => {
+      setPlaceReservations(res.data)
+    })
+    axios.get(
       `${process.env.NEXT_PUBLIC_API}/reservation-equip?status=심사중`,
-    )
-    setEquipReservations(res2.data)
+    ).then((res) => {
+      setEquipReservations(res.data)
+    })
   }, [])
 
   return (
     <ReservationLayout>
       <h3>예약 대기 목록</h3>
       <p><b>심사중</b>인 모든 예약이 이곳에 표시됩니다.</p>
-      <div style={{marginBottom: "1rem"}}>
+      <div style={{marginBottom: 24}}>
         <h4>장소 예약</h4>
         {
           place_reservations.length ?
@@ -35,7 +37,7 @@ const ReservationPage = () => {
             /> : <p>대기 중인 장소 예약이 없습니다 🎈</p>
         }
       </div>
-      <div style={{marginBottom: "1rem"}}>
+      <div style={{marginBottom: 24}}>
         <h4>장비 예약</h4>
         {
           equip_reservations.length ?

diff --git a/pages/user.jsx b/pages/user.jsx
@@ -11,16 +11,18 @@ const UserPage = () => {
   const [total_count, setTotalCount] = useState(0)
   const page_size = 10
 
-  useEffect(async () => {
+  useEffect(() => {
     try {
-      const res = await axios.get(
+      axios.get(
         `${process.env.NEXT_PUBLIC_API}/user?take=${page_size}`,
-        { withCredentials: true })
-      setUsers(res.data)
-      const res2 = await axios.get(
+        { withCredentials: true }).then((res) => {
+        setUsers(res.data)
+      })
+      axios.get(
         `${process.env.NEXT_PUBLIC_API}/user/count`,
-      )
-      setTotalCount(res2.data)
+      ).then((res) => {
+        setTotalCount(res.data)
+      })
     } catch (err) {
       alert('유저 목록을 불러오는데 실패했습니다.')
       console.log(err)