Merge pull request #36 from HyeokjinKang/develop

fix: 정상적인 배포를 위하여 npm version을 쿼리스트링에 사용합니다.
HyeokjinKang · Aug 22, 2023 · c607fdf · c607fdf
2 parents a8873a9 + 44df851
commit c607fdf
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 94 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -19,6 +19,7 @@ app.get("/", (req, res) => {
   res.render("index", {
     url: config.project.url,
     api: config.project.api,
+    ver: process.env.npm_package_version,
     community: config.project.community,
     mirai: config.project.mirai,
   });
@@ -34,65 +35,16 @@ app.get("/ko", function (req, res) {
   res.redirect("/");
 });
 
-app.get("/acc", (req, res) => {
-  res.render("account", { api: config.project.api, url: config.project.url });
-});
-
 app.get("/join", (req, res) => {
-  res.render("join", { api: config.project.api, url: config.project.url });
-});
-
-app.get("/authentication", (req, res) => {
-  res.render("authentication", {
-    api: config.project.api,
-    url: config.project.url,
-  });
-});
-
-app.get("/authentication/success", (req, res) => {
-  res.render("authenticationSuccess", {
-    api: config.project.api,
-    url: config.project.url,
-  });
-});
-
-app.get("/authentication/failed", (req, res) => {
-  res.render("authenticationFailed", {
-    url: config.project.url,
-  });
-});
-
-app.post("/authentication/failed", (req, res) => {
-  res.render("authenticationFailed", {
-    url: config.project.url,
-  });
-});
-
-app.get("/advanced/canceled", (req, res) => {
-  res.render("subscriptionCanceled", {
-    url: config.project.url,
-  });
-});
-
-app.get("/authorize", (req, res) => {
-  if (req.query.status == "fail") {
-    res.render("authorizeFail", {
-      url: config.project.url,
-      api: config.project.api,
-    });
-  } else {
-    res.render("authorize", {
-      url: config.project.url,
-      api: config.project.api,
-    });
-  }
+  res.render("join", { api: config.project.api, ver: process.env.npm_package_version, url: config.project.url });
 });
 
 app.get("/game", async (req, res) => {
   res.render("game", {
     cdn: config.project.cdn,
     url: config.project.url,
     api: config.project.api,
+    ver: process.env.npm_package_version,
   });
 });
 
@@ -101,6 +53,7 @@ app.get("/editor", async (req, res) => {
     cdn: config.project.cdn,
     url: config.project.url,
     api: config.project.api,
+    ver: process.env.npm_package_version,
   });
 });
 
@@ -109,6 +62,7 @@ app.get("/test", async (req, res) => {
     cdn: config.project.cdn,
     url: config.project.url,
     api: config.project.api,
+    ver: process.env.npm_package_version,
   });
 });
 
@@ -117,6 +71,7 @@ app.get("/play", async (req, res) => {
     cdn: config.project.cdn,
     url: config.project.url,
     api: config.project.api,
+    ver: process.env.npm_package_version,
   });
 });
 
@@ -125,6 +80,7 @@ app.get("/tutorial", async (req, res) => {
     cdn: config.project.cdn,
     url: config.project.url,
     api: config.project.api,
+    ver: process.env.npm_package_version,
   });
 });
 
@@ -140,20 +96,7 @@ app.get("/privacy", (req, res) => {
   res.render("privacy");
 });
 
-app.get("/storePurchased", (req, res) => {
-  res.render("storePurchased", { url: config.project.url });
-});
-
-app.get("/storeDenied", (req, res) => {
-  if (req.query.error == "undefined") {
-    req.query.error = "Payment information verification error";
-  }
-  res.render("storeDenied", {
-    error: req.query.error,
-    url: config.project.url,
-  });
-});
-
 app.listen(config.project.port, () => {
+  signale.info(`URLATE-v3l-frontend is running on version ${process.env.npm_package_version}.`);
   signale.success(`HTTP Server running at port ${config.project.port}.`);
 });
diff --git a/views/editor.ejs b/views/editor.ejs
@@ -1,23 +1,12 @@
 <!DOCTYPE html>
 <html lang="<%= __('lang') %>">
   <head>
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-177236027-1"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag() {
-        dataLayer.push(arguments);
-      }
-      gtag("js", new Date());
-
-      gtag("config", "UA-177236027-1");
-    </script>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <title>Editor</title>
     <link rel="stylesheet" href="/css/iziToast.min.css" />
-    <link rel="stylesheet" href="/css/editor.css" />
+    <link rel="stylesheet" href="/css/editor.css?v=<%= ver %>" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
     <script data-pace-options='{ "eventLag": false }' src="/js/pace.js"></script>
   </head>
