Merge branch 'development' into production

saitamau-maximum · Oct 16, 2023 · c4098cf · c4098cf
2 parents be9f399 + 5b36f19
commit c4098cf
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 6 deletions.
diff --git a/backend/main.go b/backend/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"time"
 
 	_ "github.com/go-sql-driver/mysql"
@@ -72,8 +73,18 @@ type Post struct {
 }
 
 func (h *Handler) GetPosts(c echo.Context) error {
+	pageParam := c.QueryParam("page")
+	if pageParam == "" {
+		pageParam = "0"
+	}
+	page, err := strconv.ParseUint(pageParam, 10, 0)
+	if err != nil {
+		return c.JSON(400, err)
+	}
+
+	index := page * 20
 	posts := []Post{}
-	err := h.DB.Select(&posts, "SELECT * FROM posts ORDER BY created_at DESC LIMIT 20")
+	err = h.DB.Select(&posts, "SELECT * FROM posts ORDER BY created_at DESC LIMIT 20 OFFSET ?", index)
 	if err != nil {
 		h.Logger.Error(err)
 		return c.JSON(500, err)

diff --git a/backend/migration.go b/backend/migration.go
@@ -29,7 +29,7 @@ func migrate() {
 	}
 
 	// indexをposts.created_atにつける
-	_, err = db.Exec("CREATE INDEX posts_latest_idx ON posts (created_at)")
+	_, err = db.Exec("CREATE INDEX posts_latest_idx ON posts (created_at DESC)")
 	if err != nil {
 		log.Println("index already exists")
 	}

diff --git a/frontend/index.html b/frontend/index.html
@@ -7,6 +7,11 @@
     <title>Maxitter | タイムライン</title>
   </head>
   <body>
+    <header>
+      <a href="/">
+        <img src="karilogo.png" width="200"  height="60" alt="karilogo">
+      </a>
+    </header>
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>
   </body>

diff --git a/frontend/public/karilogo.png b/frontend/public/karilogo.png
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
@@ -59,4 +59,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;
diff --git a/frontend/src/components/Timeline.jsx b/frontend/src/components/Timeline.jsx
@@ -1,7 +1,22 @@
-import { Box, Button, Card, CardContent, Typography , CardActionArea } from "@mui/material";
+import {
+  Box,
+  Button,
+  Card,
+  CardContent,
+  Typography,
+  CardActionArea,
+} from "@mui/material";
 
 const formatDateTime = (dateTimeString) => {
-  const options = {timeZone: "Asia/Tokyo", year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" };
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  const options = {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+  };
   return new Date(dateTimeString).toLocaleString("ja-JP", options);
 };
 
@@ -23,7 +38,9 @@ export const Timeline = ({ posts, isLoading, fetchPosts }) => {
           <CardActionArea>
             <CardContent>
               <Typography variant="body1">{post.body}</Typography>
-              <Typography variant="subtitle2" color="text.secondary">{formatDateTime(post.created_at)}</Typography>
+              <Typography variant="subtitle2" color="text.secondary">
+                {formatDateTime(post.created_at)}
+              </Typography>
             </CardContent>
           </CardActionArea>
         </Card>

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -44,6 +44,7 @@ echo "バックエンドのセットアップが完了しました！"
 
 echo "Dockerのセットアップを開始します..."
 
+docker compose down
 docker compose build
 docker compose up -d