Fix display navbar with reports

.gitea/workflows/cd.yaml

@@ -0,0 +1,41 @@
+name: Continuous Deployment
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  lint:
+    runs-on: linux
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      - name: Run linter
+        run: make lint
+
+  deploy-chrome:
+    needs: lint
+    runs-on: linux
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      - name: Deploy project to Chrome Webstore
+        env:
+          CLIENT_ID: ${{ vars.CHROME_CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }}
+          EXTENSION_ID: ${{ vars.CHROME_EXTENSION_ID }}
+          REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
+        run: make deploy_chrome
+
+  deploy-firefox:
+    needs: lint
+    runs-on: linux
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      - name: Deploy project to Firefox Addons
+        env:
+          WEB_EXT_API_KEY: ${{ vars.FIREFOX_API_KEY }}
+          WEB_EXT_API_SECRET: ${{ secrets.FIREFOX_API_SECRET }}
+        run: make deploy_firefox

.gitignore

@@ -1 +1,2 @@
 web-ext-artifacts/
+.idea/

CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## 1.4.14 (2025-11-13)
+
+- correction affichage menu avec rapports
+
+## 1.4.13 (2025-11-13)
+
+- déploiement automatique sur chrome
+
+## 1.4.12 (2025-11-11)
+
+- correction bug menu
+
+## 1.4.11 (2025-11-11)
+
+- ajout des data collection permissions
+
+## 1.4.10 (2025-11-11)
+
+- correction du fichier metadata.json
+
+## 1.4.9 (2025-11-11)
+
+- test déploiement manuel
+
+## 1.4.8 (2025-11-11)
+
+- suppression de data_collection_permissions car non supporté pour Android
+
+## 1.4.7 (2025-11-11)
+
+- correction du déploiement automatisé
+- ajout de data_collection_permissions dans manifest.json
+
+## 1.4.6 (2025-11-11)
+
+- déploiement automatisé sur firefox
+- correction du bug d'affichage du menu Messages et Rapports
+
+## 1.4.5 (2025-10-14)
+
+- tests de déploiement automatisé
+
+## 1.4.4 (2025-10-11)
+
+- tests de déploiement automatisé
+
 ## 1.4.3 (2025-09-15)
 
 - correction de l'affichage du menu en cas de nouveau rapport

Makefile

@@ -0,0 +1,14 @@
+build:
+	web-ext build --overwrite-dest
+  
+lint:
+	web-ext lint
+
+deploy_chrome:
+	chrome-webstore-upload
+  
+deploy_firefox:
+	web-ext sign --channel listed --amo-metadata metadata.json
+
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

manifest.json

@@ -1,36 +1,42 @@
 {
   "manifest_version": 3,
   "name": "KAplus",
-  "version": "1.4.3",
+  "version": "1.4.14",
 
-	"author": "Samuel Campos - netoik.io",
+  "author": "Samuel Campos - netoik.io",
-	"description": "Extension développée pour améliorer l'expérience de jeu KingsAge (fonctionne avec ou sans premium)",
+  "description": "Extension développée pour améliorer l'expérience de jeu KingsAge (fonctionne avec ou sans premium)",
 
-	"browser_specific_settings": {
+  "browser_specific_settings": {
-		"gecko": {
+    "gecko": {
-			"id": "{e750d6a9-86ff-4129-aed6-542de03deb79}"
+      "id": "{e750d6a9-86ff-4129-aed6-542de03deb79}",
-		}
+      "data_collection_permissions": {
-	},
+        "required": [
+          "websiteContent",
+          "websiteActivity"
+        ]
+      }
+    }
+  },
 
   "content_scripts": [
     {
       "matches": ["https://*.kingsage.gameforge.com/*"],
       "js": ["src/kaplus.js"],
-			"css": ["src/kaplus.css"]
+      "css": ["src/kaplus.css"]
     }
   ],
 
-	"web_accessible_resources": [
+  "web_accessible_resources": [
-		{
+    {
       "matches": ["https://*.kingsage.gameforge.com/*"],
       "resources": ["images/*.svg"]
-		}
+    }
-	],
+  ],
 
-	"icons": {
+  "icons": {
-		"32": "icons/kaplus32.png",
+    "32": "icons/kaplus32.png",
-		"64": "icons/kaplus64.png",
+    "64": "icons/kaplus64.png",
-		"100": "icons/kaplus.png",
+    "100": "icons/kaplus.png",
-		"128": "icons/kaplus128.png"
+    "128": "icons/kaplus128.png"
-	}
+  }
 }

