Merge branch 'main' into live

NTIG-Uppsala · Sep 16, 2024 · 3d74b19 · 3d74b19
2 parents 2f47921 + 38630fd
commit 3d74b19
Show file tree

Hide file tree

Showing 19 changed files with 192 additions and 133 deletions.
diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
@@ -21,10 +21,7 @@ on:
     push:
         branches:
             - main
-            - gh-pages
-            - validation-testing
             - live
-            - validation-and-automation-testing
 
 jobs:
     test:
@@ -52,7 +49,7 @@ jobs:
               continue-on-error: true
 
             - name: Upload test results
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: test-results
                   path: test-results.json

diff --git a/.github/workflows/w3c-validation.yml b/.github/workflows/w3c-validation.yml
@@ -17,10 +17,7 @@ on:
     push:
         branches:
             - main
-            - gh-pages
-            - validation-testing
             - live
-            - validation-and-automation-testing
 
 jobs:
     validate:
@@ -57,7 +54,7 @@ jobs:
                   echo "$validation_failed" > validation_results/validation_failed_flag.txt
 
             - name: Upload validation results
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: validation-results
                   path: validation_results

diff --git a/README.md b/README.md
@@ -45,11 +45,11 @@ When making changes to any of the above files also make sure to add that change
 
 ### Manual and Automated Testing
 
