카드 정렬 및 날짜표시

@@ -3,15 +3,17 @@ import React, { useState, useEffect } from "react";
 import { makeStyles } from "@material-ui/core/styles";
 import { makeStyles } from "@material-ui/core/styles";
 import Container from "@material-ui/core/Container";
 import Container from "@material-ui/core/Container";
 import Grid from "@material-ui/core/Grid";
 import Grid from "@material-ui/core/Grid";
+import Typography from "@material-ui/core/Typography";
+
 import Icon from "@material-ui/core/Icon";
 import Icon from "@material-ui/core/Icon";
-import CircularProgress from "@material-ui/core/CircularProgress";
+// import CircularProgress from "@material-ui/core/CircularProgress";
 
 
 import TodoCard from "./TodoCard.js";
 import TodoCard from "./TodoCard.js";
 
 
 const useStyles = makeStyles((theme) => ({
 const useStyles = makeStyles((theme) => ({
   root: {
   root: {
-    minHeight:"100vh",
-    backgroundColor: "rgba(1,0,0,0.5)"
+    minHeight: "100vh",
+    backgroundColor: "rgba(0,0,0,0.5)",
   },
   },
   container: {
   container: {
     flexGrow: 1,
     flexGrow: 1,
@@ -19,7 +21,7 @@ const useStyles = makeStyles((theme) => ({
     paddingBottom: "1rem",
     paddingBottom: "1rem",
     marginLeft: "auto",
     marginLeft: "auto",
     marginRight: "auto",
     marginRight: "auto",
-  }
+  },
 }));
 }));
 
 
 export default function BodyLayout() {
 export default function BodyLayout() {
@@ -31,7 +33,7 @@ export default function BodyLayout() {
   const callApi = async () => {
   const callApi = async () => {
     const response = await fetch("/api/cards");
     const response = await fetch("/api/cards");
     const body = await response.json();
     const body = await response.json();
-    return body;
+    return body.reverse();
   };
   };
 
 
   useEffect(() => {
   useEffect(() => {
@@ -44,27 +46,35 @@ export default function BodyLayout() {
   }, []);
   }, []);
 
 
   if (isLoading) {
   if (isLoading) {
-    return (
-      <>
-        <CircularProgress />
-      </>
-    );
+    return <></>;
   } else {
   } else {
     return (
     return (
       <div className={classes.root}>
       <div className={classes.root}>
         <Container className={classes.container} maxwidth="md">
         <Container className={classes.container} maxwidth="md">
           <Grid className={classes.item} container>
           <Grid className={classes.item} container>
-            {data.map((data) => {
+            {data.map((card, idx) => {
+              if (idx===0 || card.date !== data[idx - 1].date) {
                 return (
                 return (
+                  <>
+                  <Typography variant="h4" style={{width:"100%", color:"white"}}>{card.date}</Typography>
                     <Grid item xs={6} sm={6} md={3}>
                     <Grid item xs={6} sm={6} md={3}>
-                  <TodoCard id={data.id} data={data} />
+                      <TodoCard key={card.id} data={card} />
                     </Grid>
                     </Grid>
+                  </>
                 );
                 );
-            })}
-            <hr width="100%" height="19%" color="white" />
+              } else {
+                return (
                   <Grid item xs={6} sm={6} md={3}>
                   <Grid item xs={6} sm={6} md={3}>
-              <Icon style={{ fontSize: 60 }}>add_circle</Icon>
+                    <TodoCard key={card.id} data={card} />
                   </Grid>
                   </Grid>
+                );
+              }
+            })}
+
+            {/* <Grid item xs={6} sm={6} md={3}>
+              <Icon style={{ fontSize: 60 }}>add_circle</Icon>
+            </Grid> */}
+
           </Grid>
           </Grid>
         </Container>
         </Container>
       </div>
       </div>

@@ -33,9 +33,9 @@ export default function ButtonAppBar() {
             <MenuIcon />
             <MenuIcon />
           </IconButton>
           </IconButton>
           <Typography variant="h6" className={classes.title}>
           <Typography variant="h6" className={classes.title}>
-            Fuck
+            Do-gether
           </Typography>
           </Typography>
-          <Button color="inherit">Login</Button>
+          <Button color="inherit">Logout</Button>
         </Toolbar>
         </Toolbar>
       </AppBar>
       </AppBar>
     </div>
     </div>

@@ -41,7 +41,7 @@ export default function TodoCard(props) {
   const todo = data.todo.split(",");
   const todo = data.todo.split(",");
   const isTrue = "1";
   const isTrue = "1";
   const check = data.ck.split(",").map((ck) => {
   const check = data.ck.split(",").map((ck) => {
-    return isTrue == ck;
+    return isTrue === ck;
   });
   });
 
 
   return (
   return (