Исправления для GitHub Pages

SergeyAkkuratov · May 30, 2024 · 7977635 · 7977635
1 parent 2c84af3
commit 7977635
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/src/weatherApp.js b/src/weatherApp.js
@@ -55,28 +55,38 @@ export default async function weatherApp(rootElement) {
 
   async function updateHistoryBlock(cityName) {
     const historyElement = rootElement.querySelector("#history");
+
     if (historyList.includes(cityName)) {
       historyList.splice(historyList.indexOf(cityName), 1);
-      historyList.unshift(cityName);
+    }
 
-      const p = historyElement.querySelector(`[id='${cityName}']`);
+    historyList.unshift(cityName);
+    let p = historyElement.querySelector(`[id='${cityName}']`);
 
+    if (p) {
       historyElement.removeChild(p);
       historyElement.querySelector("span").insertAdjacentElement("afterend", p);
     } else {
-      historyList.unshift(cityName);
-      const p = createHistoryParagraph(cityName);
-
+      p = createHistoryParagraph(cityName);
       historyElement.querySelector("span").insertAdjacentElement("afterend", p);
+    }
 
-      if (historyList.length > maxHistorylines) {
-        historyList.pop();
-        historyElement.removeChild(historyElement.lastElementChild);
-      }
+    if (historyList.length > maxHistorylines) {
+      historyList.pop();
+      historyElement.removeChild(historyElement.lastElementChild);
     }
     setHistorySet(historyList);
   }
 
+  function loadHistory() {
+    const localHistoryList = getHistoryList();
+    if (localHistoryList.length > 0) {
+      localHistoryList
+        .reverse()
+        .forEach((cityName) => updateHistoryBlock(cityName));
+    }
+  }
+
   const ipInfo = await getInfoByIP();
 
   rootElement.innerHTML = mainTemplate;
@@ -97,7 +107,8 @@ export default async function weatherApp(rootElement) {
   rootElement.addEventListener("click", (event) => {
     if (event.target instanceof HTMLAnchorElement) {
       event.preventDefault();
-      router.navigate(event.target.href);
+      // eslint-disable-next-line no-undef
+      router.navigate(PREFIX + event.target.href);
     }
   });
 
@@ -119,15 +130,10 @@ export default async function weatherApp(rootElement) {
     path: "/",
     onEnter: () => {
       rootElement.innerHTML = mainTemplate;
+      loadHistory();
     },
   });
 
-  const localHistoryList = getHistoryList();
-  if (localHistoryList.length > 0) {
-    localHistoryList
-      .reverse()
-      .forEach((cityName) => updateHistoryBlock(cityName));
-  }
-
+  loadHistory();
   if (ipInfo.city) router.navigate(`/weather/${ipInfo.city}`);
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,9 @@
 const path = require("path");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
+const { DefinePlugin } = require("webpack");
+
+const PREFIX =
+  process.env.NODE_ENV === "production" ? "/OTUS_homework_lesson07" : "";
 
 module.exports = {
   entry: "./src/index.js",
@@ -20,6 +24,9 @@ module.exports = {
       favicon: "./src/assets/favicon.png",
       filename: "404.html",
     }),
+    new DefinePlugin({
+      PREFIX: JSON.stringify(PREFIX),
+    }),
   ],
   module: {
     rules: [