@@ -512,8 +501,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.5/lottie.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.1.2/howler.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js"></script>
-    <script src="/js/playerModules.js"></script>
+    <script src="/js/playerModules.js?v=<%= ver %>"></script>
     <script src="/js/iziToast.min.js"></script>
-    <script src="/js/editor.js"></script>
+    <script src="/js/editor.js?v=<%= ver %>"></script>
   </body>
 </html>
diff --git a/views/game.ejs b/views/game.ejs
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <title>URLATE Client</title>
-    <link rel="stylesheet" href="/css/game.css" />
+    <link rel="stylesheet" href="/css/game.css?v=<%= ver %>" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
     <script data-pace-options='{ "eventLag": false }' src="/js/pace.js"></script>
   </head>
@@ -1124,6 +1124,6 @@
       };
     </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.5/lottie.js"></script>
-    <script src="/js/game.js"></script>
+    <script src="/js/game.js?v=<%= ver %>"></script>
   </body>
 </html>
diff --git a/views/index.ejs b/views/index.ejs
@@ -10,7 +10,7 @@
     <meta property="og:image" content="/images/mainImage.png" />
     <meta name="naver-site-verification" content="7ae378668c928c7b17400b60b364b844a751c1f1" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
-    <link rel="stylesheet" href="/css/index.css" />
+    <link rel="stylesheet" href="/css/index.css?v=<%= ver %>" />
     <title>URLATE</title>
   </head>
   <body oncontextmenu="return false">
@@ -58,6 +58,6 @@
     </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.5/lottie.js"></script>
     <script src="https://accounts.google.com/gsi/client" async defer></script>
-    <script src="/js/index.js"></script>
+    <script src="/js/index.js?v=<%= ver %>"></script>
   </body>
 </html>
diff --git a/views/join.ejs b/views/join.ejs
@@ -2,7 +2,7 @@
 <html lang="<%= __('lang') %>">
   <head>
     <meta charset="UTF-8" />
-    <link rel="stylesheet" href="/css/join.css" />
+    <link rel="stylesheet" href="/css/join.css?v=<%= ver %>" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
     <title><%= __('join_title') %></title>
   </head>
@@ -21,6 +21,6 @@
       const lang = "<%= __('lang') %>";
       if (lang == "en") document.body.style.letterSpacing = "-0.3px";
     </script>
-    <script src="/js/join.js"></script>
+    <script src="/js/join.js?v=<%= ver %>"></script>
   </body>
 </html>
diff --git a/views/play.ejs b/views/play.ejs
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <title>URLATE</title>
-    <link rel="stylesheet" href="/css/test.css" />
+    <link rel="stylesheet" href="/css/test.css?v=<%= ver %>" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
     <script data-pace-options='{ "eventLag": false }' src="/js/pace.js"></script>
   </head>
@@ -128,7 +128,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.5/lottie.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.1.2/howler.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js"></script>
-    <script src="/js/playerModules.js"></script>
-    <script src="/js/play.js"></script>
+    <script src="/js/playerModules.js?v=<%= ver %>"></script>
+    <script src="/js/play.js?v=<%= ver %>"></script>
   </body>
 </html>
diff --git a/views/test.ejs b/views/test.ejs
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <title>Test</title>
-    <link rel="stylesheet" href="/css/test.css" />
+    <link rel="stylesheet" href="/css/test.css?v=<%= ver %>" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
     <script data-pace-options='{ "eventLag": false }' src="/js/pace.js"></script>
   </head>
@@ -129,7 +129,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.5/lottie.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.1.2/howler.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js"></script>
-    <script src="/js/playerModules.js"></script>
-    <script src="/js/test.js"></script>
+    <script src="/js/playerModules.js?v=<%= ver %>"></script>
+    <script src="/js/test.js?v=<%= ver %>"></script>
   </body>
 </html>
diff --git a/views/tutorial.ejs b/views/tutorial.ejs
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <title>URLATE Tutorial</title>
-    <link rel="stylesheet" href="/css/test.css" />
+    <link rel="stylesheet" href="/css/test.css?v=<%= ver %>" />
     <link rel="shortcut icon" href="/images/favicon.ico" />
     <script data-pace-options='{ "eventLag": false }' src="/js/pace.js"></script>
   </head>
@@ -129,7 +129,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.7.5/lottie.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.1.2/howler.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js"></script>
-    <script src="/js/playerModules.js"></script>
-    <script src="/js/tutorial.js"></script>
+    <script src="/js/playerModules.js?v=<%= ver %>"></script>
+    <script src="/js/tutorial.js?v=<%= ver %>"></script>
   </body>
 </html>