From 1e8584899f1841ce4049a8faf3ad82c42dd308a9 Mon Sep 17 00:00:00 2001
From: "dorian.hodin" <Dorian/2020>
Date: Mon, 3 Apr 2023 17:17:37 +0200
Subject: [PATCH] Change default path, add / at the beginning of the url,
 change env var

---
 .drone.yml                                   |  2 +-
 .idea/inspectionProfiles/Project_Default.xml |  7 +++++--
 Source/Config/config.php                     | 10 ----------
 Source/Views/HTML/admin.php                  |  6 +++---
 Source/Views/HTML/adminLogin.php             |  4 ++--
 Source/Views/HTML/categories.php             |  2 +-
 Source/Views/HTML/continue.php               |  8 ++++----
 Source/Views/HTML/error.php                  |  4 ++--
 Source/Views/HTML/form.php                   |  8 ++++----
 Source/Views/HTML/possibleResponsesForm.php  |  8 ++++----
 Source/Views/HTML/questions.php              |  2 +-
 Source/Views/HTML/responses.php              |  2 +-
 Source/Views/HTML/thanks.php                 |  8 ++++----
 13 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1309584..7dbfe10 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,7 +29,7 @@ steps:
       COMMAND: create
       OVERWRITE: true
       CODEFIRST_CLIENTDRONE_ENV_CONTAINER_NAME:
-        from_secret: CONTAINER_NAME
+        ${{ secrets.TEAM_NAME }}_${{ secrets.CONTAINER_NAME }}
       ADMINS: dorianhodin,alexislamande,baptistebaverel,johanlachenal
     depends_on: [ formulaire ]
 
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 5932565..ccc3727 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,13 +3,13 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <Languages>
-        <language minSize="46" name="HTML" />
+        <language minSize="68" name="HTML" />
       </Languages>
     </inspection_tool>
     <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myValues">
         <value>
-          <list size="7">
+          <list size="10">
             <item index="0" class="java.lang.String" itemvalue="nobr" />
             <item index="1" class="java.lang.String" itemvalue="noembed" />
             <item index="2" class="java.lang.String" itemvalue="comment" />
@@ -17,6 +17,9 @@
             <item index="4" class="java.lang.String" itemvalue="embed" />
             <item index="5" class="java.lang.String" itemvalue="script" />
             <item index="6" class="java.lang.String" itemvalue="li" />
+            <item index="7" class="java.lang.String" itemvalue="form" />
+            <item index="8" class="java.lang.String" itemvalue="p" />
+            <item index="9" class="java.lang.String" itemvalue="option" />
           </list>
         </value>
       </option>
diff --git a/Source/Config/config.php b/Source/Config/config.php
index 346c678..ef51a97 100644
--- a/Source/Config/config.php
+++ b/Source/Config/config.php
@@ -13,18 +13,8 @@ $views['responses'] = 'Views/HTML/responses.php';
 $views['thanks'] = 'Views/HTML/thanks.php';
 $views['error'] = 'Views/HTML/error.php';
 
-/*
-if (empty($_ENV['CONTAINER_NAME'])){
-    $_SERVER['BASE_URI'] = '';
-}else{
-    $_SERVER['BASE_URI'] = $_ENV['CONTAINER_NAME'];
-}
-*/
 $_SERVER['BASE_URI'] = '';
 
-
-$url = $_SERVER['PHP_SELF'];
-
 $controller['Candidate'] = 'ControllerCandidate';
 $controller['Admin'] = 'ControllerAdmin';
 
diff --git a/Source/Views/HTML/admin.php b/Source/Views/HTML/admin.php
index 9db6ea2..840d750 100644
--- a/Source/Views/HTML/admin.php
+++ b/Source/Views/HTML/admin.php
@@ -13,7 +13,7 @@
     <link href="<?php echo $bootstrapMin; ?>" rel="stylesheet" />
     <link href="<?php echo $awesomeFont; ?>" rel="stylesheet" />
     <link rel="stylesheet" type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/styles.css"?>" />
