Merge pull request #41 from kishikawakatsumi/refactor

Refactor
kishikawakatsumi · Sep 24, 2023 · a6339b4 · a6339b4
2 parents db569e0 + f1f7fd5
commit a6339b4
Show file tree

Hide file tree

Showing 44 changed files with 10 additions and 12 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,11 +1,12 @@
 .DS_Store
 .env
+.env.example
 .dockerignore
 .git
 .github
 .gitignore
 .vscode
-scripts
+docker-compose.yml
 Dockerfile
 README.md
 SECURITY.md
diff --git a/Dockerfile b/Dockerfile
@@ -18,10 +18,10 @@ WORKDIR /app
 
 COPY --from=node /build/dist ./dist
 
-COPY src/deps.ts .
+COPY backend/deps.ts .
 RUN deno cache --reload deps.ts
 
-ADD src .
+ADD backend .
 RUN deno cache main.ts
 
 EXPOSE 8080

diff --git a/src/deps.ts → backend/deps.ts b/src/deps.ts → backend/deps.ts
diff --git a/src/handlers/get.ts → backend/handlers/get.ts b/src/handlers/get.ts → backend/handlers/get.ts
diff --git a/src/handlers/health.ts → backend/handlers/health.ts b/src/handlers/health.ts → backend/handlers/health.ts
diff --git a/src/handlers/search.ts → backend/handlers/search.ts b/src/handlers/search.ts → backend/handlers/search.ts
diff --git a/src/main.ts → backend/main.ts b/src/main.ts → backend/main.ts
@@ -18,7 +18,8 @@ const eta = new Eta({
   views: templates,
 });
 