-The project currently uses GitHub workflows to automate the testing of any files pushed to the following branches: main, gh-pages, validation-testing, live, and validation-and-automation-testing. To change which branches are tested open .github/workflows/automated-tests.yml and .github/workflows/w3c-validation.yml and under "branches:" remove or add desired branches.
+The project currently uses GitHub workflows to automate the testing of any files pushed to certain branches. To view and change which branches are tested, open ".github/workflows/automated-tests.yml" and ".github/workflows/w3c-validation.yml" and under "branches:" remove or add desired branches for each file.
 
 To manually conduct the w3c validation tests open [this page](https://validator.w3.org/#validate_by_upload) and submit the desired html-files.
 
-To manually conduct the automated content testing install Python version 3.12.5 and run the following commands in the terminal: 
+To manually conduct the automated content testing you need to have installed Python version 3.12.5 and then run the following commands in the terminal: 
 
 ``pip install pytest-playwright playwright pytest-json-report``
 
@@ -59,10 +59,17 @@ To add more Python tests either add more methods (which start with test*) in the
 
 ---
 
+### Deploy to Github Pages
+
+Github Pages is built from the "live" branch.
+To update the live github pages site you have to merge or rebase your changes to the "live" branch and then push to upstream (origin).
+
+---
+
 ### Documents
 
 _You must be a member of the NTI organization to open these documents due to administrator restrictions._
 
 -   [Coding Standards](https://docs.google.com/document/d/1dJfQdgAl6E9tcHBeBnb0e2uB0bi2bdLuae2takOrGkk)
 -   [Development Environment](https://docs.google.com/document/d/1Ssf3YnYcBpyaFDB6_u13xwsDctFAzLoYFpRsogTgHsQ)
--   [Programming languages](https://docs.google.com/document/d/1SSwpfVekfKO-xPAD7ia-tl_2XUqu4rodW4a1T_FcxaQ)
+-   [Programming languages](https://docs.google.com/document/d/1SSwpfVekfKO-xPAD7ia-tl_2XUqu4rodW4a1T_FcxaQ)
diff --git a/hbs/index.hbs b/hbs/index.hbs
@@ -1,23 +1,29 @@
+<!DOCTYPE html>
 <html lang="{{lang.lang}}">
 
 <head>
-    <meta name="robots" content="noindex, nofollow" />
-    <meta name="googlebot" content="noindex, nofollow" />
+    <meta name="robots" content="noindex, nofollow">
+    <meta name="googlebot" content="noindex, nofollow">
 
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{lang.ntb_car_rental}}</title>
 
+    <link rel="apple-touch-icon" sizes="180x180" href="../../assets/icons/ntbfavicon_io/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="../../assets/icons/ntbfavicon_io/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="../../assets/icons/ntbfavicon_io/favicon-16x16.png">
+    <link rel="manifest" href="../../assets/icons/ntbfavicon_io/site.webmanifest">
+
     <!-- Google fonts import -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Oswald:[email protected]&display=swap" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Oswald:[email protected]&display=swap" rel="stylesheet">
 
     <!-- Adobe font import -->
-    <link rel="stylesheet" href="https://use.typekit.net/juf0kst.css" />
+    <link rel="stylesheet" href="https://use.typekit.net/juf0kst.css">
 
-    <link rel="stylesheet" href="../../style/variables.css" />
-    <link rel="stylesheet" href="../../style/main.css" />
+    <link rel="stylesheet" href="../../style/variables.css">
+    <link rel="stylesheet" href="../../style/main.css">
 
     <script defer src="../../js/switchLocationAndLocale.js"></script>
     <script src="../../js/openHours.js"></script>
@@ -98,7 +104,7 @@
     <main>
         <section class="welcome-section">
             <div class="background-image">
-                <img src="../../assets/images/row_of_cars_no_car_no_pillar1080.jpeg" alt="{{lang.background_image}}" />
+                <img src="../../assets/images/row_of_cars_no_car_no_pillar1080.jpeg" alt="{{lang.background_image}}">
             </div>
 
             <h1>{{lang.welcome}}, {{location.location}}</h1>
@@ -214,14 +220,14 @@
             <p>{{lang.delivery_description}}</p>
 
             <div class="input-container">
-                <input type="number" placeholder="{{lang.zip_code}}" id="zip-input" />
+                <input type="number" placeholder="{{lang.zip_code}}" id="zip-input">
                 <button id="zip-button">{{lang.search}}</button>
             </div>
 
             <p id="delivery-status-tag"></p>
 
             <div class="background-image">
-                <img src="../../assets/images/car_on_map1080.jpg" alt="{{lang.background_image}}" />
+                <img src="../../assets/images/car_on_map1080.jpg" alt="{{lang.background_image}}">
             </div>
         </section>
 
@@ -249,7 +255,7 @@
                 </table>
 
                 <div class="background-image">
-                    <img src="../../assets/images/car_on_map1080.jpg" alt="{{lang.background_image}}" />
+                    <img src="../../assets/images/car_on_map1080.jpg" alt="{{lang.background_image}}">
                 </div>
             </section>
         </noscript>
@@ -322,13 +328,13 @@
 
         <div id="social-media-container">
             <a href="https://facebook.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-facebook-material-outlined/icons8-facebook-192.png" data-source="https://icons8.com/icon/85330/facebook" alt="Facebook" />
+                <img src="../../assets/icons/icons8-facebook-material-outlined/icons8-facebook-192.png" data-source="https://icons8.com/icon/85330/facebook" alt="Facebook">
             </a>
             <a href="https://instagram.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-instagram-material-outlined/icons8-instagram-192.png" data-source="https://icons8.com/icon/85342/instagram" alt="Instagram" />
+                <img src="../../assets/icons/icons8-instagram-material-outlined/icons8-instagram-192.png" data-source="https://icons8.com/icon/85342/instagram" alt="Instagram">
             </a>
             <a href="https://x.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-twitterx-material-outlined/icons8-twitterx-192.png" data-source="https://icons8.com/icon/AsTsQrvtZVNv/twitterx" alt="X/Twitter" />
+                <img src="../../assets/icons/icons8-twitterx-material-outlined/icons8-twitterx-192.png" data-source="https://icons8.com/icon/AsTsQrvtZVNv/twitterx" alt="X/Twitter">
             </a>
         </div>
 

diff --git a/public/assets/icons/ntbfavicon_io/android-chrome-192x192.png b/public/assets/icons/ntbfavicon_io/android-chrome-192x192.png
diff --git a/public/assets/icons/ntbfavicon_io/android-chrome-512x512.png b/public/assets/icons/ntbfavicon_io/android-chrome-512x512.png
diff --git a/public/assets/icons/ntbfavicon_io/apple-touch-icon.png b/public/assets/icons/ntbfavicon_io/apple-touch-icon.png
diff --git a/public/assets/icons/ntbfavicon_io/favicon-16x16.png b/public/assets/icons/ntbfavicon_io/favicon-16x16.png
diff --git a/public/assets/icons/ntbfavicon_io/favicon-32x32.png b/public/assets/icons/ntbfavicon_io/favicon-32x32.png
diff --git a/public/assets/icons/ntbfavicon_io/favicon.ico b/public/assets/icons/ntbfavicon_io/favicon.ico
diff --git a/public/assets/icons/ntbfavicon_io/site.webmanifest b/public/assets/icons/ntbfavicon_io/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/public/en/kiruna/index.html b/public/en/kiruna/index.html
@@ -1,23 +1,29 @@
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <meta name="robots" content="noindex, nofollow" />
-    <meta name="googlebot" content="noindex, nofollow" />
+    <meta name="robots" content="noindex, nofollow">
+    <meta name="googlebot" content="noindex, nofollow">
 
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>NTB Car Rental</title>
 
+    <link rel="apple-touch-icon" sizes="180x180" href="../../assets/icons/ntbfavicon_io/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="../../assets/icons/ntbfavicon_io/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="../../assets/icons/ntbfavicon_io/favicon-16x16.png">
+    <link rel="manifest" href="../../assets/icons/ntbfavicon_io/site.webmanifest">
+
     <!-- Google fonts import -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Oswald:[email protected]&display=swap" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Oswald:[email protected]&display=swap" rel="stylesheet">
 
     <!-- Adobe font import -->
-    <link rel="stylesheet" href="https://use.typekit.net/juf0kst.css" />
+    <link rel="stylesheet" href="https://use.typekit.net/juf0kst.css">
 
-    <link rel="stylesheet" href="../../style/variables.css" />
-    <link rel="stylesheet" href="../../style/main.css" />
+    <link rel="stylesheet" href="../../style/variables.css">
+    <link rel="stylesheet" href="../../style/main.css">
 
     <script defer src="../../js/switchLocationAndLocale.js"></script>
     <script src="../../js/openHours.js"></script>
@@ -83,7 +89,7 @@ <h3 style="cursor: pointer;" onclick="window.scrollTo(0, 0); location.reload();"
     <main>
         <section class="welcome-section">
             <div class="background-image">
-                <img src="../../assets/images/row_of_cars_no_car_no_pillar1080.jpeg" alt="Background image" />
+                <img src="../../assets/images/row_of_cars_no_car_no_pillar1080.jpeg" alt="Background image">
             </div>
 
             <h1>Welcome to NTB Car Rental, Kiruna</h1>
@@ -217,14 +223,14 @@ <h2>Delivery</h2>
             <p>We deliver to certain zip codes, check if we deliver to you</p>
 
             <div class="input-container">
-                <input type="number" placeholder="Zip code" id="zip-input" />
+                <input type="number" placeholder="Zip code" id="zip-input">
                 <button id="zip-button">Search</button>
             </div>
 
             <p id="delivery-status-tag"></p>
 
             <div class="background-image">
-                <img src="../../assets/images/car_on_map1080.jpg" alt="Background image" />
+                <img src="../../assets/images/car_on_map1080.jpg" alt="Background image">
             </div>
         </section>
 
@@ -274,7 +280,7 @@ <h2>Delivery</h2>
                 </table>
 
                 <div class="background-image">
-                    <img src="../../assets/images/car_on_map1080.jpg" alt="Background image" />
+                    <img src="../../assets/images/car_on_map1080.jpg" alt="Background image">
                 </div>
             </section>
         </noscript>
@@ -347,13 +353,13 @@ <h4>Address</h4>
 
         <div id="social-media-container">
             <a href="https://facebook.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-facebook-material-outlined/icons8-facebook-192.png" data-source="https://icons8.com/icon/85330/facebook" alt="Facebook" />
+                <img src="../../assets/icons/icons8-facebook-material-outlined/icons8-facebook-192.png" data-source="https://icons8.com/icon/85330/facebook" alt="Facebook">
             </a>
             <a href="https://instagram.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-instagram-material-outlined/icons8-instagram-192.png" data-source="https://icons8.com/icon/85342/instagram" alt="Instagram" />
+                <img src="../../assets/icons/icons8-instagram-material-outlined/icons8-instagram-192.png" data-source="https://icons8.com/icon/85342/instagram" alt="Instagram">
             </a>
             <a href="https://x.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-twitterx-material-outlined/icons8-twitterx-192.png" data-source="https://icons8.com/icon/AsTsQrvtZVNv/twitterx" alt="X/Twitter" />
+                <img src="../../assets/icons/icons8-twitterx-material-outlined/icons8-twitterx-192.png" data-source="https://icons8.com/icon/AsTsQrvtZVNv/twitterx" alt="X/Twitter">
             </a>
         </div>
 

diff --git a/public/en/lulea/index.html b/public/en/lulea/index.html
@@ -1,23 +1,29 @@
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <meta name="robots" content="noindex, nofollow" />
-    <meta name="googlebot" content="noindex, nofollow" />
+    <meta name="robots" content="noindex, nofollow">
+    <meta name="googlebot" content="noindex, nofollow">
 
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>NTB Car Rental</title>
 
+    <link rel="apple-touch-icon" sizes="180x180" href="../../assets/icons/ntbfavicon_io/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="../../assets/icons/ntbfavicon_io/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="../../assets/icons/ntbfavicon_io/favicon-16x16.png">
+    <link rel="manifest" href="../../assets/icons/ntbfavicon_io/site.webmanifest">
+
     <!-- Google fonts import -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Oswald:[email protected]&display=swap" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&family=Oswald:[email protected]&display=swap" rel="stylesheet">
 
     <!-- Adobe font import -->
-    <link rel="stylesheet" href="https://use.typekit.net/juf0kst.css" />
+    <link rel="stylesheet" href="https://use.typekit.net/juf0kst.css">
 
-    <link rel="stylesheet" href="../../style/variables.css" />
-    <link rel="stylesheet" href="../../style/main.css" />
+    <link rel="stylesheet" href="../../style/variables.css">
+    <link rel="stylesheet" href="../../style/main.css">
 
     <script defer src="../../js/switchLocationAndLocale.js"></script>
     <script src="../../js/openHours.js"></script>
@@ -83,7 +89,7 @@ <h3 style="cursor: pointer;" onclick="window.scrollTo(0, 0); location.reload();"
     <main>
         <section class="welcome-section">
             <div class="background-image">
-                <img src="../../assets/images/row_of_cars_no_car_no_pillar1080.jpeg" alt="Background image" />
+                <img src="../../assets/images/row_of_cars_no_car_no_pillar1080.jpeg" alt="Background image">
             </div>
 
             <h1>Welcome to NTB Car Rental, Luleå</h1>
@@ -217,14 +223,14 @@ <h2>Delivery</h2>
             <p>We deliver to certain zip codes, check if we deliver to you</p>
 
             <div class="input-container">
-                <input type="number" placeholder="Zip code" id="zip-input" />
+                <input type="number" placeholder="Zip code" id="zip-input">
                 <button id="zip-button">Search</button>
             </div>
 
             <p id="delivery-status-tag"></p>
 
             <div class="background-image">
-                <img src="../../assets/images/car_on_map1080.jpg" alt="Background image" />
+                <img src="../../assets/images/car_on_map1080.jpg" alt="Background image">
             </div>
         </section>
 
@@ -262,7 +268,7 @@ <h2>Delivery</h2>
                 </table>
 
                 <div class="background-image">
-                    <img src="../../assets/images/car_on_map1080.jpg" alt="Background image" />
+                    <img src="../../assets/images/car_on_map1080.jpg" alt="Background image">
                 </div>
             </section>
         </noscript>
@@ -335,13 +341,13 @@ <h4>Address</h4>
 
         <div id="social-media-container">
             <a href="https://facebook.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-facebook-material-outlined/icons8-facebook-192.png" data-source="https://icons8.com/icon/85330/facebook" alt="Facebook" />
+                <img src="../../assets/icons/icons8-facebook-material-outlined/icons8-facebook-192.png" data-source="https://icons8.com/icon/85330/facebook" alt="Facebook">
             </a>
             <a href="https://instagram.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-instagram-material-outlined/icons8-instagram-192.png" data-source="https://icons8.com/icon/85342/instagram" alt="Instagram" />
+                <img src="../../assets/icons/icons8-instagram-material-outlined/icons8-instagram-192.png" data-source="https://icons8.com/icon/85342/instagram" alt="Instagram">
             </a>
             <a href="https://x.com/ntiuppsala">
-                <img src="../../assets/icons/icons8-twitterx-material-outlined/icons8-twitterx-192.png" data-source="https://icons8.com/icon/AsTsQrvtZVNv/twitterx" alt="X/Twitter" />
+                <img src="../../assets/icons/icons8-twitterx-material-outlined/icons8-twitterx-192.png" data-source="https://icons8.com/icon/AsTsQrvtZVNv/twitterx" alt="X/Twitter">
             </a>
         </div>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}