-    <link rel="stylesheet" type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/stylesForm.css"?>" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/stylesForm.css"?>" />
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
     <link rel="shortcut icon" href="<?php echo $icon; ?>" type="image/x-icon">
     <link rel="icon" href="<?php echo $icon; ?>" type="image/x-icon">
@@ -42,7 +42,7 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link" href="<?php echo $_ENV['CONTAINER_NAME']."index.php?action=GoToAddTestimony"?>">Témoignages</a>
+                        <a class="nav-link" href="<?php echo $_ENV['CONTAINER_NAME']."/index.php?action=GoToAddTestimony"?>">Témoignages</a>
                     </li>
                 </ul>
             </div>
@@ -105,7 +105,7 @@
     <script src="<?php echo $jQueryMin; ?>"></script>
     <script src="<?php echo $bundle4; ?>"></script>
     <script src="<?php echo $bundle5; ?>"></script>
-    <script src="<?php echo $_ENV['CONTAINER_NAME']."Views/js/scripts.js"?>"></script>
+    <script src="<?php echo $_ENV['CONTAINER_NAME']."/Views/JS/scripts.js"?>"></script>
 
 </body>
 
diff --git a/Source/Views/HTML/adminLogin.php b/Source/Views/HTML/adminLogin.php
index f160308..783a4c8 100644
--- a/Source/Views/HTML/adminLogin.php
+++ b/Source/Views/HTML/adminLogin.php
@@ -7,14 +7,14 @@
     <meta charset="UTF-8">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.grid-min.css">
-    <link rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views\CSS\adminLogin.css"?>">
+    <link rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/adminLogin.css"?>">
     <link rel="preconnect" href="<?php echo $googleApis; ?>">
     <link rel="preconnect" href="<?php echo $googleStatic; ?>" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Barlow&display=swap" rel="stylesheet">
     <title></title>
 </head>
 <body class="acolorba d-flex flex-column align-items-center">
-    <img src="<?php echo $_ENV['CONTAINER_NAME']."Views\IMAGES\logoUca.png"?>" class="logo" alt="logo">
+    <img src="<?php echo $_ENV['CONTAINER_NAME']."/Views/IMAGES/logoUca.png"?>" class="logo" alt="logo">
     <article class="card">
         <main id="main-content">
             <section id="content">
diff --git a/Source/Views/HTML/categories.php b/Source/Views/HTML/categories.php
index c78e952..02a9c6c 100644
--- a/Source/Views/HTML/categories.php
+++ b/Source/Views/HTML/categories.php
@@ -5,7 +5,7 @@
     global $googleApis, $googleStatic, $poppins, $icon, $logoUCA;
     ?>
     <meta charset="UTF-8">
-    <link rel="stylesheet" type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/base.css"?>" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/base.css"?>" />
     <link rel="preconnect" href="<?php echo $googleApis; ?>">
     <link rel="preconnect" href="<?php echo $googleStatic; ?>" crossorigin>
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
diff --git a/Source/Views/HTML/continue.php b/Source/Views/HTML/continue.php
index 0d0055c..89f3e02 100644
--- a/Source/Views/HTML/continue.php
+++ b/Source/Views/HTML/continue.php
@@ -12,8 +12,8 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css" rel="stylesheet" />
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" />
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
-    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."Views/css/styles.css"?>" rel="stylesheet" />
-    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."Views/css/stylesForm.css"?>" rel="stylesheet" />
+    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/styles.css"?>" rel="stylesheet" />
+    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/stylesForm.css"?>" rel="stylesheet" />
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
     <link rel="shortcut icon" href="<?php echo $icon; ?>" type="image/x-icon">
     <link rel="icon" href="<?php echo $icon; ?>" type="image/x-icon">
