Merge remote-tracking branch 'origin/develop-backend' into feature-frontend-dishedit

4 months ago · 9d5a87b303
parent 5a85ea5dbc 3c0b7596cc
commit 9d5a87b303
3 changed files with 2 additions and 2 deletions
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/testicon.ico" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="theme-color" content="#000000" />
    <meta
--- a/frontend/public/testicon.ico
+++ b/frontend/public/testicon.ico
--- a/frontend/src/pages/LoginPage.tsx
+++ b/frontend/src/pages/LoginPage.tsx
@ -64,7 +64,7 @@ const LoginPage: React.FC = () => {
          <Paper elevation={3} sx={{ p: 4 }}>
            <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
              <Typography component="h1" variant="h5" gutterBottom>
-                ToDoアプリ ログイン
+                shopchop ログイン
              </Typography>
              {/* エラーがある場合のみアラートを表示 */}
              {error && (