metadata.json

@@ -0,0 +1,12 @@
+{
+  "version": {
+    "compatibility": [
+      "android",
+      "firefox"
+    ],
+    "release_notes": {
+      "fr": "- correction affichage menu avec rapports",
+      "en-US": "- fix display navbar with reports"
+    }
+  }
+}

src/kaplus.js

@@ -3,15 +3,15 @@ function num(s) {
 }
 
 function str(n) {
-	if (n == 0) {
+	if (n === 0) {
 		return "0";
 	}
-	s = "";
+	let s = "";
 	while (n > 0) {
-		if (s != "") {
+		if (s !== "") {
 			s = "." + s;
 		}
-		r = n % 1000;
+		let r = n % 1000;
 		s = r.toString().padStart(3, "0") + s;
 		n = ~~(n/1000);
 	}
@@ -19,38 +19,38 @@ function str(n) {
 }
 
 function createRow(key, value) {
-	keyCell = document.createElement("td");
+	let keyCell = document.createElement("td");
-  keyCell.textContent = key;
+    keyCell.textContent = key;
-  valueCell = document.createElement("td");
+
-  valueCell.textContent = value;
+    let valueCell = document.createElement("td");
-  row = document.createElement("tr");
+    valueCell.textContent = value;
-  row.appendChild(keyCell);
+
-  row.appendChild(valueCell);
+    let row = document.createElement("tr");
-	return row;
+    row.appendChild(keyCell);
+    row.appendChild(valueCell);
+    return row;
 }
 
 function shortcutElementReplace(elt, img, text) {
-	imgElements = elt.getElementsByTagName("img");
+    // If more than one hyperlink element found,
-	for (i=0; i<imgElements.length; i++) {
+    // then keep the last one but with href of the first one.
-		if (i == 0) {
+	let aElements = elt.getElementsByTagName("a");
-			elt.getElementsByTagName("a")[0].classList.add("has_notif");
+    let imgElements = elt.getElementsByTagName("img");
-		}
+    if (aElements.length > 1 || imgElements.length > 0) {
-		imgElements[i].remove();
+        aElements[aElements.length - 1].classList.add("has_notif");
-		i --;
+        aElements[aElements.length - 1].setAttribute("href", aElements[0].getAttribute("href"));
-	}
+        for (let i = imgElements.length - 1; i >= 0; i --) {
+            imgElements[i].remove();
+        }
+        for (let i = aElements.length - 2; i >= 0; i --) {
+            aElements[i].remove();
+        }
+    }
 	
-	aElements = elt.getElementsByTagName("a");
+	let spanImageElement = document.createElement("span");
-	for (i=0; i<aElements.length; i++) {
-		if (i > 0) {
-			aElements[i].remove();
-			i --;
-		}
-	}
-	
-	spanImageElement = document.createElement("span");
 	spanImageElement.classList.add("shortcut_element_image");
 
-	imgElement = document.createElement("img");
+	let imgElement = document.createElement("img");
 	imgElement.setAttribute("src", chrome.runtime.getURL("images/"+img+".svg"));
 	spanImageElement.appendChild(imgElement);
 
@@ -58,7 +58,7 @@ function shortcutElementReplace(elt, img, text) {
 	aElements[0].appendChild(spanImageElement);
 
 	if (text) {
-		spanDescElement = document.createElement("span");
+		let spanDescElement = document.createElement("span");
 		spanDescElement.classList.add("shortcut_element_desc");
 		spanDescElement.textContent = text;
 		aElements[0].appendChild(spanDescElement);
@@ -66,11 +66,11 @@ function shortcutElementReplace(elt, img, text) {
 }
 
 /* Improve main menu display */
-layCastleTopElements = document.getElementsByClassName("lay_castle_top");
+let layCastleTopElements = document.getElementsByClassName("lay_castle_top");
-if (layCastleTopElements.length == 1) {
+if (layCastleTopElements.length === 1) {
 	document.getElementById("banner_skyscraper").remove();
 
-	shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
+	let shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
 	shortcutElementReplace(shortcutElements[0], "ranking", shortcutElements[0].textContent.replace(/[^0-9]/g, ""));
 	shortcutElementReplace(shortcutElements[1], "ally", "");
 	shortcutElementReplace(shortcutElements[2], "profile", "");
@@ -79,51 +79,51 @@ if (layCastleTopElements.length == 1) {
 	shortcutElementReplace(shortcutElements[5], "tools", "");
 	shortcutElementReplace(shortcutElements[6], "favorites", "");
 	
-	shortcutContainers = layCastleTopElements[0].getElementsByClassName("shortcut_container");
+	let shortcutContainers = layCastleTopElements[0].getElementsByClassName("shortcut_container");
 	shortcutContainers[0].classList.add("shortcut_container_left");
 	shortcutContainers[2].classList.add("shortcut_container_right"); 
 }
 
 /* Display unit-points on user profile */
 if (document.body.id === "info_player") {
-	mainContentPane = document.getElementsByClassName("contentpane")[1];
+	let mainContentPane = document.getElementsByClassName("contentpane")[1];
-	borderLists = mainContentPane.getElementsByClassName("borderlist");
+	let borderLists = mainContentPane.getElementsByClassName("borderlist");
 	
-	playerPropertiesTable = borderLists[0];
+	let playerPropertiesTable = borderLists[0];
-	playerPropertiesRows = playerPropertiesTable.getElementsByTagName("tr");
+	let playerPropertiesRows = playerPropertiesTable.getElementsByTagName("tr");
-	totalPoints = num(playerPropertiesRows[2].getElementsByTagName("td")[1].textContent);
+	let totalPoints = num(playerPropertiesRows[2].getElementsByTagName("td")[1].textContent);
-	villagesCount = num(playerPropertiesRows[4].getElementsByTagName("td")[1].textContent);
+	let villagesCount = num(playerPropertiesRows[4].getElementsByTagName("td")[1].textContent);
 
-	villagesTable = borderLists[1];
+    let villagesTable = borderLists[1];
-	villagesRows = villagesTable.getElementsByTagName("tr");
+    let villagesRows = villagesTable.getElementsByTagName("tr");
-	villagesPoints = 0;
+    let villagesPoints = 0;
-	for (i=1; i<villagesRows.length; i+=1) {
+	for (let i=1; i<villagesRows.length; i+=1) {
 		villagesPoints += num(villagesRows[i].getElementsByTagName("td")[2].textContent);
 	}
-	villagesBonus = 2250 * Math.max(0, villagesCount - 1);
+    let villagesBonus = 2250 * Math.max(0, villagesCount - 1);
 
-	armyPoints = totalPoints - villagesPoints - villagesBonus;
+    let armyPoints = totalPoints - villagesPoints - villagesBonus;
+    let armyPercent = "-";
 	if (villagesCount > 0) {
-		armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
+        armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
-	} else {
-		armyPercent = "-";
 	}
 
-	playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
+    playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
 	playerPropertiesTable.appendChild(createRow("% points troupes:", armyPercent));
 }
 
 /* Display unit-points on village overview */
 if (document.body.id === "overview") {
-	settlements = document.getElementById("settlement").textContent.split("|");
+    let settlements = document.getElementById("settlement").textContent.split("|");
-	noborderRows = document.getElementsByClassName("noborder");
+    let noBorderRows = document.getElementsByClassName("noborder");
-	for (i=0; i<noborderRows.length; i++) {
+    let villagePointsRow = noBorderRows[0];
-		if (noborderRows[i].textContent.startsWith("Points:")) {
+	for (let i=0; i<noBorderRows.length; i++) {
-			villagePointsRow = noborderRows[i];
+		if (noBorderRows[i].textContent.startsWith("Points:")) {
+            villagePointsRow = noBorderRows[i];
 			break;
 		}
 	}
-	unitPointsRow = villagePointsRow.cloneNode(true);
+	let unitPointsRow = villagePointsRow.cloneNode(true);
 	villagePointsRow.getElementsByTagName("td")[1].textContent = "Points village: " + settlements[3];
 	unitPointsRow.getElementsByTagName("td")[1].textContent = "Points troupes: " + settlements[4];
 	villagePointsRow.after(unitPointsRow);