@@ -41,7 +41,7 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link" href="<?php echo $_ENV['CONTAINER_NAME']."index.php?action=GoToAddTestimony"?>">Témoignages</a>
+                        <a class="nav-link" href="<?php echo $_ENV['CONTAINER_NAME']."/index.php?action=GoToAddTestimony"?>">Témoignages</a>
                     </li>
                 </ul>
             </div>
@@ -68,7 +68,7 @@
     <script src="<?php echo $jQueryMin; ?>"></script>
     <script src="<?php echo $bundle4; ?>"></script>
     <script src="<?php echo $bundle5; ?>"></script>
-    <script src="<?php echo $_ENV['CONTAINER_NAME']."Views/js/scripts.js"?>"></script>
+    <script src="<?php echo $_ENV['CONTAINER_NAME']."Views/JS/scripts.js"?>"></script>
 
 </body>
 
diff --git a/Source/Views/HTML/error.php b/Source/Views/HTML/error.php
index 7f4ebe6..208f288 100644
--- a/Source/Views/HTML/error.php
+++ b/Source/Views/HTML/error.php
@@ -2,8 +2,8 @@
 <html lang="fr">
 <head>
     <meta charset="UTF-8">
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/common.css"?>">
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."node_modules/bootstrap/dist/css/bootstrap.min.css"?>">
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/common.css"?>">
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/node_modules/bootstrap/dist/css/bootstrap.min.css"?>">
     <title>Error Page</title>
 <body class="d-flex flex-column align-items-center">
     <h1>
diff --git a/Source/Views/HTML/form.php b/Source/Views/HTML/form.php
index 9dedf5a..4821d42 100644
--- a/Source/Views/HTML/form.php
+++ b/Source/Views/HTML/form.php
@@ -6,8 +6,8 @@
     global $jQueryMin, $bundle4, $bundle5;
     ?>
     <meta charset="UTF-8">
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/styles.css"?>" />
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/stylesForm.css"?>" />
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/styles.css"?>" />
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/stylesForm.css"?>" />
     <link rel="preconnect" href="<?php echo $googleApis; ?>">
     <link rel="preconnect" href="<?php echo $googleStatic; ?>" crossorigin>
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
@@ -40,8 +40,8 @@
     <script src="<?php echo $jQueryMin; ?>"></script>
     <script src="<?php echo $bundle4; ?>"></script>
     <script src="<?php echo $bundle5; ?>"></script>
-    <script type="text/javascript" src="<?php echo $_ENV['CONTAINER_NAME']."Views/JS/scripts.js"?>"></script>
-    <script type="text/javascript" src="<?php echo $_ENV['CONTAINER_NAME']."Views/JS/getData-Ids.js"?>"></script>
+    <script type="text/javascript" src="<?php echo $_ENV['CONTAINER_NAME']."/Views/JS/scripts.js"?>"></script>
+    <script type="text/javascript" src="<?php echo $_ENV['CONTAINER_NAME']."/Views/JS/getData-Ids.js"?>"></script>
 
 </body>
 
diff --git a/Source/Views/HTML/possibleResponsesForm.php b/Source/Views/HTML/possibleResponsesForm.php
index 8ba8e25..d0387f5 100644
--- a/Source/Views/HTML/possibleResponsesForm.php
+++ b/Source/Views/HTML/possibleResponsesForm.php
@@ -12,8 +12,8 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css" rel="stylesheet" />
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" rel="stylesheet" />
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
-    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."Views/css/styles.css"?>" rel="stylesheet" />
-    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."Views/css/stylesForm.css"?>" rel="stylesheet" />
+    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/styles.css"?>" rel="stylesheet" />
+    <link type="text/css" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/stylesForm.css"?>" rel="stylesheet" />
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
     <link rel="shortcut icon" href="<?php echo $icon; ?>" type="image/x-icon">
     <link rel="icon" href="<?php echo $icon; ?>" type="image/x-icon">
