Merge pull request #143 from mark-szabo/v2.2

CarWash App v2.2 - Graphisoft Park Expansion
mark-szabo · Oct 29, 2024 · 4274dfc · 4274dfc
2 parents fd3cf82 + 83d5bcd
commit 4274dfc
Show file tree

Hide file tree

Showing 77 changed files with 38,240 additions and 18,260 deletions.
diff --git a/.github/workflows/mimosonk.yml b/.github/workflows/mimosonk.yml
@@ -0,0 +1,48 @@
+name: Build and deploy to PROD
+on:
+  push:
+    branches:
+    - main
+env:
+  AZURE_WEBAPP_NAME: mimosonk
+  AZURE_WEBAPP_PACKAGE_PATH: CarWash.PWA\publish
+  CONFIGURATION: Release
+  DOTNET_CORE_VERSION: 8.0.x
+  WORKING_DIRECTORY: CarWash.PWA
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ env.DOTNET_CORE_VERSION }}
+    - name: Restore
+      run: dotnet restore "${{ env.WORKING_DIRECTORY }}"
+    - name: Build
+      run: dotnet build "${{ env.WORKING_DIRECTORY }}" --configuration ${{ env.CONFIGURATION }} --no-restore
+    - name: Test
+      run: dotnet test "${{ env.WORKING_DIRECTORY }}" --no-build
+    - name: Publish
+      run: dotnet publish "${{ env.WORKING_DIRECTORY }}" --configuration ${{ env.CONFIGURATION }} --no-build --output "${{ env.AZURE_WEBAPP_PACKAGE_PATH }}"
+    - name: Publish Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: webapp
+        path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
+  deploy:
+    runs-on: windows-latest
+    needs: build
+    steps:
+    - name: Download artifact from build job
+      uses: actions/download-artifact@v3
+      with:
+        name: webapp
+        path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
+    - name: Deploy to Azure WebApp
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: ${{ env.AZURE_WEBAPP_NAME }}
+        publish-profile: ${{ secrets.mimosonk_E838 }}
+        package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ CarWash\.PWA\.Windows/bld/
 CarWash\.PWA\.Windows/_pkginfo\.txt
 
 TestResults/
+CarWash.PWA/Properties/serviceDependencies.mimosonk.json
diff --git a/CarWash.ClassLibrary/CarWash.ClassLibrary.csproj b/CarWash.ClassLibrary/CarWash.ClassLibrary.csproj
@@ -1,37 +1,42 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\Debug\netstandard2.0\CarWash.ClassLibrary.xml</DocumentationFile>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Remove="Migrations\20180902003120_PushSubscription.cs" />
     <Compile Remove="Migrations\20180902003549_PushSubscription.cs" />
     <Compile Remove="Migrations\20180902233002_Keys.cs" />
     <Compile Remove="Migrations\20180905115640_PushSubscription.cs" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="3.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Graph" Version="3.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-    <PackageReference Include="WebPush" Version="1.0.11" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
+    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
+    <PackageReference Include="Azure.Storage.Common" Version="12.21.1" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.20.1" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
+    <PackageReference Include="Microsoft.Graph" Version="5.61.0" />
+    <PackageReference Include="WebPush" Version="1.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.10" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/CarWash.ClassLibrary/Enums/ServiceType.cs b/CarWash.ClassLibrary/Enums/ServiceType.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using static CarWash.ClassLibrary.Enums.ServiceType;
 
 namespace CarWash.ClassLibrary.Enums
