Merge pull request #826 from DJ2LS/develop

0.16.7
DJ2LS · Sep 30, 2024 · 999295b · 999295b
2 parents 9e9bef5 + e81da9e
commit 999295b
Show file tree

Hide file tree

Showing 14 changed files with 214 additions and 99 deletions.
diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml
@@ -98,4 +98,3 @@ jobs:
           draft: true
           files: ./FreeDATA-Installer.exe
           tag_name: ${{ github.ref_name }}
-          name: 'FreeDATA-${{ github.ref_name }}'
diff --git a/.github/workflows/modem_tests.yml b/.github/workflows/modem_tests.yml
@@ -21,7 +21,7 @@ jobs:
           - python-version: "3.9"
           - python-version: "3.10"
           - python-version: "3.11"
-          #- python-version: "3.12" NOT YET SUPPORTED BY NUITKA!
+          - python-version: "3.12"
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pip_package.yml b/.github/workflows/pip_package.yml
@@ -39,6 +39,7 @@ jobs:
 
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@v1.10.1
+      if: startsWith(github.ref, 'refs/tags/v')
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/freedata_gui/package.json b/freedata_gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "FreeDATA",
-  "version": "0.16.6-alpha",
+  "version": "0.16.7-alpha",
   "description": "FreeDATA Client application for connecting to FreeDATA server",
   "private": true,
   "scripts": {

diff --git a/freedata_gui/src/App.vue b/freedata_gui/src/App.vue
@@ -1,13 +1,32 @@
 <template>
-  <FreeDATAMain />
+  <Suspense>
+    <template #default>
+      <!-- Lazy load FreeDATAMain -->
+      <FreeDATAMain />
+    </template>
+    <template #fallback>
+      <!-- Show loading screen while the component is loading -->
+      <LoadingScreen />
+    </template>
+  </Suspense>
 </template>
 
 <script setup>
-import FreeDATAMain from './components/main_screen.vue';
-import { onMounted } from 'vue';
+import { defineAsyncComponent, onMounted } from 'vue';
+
+// Lazy load FreeDATAMain
+const FreeDATAMain = defineAsyncComponent(() =>
+  import('./components/main_screen.vue')
+);
+
+// Import the loading screen
+const LoadingScreen = defineAsyncComponent(() =>
+  import('./components/main_loading_screen.vue')
+);
+
+// Set attributes on the <html> element
 onMounted(() => {
-  // Set attributes on the <html> element
   document.documentElement.setAttribute('lang', 'en');
   document.documentElement.setAttribute('data-bs-theme', 'light');
 });
-</script>
+</script>
diff --git a/freedata_gui/src/components/chat_conversations.vue b/freedata_gui/src/components/chat_conversations.vue
@@ -35,7 +35,7 @@
               {{ details.unread_messages }} new
             </span>
             <br />
-            <small>{{ details.body ? details.body : '<file>' }}</small>
+            <small>{{ sanitizeBody(details.body) || '<file>' }}</small>
           </div>
           <div class="col-3 text-end">
             <small>{{ getDateTime(details.timestamp) }}</small>
@@ -48,6 +48,7 @@
 </template>
 
 <script>
+import DOMPurify from 'dompurify';
 import { setActivePinia } from 'pinia';
 import pinia from '../store/index';
 import { useChatStore } from '../store/chatStore.js';
@@ -117,9 +118,13 @@ function startNewChat() {
   chat.newChatMessage = "Hi there! Nice to meet you!";
 }
 
+function sanitizeBody(body) {
+  return body ? DOMPurify.sanitize(body, { ALLOWED_TAGS: [] }) : null;
+}
+
 export default {
   setup() {
-    return { chat, newChatCall, chatSelected, setMessagesAsRead, processBeaconData, getDateTime, newChat, startNewChat };
+    return { chat, newChatCall, chatSelected, setMessagesAsRead, processBeaconData, getDateTime, newChat, startNewChat, sanitizeBody };
   }
 };
 </script>
diff --git a/freedata_gui/src/components/grid/grid_stations_map.vue b/freedata_gui/src/components/grid/grid_stations_map.vue
@@ -82,7 +82,9 @@ const drawMap = () => {
 
       // Adjust pin size and line width with zoom
       actualPinRadius = basePinRadius / event.transform.k;
-      svg.selectAll('.pin').attr('r', actualPinRadius);
+      svg.selectAll('.my-pin').attr('r', actualPinRadius);
+      svg.selectAll('.heard-pin').attr('r', actualPinRadius);
+
       svg.selectAll('.connection-line').attr('stroke-width', 1 / event.transform.k);
       svg.selectAll('.country-path').attr('stroke-width', 0.5 / event.transform.k);
 
@@ -123,7 +125,7 @@ const drawMap = () => {
 
     // Draw the pin for your station
     g.append('circle')
-        .attr('class', 'pin my-pin')
+        .attr('class', 'my-pin')
         .attr('r', actualPinRadius + 2)
         .attr('fill', 'blue')
         .attr('cx', myX)
@@ -185,10 +187,12 @@ const drawMap = () => {
   });
 };
 
+// Function to update pins and draw lines
 // Function to update pins and draw lines
 const updatePinsAndLines = (g) => {
   // Remove existing pins and lines
-  g.selectAll('.pin').remove();
+  g.selectAll('.my-pin').remove();
+  g.selectAll('.heard-pin').remove();
   g.selectAll('.connection-line').remove();
 
   const heardStations = toRaw(state.heard_stations); // Ensure it's the raw data
@@ -210,7 +214,7 @@ const updatePinsAndLines = (g) => {
 
     // Draw the pin for your station
     g.append('circle')
-        .attr('class', 'pin my-pin')
+        .attr('class', 'my-pin')
         .attr('r', actualPinRadius + 2)
         .attr('fill', 'blue')
         .attr('cx', myX)
@@ -238,11 +242,11 @@ const updatePinsAndLines = (g) => {
   }
 
   // Add pins for heard stations
-  g.selectAll('.pin')
+  g.selectAll('.heard-pin')
       .data(points)
       .enter()
       .append('circle')
-      .attr('class', 'pin')
+      .attr('class', 'heard-pin')
       .attr('r', actualPinRadius)
       .attr('fill', 'red')
       .attr('cx', d => projection([d.lon, d.lat])[0])
@@ -255,16 +259,6 @@ const updatePinsAndLines = (g) => {
       });
 };
 
-// Zoom in function
-const zoomIn = () => {
-  svg.transition().call(zoom.scaleBy, 1.2);
-};
-
-// Zoom out function
-const zoomOut = () => {
-  svg.transition().call(zoom.scaleBy, 0.8);
-};
-
 // Center the map
 const centerMap = () => {
   let mygrid = settings.remote.STATION.mygrid;
@@ -288,6 +282,15 @@ const centerMap = () => {
   );
 };
 
+// Zoom in function
+const zoomIn = () => {
+  svg.transition().call(zoom.scaleBy, 1.2);
+};
+
+// Zoom out function
+const zoomOut = () => {
+  svg.transition().call(zoom.scaleBy, 0.8);
+};
 
 // Lifecycle hooks
 onMounted(async () => {
@@ -308,7 +311,13 @@ onBeforeUnmount(() => {
   height: 400px;
 }
 
-.pin {
+.my-pin {
+  fill: blue;
+  stroke: black;
+  stroke-width: 1px;
+}
+
+.heard-pin {
   fill: red;
   stroke: black;
   stroke-width: 1px;
@@ -320,7 +329,7 @@ onBeforeUnmount(() => {
 }
 
 .connection-line {
-  stroke: blue;
+  stroke: red;
   stroke-width: 1;
   stroke-opacity: 0.5;
 }