@@ -42,7 +42,7 @@
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                     <li class="nav-item">
-                        <a class="nav-link" href="<?php echo $_ENV['CONTAINER_NAME']."index.php?action=GoToAddTestimony"?>">Témoignages</a>
+                        <a class="nav-link" href="<?php echo $_ENV['CONTAINER_NAME']."/index.php?action=GoToAddTestimony"?>">Témoignages</a>
                     </li>
                 </ul>
             </div>
@@ -108,7 +108,7 @@
     <script src="<?php echo $jQueryMin; ?>"></script>
     <script src="<?php echo $bundle4; ?>"></script>
     <script src="<?php echo $bundle5; ?>"></script>
-    <script src="<?php echo $_ENV['CONTAINER_NAME']."Views/js/scripts.js"?>"></script>
+    <script src="<?php echo $_ENV['CONTAINER_NAME']."/Views/JS/scripts.js"?>"></script>
 
 </body>
 
diff --git a/Source/Views/HTML/questions.php b/Source/Views/HTML/questions.php
index 9c2a6b0..45ee4f2 100644
--- a/Source/Views/HTML/questions.php
+++ b/Source/Views/HTML/questions.php
@@ -5,7 +5,7 @@
     global $googleApis, $googleStatic, $poppins, $icon, $logoUCA;
     ?>
     <meta charset="UTF-8">
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/base.css"?>" />
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/base.css"?>" />
     <link rel="preconnect" href="<?php echo $googleApis; ?>">
     <link rel="preconnect" href="<?php echo $googleStatic; ?>" crossorigin>
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
diff --git a/Source/Views/HTML/responses.php b/Source/Views/HTML/responses.php
index 3ecd24e..ccd3b73 100644
--- a/Source/Views/HTML/responses.php
+++ b/Source/Views/HTML/responses.php
@@ -5,7 +5,7 @@
     global $googleApis, $googleStatic, $poppins, $icon, $logoUCA;
     ?>
     <meta charset="UTF-8">
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/base.css"?>" />
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/base.css"?>" />
     <link rel="preconnect" href="<?php echo $googleApis; ?>">
     <link rel="preconnect" href="<?php echo $googleStatic; ?>" crossorigin>
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
diff --git a/Source/Views/HTML/thanks.php b/Source/Views/HTML/thanks.php
index 9469b6e..23d2013 100644
--- a/Source/Views/HTML/thanks.php
+++ b/Source/Views/HTML/thanks.php
@@ -6,8 +6,8 @@
     global $jQueryMin, $bundle4, $bundle5;
     ?>
     <meta charset="UTF-8">
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/styles.css"?>" />
-    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."Views/CSS/stylesForm.css"?>" />
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/styles.css"?>" />
+    <link type="text/css" rel="stylesheet" href="<?php echo $_ENV['CONTAINER_NAME']."/Views/CSS/stylesForm.css"?>" />
     <link rel="preconnect" href="<?php echo $googleApis; ?>">
     <link rel="preconnect" href="<?php echo $googleStatic; ?>" crossorigin>
     <link href="<?php echo $poppins; ?>" rel="stylesheet">
@@ -44,8 +44,8 @@
 <script src="<?php echo $jQueryMin; ?>"></script>
 <script src="<?php echo $bundle4; ?>"></script>
 <script src="<?php echo $bundle5; ?>"></script>
-<script src="<?php echo $_ENV['CONTAINER_NAME']."Views/JS/scripts.js"?>"></script>
-<script src="<?php echo $_ENV['CONTAINER_NAME']."Views/JS/getData-Ids.js"?>"></script>
+<script src="<?php echo $_ENV['CONTAINER_NAME']."/Views/JS/scripts.js"?>"></script>
+<script src="<?php echo $_ENV['CONTAINER_NAME']."/Views/JS/getData-Ids.js"?>"></script>
 
 </body>