Merge: 충돌 병합

team-3-in · Feb 11, 2024 · b2bf4a9 · b2bf4a9
2 parents 9c9f832 + 7bd3f16
commit b2bf4a9
Show file tree

Hide file tree

Showing 84 changed files with 25,665 additions and 12,925 deletions.
diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml
@@ -1,7 +1,10 @@
 name: client lint
 
 on:
-  workflow_dispatch:
+  push:
+    branches: [feat/*]
+    paths:
+      - "frontend/**"
 
 jobs:
   lint:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "liveServer.settings.port": 5501
+}
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,16 +1,22 @@
 {
   "files": {
-    "main.css": "/static/css/main.f855e6bc.css",
-    "main.js": "/static/js/main.0ceac100.js",
-    "static/js/787.4de39970.chunk.js": "/static/js/787.4de39970.chunk.js",
-    "static/media/logo.svg": "/static/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg",
+    "main.css": "/static/css/main.edab73f6.css",
+    "main.js": "/static/js/main.06c85235.js",
+    "static/css/216.3fa19541.chunk.css": "/static/css/216.3fa19541.chunk.css",
+    "static/js/216.ea565ff2.chunk.js": "/static/js/216.ea565ff2.chunk.js",
+    "static/js/592.bf6ca574.chunk.js": "/static/js/592.bf6ca574.chunk.js",
+    "static/js/603.94be1680.chunk.js": "/static/js/603.94be1680.chunk.js",
+    "service-worker.js": "/service-worker.js",
     "index.html": "/index.html",
-    "main.f855e6bc.css.map": "/static/css/main.f855e6bc.css.map",
-    "main.0ceac100.js.map": "/static/js/main.0ceac100.js.map",
-    "787.4de39970.chunk.js.map": "/static/js/787.4de39970.chunk.js.map"
+    "main.edab73f6.css.map": "/static/css/main.edab73f6.css.map",
+    "main.06c85235.js.map": "/static/js/main.06c85235.js.map",
+    "216.3fa19541.chunk.css.map": "/static/css/216.3fa19541.chunk.css.map",
+    "216.ea565ff2.chunk.js.map": "/static/js/216.ea565ff2.chunk.js.map",
+    "592.bf6ca574.chunk.js.map": "/static/js/592.bf6ca574.chunk.js.map",
+    "603.94be1680.chunk.js.map": "/static/js/603.94be1680.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.f855e6bc.css",
-    "static/js/main.0ceac100.js"
+    "static/css/main.edab73f6.css",
+    "static/js/main.06c85235.js"
   ]
 }
diff --git a/frontend/build/favicon.ico b/frontend/build/favicon.ico
diff --git a/frontend/build/index.html b/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.0ceac100.js"></script><link href="/static/css/main.f855e6bc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="yes"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="apple-touch-icon" href="touch-icon-iphone.png"><link rel="apple-touch-icon" sizes="152x152" href="touch-icon-ipad.png"><link rel="apple-touch-icon" sizes="167x167" href="touch-icon-ipad-retina.png"><link rel="apple-touch-icon" sizes="180x180" href="touch-icon-iphone-retina.png"><title>TOEIC</title><script defer="defer" src="/static/js/main.06c85235.js"></script><link href="/static/css/main.edab73f6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/frontend/build/logo192.png b/frontend/build/logo192.png
diff --git a/frontend/build/logo512.png b/frontend/build/logo512.png
diff --git a/frontend/build/manifest.json b/frontend/build/manifest.json
@@ -1,25 +1,54 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "TOEIC",
+  "name": "TOEIC",
   "icons": [
     {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
+      "src": "icons/logo16.png",
+      "type": "image/png",
+      "sizes": "16x16"
+    },
+    {
+      "src": "icons/logo24.png",
+      "type": "image/png",
+      "sizes": "24x24"
+    },
+    {
+      "src": "icons/logo32.png",
+      "type": "image/png",
+      "sizes": "32x32"
     },
     {
-      "src": "logo192.png",
+      "src": "icons/logo192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "icons/logo512.png",
       "type": "image/png",
       "sizes": "512x512"
     }
   ],
   "start_url": ".",
   "display": "standalone",
   "theme_color": "#000000",
-  "background_color": "#ffffff"
+  "background_color": "#ffffff",
+  "shortcuts": [
+    {
+      "name": "TOEIC",
+      "short_name": "TOEIC",
+      "description": "다양한 토익 기출문제를 제공합니다!",
+      "url": ".",
+      "icons": [{ "src": "/img/logo192.png", "sizes": "192x192" }]
+    }
+  ],
+  "description": "TOEIC",
+  "screenshots": [
+    {
+      "src": "img/snapshot.png",
+      "sizes": "640x320",
+      "type": "image/png",
+      "form_factor": "wide",
+      "label": "Wonder Widgets"
+    }
+  ]
 }
diff --git a/frontend/build/static/css/main.f855e6bc.css b/frontend/build/static/css/main.f855e6bc.css
diff --git a/frontend/build/static/css/main.f855e6bc.css.map b/frontend/build/static/css/main.f855e6bc.css.map
diff --git a/frontend/build/static/js/787.4de39970.chunk.js b/frontend/build/static/js/787.4de39970.chunk.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.0ceac100.js"></script><link href="/static/css/main.f855e6bc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="yes"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="apple-touch-icon" href="touch-icon-iphone.png"><link rel="apple-touch-icon" sizes="152x152" href="touch-icon-ipad.png"><link rel="apple-touch-icon" sizes="167x167" href="touch-icon-ipad-retina.png"><link rel="apple-touch-icon" sizes="180x180" href="touch-icon-iphone-retina.png"><title>TOEIC</title><script defer="defer" src="/static/js/main.06c85235.js"></script><link href="/static/css/main.edab73f6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>