@@ -86,20 +87,129 @@ public static class ServiceTypes
         /// </summary>
         public static readonly List<Service> Types = new List<Service>
         {
-            new Service {Type = Exterior, TimeInMinutes = 12, Price = 3213, PriceMpv = 4017, Hidden = false},
-            new Service {Type = Interior, TimeInMinutes = 12, Price = 1607, PriceMpv = 2410, Hidden = false},
-            new Service {Type = Carpet, TimeInMinutes = 24, Price = -1, PriceMpv = -1, Hidden = false},
-            new Service {Type = SpotCleaning, TimeInMinutes = 0, Price = 3534, PriceMpv = 3534, Hidden = false},
-            new Service {Type = VignetteRemoval, TimeInMinutes = 0, Price = 466, PriceMpv = 466, Hidden = false},
-            new Service {Type = Polishing, TimeInMinutes = 0, Price = 4498, PriceMpv = 4498, Hidden = false},
-            new Service {Type = AcCleaningOzon, TimeInMinutes = 0, Price = 8033, PriceMpv = 8033, Hidden = false},
-            new Service {Type = AcCleaningBomba, TimeInMinutes = 0, Price = 6426, PriceMpv = 6426, Hidden = false},
-            new Service {Type = BugRemoval, TimeInMinutes = 0, Price = 804, PriceMpv = 804, Hidden = true},
-            new Service {Type = WheelCleaning, TimeInMinutes = 0, Price = 964, PriceMpv = 964, Hidden = true},
-            new Service {Type = TireCare, TimeInMinutes = 0, Price = 804, PriceMpv = 804, Hidden = true},
-            new Service {Type = LeatherCare, TimeInMinutes = 0, Price = 8033, PriceMpv = 8033, Hidden = true},
-            new Service {Type = PlasticCare, TimeInMinutes = 0, Price = 7230, PriceMpv = 7230, Hidden = true},
-            new Service {Type = PreWash, TimeInMinutes = 0, Price = 804, PriceMpv = 804, Hidden = true}
+            new Service {
+                Type = Exterior,
+                Name = "exterior",
+                TimeInMinutes = 12,
+                Price = 3712,
+                PriceMpv = 4641,
+                Hidden = false
+            },
+            new Service {
+                Type = Interior,
+                Name = "interior",
+                TimeInMinutes = 12,
+                Price = 2124,
+                PriceMpv = 3180,
+                Hidden = false},
+            new Service {
+                Type = Carpet,
+                Name = "carpet",
+                Description = "whole carpet cleaning, including all the seats",
+                TimeInMinutes = 24,
+                Price = -1,
+                PriceMpv = -1,
+                Hidden = false
+            },
+            new Service {
+                Type = SpotCleaning,
+                Name = "spot cleaning",
+                Description = "partial cleaning of the carpet, only where it is needed (eg. when something is spilled in the car)",
+                TimeInMinutes = 0,
+                Price = 4474,
+                PriceMpv = 4474,
+                Hidden = false
+            },
+            new Service {
+                Type = VignetteRemoval,
+                Name = "vignette removal",
+                Description = "eg. highway vignettes on the windscreen",
+                TimeInMinutes = 0,
+                Price = 593,
+                PriceMpv = 593,
+                Hidden = false
+            },
+            new Service {
+                Type = Polishing,
+                Name = "polishing",
+                Description = "for small scratches",
+                TimeInMinutes = 0,
+                Price = 5693,
+                PriceMpv = 5693,
+                Hidden = false
+            },
+            new Service {
+                Type = AcCleaningOzon,
+                Name = "AC cleaning 'ozon'",
+                Description = "disinfects molecules with ozone",
+                TimeInMinutes = 0,
+                Price = 10166,
+                PriceMpv = 10166,
+                Hidden = false
+            },
+            new Service {
+                Type = AcCleaningBomba,
+                Name = "AC cleaning 'bomba'",
+                Description = "blowing chemical spray in the AC system",
+                TimeInMinutes = 0,
+                Price = 8131,
+                PriceMpv = 8131,
+                Hidden = false
+            },
+            new Service {
+                Type = BugRemoval,
+                Name = "bug removal",
+                Description = "we'll add this if it's needed",
+                TimeInMinutes = 0,
+                Price = 1018,
+                PriceMpv = 1018,
+                Hidden = true
+            },
+            new Service {
+                Type = WheelCleaning,
+                Name = "wheel cleaning",
+                Description = "we'll add this if it's needed",
+                TimeInMinutes = 0,
+                Price = 1219,
+                PriceMpv = 1219,
+                Hidden = true
+            },
+            new Service {
+                Type = TireCare,
+                Name = "tire care",
+                Description = "we'll add this if it's needed",
+                TimeInMinutes = 0,
+                Price = 1018,
+                PriceMpv = 1018,
+                Hidden = true
+            },
+            new Service {
+                Type = LeatherCare,
+                Name = "leather care",
+                Description = "we'll add this if it's needed",
+                TimeInMinutes = 0,
+                Price = 10166,
+                PriceMpv = 10166,
+                Hidden = true
+            },
+            new Service {
+                Type = PlasticCare,
+                Name = "plastic care",
+                Description = "we'll add this if it's needed",
+                TimeInMinutes = 0,
+                Price = 9149,
+                PriceMpv = 9149,
+                Hidden = true
+            },
+            new Service {
+                Type = PreWash,
+                Name = "prewash",
+                Description = "we'll add this if it's needed",
+                TimeInMinutes = 0,
+                Price = 1018,
+                PriceMpv = 1018,
+                Hidden = true
+            }
         };
     }
 
@@ -111,8 +221,19 @@ public class Service
         /// <summary>
         /// Gets or sets the type of the service.
         /// </summary>
+        [JsonPropertyName("id")]
         public ServiceType Type { get; set; }
 
+        /// <summary>
+        /// Gets or sets the name of the service.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description of the service.
+        /// </summary>
+        public string Description { get; set; }
+
         /// <summary>
         /// Gets or sets the time needed for this service.
         /// </summary>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,4 @@ CarWash\.PWA\.Windows/bld/
		CarWash\.PWA\.Windows/_pkginfo\.txt

		TestResults/
		CarWash.PWA/Properties/serviceDependencies.mimosonk.json