Minor changes

plankanban · Jun 12, 2024 · 0d9306d · 0d9306d
1 parent e41b3d5
commit 0d9306d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/client/.env b/client/.env
@@ -1 +1,3 @@
-REACT_APP_VERSION=1.17.5
+REACT_APP_VERSION=1.17.4
+# REACT_APP_SERVER_BASE_URL=https://extranet.adscom.fr:44382/taches
+PUBLIC_URL=https://extranet.adscom.fr:44382/planka.test
diff --git a/client/config-overrides.js b/client/config-overrides.js
@@ -32,7 +32,7 @@ const replaceBaseUrl = (compiler) => {
         replaceInFile(info.targetPath, `"${BASE_URL_PLACEHOLDER}"`, '`${window.BASE_URL}/`');
       } else if (/index\.html$/.exec(info.targetPath)) {
         // For the main html file, we set a placeholder for sails to inject the correct value as runtime
-        replaceInFile(info.targetPath, BASE_URL_PLACEHOLDER, '<%= BASE_URL %>');
+        replaceInFile(info.targetPath, BASE_URL_PLACEHOLDER, process.env.PUBLIC_URL);
       }
     }
   });

diff --git a/client/public/index.html b/client/public/index.html
@@ -1,14 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Planka is an open source project management software"
-    />
+    <meta name="description" content="Planka is an open source project management software" />
     <link rel="apple-touch-icon" href="logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
@@ -26,7 +23,11 @@
     -->
     <title>Planka</title>
   </head>
-  <script>window.BASE_URL = "%PUBLIC_URL%";</script>
+  <script>
+    window.BASE_URL = '%PUBLIC_URL%';
+    window.SERVER_BASE_URL = '%REACT_APP_SERVER_BASE_URL%';
+  </script>
+
   <body id="app">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>

diff --git a/client/src/components/Background/Background.module.scss b/client/src/components/Background/Background.module.scss
@@ -4,10 +4,7 @@
     position: fixed;
     width: 100%;
     z-index: -1;
-
-    @media only screen and (max-width: 797px) {
-      max-width: 100vw;
-      max-height: 100vh;
-    }
+    max-width: 100vw;
+    max-height: 100vh;
   }
 }
diff --git a/client/src/components/BoardActions/Filters.module.scss b/client/src/components/BoardActions/Filters.module.scss
@@ -51,18 +51,8 @@
     width: 220px;
     margin: 0 12px;
 
-    @media only screen and (min-width: 600px) {
-      width: 280px;
-    }
-
-    @media only screen and (max-width: 600px) {
-      height: 30px;
-      width: calc(100vw - 40px);
-      margin: unset;
-    }
-
     @media only screen and (min-width: 797px) {
-      width: 100%;
+      width: 280px;
       height: 30px;
     }
 

diff --git a/client/src/components/Fixed/Fixed.module.scss b/client/src/components/Fixed/Fixed.module.scss
@@ -3,9 +3,6 @@
     position: fixed;
     width: 100%;
     z-index: 1;
-
-    @media only screen and (max-width: 797px) {
-      max-width: 100vw;
-    }
+    max-width: 100vw;
   }
 }