-const Platform = {
+// deno-lint-ignore no-explicit-any
+const Platform: Record<string, any> = {
   ios: {
     latest: {
       name: "iOS",

diff --git a/src/models/ios15/bundles.json → backend/models/ios15/bundles.json b/src/models/ios15/bundles.json → backend/models/ios15/bundles.json
diff --git a/src/models/ios15/language_mappings.ts → backend/models/ios15/language_mappings.ts b/src/models/ios15/language_mappings.ts → backend/models/ios15/language_mappings.ts
diff --git a/src/models/ios16/bundles.json → backend/models/ios16/bundles.json b/src/models/ios16/bundles.json → backend/models/ios16/bundles.json
diff --git a/src/models/ios16/language_mappings.ts → backend/models/ios16/language_mappings.ts b/src/models/ios16/language_mappings.ts → backend/models/ios16/language_mappings.ts
diff --git a/src/models/macos12/bundles.json → backend/models/macos12/bundles.json b/src/models/macos12/bundles.json → backend/models/macos12/bundles.json
diff --git a/src/models/macos12/language_mappings.ts → backend/models/macos12/language_mappings.ts b/src/models/macos12/language_mappings.ts → backend/models/macos12/language_mappings.ts
diff --git a/src/models/macos13/bundles.json → backend/models/macos13/bundles.json b/src/models/macos13/bundles.json → backend/models/macos13/bundles.json
diff --git a/src/models/macos13/language_mappings.ts → backend/models/macos13/language_mappings.ts b/src/models/macos13/language_mappings.ts → backend/models/macos13/language_mappings.ts
diff --git a/src/services/cache.ts → backend/services/cache.ts b/src/services/cache.ts → backend/services/cache.ts
diff --git a/src/services/db.ts → backend/services/db.ts b/src/services/db.ts → backend/services/db.ts
diff --git a/src/utils/query_builder.ts → backend/utils/query_builder.ts b/src/utils/query_builder.ts → backend/utils/query_builder.ts
diff --git a/css/index.css → frontend/css/index.css b/css/index.css → frontend/css/index.css
diff --git a/index.html → frontend/index.html b/index.html → frontend/index.html
diff --git a/index.js → frontend/index.js b/index.js → frontend/index.js
diff --git a/js/icon.js → frontend/js/icon.js b/js/icon.js → frontend/js/icon.js
diff --git a/js/language_names.js → frontend/js/language_names.js b/js/language_names.js → frontend/js/language_names.js
diff --git a/js/search.js → frontend/js/search.js b/js/search.js → frontend/js/search.js
diff --git a/static/android-chrome-192x192.png → frontend/static/android-chrome-192x192.png b/static/android-chrome-192x192.png → frontend/static/android-chrome-192x192.png
diff --git a/static/android-chrome-512x512.png → frontend/static/android-chrome-512x512.png b/static/android-chrome-512x512.png → frontend/static/android-chrome-512x512.png
diff --git a/static/apple-touch-icon.png → frontend/static/apple-touch-icon.png b/static/apple-touch-icon.png → frontend/static/apple-touch-icon.png
diff --git a/static/browserconfig.xml → frontend/static/browserconfig.xml b/static/browserconfig.xml → frontend/static/browserconfig.xml
diff --git a/static/favicon-16x16.png → frontend/static/favicon-16x16.png b/static/favicon-16x16.png → frontend/static/favicon-16x16.png
diff --git a/static/favicon-32x32.png → frontend/static/favicon-32x32.png b/static/favicon-32x32.png → frontend/static/favicon-32x32.png
diff --git a/static/favicon.ico → frontend/static/favicon.ico b/static/favicon.ico → frontend/static/favicon.ico
diff --git a/static/fb.png → frontend/static/fb.png b/static/fb.png → frontend/static/fb.png
diff --git a/static/mstile-144x144.png → frontend/static/mstile-144x144.png b/static/mstile-144x144.png → frontend/static/mstile-144x144.png
diff --git a/static/mstile-150x150.png → frontend/static/mstile-150x150.png b/static/mstile-150x150.png → frontend/static/mstile-150x150.png
diff --git a/static/mstile-310x150.png → frontend/static/mstile-310x150.png b/static/mstile-310x150.png → frontend/static/mstile-310x150.png
diff --git a/static/mstile-310x310.png → frontend/static/mstile-310x310.png b/static/mstile-310x310.png → frontend/static/mstile-310x310.png
diff --git a/static/mstile-70x70.png → frontend/static/mstile-70x70.png b/static/mstile-70x70.png → frontend/static/mstile-70x70.png
diff --git a/static/og.png → frontend/static/og.png b/static/og.png → frontend/static/og.png
diff --git a/static/robots.txt → frontend/static/robots.txt b/static/robots.txt → frontend/static/robots.txt
diff --git a/static/safari-pinned-tab.svg → frontend/static/safari-pinned-tab.svg b/static/safari-pinned-tab.svg → frontend/static/safari-pinned-tab.svg
diff --git a/static/site.webmanifest → frontend/static/site.webmanifest b/static/site.webmanifest → frontend/static/site.webmanifest
diff --git a/templates/language-filter.html → frontend/templates/language-filter.html b/templates/language-filter.html → frontend/templates/language-filter.html
diff --git a/scripts/run.sh b/scripts/run.sh
diff --git a/webpack.common.js b/webpack.common.js
@@ -5,7 +5,7 @@ const CopyWebbackPlugin = require("copy-webpack-plugin");
 
 module.exports = {
   entry: {
-    index: "./index.js",
+    index: "./frontend/index.js",
   },
   output: {
     globalObject: "self",
@@ -65,12 +65,12 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ["index"],
       filename: "templates/index.html",
-      template: "index.html",
+      template: "frontend/index.html",
     }),
     new CopyWebbackPlugin({
       patterns: [
-        { from: "templates/*.*", to: "templates/[name][ext]" },
-        { from: "static/*.*", to: "static/[name][ext]" },
+        { from: "frontend/templates/*.*", to: "templates/[name][ext]" },
+        { from: "frontend/static/*.*", to: "static/[name][ext]" },
       ],
     }),
   ],