Refactor deployment process to use rsync for frontend and backend, update project paths, and add CtagShuttleRealtimeEstimatesProvider and CtagShuttleStatus classes

11 files changed, 8 insertions, 9 deletions

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 19a5936..6db98b2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -137,7 +137,7 @@ jobs:
       - name: Deploy frontend
         if: needs.detect-changes.outputs.frontend == 'true'
         run: |
-          scp -r dist/frontend/* ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }}:/var/www/enmarcha/
+          rsync -avz dist/frontend/ ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }}:/var/www/enmarcha/
 
       - name: Stop service
         if: needs.detect-changes.outputs.backend == 'true'
@@ -145,7 +145,7 @@ jobs:
 
       - name: Upload backend
         if: needs.detect-changes.outputs.backend == 'true'
-        run: scp -r dist/backend/* app@${{ secrets.TARGET_HOST }}:/opt/enmarcha/
+        run: rsync -avz dist/backend/ ${{ secrets.TARGET_USER }}@${{ secrets.TARGET_HOST }}:/opt/enmarcha/
 
       - name: Allow execution
         if: needs.detect-changes.outputs.backend == 'true'
diff --git a/Enmarcha.slnx b/Enmarcha.slnx
index 63ed763..a1202f4 100644
--- a/Enmarcha.slnx
+++ b/Enmarcha.slnx
@@ -1,5 +1,5 @@
 <Solution>
-  <Project Path="Enmarcha.Sources.CtagShuttle/Enmarcha.Sources.CtagShuttle.csproj" />
+  <Project Path="src/Enmarcha.Sources.CtagShuttle/Enmarcha.Sources.CtagShuttle.csproj" />
   <Project Path="src/Enmarcha.Backend/Enmarcha.Backend.csproj" />
   <Project Path="src/Enmarcha.Experimental.ServiceViewer/Enmarcha.Experimental.ServiceViewer.csproj" />
   <Project Path="src/Enmarcha.Sources.OpenTripPlannerGql/Enmarcha.Sources.OpenTripPlannerGql.csproj" />
diff --git a/src/Enmarcha.Backend/Enmarcha.Backend.csproj b/src/Enmarcha.Backend/Enmarcha.Backend.csproj
index a353b4d..3ce20ad 100644
--- a/src/Enmarcha.Backend/Enmarcha.Backend.csproj
+++ b/src/Enmarcha.Backend/Enmarcha.Backend.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Enmarcha.Sources.CtagShuttle\Enmarcha.Sources.CtagShuttle.csproj" />
+    <ProjectReference Include="..\Enmarcha.Sources.CtagShuttle\Enmarcha.Sources.CtagShuttle.csproj" />
     <ProjectReference Include="..\Enmarcha.Sources.OpenTripPlannerGql\Enmarcha.Sources.OpenTripPlannerGql.csproj" />
     <ProjectReference Include="..\Enmarcha.Sources.TranviasCoruna\Enmarcha.Sources.TranviasCoruna.csproj" />
     <ProjectReference Include="..\Enmarcha.Sources.Tussa\Enmarcha.Sources.Tussa.csproj" />
diff --git a/src/Enmarcha.Backend/Services/Processors/CtagShuttleRealTimeProcessor.cs b/src/Enmarcha.Backend/Services/Processors/CtagShuttleRealTimeProcessor.cs
index 593ac86..316591d 100644
--- a/src/Enmarcha.Backend/Services/Processors/CtagShuttleRealTimeProcessor.cs
+++ b/src/Enmarcha.Backend/Services/Processors/CtagShuttleRealTimeProcessor.cs
@@ -175,7 +175,7 @@ public class CtagShuttleRealTimeProcessor : AbstractRealTimeProcessor
                     .Where(a => a.Estimate.Minutes >= 0)
                     .OrderBy(a => a.Estimate.Minutes)
                     .FirstOrDefault();
-                
+
                 _logger.LogDebug("No matching arrival found, using next upcoming trip");
             }
 
diff --git a/src/Enmarcha.Backend/Services/Processors/VigoUsageProcessor.cs b/src/Enmarcha.Backend/Services/Processors/VigoUsageProcessor.cs
index f5c7664..7f98fff 100644
--- a/src/Enmarcha.Backend/Services/Processors/VigoUsageProcessor.cs
+++ b/src/Enmarcha.Backend/Services/Processors/VigoUsageProcessor.cs
@@ -1,6 +1,5 @@
 using System.Text.Json;
 using CsvHelper;
-using CsvHelper.Configuration;
 using Enmarcha.Backend.Types.Arrivals;
 using Microsoft.Extensions.Caching.Memory;
 using System.Globalization;
diff --git a/Enmarcha.Sources.CtagShuttle/CtagShuttleRealtimeEstimatesProvider.cs b/src/Enmarcha.Sources.CtagShuttle/CtagShuttleRealtimeEstimatesProvider.cs
index 3ec0c6f..3ec0c6f 100644
--- a/Enmarcha.Sources.CtagShuttle/CtagShuttleRealtimeEstimatesProvider.cs
+++ b/src/Enmarcha.Sources.CtagShuttle/CtagShuttleRealtimeEstimatesProvider.cs
diff --git a/Enmarcha.Sources.CtagShuttle/Enmarcha.Sources.CtagShuttle.csproj b/src/Enmarcha.Sources.CtagShuttle/Enmarcha.Sources.CtagShuttle.csproj
index 237d661..237d661 100644
--- a/Enmarcha.Sources.CtagShuttle/Enmarcha.Sources.CtagShuttle.csproj
+++ b/src/Enmarcha.Sources.CtagShuttle/Enmarcha.Sources.CtagShuttle.csproj
diff --git a/Enmarcha.Sources.CtagShuttle/Status.cs b/src/Enmarcha.Sources.CtagShuttle/Status.cs
index ecf2da1..ecf2da1 100644
--- a/Enmarcha.Sources.CtagShuttle/Status.cs
+++ b/src/Enmarcha.Sources.CtagShuttle/Status.cs
diff --git a/src/frontend/app/i18n/locales/en-GB.json b/src/frontend/app/i18n/locales/en-GB.json
index 3d8b32f..aed0066 100644
--- a/src/frontend/app/i18n/locales/en-GB.json
+++ b/src/frontend/app/i18n/locales/en-GB.json
@@ -12,7 +12,7 @@
     "data_traffic_source": "Municipal open data",
     "data_lines": "Line listings and schedules",
     "map_tiles": "Maps",
-    "map_themes": "(\"liberty\" and \"positron\" themes for light/dark mode)",
+    "map_themes": "(\"libery\" theme, modified by myself)",
     "thanks_council": "Special thanks to Vigo City Council for providing this data under an open license.",
     "credits": "Credits",
     "developed_by": "Developed by",
diff --git a/src/frontend/app/i18n/locales/es-ES.json b/src/frontend/app/i18n/locales/es-ES.json
index 2184cfc..1c805b3 100644
--- a/src/frontend/app/i18n/locales/es-ES.json
+++ b/src/frontend/app/i18n/locales/es-ES.json
@@ -12,7 +12,7 @@
     "data_traffic_source": "Datos abiertos municipales",
     "data_lines": "Listado de líneas y horarios",
     "map_tiles": "Mapas",
-    "map_themes": "(temas \"liberty\" y \"positron\" para modo claro/oscuro)",
+    "map_themes": "(tema \"liberty\", modificado por mí)",
     "thanks_council": "Agradecemos especialmente al Concello de Vigo por facilitar estos datos bajo licencia abierta.",
     "credits": "Créditos",
     "developed_by": "Desarrollado por",
diff --git a/src/frontend/app/i18n/locales/gl-ES.json b/src/frontend/app/i18n/locales/gl-ES.json
index b951278..1af3b56 100644
--- a/src/frontend/app/i18n/locales/gl-ES.json
+++ b/src/frontend/app/i18n/locales/gl-ES.json
@@ -16,7 +16,7 @@
     "data_traffic_source": "Datos abertos municipais",
     "data_lines": "Listaxe de liñas e horarios",
     "map_tiles": "Mapas",
-    "map_themes": "(temas \"liberty\" e \"positron\" para modo claro/escuro)",
+    "map_themes": "(tema \"liberty\", modificado por min)",
     "thanks_council": "Agradecemos especialmente ao Concello de Vigo por facilitar estes datos baixo licenza aberta.",
     "credits": "Créditos",
     "developed_by": "Desenvolvido por",