From 6df8bf399d5c02cad9cc24fcaee9c84544f9c795 Mon Sep 17 00:00:00 2001
From: koalasat <koalasat@satstralia.com>
Date: Wed, 18 Sep 2024 10:14:43 +0200
Subject: [PATCH] new integrations pipelines fix

---
 .github/workflows/frontend-build.yml  |  2 +-
 .gitignore                            |  1 +
 frontend/templates/frontend/index.ejs |  2 +-
 frontend/webpack.config.ts            | 33 +++++++++++++--------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml
index 9f91a2620..3e7a61153 100644
--- a/.github/workflows/frontend-build.yml
+++ b/.github/workflows/frontend-build.yml
@@ -33,7 +33,7 @@ jobs:
     - name: 'Setup node'
       uses: actions/setup-node@v4
       with:
-        node-version: 16.17.0
+        node-version: 22.4.0
         cache: npm
         cache-dependency-path: frontend/package-lock.json
     - name: 'Install NPM Dependencies'
diff --git a/.gitignore b/.gitignore
index c65f02cf7..5e50783cf 100755
--- a/.gitignore
+++ b/.gitignore
@@ -646,6 +646,7 @@ frontend/static/frontend/**
 docs/.jekyll-cache*
 docs/_site*
 node
+desktopApp/release-builds
 
 # frontend statics
 frontend/templates/frontend/*.html
diff --git a/frontend/templates/frontend/index.ejs b/frontend/templates/frontend/index.ejs
index 0536e8d4d..704683374 100644
--- a/frontend/templates/frontend/index.ejs
+++ b/frontend/templates/frontend/index.ejs
@@ -21,7 +21,7 @@
 
     <link rel="stylesheet" href="./static/css/fonts.css"/>
     <% } %>
-    {% load static %}
+
     <link rel="stylesheet" type="text/css" href="./static/css/loader.css"/>
     <link rel="stylesheet" type="text/css" href="./static/css/index.css"/>
     <link rel="stylesheet" type="text/css" href="./static/css/leaflet.css"/>
diff --git a/frontend/webpack.config.ts b/frontend/webpack.config.ts
index 3bcdd33d7..538245c0f 100644
--- a/frontend/webpack.config.ts
+++ b/frontend/webpack.config.ts
@@ -73,6 +73,14 @@ const configNode: Configuration = {
       inject: 'body',
       robosatsSettings: 'selfhosted-pro',
     }),
+    new CopyPlugin({
+      patterns: [
+        {
+          from: path.resolve(__dirname, 'static'),
+          to: path.resolve(__dirname, '../nodeapp/static'),
+        },
+      ],
+    }),
     // Desktop App HTML
     new HtmlWebpackPlugin({
       template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@@ -83,6 +91,14 @@ const configNode: Configuration = {
       inject: 'body',
       robosatsSettings: 'desktop-basic',
     }),
+    new CopyPlugin({
+      patterns: [
+        {
+          from: path.resolve(__dirname, 'static'),
+          to: path.resolve(__dirname, '../desktopApp/static'),
+        },
+      ],
+    }),
     // Web App HTML
     new HtmlWebpackPlugin({
       template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@@ -102,15 +118,6 @@ const configNode: Configuration = {
       inject: 'body',
       robosatsSettings: 'web-pro',
     }),
-    // Static files
-    new CopyPlugin({
-      patterns: [
-        {
-          from: path.resolve(__dirname, 'static'),
-          to: path.resolve(__dirname, '../nodeapp/static'),
-        },
-      ],
-    }),
     new CopyPlugin({
       patterns: [
         {
@@ -119,14 +126,6 @@ const configNode: Configuration = {
         },
       ],
     }),
-    new CopyPlugin({
-      patterns: [
-        {
-          from: path.resolve(__dirname, 'static'),
-          to: path.resolve(__dirname, '../desktopApp/static'),
-        },
-      ],
-    }),
   ],
 };