Upgrade to .NET 9 and update nuget packages

.dockerignore

@@ -1,7 +1,7 @@
 **/.classpath
 **/.dockerignore
 **/.env
-#**/.git
+**/.git
 **/.gitignore
 **/.project
 **/.settings

.drone.yml

@@ -1,93 +0,0 @@
-kind: pipeline
-type: docker
-name: Build and test
-
-trigger:
-  event: 
-    include:
-      - push
-      - pull_request
-      - custom
-
-steps:
-  - name: compile (.NET)
-    image: mcr.microsoft.com/dotnet/sdk:9.0-alpine
-    environment:
-      CI_WORKSPACE: "/drone/src"
-    commands:
-      - dotnet build ./vegasco-server.slnx
-
-  - name: compile (Angular)
-    image: node:lts
-    commands:
-      - npm install -g pnpm
-      - cd src/Vegasco-Web
-      - pnpm install
-      - pnpm build
-
-  - name: test
-    image: quay.io/testcontainers/dind-drone-plugin
-    environment:
-      CI_WORKSPACE: "/drone/src"
-    settings:
-      build_image: mcr.microsoft.com/dotnet/sdk:9.0-alpine
-      cmd:
-        - dotnet test --no-build
-    volumes:
-      - name: dockersock
-        path: /var/run
-    depends_on:
-      - compile (.NET)
-
-  - name: docker build and push
-    image: docker:24.0.7
-    commands:
-      - docker build . -t $docker_registry$docker_repo:$DRONE_BRANCH
-      - echo $docker_password | docker login --username $docker_username --password-stdin $docker_registry
-      - docker push $docker_registry$docker_repo:$DRONE_BRANCH
-    environment:
-      docker_username:
-        from_secret: docker_username
-      docker_password:
-        from_secret: docker_password
-      docker_repo:
-        from_secret: docker_repo
-      docker_registry:
-        from_secret: docker_registry
-    volumes:
-      - name: dockersock
-        path: /var/run
-    when:
-      branch:
-        - main
-    depends_on:
-      - compile (.NET)
-      - test
-  
-  - name: Telegram notification
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: telegram_token
-      to:
-        from_secret: telegram_user_id
-    when:
-      status: 
-        - failure
-    depends_on:
-      - compile (.NET)
-      - compile (Angular)
-      - test
-      - docker build and push
-
-services:
-  - name: docker
-    image: docker:dind
-    privileged: true
-    volumes:
-      - name: dockersock
-        path: /var/run
-
-volumes:
-  - name: dockersock
-    temp: { }

.editorconfig

@@ -1,271 +0,0 @@
-# Remove the line below if you want to inherit .editorconfig settings from higher directories
-root = true
-
-# C# files
-[*.cs]
-
-#### Core EditorConfig Options ####
-
-# Indentation and spacing
-indent_size = 4
-indent_style = tab
-tab_width = 4
-
-# New line preferences
-end_of_line = crlf
-insert_final_newline = false
-
-#### .NET Coding Conventions ####
-
-# Organize usings
-dotnet_separate_import_directive_groups = false
-dotnet_sort_system_directives_first = false
-file_header_template = unset
-
-# this. and Me. preferences
-dotnet_style_qualification_for_event = false
-dotnet_style_qualification_for_field = false
-dotnet_style_qualification_for_method = false
-dotnet_style_qualification_for_property = false
-
-# Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true
-dotnet_style_predefined_type_for_member_access = true
-
-# Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
-
-# Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members
-
-# Expression-level preferences
-dotnet_style_coalesce_expression = true
-dotnet_style_collection_initializer = true
-dotnet_style_explicit_tuple_names = true
-dotnet_style_namespace_match_folder = true
-dotnet_style_null_propagation = true
-dotnet_style_object_initializer = true
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_prefer_auto_properties = true:suggestion
-dotnet_style_prefer_collection_expression = when_types_loosely_match
-dotnet_style_prefer_compound_assignment = true
-dotnet_style_prefer_conditional_expression_over_assignment = true
-dotnet_style_prefer_conditional_expression_over_return = true
-dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
-dotnet_style_prefer_inferred_anonymous_type_member_names = true
-dotnet_style_prefer_inferred_tuple_names = true
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true
-dotnet_style_prefer_simplified_boolean_expressions = true
-dotnet_style_prefer_simplified_interpolation = true
-
-# Field preferences
-dotnet_style_readonly_field = true
-
-# Parameter preferences
-dotnet_code_quality_unused_parameters = all
-
-# Suppression preferences
-dotnet_remove_unnecessary_suppression_exclusions = none
-
-# New line preferences
-dotnet_style_allow_multiple_blank_lines_experimental = false:suggestion
-dotnet_style_allow_statement_immediately_after_block_experimental = false:suggestion
-
-#### C# Coding Conventions ####
-
-# var preferences
-csharp_style_var_elsewhere = false
-csharp_style_var_for_built_in_types = false
-csharp_style_var_when_type_is_apparent = false
-
-# Expression-bodied members
-csharp_style_expression_bodied_accessors = true:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_lambdas = true:silent
-csharp_style_expression_bodied_local_functions = true:silent
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:silent
-
-# Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true
-csharp_style_pattern_matching_over_is_with_cast_check = true
-csharp_style_prefer_extended_property_pattern = true
-csharp_style_prefer_not_pattern = true
-csharp_style_prefer_pattern_matching = true
-csharp_style_prefer_switch_expression = true
-
-# Null-checking preferences
-csharp_style_conditional_delegate_call = true
-
-# Modifier preferences
-csharp_prefer_static_local_function = true
-csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
-csharp_style_prefer_readonly_struct = true
-csharp_style_prefer_readonly_struct_member = true
-
-# Code-block preferences
-csharp_prefer_braces = true:silent
-csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_namespace_declarations = file_scoped:silent
-csharp_style_prefer_method_group_conversion = true:silent
-csharp_style_prefer_primary_constructors = true:suggestion
-csharp_style_prefer_top_level_statements = true:silent
-
-# Expression-level preferences
-csharp_prefer_simple_default_expression = true
-csharp_style_deconstructed_variable_declaration = true
-csharp_style_implicit_object_creation_when_type_is_apparent = true
-csharp_style_inlined_variable_declaration = true
-csharp_style_prefer_index_operator = true
-csharp_style_prefer_local_over_anonymous_function = true
-csharp_style_prefer_null_check_over_type_check = true
-csharp_style_prefer_range_operator = true
-csharp_style_prefer_tuple_swap = true
-csharp_style_prefer_utf8_string_literals = true
-csharp_style_throw_expression = true
-csharp_style_unused_value_assignment_preference = discard_variable
-csharp_style_unused_value_expression_statement_preference = discard_variable
-
-# 'using' directive preferences
-csharp_using_directive_placement = outside_namespace:silent
-
-# New line preferences
-csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
-csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
-csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:suggestion
-csharp_style_allow_embedded_statements_on_same_line_experimental = true
-
-#### C# Formatting Rules ####
-
-# New line preferences
-csharp_new_line_before_catch = true
-csharp_new_line_before_else = true
-csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = all
-csharp_new_line_between_query_expression_clauses = true
-
-# Indentation preferences
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = one_less_than_current
-csharp_indent_switch_labels = true
-
-# Space preferences
-csharp_space_after_cast = false
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_after_comma = true
-csharp_space_after_dot = false
-csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_before_comma = false
-csharp_space_before_dot = false
-csharp_space_before_open_square_brackets = false
-csharp_space_before_semicolon_in_for_statement = false
-csharp_space_between_empty_square_brackets = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_declaration_name_and_open_parenthesis = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
-
-# Wrapping preferences
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = true
-
-#### Naming styles ####
-
-# Naming rules
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-dotnet_naming_rule.types_should_be_pascal_case.severity = warning
-dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning
-dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.private_or_internal_field_should_be_underscore.severity = warning
-dotnet_naming_rule.private_or_internal_field_should_be_underscore.symbols = private_or_internal_field
-dotnet_naming_rule.private_or_internal_field_should_be_underscore.style = underscore
-
-dotnet_naming_rule.private_or_internal_static_field_should_be_sunderscore.severity = warning
-dotnet_naming_rule.private_or_internal_static_field_should_be_sunderscore.symbols = private_or_internal_static_field
-dotnet_naming_rule.private_or_internal_static_field_should_be_sunderscore.style = sunderscore
-
-# Symbol specifications
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers = 
-
-dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
-dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected
-dotnet_naming_symbols.private_or_internal_field.required_modifiers = 
-
-dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field
-dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected
-dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static
-
-dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers = 
-
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers = 
-
-# Naming styles
-
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix = 
-dotnet_naming_style.begins_with_i.word_separator = 
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
-
-dotnet_naming_style.underscore.required_prefix = _
-dotnet_naming_style.underscore.required_suffix = 
-dotnet_naming_style.underscore.word_separator = 
-dotnet_naming_style.underscore.capitalization = camel_case
-
-dotnet_naming_style.sunderscore.required_prefix = s_
-dotnet_naming_style.sunderscore.required_suffix = 
-dotnet_naming_style.sunderscore.word_separator = 
-dotnet_naming_style.sunderscore.capitalization = camel_case
-
-[*.{cs,vb}]
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_auto_properties = true:suggestion
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-tab_width = 4
-indent_size = 4
-end_of_line = crlf

Create-Migration.ps1

@@ -1,2 +0,0 @@
-dotnet ef migrations add $args[0] --project .\src\Vegasco.Server.Api\Vegasco.Server.Api.csproj --output-dir Persistence/Migrations
-dotnet ef migrations script --idempotent --project .\src\Vegasco.Server.Api\Vegasco.Server.Api.csproj --output ./src/Vegasco.Server.Api/migrations/migration.sql

Directory.Build.props

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-      <PrivateAssets>all</PrivateAssets>
-      <Version>3.6.141</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>

Dockerfile

@@ -1,27 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
-WORKDIR /app
-EXPOSE 8080
-EXPOSE 8081
-RUN apt-get update && apt-get install -y curl
-USER app
-
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /src
-COPY ["src/Vegasco.Server.Api/Vegasco.Server.Api.csproj", "src/Vegasco.Server.Api/"]
-RUN dotnet restore "./src/Vegasco.Server.Api/Vegasco.Server.Api.csproj"
-COPY . .
-WORKDIR "/src/src/Vegasco.Server.Api"
-RUN dotnet build "./Vegasco.Server.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build
-
-FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./Vegasco.Server.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-HEALTHCHECK --interval=20s --timeout=1s --start-period=10s --retries=3 CMD curl --fail http://localhost:8080/health || exit 1
-ENTRYPOINT ["dotnet", "Vegasco.Server.Api.dll"]

README.md

@@ -1,69 +1 @@
-# Vegasco Server
+# vegasco-server
-
-Vegasco (**VE**hicle **GAS** **CO**nsumption) application.
-
-Includes the backend (`src/Vegasco.Server.Api`) and the frontend (`src/Vegasco-Web`). Utilizes [Aspire](https://learn.microsoft.com/en-us/dotnet/aspire/get-started/aspire-overview).
-
-## Getting Started
-
-### Configuration
-
-| Configuration            | Description                                                                                                 | Default                                                    | Required |
-|--------------------------|---------------------------------------------------------------------------------------------------------------|------------------------------------------------------------|----------|
-| JWT:MetadataUrl          | The oidc meta data url                                                                                        | -                                                          | true     |
-| JWT:ValidAudience        | The valid audience of the JWT token.                                                                          | -                                                          | true     |
-| JWT:NameClaimType        | The claim type of the user's name claim. For keycloak, using `preferred_username` is often the better choice. | http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name | false    |
-| JWT:AllowHttpMetadataUrl | Whether to allow the meta data url to have http as protocol. Always true when `ASPNETCORE_ENVIRONMENT=true`   | false                                                      | false    |
-
-The application uses the prefix `Vegasco_` for environment variable names. The prefix is removed when the application reads the environment variables and duplicate entries are overwritten by the environment variables. 
-
-Example:
-
-- `foo=bar1`
-- `Vegasco_foo=bar2`
-
-Results in:
-
-- `foo=bar2`
-- `Vegasco_foo=bar2`
-
-Configuration hierarchy in environment variables is usually denoted using a colon (`:`). But because on some systems the colon character is a reserved character, you can use a double underscore (`__`) as an alternative. The application will replace the double underscore with a colon when reading the environment variables.
-
-Example:
-
-The environment variable `foo__bar=value` (as well as `Vegasco_foo__bar=value`) will be converted to `foo:bar=value` in the application.
-
-### Configuration examples
-
-As environment variables:
-
-```env
-Vegasco_JWT__Authority=https://example.authority.com
-Vegasco_JWT__Audience=example-audience
-Vegasco_JWT__Issuer=https://example.authority.com/realms/example-realm/
-Vegasco_JWT__NameClaimType=preferred_username
-```
-
-As appsettings.json (or a environment specific appsettings.*.json):
-
-**Note: the `Vegasco_` prefix is only for environment variables**
-
-```json
-{
-  "JWT": {
-    "Authority": "https://example.authority.com/realms/example-realm",
-    "Audience": "example-audience",
-    "Issuer": "https://example.authority.com/realms/example-realm/",
-    "NameClaimType": "preferred_username"
-  }
-}
-```
-
-### Running the application
-
-The solution uses Aspire to orchestrate the application. Specifically, it introduces sensible service defaults, including but not limited to OpenTelemetry,
-creates a Postgres database as a docker container, and starts the Api with the correct configuration to communicate with the database.
-
-Ensure you have an identity provider set up, for example Keycloak, and configured the relevant options described above.
-
-Then, to run the application, ensure you have Docker running, then run either the `http` or `https` launch profile of the `Vegasco.Server.AppHost` project.

Run-PostgresDb.ps1

@@ -1 +0,0 @@
-docker run -d -p 5432:5432 --restart always --name vegasco-test-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres postgres:16.3-alpine

Vegasco.slnx

@@ -0,0 +1,6 @@
+<Solution>
+  <Project Path="src\Vegasco.WebApi\Vegasco.WebApi.csproj" Type="C#" />
+  <Properties Name="Visual Studio">
+    <Property Name="OpenWith" Value="Visual Studio Version 17" />
+  </Properties>
+</Solution>

nuget.config

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>

src/UploadData/UploadData.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Vegasco.Server.Api\Vegasco.Server.Api.csproj" />
-    </ItemGroup>
-
-</Project>

src/Vegasco-Web/.dockerignore

@@ -1,10 +0,0 @@
-node_modules
-npm-debug.log
-Dockerfile*
-docker-compose*
-.dockerignore
-.git
-.gitignore
-README.md
-LICENSE
-.vscode

src/Vegasco-Web/.editorconfig

@@ -1,17 +0,0 @@
-# Editor configuration, see https://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.ts]
-quote_type = single
-ij_typescript_use_double_quotes = false
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false

src/Vegasco-Web/.gitignore

@@ -1,42 +0,0 @@
-# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
-
-# Compiled output
-/dist
-/tmp
-/out-tsc
-/bazel-out
-
-# Node
-/node_modules
-npm-debug.log
-yarn-error.log
-
-# IDEs and editors
-.idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# Visual Studio Code
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.history/*
-
-# Miscellaneous
-/.angular/cache
-.sass-cache/
-/connect.lock
-/coverage
-/libpeerconnection.log
-testem.log
-/typings
-
-# System files
-.DS_Store
-Thumbs.db

src/Vegasco-Web/.postcssrc.json

@@ -1,5 +0,0 @@
-{
-  "plugins": {
-    "@tailwindcss/postcss": {}
-  }
-}

src/Vegasco-Web/.vscode/extensions.json

@@ -1,4 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
-  "recommendations": ["angular.ng-template"]
-}

src/Vegasco-Web/.vscode/launch.json

@@ -1,14 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch Web (Chrome)",
-      "type": "chrome",
-      "request": "launch",
-      "preLaunchTask": "npm: start",
-      "postDebugTask": "Terminate All Tasks",
-      "url": "http://localhost:44200/",
-    }
-  ]
-}

src/Vegasco-Web/.vscode/tasks.json

@@ -1,63 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Terminate All Tasks",
-      "command": "echo ${input:terminate}",
-      "type": "shell",
-      "problemMatcher": []
-    },
-    {
-      "type": "npm",
-      "script": "start",
-      "options": {
-        "env": {
-          "PORT": "44200",
-          "services__Api__https__0": "https://localhost:7098",
-          "NODE_ENV": "development"
-        }
-      },
-      "isBackground": true,
-      "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": {
-            "regexp": "(.*?)"
-          },
-          "endsPattern": {
-            "regexp": "bundle generation complete"
-          }
-        }
-      }
-    },
-    {
-      "type": "npm",
-      "script": "test",
-      "isBackground": true,
-      "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": {
-            "regexp": "(.*?)"
-          },
-          "endsPattern": {
-            "regexp": "bundle generation complete"
-          }
-        }
-      }
-    }
-  ],
-  "inputs": [
-    {
-      "id": "terminate",
-      "type": "command",
-      "command": "workbench.action.tasks.terminate",
-      "args": "terminateAll"
-    }
-  ]
-}

src/Vegasco-Web/Dockerfile

@@ -1,18 +0,0 @@
-FROM node:lts AS build
-RUN npm install -g pnpm
-ARG CONFIGURATION=development
-WORKDIR /usr/local/app
-COPY . .
-RUN pnpm install
-RUN pnpm "build:$CONFIGURATION"
-
-FROM nginx:alpine
-RUN rm /etc/nginx/conf.d/*
-
-ENV DOLLAR=$
-
-WORKDIR /usr/share/nginx/html
-COPY --from=build /usr/local/app/dist/Vegasco-Web/browser .
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY webserver.conf.template /etc/nginx/templates/webserver.conf.template
-EXPOSE 80

src/Vegasco-Web/README.md

@@ -1,69 +0,0 @@
-# VegascoWeb
-
-This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 20.0.1.
-
-## Development server
-
-To start a local development server, run:
-
-```bash
-ng serve
-```
-
-Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
-
-## API Proxy
-
-Because the solution utilizes Aspire which injects endpoint references for the API as environment variables, this application uses a proxy to access the API. The proxy is configured in the `proxy.config.js` file which is used in the `serve` section of the `angular.json` file. This makes the dev server provide a proxy when serving the application.
-
-The environment variables for the API endpoint are named `services__Api__https__0` and `services__Api__http__0` for the https and the http endpoints respectively. If the https endpoint is not configured, the http endpoint is used. At least one of them has to be configured.
-
-To allow the dev proxy to accept otherwise untrusted server certificates, set `NODE_ENV` to `development`. Otherwise the dev proxy rejects untrusted certificates.
-
-When deploying the application elsewhere, another proxy has to be configured to provide the same functionality to ensure the application works correctly.
-
-## Code scaffolding
-
-Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
-
-```bash
-ng generate component component-name
-```
-
-For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
-
-```bash
-ng generate --help
-```
-
-## Building
-
-To build the project run:
-
-```bash
-ng build
-```
-
-This will compile your project and store the build artifacts in the `dist/` directory. By default, the production build optimizes your application for performance and speed.
-
-## Running unit tests
-
-To execute unit tests with the [Karma](https://karma-runner.github.io) test runner, use the following command:
-
-```bash
-ng test
-```
-
-## Running end-to-end tests
-
-For end-to-end (e2e) testing, run:
-
-```bash
-ng e2e
-```
-
-Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
-
-## Additional Resources
-
-For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.

src/Vegasco-Web/angular.json

@@ -1,120 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "Vegasco-Web": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:application",
-          "options": {
-            "outputPath": "dist/Vegasco-Web",
-            "index": "src/index.html",
-            "browser": "src/main.ts",
-            "polyfills": [
-              "zone.js"
-            ],
-            "tsConfig": "tsconfig.app.json",
-            "inlineStyleLanguage": "scss",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kB",
-                  "maximumError": "1MB"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "4kB",
-                  "maximumError": "8kB"
-                }
-              ],
-              "outputHashing": "all",
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.production.ts"
-                }
-              ]
-            },
-            "development": {
-              "optimization": false,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.development.ts"
-                }
-              ]
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "proxyConfig": "proxy.config.js"
-          },
-          "configurations": {
-            "production": {
-              "buildTarget": "Vegasco-Web:build:production"
-            },
-            "development": {
-              "buildTarget": "Vegasco-Web:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n"
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "polyfills": [
-              "zone.js",
-              "zone.js/testing"
-            ],
-            "tsConfig": "tsconfig.spec.json",
-            "inlineStyleLanguage": "scss",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": []
-          }
-        }
-      }
-    }
-  },
-  "cli": {
-    "analytics": false
-  }
-}

src/Vegasco-Web/nginx.conf

@@ -1,8 +0,0 @@
-events { }
-http {
-    include mime.types;
-
-    resolver 8.8.8.8 8.8.4.4 1.1.1.1;
-
-    include /etc/nginx/conf.d/webserver.conf;
-}

src/Vegasco-Web/package.json

@@ -1,53 +0,0 @@
-{
-  "name": "vegasco-web",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start:withInstall": "pnpm install && pnpm run start",
-    "start": "run-script-os",
-    "start:win32": "ng serve --port %PORT% --configuration development",
-    "start:default": "ng serve --port $PORT --configuration development",
-    "build": "pnpm build:development",
-    "build:development": "ng build",
-    "build:production": "ng build --configuration production",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/common": "^19.2.14",
-    "@angular/compiler": "^19.2.14",
-    "@angular/core": "^19.2.14",
-    "@angular/forms": "^19.2.14",
-    "@angular/platform-browser": "^19.2.14",
-    "@angular/router": "^19.2.14",
-    "@ng-icons/core": "^31.4.0",
-    "@ng-icons/material-file-icons": "^31.4.0",
-    "@ng-icons/material-icons": "^31.4.0",
-    "@primeng/themes": "^19.1.3",
-    "@tailwindcss/postcss": "^4.1.10",
-    "dayjs": "^1.11.13",
-    "keycloak-angular": "^19.0.2",
-    "postcss": "^8.5.6",
-    "primeng": "^19.1.3",
-    "rxjs": "~7.8.2",
-    "tailwindcss": "^4.1.10",
-    "tailwindcss-primeui": "^0.6.1",
-    "tslib": "^2.8.1",
-    "zone.js": "~0.15.1"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "^19.2.15",
-    "@angular/cli": "^19.2.15",
-    "@angular/compiler-cli": "^19.2.14",
-    "@types/jasmine": "~5.1.8",
-    "jasmine-core": "~5.7.1",
-    "karma": "~6.4.4",
-    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.2.1",
-    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
-    "run-script-os": "^1.1.6",
-    "typescript": "~5.8.3"
-  }
-}

src/Vegasco-Web/proxy.config.js

@@ -1,11 +0,0 @@
-module.exports = {
-  "/api": {
-    target:
-      process.env["services__Api__https__0"] ||
-      process.env["services__Api__http__0"],
-    secure: process.env["NODE_ENV"] !== "development",
-    pathRewrite: {
-      "^/api": "",
-    },
-  },
-};

src/Vegasco-Web/src/app/api/api-base-path.ts

@@ -1,6 +0,0 @@
-import { InjectionToken } from "@angular/core";
-
-/**
- * The base path for all API requests, e.g. when using a proxy on the origin's address.
- */
-export const API_BASE_PATH = new InjectionToken<string>('API_BASE_PATH');

src/Vegasco-Web/src/app/api/cars/car-client.ts

@@ -1,35 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { inject, Injectable } from "@angular/core";
-import { map, Observable } from 'rxjs';
-import { API_BASE_PATH } from "../api-base-path";
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CarClient {
-  private readonly http = inject(HttpClient);
-  private readonly apiBasePath = inject(API_BASE_PATH, { optional: true });
-
-  getAll(): Observable<GetCarsResponse> {
-    return this.http.get<GetCarsResponse>(`${this.apiBasePath}/v1/cars`);
-  }
-
-  getSingle(id: string): Observable<Car> {
-    return this.http.get<Car>(`${this.apiBasePath}/v1/cars/${id}`);
-  }
-
-  create(request: CreateCarRequest): Observable<Car> {
-    return this.http.post<Car>(`${this.apiBasePath}/v1/cars`, request);
-  }
-
-  update(id: string, request: UpdateCarRequest): Observable<Car> {
-    return this.http.put<Car>(`${this.apiBasePath}/v1/cars/${id}`, request);
-  }
-
-  delete(id: string): Observable<void> {
-    return this.http.delete(`${this.apiBasePath}/v1/cars/${id}`)
-      .pipe(
-        map(_ => undefined)
-      );
-  }
-}

src/Vegasco-Web/src/app/api/cars/car.ts

@@ -1,4 +0,0 @@
-interface Car {
-  id: string;
-  name: string;
-}

src/Vegasco-Web/src/app/api/cars/create-car-request.ts

@@ -1,3 +0,0 @@
-interface CreateCarRequest {
-  name: string;
-}

src/Vegasco-Web/src/app/api/cars/get-cars-response.ts

@@ -1,3 +0,0 @@
-interface GetCarsResponse {
-    cars: Car[];
-}

src/Vegasco-Web/src/app/api/cars/update-car-request.ts

@@ -1,3 +0,0 @@
-interface UpdateCarRequest {
-  name: string;
-}

src/Vegasco-Web/src/app/api/consumptions/consumption-client.ts

@@ -1,35 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { inject, Injectable } from '@angular/core';
-import { map, Observable } from 'rxjs';
-import { API_BASE_PATH } from '../api-base-path';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ConsumptionClient {
-  private readonly http = inject(HttpClient);
-  private readonly apiBasePath = inject(API_BASE_PATH, { optional: true });
-
-  getAll(): Observable<GetConsumptionEntriesResponse> {
-    return this.http.get<GetConsumptionEntriesResponse>(`${this.apiBasePath}/v1/consumptions`);
-  }
-
-  getSingle(id: string): Observable<ConsumptionEntry> {
-    return this.http.get<ConsumptionEntry>(`${this.apiBasePath}/v1/consumptions/${id}`);
-  }
-
-  create(request: CreateConsumptionEntry): Observable<ConsumptionEntry> {
-    return this.http.post<ConsumptionEntry>(`${this.apiBasePath}/v1/consumptions`, request);
-  }
-
-  update(id: string, request: UpdateConsumptionEntry): Observable<ConsumptionEntry> {
-    return this.http.put<ConsumptionEntry>(`${this.apiBasePath}/v1/consumptions/${id}`, request);
-  }
-
-  delete(id: string): Observable<void> {
-    return this.http.delete(`${this.apiBasePath}/v1/consumptions/${id}`)
-      .pipe(
-        map(_ => undefined),
-      );
-  }
-}

src/Vegasco-Web/src/app/api/consumptions/consumption-entry.ts

@@ -1,7 +0,0 @@
-interface ConsumptionEntry {
-    id: string;
-    dateTime: string;
-    distance: number;
-    amount: number;
-    carId: string;
-}

src/Vegasco-Web/src/app/api/consumptions/create-consumption-entry.ts

@@ -1,6 +0,0 @@
-interface CreateConsumptionEntry {
-    dateTime: string;
-    distance: number;
-    amount: number;
-    carId: string;
-}

src/Vegasco-Web/src/app/api/consumptions/get-consumption-entries-entry.ts

@@ -1,11 +0,0 @@
-interface GetConsumptionEntriesEntry {
-    id: string;
-    dateTime: string;
-    distance: number;
-    amount: number;
-    car: {
-        id: string;
-        name: string;
-    };
-    literPer100Km: number | null;
-}

src/Vegasco-Web/src/app/api/consumptions/get-consumption-entries-response.ts

@@ -1,3 +0,0 @@
-interface GetConsumptionEntriesResponse {
-    consumptions: GetConsumptionEntriesEntry[];
-}

src/Vegasco-Web/src/app/api/consumptions/update-consumption-entry.ts

@@ -1,6 +0,0 @@
-interface UpdateConsumptionEntry {
-    dateTime: string;
-    distance: number;
-    amount: number;
-    carId: string;
-}

src/Vegasco-Web/src/app/app.config.ts

@@ -1,30 +0,0 @@
-import { provideHttpClient, withInterceptors } from '@angular/common/http';
-import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
-import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
-import { provideRouter, withComponentInputBinding } from '@angular/router';
-import Lara from '@primeng/themes/lara';
-import { includeBearerTokenInterceptor } from 'keycloak-angular';
-import { providePrimeNG } from 'primeng/config';
-import { routes } from './app.routes';
-import { provideKeycloakAngular } from './auth/auth.config';
-import {API_BASE_PATH} from './api/api-base-path';
-
-export const appConfig: ApplicationConfig = {
-  providers: [
-    provideKeycloakAngular(),
-    provideZoneChangeDetection({ eventCoalescing: true }),
-    provideRouter(routes, withComponentInputBinding()),
-    provideHttpClient(withInterceptors([includeBearerTokenInterceptor])),
-    provideAnimationsAsync(),
-    providePrimeNG({
-      theme: {
-        preset: Lara
-      },
-      ripple: true
-    }),
-    {
-      provide: API_BASE_PATH,
-      useValue: '/api'
-    }
-  ]
-};

src/Vegasco-Web/src/app/app.html

@@ -1,21 +0,0 @@
-<main class="main">
-  <header class="h-12 bg-primary text-primary-contrast">
-    <div class="header max-content-width mx-auto flex items-center justify-between">
-      <a routerLink="/" class="reset cursor-pointer">
-        Vegasco
-      </a>
-      <span class="flex items-center gap-4">
-        <a routerLink="/entries" class="reset cursor-pointer">
-          Einträge
-        </a>
-        <a routerLink="/cars" class="reset cursor-pointer">
-          Autos
-        </a>
-      </span>
-    </div>
-  </header>
-  <div class="content max-content-width mx-auto">
-    <p-toast />
-    <router-outlet></router-outlet>
-  </div>
-</main>

src/Vegasco-Web/src/app/app.routes.ts

@@ -1,17 +0,0 @@
-import { Routes } from '@angular/router';
-
-export const routes: Routes = [
-    {
-        path: '',
-        redirectTo: 'entries',
-        pathMatch: 'full'
-    },
-    {
-        path: 'entries',
-        loadChildren: () => import('./modules/entries/entries.routes').then(m => m.routes)
-    },
-    {
-        path: 'cars',
-        loadChildren: () => import('./modules/cars/cars.routes').then(m => m.routes)
-    }
-];

src/Vegasco-Web/src/app/app.scss

@@ -1,10 +0,0 @@
-.content {
-    padding: 1rem;
-}
-
-.header {
-    padding: 0 1rem;
-    display: flex;
-    align-items: center;
-    height: 100%;
-}

src/Vegasco-Web/src/app/app.spec.ts

@@ -1,23 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { App } from './app';
-
-describe('App', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [App],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(App);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(App);
-    fixture.detectChanges();
-    const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('h1')?.textContent).toContain('Hello, Vegasco-Web');
-  });
-});

src/Vegasco-Web/src/app/app.ts

@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterLink, RouterOutlet } from '@angular/router';
-import { MessageService } from 'primeng/api';
-import { ToastModule } from 'primeng/toast';
-
-
-@Component({
-  selector: 'app-root',
-  imports: [RouterLink, RouterOutlet, ToastModule],
-  providers: [MessageService],
-  templateUrl: './app.html',
-  styleUrl: './app.scss'
-})
-export class App {
-}

src/Vegasco-Web/src/app/auth/auth.config.ts

@@ -1,45 +0,0 @@
-import { environment } from '@vegasco-web/environments/environment';
-import {
-  AutoRefreshTokenService,
-  createInterceptorCondition,
-  INCLUDE_BEARER_TOKEN_INTERCEPTOR_CONFIG,
-  IncludeBearerTokenCondition,
-  provideKeycloak,
-  UserActivityService,
-  withAutoRefreshToken
-} from 'keycloak-angular';
-
-const serverHostBearerInterceptorCondition = createInterceptorCondition<IncludeBearerTokenCondition>({
-  // The API is consumed through a proxy running on the same origin as the application.
-  // This means that the interceptor should include the bearer token for requests to the same origin
-  // which includes requests starting to / which implicitly sends the request to the same origin.
-  urlPattern: new RegExp(`^(${window.origin}|/)`)
-});
-
-export const provideKeycloakAngular = () =>
-  provideKeycloak({
-    config: {
-      url: environment.keycloak.host,
-      realm: environment.keycloak.realm,
-      clientId: environment.keycloak.clientId,
-    },
-    initOptions: {
-      onLoad: 'login-required',
-      silentCheckSsoRedirectUri: window.location.origin + '/silent-check-sso.html',
-      redirectUri: window.location.origin + '/',
-      checkLoginIframe: false,
-    },
-    features: [
-      withAutoRefreshToken({
-        onInactivityTimeout: 'login',
-      })
-    ],
-    providers: [
-      AutoRefreshTokenService,
-      UserActivityService,
-      {
-        provide: INCLUDE_BEARER_TOKEN_INTERCEPTOR_CONFIG,
-        useValue: [serverHostBearerInterceptorCondition]
-      }
-    ]
-  });

src/Vegasco-Web/src/app/modules/cars/cars.routes.ts

@@ -1,17 +0,0 @@
-import { Routes } from "@angular/router";
-import { CarsComponent } from "./cars/cars.component";
-
-export const routes: Routes = [
-    {
-        path: '',
-        component: CarsComponent
-    },
-    {
-        path: 'create',
-        loadComponent: () => import('./edit-car/edit-car.component').then(m => m.EditCarComponent)
-    },
-    {
-        path: 'edit/:id',
-        loadComponent: () => import('./edit-car/edit-car.component').then(m => m.EditCarComponent)
-    }
-];

src/Vegasco-Web/src/app/modules/cars/cars/cars.component.html

@@ -1,38 +0,0 @@
-<section>
-  <p-scrollTop />
-  <div class="mb-4 flex gap-2 md:justify-end">
-    <div>
-      <p-button label="Erstellen" routerLink="/cars/create">
-        <ng-icon name="matAddSharp"></ng-icon>
-      </p-button>
-    </div>
-  </div>
-  <div>
-    @if (nonDeletedCars$ | async; as cars) {
-    <p-dataView
-      [value]="cars"
-      [paginator]="true"
-      [rows]="25"
-      [rowsPerPageOptions]="[10, 25, 50, 100]"
-      [pageLinks]="0"
-      [showCurrentPageReport]="true"
-      currentPageReportTemplate="{currentPage} / {totalPages}"
-      layout="list">
-      <ng-template #list let-cars>
-        <div class="flex flex-col gap-2">
-          @for (car of cars; track car.id) {
-            <app-car-card [car]="car"
-              (carDeleted)="onCarDeleted($event)" />
-          }
-        </div>
-      </ng-template>
-    </p-dataView>
-    } @else {
-    <div class="flex flex-col gap-2">
-      @for (_ of skeletonsIterationSource; track $index) {
-      <p-skeleton height="4rem" styleClass="mb-2" />
-      }
-    </div>
-    }
-  </div>
-</section>

src/Vegasco-Web/src/app/modules/cars/cars/cars.component.scss

@@ -1,3 +0,0 @@
-th, td {
-    padding: 0.5rem;
-}

src/Vegasco-Web/src/app/modules/cars/cars/cars.component.ts

@@ -1,127 +0,0 @@
-import { AsyncPipe, CommonModule } from '@angular/common';
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component, DestroyRef, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { RouterLink } from '@angular/router';
-import { NgIconComponent, provideIcons } from '@ng-icons/core';
-import {
-  matAddSharp,
-} from '@ng-icons/material-icons/sharp';
-import { CarClient } from '@vegasco-web/api/cars/car-client';
-import { MessageService } from 'primeng/api';
-import { ButtonModule } from 'primeng/button';
-import { DataViewModule } from 'primeng/dataview';
-import { ScrollTopModule } from 'primeng/scrolltop';
-import { SelectModule } from 'primeng/select';
-import { SkeletonModule } from 'primeng/skeleton';
-import {
-  BehaviorSubject,
-  catchError,
-  combineLatest,
-  EMPTY,
-  map,
-  Observable,
-  throwError
-} from 'rxjs';
-import { CarCardComponent } from './components/car-card/car-card.component';
-import { SelectedCarService } from '@vegasco-web/modules/entries/services/selected-car.service';
-
-@Component({
-  selector: 'app-entries',
-  imports: [
-    AsyncPipe,
-    ButtonModule,
-    CommonModule,
-    DataViewModule,
-    CarCardComponent,
-    NgIconComponent,
-    ReactiveFormsModule,
-    RouterLink,
-    ScrollTopModule,
-    SelectModule,
-    SkeletonModule,
-  ],
-  providers: [
-    provideIcons({
-      matAddSharp,
-    }),
-  ],
-  templateUrl: './cars.component.html',
-  styleUrl: './cars.component.scss'
-})
-export class CarsComponent {
-  private readonly carClient = inject(CarClient);
-  private readonly messageService = inject(MessageService);
-  private readonly selectedCarService = inject(SelectedCarService);
-
-  protected readonly nonDeletedCars$: Observable<Car[]>;
-
-  protected readonly skeletonsIterationSource = Array(10).fill(0);
-
-  private readonly deletedCars$ = new BehaviorSubject(<string[]>[]);
-
-  constructor() {
-    const cars$ = this.carClient.getAll()
-      .pipe(
-        map(response => response.cars),
-        map((cars) => cars
-          .sort((a, b) => a.name.localeCompare(b.name))),
-      );
-
-    this.nonDeletedCars$ = combineLatest([
-      cars$,
-      this.deletedCars$
-    ])
-      .pipe(
-        takeUntilDestroyed(),
-        map(([cars, deletedCars]) => cars.filter(car => !deletedCars.includes(car.id))),
-        catchError((error) => this.handleGetCarsError(error)),
-      );
-  }
-
-  onCarDeleted(car: Car): void {
-    this.deletedCars$.next([...this.deletedCars$.value, car.id]);
-    this.messageService.add({
-      severity: 'success',
-      summary: 'Auto gelöscht',
-      detail: 'Das Auto wurde erfolgreich gelöscht.',
-    });
-    this.resetSelectedCarIfDeleted(car);
-  }
-
-  private resetSelectedCarIfDeleted(car: Car) {
-    const selectedCarId = this.selectedCarService.getSelectedCarId();
-    if (selectedCarId === car.id) {
-      this.selectedCarService.setSelectedCarId(null);
-    }
-  }
-
-  private handleGetCarsError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => new Error('An unexpected error occurred'));
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Abrufen der Einträge ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Abrufen der Einträge hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-}

src/Vegasco-Web/src/app/modules/cars/cars/components/car-card/car-card.component.html

@@ -1,22 +0,0 @@
-<p-confirmDialog></p-confirmDialog>
-
-<div class="flex rounded-border shadow">
-  <div class="grow p-4 pos-relative edit-button" (click)="navigateToEdit()" role="button"
-    aria-roledescription="Bearbeite diesen Eintrag">
-    <div class="grid grid-cols-4 gap-4">
-
-      <div class="col-span-4 sm:col-span-2 md:col-span-1 flex my-auto items-center justify-center">
-        <div class="flex gap-2 items-center">
-          <ng-icon name="matDirectionsCarOutline" />
-          <div>{{ car().name }}</div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="bg-red-500 text-white rounded-r text-center flex flex-col justify-center">
-    <button type="button" title="Löschen" class="reset cursor-pointer primary-color-text p-4 h-full rounded-r"
-      (click)="confirmDeleteCar()">
-      <ng-icon name="matDeleteSharp"></ng-icon>
-    </button>
-  </div>
-</div>

src/Vegasco-Web/src/app/modules/cars/cars/components/car-card/car-card.component.scss

@@ -1,3 +0,0 @@
-.edit-button {
-    cursor: pointer;
-}

src/Vegasco-Web/src/app/modules/cars/cars/components/car-card/car-card.component.ts

@@ -1,116 +0,0 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component, DestroyRef, inject, input, output } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { NgIconComponent, provideIcons } from '@ng-icons/core';
-import {
-  matDirectionsCarOutline,
-} from '@ng-icons/material-icons/outline';
-import {
-  matDeleteSharp
-} from '@ng-icons/material-icons/sharp';
-import { CarClient } from '@vegasco-web/api/cars/car-client';
-import { RoutingService } from '@vegasco-web/services/routing.service';
-import { ConfirmationService, MessageService } from 'primeng/api';
-import { ButtonModule } from 'primeng/button';
-import { CardModule } from 'primeng/card';
-import { ConfirmDialogModule } from 'primeng/confirmdialog';
-import { catchError, EMPTY, Observable, tap, throwError } from 'rxjs';
-
-@Component({
-  selector: 'app-car-card',
-  imports: [
-    ButtonModule,
-    CardModule,
-    ConfirmDialogModule,
-    NgIconComponent,
-  ],
-  providers: [
-    provideIcons({
-      matDeleteSharp,
-      matDirectionsCarOutline,
-    }),
-    ConfirmationService,
-  ],
-  templateUrl: './car-card.component.html',
-  styleUrl: './car-card.component.scss'
-})
-export class CarCardComponent {
-  readonly car = input.required<Car>();
-
-  readonly carDeleted = output<Car>();
-
-  private readonly routingService = inject(RoutingService);
-  private readonly carClient = inject(CarClient);
-  private readonly messageService = inject(MessageService);
-  private readonly confirmationService = inject(ConfirmationService);
-
-  private readonly destroyRef = inject(DestroyRef);
-
-  async navigateToEdit(): Promise<void> {
-    await this.routingService.navigateToEditCar(this.car().id);
-  }
-
-  confirmDeleteCar(): void {
-    this.confirmationService.confirm({
-      closeOnEscape: true,
-      dismissableMask: true,
-      header: 'Bist du sicher?',
-      message: `Möchtest du das Auto "${this.car().name}" wirklich löschen?`,
-      acceptButtonProps: {
-        label: 'Löschen',
-        severity: 'danger',
-      },
-      rejectButtonProps: {
-        label: 'Abbrechen',
-        outlined: true,
-      },
-      accept: () => this.deleteCar(),
-    });
-  }
-
-  deleteCar(): void {
-    this.carClient.delete(this.car().id)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        tap(() => this.carDeleted.emit(this.car())),
-        catchError((error) => this.handleError(error)),
-      )
-      .subscribe();
-  }
-
-  private handleError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => error);
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Löschen des Autos ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      case error.status === 400:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Clientfehler',
-          detail:
-            'Die Anwendung scheint falsche Daten an den Server zu senden.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Löschen des Autos hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-}

src/Vegasco-Web/src/app/modules/cars/edit-car/components/required-marker.component.html

@@ -1 +0,0 @@
-<span class="required">*</span>

src/Vegasco-Web/src/app/modules/cars/edit-car/components/required-marker.component.scss

@@ -1,3 +0,0 @@
-.required {
-    color: red;
-}

src/Vegasco-Web/src/app/modules/cars/edit-car/components/required-marker.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-required-marker',
-  imports: [
-  ],
-  templateUrl: './required-marker.component.html',
-  styleUrl: './required-marker.component.scss'
-})
-export class RequiredMarkerComponent {
-}

src/Vegasco-Web/src/app/modules/cars/edit-car/edit-car.component.html

@@ -1,31 +0,0 @@
-@if (!isCarDataLoaded()) {
-  <div class="flex flex-col gap-6">
-    <p-skeleton height="3.5rem" />
-    <div class="flex flex-row gap-4">
-      <p-skeleton height="3.5rem" width="10rem" />
-      <p-skeleton height="3.5rem" width="10rem" />
-    </div>
-  </div>
-} @else {
-  <form [formGroup]="formGroup" class="flex flex-col gap-4" (ngSubmit)="onSubmit()">
-
-    <div class="flex flex-col gap-2">
-      <label [for]="formFieldNames.name">
-        Name
-        <app-required-marker />
-      </label>
-      <input 
-          id="name"
-          placeholder="Name eingeben"
-          type="text"
-          pInputText
-          [formControlName]="formFieldNames.name" />
-    </div>
-
-    <div class="flex gap-2">
-      <p-button type="button" label="Abbrechen" (click)="navigateToOverviewPage()" severity="warn" />
-      <p-button type="submit" label="Abschicken" severity="success" [disabled]="formGroup.invalid" />
-    </div>
-
-  </form>
-}

src/Vegasco-Web/src/app/modules/cars/edit-car/edit-car.component.ts

@@ -1,225 +0,0 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component, DestroyRef, inject, input, OnInit, signal } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { CarClient } from '@vegasco-web/api/cars/car-client';
-import { RoutingService } from '@vegasco-web/services/routing.service';
-import { MessageService } from 'primeng/api';
-import { ButtonModule } from 'primeng/button';
-import { ChipModule } from 'primeng/chip';
-import { DatePickerModule } from 'primeng/datepicker';
-import { FloatLabelModule } from 'primeng/floatlabel';
-import { InputGroupModule } from 'primeng/inputgroup';
-import { InputGroupAddonModule } from 'primeng/inputgroupaddon';
-import { InputNumberModule } from 'primeng/inputnumber';
-import { InputTextModule } from 'primeng/inputtext';
-import { MultiSelectModule } from 'primeng/multiselect';
-import { SelectModule } from 'primeng/select';
-import { SkeletonModule } from 'primeng/skeleton';
-import { catchError, EMPTY, Observable, switchMap, tap, throwError } from 'rxjs';
-import { RequiredMarkerComponent } from './components/required-marker.component';
-
-@Component({
-  selector: 'app-edit-entry',
-  imports: [
-    ButtonModule,
-    ChipModule,
-    DatePickerModule,
-    FloatLabelModule,
-    InputGroupAddonModule,
-    InputGroupModule,
-    InputNumberModule,
-    InputTextModule,
-    MultiSelectModule,
-    ReactiveFormsModule,
-    RequiredMarkerComponent,
-    SelectModule,
-    SkeletonModule,
-  ],
-  templateUrl: './edit-car.component.html',
-  styleUrl: './edit-car.component.scss'
-})
-export class EditCarComponent implements OnInit {
-  private readonly carClient = inject(CarClient);
-  private readonly routingService = inject(RoutingService);
-  private readonly destroyRef = inject(DestroyRef);
-  private readonly messageService = inject(MessageService);
-
-  protected readonly id = input<string | undefined>(undefined);
-
-  protected readonly today = new Date();
-
-  protected readonly formFieldNames = {
-    name: 'name',
-  } as const;
-
-  protected readonly formGroup = new FormGroup({
-    [this.formFieldNames.name]: new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]),
-  });
-
-  protected readonly isCarDataLoaded = signal(false);
-
-  ngOnInit(): void {
-    this.loadEntryDetailsAndEnableControls();
-  }
-
-  private loadEntryDetailsAndEnableControls() {
-    const carId = this.id();
-
-    if (carId === undefined || carId === null) {
-      this.enableFormControls();
-      this.isCarDataLoaded.set(true);
-      return;
-    }
-
-    this.carClient
-      .getSingle(carId)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        catchError((error) => this.handleGetError(error)),
-        tap((car) => {
-          this.formGroup.patchValue({
-            [this.formFieldNames.name]: car.name,
-          });
-        }),
-        tap(() => {
-          this.enableFormControls();
-          this.isCarDataLoaded.set(true);
-        }),
-      )
-      .subscribe();
-
-  }
-
-  private enableFormControls(): void {
-    for (const controlName of Object.values(this.formFieldNames)) {
-      const control = this.formGroup.get(controlName);
-      if (control) {
-        control.enable();
-      } else {
-        console.warn(`Form control '${controlName}' not found.`);
-      }
-    }
-  }
-
-  async navigateToOverviewPage(): Promise<void> {
-    await this.routingService.navigateToCars();
-  }
-
-  onSubmit(): void {
-    if (this.formGroup.invalid) {
-      this.formGroup.markAllAsTouched();
-      return;
-    }
-
-    var carId = this.id();
-    if (carId === undefined || carId === null) {
-      this.createCar();
-      return;
-    }
-
-    this.updateCar(carId);
-  }
-
-  private getFormData() {
-    return {
-      name: this.formGroup.controls[this.formFieldNames.name].value!,
-    };
-  }
-
-  createCar() {
-    var request: CreateCarRequest = this.getFormData();
-    this.carClient.create(request)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        catchError((error) => this.handleCreateOrUpdateError(error, false)),
-        switchMap(() => this.routingService.navigateToCars())
-      )
-      .subscribe();
-  }
-
-  updateCar(id: string) {
-    var request: UpdateCarRequest = this.getFormData();
-    this.carClient.update(id, request)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        catchError((error) => this.handleCreateOrUpdateError(error, true)),
-        switchMap(() => this.routingService.navigateToCars())
-      )
-      .subscribe();
-  }
-
-  private handleGetError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => error);
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Abrufen des Autos ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Abrufen des Autos hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-
-  private handleCreateOrUpdateError(error: unknown, isUpdate: boolean): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => error);
-    }
-
-    const action = isUpdate ? 'Aktualisieren' : 'Erstellen';
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            `Beim ${action} des Eintrags ist ein Fehler aufgetreten. Bitte versuche es erneut.`,
-        });
-        break;
-      case error.status === 400:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Clientfehler',
-          detail:
-            'Die Anwendung scheint falsche Daten an den Server zu senden.',
-        });
-        break;
-      case error.status === 409:
-        this.messageService.add({
-          severity: 'warn',
-          summary: 'Konflikt',
-          detail:
-            'Es existiert bereits ein Auto mit diesem Namen. Bitte wähle einen anderen Namen.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            `Beim ${action} des Eintrags hat der Server eine unerwartete Antwort zurückgegeben.`,
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-}

src/Vegasco-Web/src/app/modules/entries/edit-entry/components/required-marker.component.html

@@ -1 +0,0 @@
-<span class="required">*</span>

src/Vegasco-Web/src/app/modules/entries/edit-entry/components/required-marker.component.scss

@@ -1,3 +0,0 @@
-.required {
-    color: red;
-}

src/Vegasco-Web/src/app/modules/entries/edit-entry/components/required-marker.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-required-marker',
-  imports: [
-  ],
-  templateUrl: './required-marker.component.html',
-  styleUrl: './required-marker.component.scss'
-})
-export class RequiredMarkerComponent {
-}

src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.html

@@ -1,90 +0,0 @@
-@if (isLoading()) {
-  <div class="flex flex-col gap-6">
-    <p-skeleton height="3.5rem" />
-    <p-skeleton height="3.5rem" />
-    <p-skeleton height="3.5rem" />
-    <p-skeleton height="3.5rem" />
-    <div class="flex flex-row gap-4">
-      <p-skeleton height="3.5rem" width="10rem" />
-      <p-skeleton height="3.5rem" width="10rem" />
-    </div>
-  </div>
-} @else {
-  <form [formGroup]="formGroup" class="flex flex-col gap-4" (ngSubmit)="onSubmit()">
-
-    <div class="flex flex-col gap-2">
-      <label [for]="formFieldNames.car">
-        Auto
-        <app-required-marker />
-      </label>
-      @if (cars(); as cars) {
-        <p-select
-          [options]="cars"
-          placeholder="Auto auswählen"
-          [formControlName]="formFieldNames.car"
-          optionLabel="name"
-          [inputId]="formFieldNames.car"
-          styleClass="w-full" />
-      }
-    </div>
-
-    <div class="flex flex-col gap-2">
-      <div class="flex gap-2 items-center">
-        <label [for]="formFieldNames.date">
-          Datum
-          <app-required-marker />
-        </label>
-      </div>
-      <p-datepicker [iconDisplay]="'input'"
-                    [firstDayOfWeek]="1"
-                    placeholder="Datum auswählen"
-                    [showIcon]="true"
-                    [maxDate]="today"
-                    [defaultDate]="today"
-                    [inputId]="formFieldNames.date"
-                    [formControlName]="formFieldNames.date"
-                    styleClass="w-full"
-                    dateFormat="dd.mm.yy" />
-    </div>
-
-    <div class="flex flex-col gap-2">
-      <label [for]="formFieldNames.mileage">
-        Kilometerstand
-        <app-required-marker />
-      </label>
-      <p-inputGroup>
-        <input 
-          id="mileage"
-          placeholder="Kilometerstand eingeben"
-          type="number"
-          min="1"
-          pInputText
-          [formControlName]="formFieldNames.mileage" />
-        <p-inputGroupAddon>km</p-inputGroupAddon>
-      </p-inputGroup>
-    </div>
-
-    <div class="flex flex-col gap-2">
-      <label [for]="formFieldNames.amount">
-        Menge
-        <app-required-marker />
-      </label>
-      <p-inputGroup>
-        <input 
-          id="amount"
-          placeholder="Menge eingeben"
-          type="number"
-          min="1"
-          pInputText
-          [formControlName]="formFieldNames.amount" />
-        <p-inputGroupAddon>&#8467;</p-inputGroupAddon>
-      </p-inputGroup>
-    </div>
-
-    <div class="flex gap-2">
-      <p-button type="button" label="Abbrechen" (click)="navigateToOverviewPage()" severity="warn" />
-      <p-button type="submit" label="Abschicken" severity="success" [disabled]="formGroup.invalid" />
-    </div>
-
-  </form>
-}

src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.ts

@@ -1,293 +0,0 @@
-import dayjs from 'dayjs';
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component, computed, DestroyRef, inject, input, OnInit, signal, Signal } from '@angular/core';
-import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
-import { FormControl, FormGroup, ReactiveFormsModule, ValidationErrors, Validators } from '@angular/forms';
-import { CarClient } from '@vegasco-web/api/cars/car-client';
-import { ConsumptionClient } from '@vegasco-web/api/consumptions/consumption-client';
-import { RoutingService } from '@vegasco-web/services/routing.service';
-import { MessageService } from 'primeng/api';
-import { ButtonModule } from 'primeng/button';
-import { ChipModule } from 'primeng/chip';
-import { DatePickerModule } from 'primeng/datepicker';
-import { FloatLabelModule } from 'primeng/floatlabel';
-import { InputGroupModule } from 'primeng/inputgroup';
-import { InputGroupAddonModule } from 'primeng/inputgroupaddon';
-import { InputNumberModule } from 'primeng/inputnumber';
-import { InputTextModule } from 'primeng/inputtext';
-import { MultiSelectModule } from 'primeng/multiselect';
-import { SelectModule } from 'primeng/select';
-import { SkeletonModule } from 'primeng/skeleton';
-import { catchError, combineLatest, EMPTY, filter, map, Observable, switchMap, tap, throwError } from 'rxjs';
-import { RequiredMarkerComponent } from './components/required-marker.component';
-import { SelectedCarService } from '../services/selected-car.service';
-
-@Component({
-  selector: 'app-edit-entry',
-  imports: [
-    ButtonModule,
-    ChipModule,
-    DatePickerModule,
-    FloatLabelModule,
-    InputGroupAddonModule,
-    InputGroupModule,
-    InputNumberModule,
-    InputTextModule,
-    MultiSelectModule,
-    ReactiveFormsModule,
-    RequiredMarkerComponent,
-    SelectModule,
-    SkeletonModule,
-  ],
-  templateUrl: './edit-entry.component.html',
-  styleUrl: './edit-entry.component.scss'
-})
-export class EditEntryComponent implements OnInit {
-  private readonly carClient = inject(CarClient);
-  private readonly consumptionClient = inject(ConsumptionClient);
-  private readonly routingService = inject(RoutingService);
-  private readonly destroyRef = inject(DestroyRef);
-  private readonly messageService = inject(MessageService);
-  private readonly selectedCarService = inject(SelectedCarService);
-
-  protected readonly id = input<string | undefined>(undefined);
-
-  protected readonly today = new Date();
-
-  protected readonly formFieldNames = {
-    car: 'car',
-    date: 'date',
-    mileage: 'mileage',
-    amount: 'amount',
-  } as const;
-
-  protected readonly formGroup = new FormGroup({
-    [this.formFieldNames.car]: new FormControl<Car | null>({ value: null, disabled: true }, [Validators.required]),
-    [this.formFieldNames.date]: new FormControl<Date>({ value: new Date(), disabled: true }, [Validators.required, this.dateTimeGreaterThanOrEqualToTodayValidator]),
-    [this.formFieldNames.mileage]: new FormControl<number | null>({ value: null, disabled: true }, [Validators.required, Validators.min(1)]),
-    [this.formFieldNames.amount]: new FormControl<number | null>({ value: null, disabled: true }, [Validators.required, Validators.min(1)]),
-  });
-
-  private readonly cars$: Observable<Car[]>;
-  protected readonly cars: Signal<Car[] | undefined>;
-
-  private readonly isEntryDataLoaded = signal(false);
-
-  protected readonly isLoading = computed(() => {
-    var cars = this.cars();
-    var isEntryDataLoaded = this.isEntryDataLoaded();
-    return cars === undefined || !isEntryDataLoaded;
-  });
-
-  constructor() {
-    this.cars$ = this.carClient
-      .getAll()
-      .pipe(
-        takeUntilDestroyed(),
-        map(response => response.cars
-          .sort((a, b) => a.name.localeCompare(b.name))),
-        tap(cars => {
-          const selectedCarId = this.selectedCarService.getSelectedCarId();
-
-          if (selectedCarId === null) {
-            const firstCar = cars[0];
-            this.formGroup.controls[this.formFieldNames.car].setValue(firstCar);
-            this.selectedCarService.setSelectedCarId(firstCar?.id ?? null);
-            return;
-          }
-
-          const selectedCar = cars.find(car => car.id === selectedCarId);
-          this.formGroup.controls[this.formFieldNames.car].setValue(selectedCar ?? null);
-          this.selectedCarService.setSelectedCarId(selectedCar?.id ?? null);
-        }),
-      );
-    this.cars = toSignal(this.cars$);
-  }
-
-  ngOnInit(): void {
-    this.loadEntryDetailsAndEnableControls();
-
-    this.formGroup.controls[this.formFieldNames.car]
-      .valueChanges
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        tap((car) => {
-          this.selectedCarService.setSelectedCarId(car?.id ?? null);
-        })
-      )
-      .subscribe();
-  }
-
-  private loadEntryDetailsAndEnableControls() {
-    const entryId = this.id();
-
-    if (entryId === undefined || entryId === null) {
-      this.enableFormControls();
-      this.isEntryDataLoaded.set(true);
-      return;
-    }
-
-    const consumption$ = this.consumptionClient
-      .getSingle(entryId);
-
-    combineLatest([
-      consumption$, this.cars$
-    ])
-      .pipe(
-        filter(([_, cars]) => cars !== undefined),
-        takeUntilDestroyed(this.destroyRef),
-        catchError((error) => this.handleGetError(error)),
-        tap(([consumption, cars]) => {
-          this.formGroup.patchValue({
-            [this.formFieldNames.car]: cars!.find(c => c.id === consumption.carId) ?? null,
-            [this.formFieldNames.date]: new Date(consumption.dateTime),
-            [this.formFieldNames.mileage]: consumption.distance,
-            [this.formFieldNames.amount]: consumption.amount,
-          });
-        }),
-        tap(() => {
-          this.enableFormControls();
-          this.isEntryDataLoaded.set(true);
-        }),
-      )
-      .subscribe();
-  }
-
-  private enableFormControls(): void {
-    for (const controlName of Object.values(this.formFieldNames)) {
-      const control = this.formGroup.get(controlName);
-      if (control) {
-        control.enable();
-      } else {
-        console.warn(`Form control '${controlName}' not found.`);
-      }
-    }
-  }
-
-  async navigateToOverviewPage(): Promise<void> {
-    await this.routingService.navigateToEntries();
-  }
-
-  onSubmit(): void {
-    if (this.formGroup.invalid) {
-      this.formGroup.markAllAsTouched();
-      return;
-    }
-
-    var entryId = this.id();
-    if (entryId === undefined || entryId === null) {
-      this.createEntry();
-      return;
-    }
-
-    this.updateEntry(entryId);
-  }
-
-  private getFormData() {
-    var dateTime = new Date((this.formGroup.controls[this.formFieldNames.date].value ?? new Date).setHours(0, 0, 0, 0));
-
-    return {
-      carId: this.formGroup.controls[this.formFieldNames.car].value!.id,
-      dateTime: dateTime.toISOString(),
-      distance: this.formGroup.controls[this.formFieldNames.mileage].value!,
-      amount: this.formGroup.controls[this.formFieldNames.amount].value!,
-    };
-  }
-
-  createEntry() {
-    var request: CreateConsumptionEntry = this.getFormData();
-    this.consumptionClient.create(request)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        catchError((error) => this.handleCreateOrUpdateError(error)),
-        switchMap(() => this.routingService.navigateToEntries())
-      )
-      .subscribe();
-  }
-
-  updateEntry(id: string) {
-    var request: UpdateConsumptionEntry = this.getFormData();
-    this.consumptionClient.update(id, request)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        catchError((error) => this.handleCreateOrUpdateError(error)),
-        switchMap(() => this.routingService.navigateToEntries())
-      )
-      .subscribe();
-  }
-
-  private handleGetError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => error);
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Erstellen des Eintrags ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Erstellen des Eintrags hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-
-  private handleCreateOrUpdateError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => error);
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Erstellen des Eintrags ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      case error.status === 400:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Clientfehler',
-          detail:
-            'Die Anwendung scheint falsche Daten an den Server zu senden.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Erstellen des Eintrags hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-
-  private dateTimeGreaterThanOrEqualToTodayValidator(control: FormControl<Date>): ValidationErrors | null {
-    const tomorrowStartOfDay = dayjs().add(1, 'day').startOf('day');
-    const controlDate = dayjs(control.value);
-
-    if (controlDate.isBefore(tomorrowStartOfDay)) {
-      return null;
-    }
-
-    return { dateTimeGreaterThanOrEqualToToday: true };
-  }
-}

src/Vegasco-Web/src/app/modules/entries/entries.routes.ts

@@ -1,17 +0,0 @@
-import { Routes } from "@angular/router";
-import { EntriesComponent } from "./entries/entries.component";
-
-export const routes: Routes = [
-    {
-        path: '',
-        component: EntriesComponent
-    },
-    {
-        path: 'create',
-        loadComponent: () => import('./edit-entry/edit-entry.component').then(m => m.EditEntryComponent)
-    },
-    {
-        path: 'edit/:id',
-        loadComponent: () => import('./edit-entry/edit-entry.component').then(m => m.EditEntryComponent)
-    }
-];

src/Vegasco-Web/src/app/modules/entries/entries/components/entry-card/entry-card.component.html

@@ -1,49 +0,0 @@
-<p-confirmDialog></p-confirmDialog>
-
-<div class="flex rounded-border shadow">
-  <div class="grow p-4 pos-relative edit-button" (click)="navigateToEdit()" role="button"
-    aria-roledescription="Bearbeite diesen Eintrag">
-    <div class="grid grid-cols-4 gap-4">
-
-      <div class="col-span-4 sm:col-span-2 md:col-span-1 flex my-auto items-center justify-center">
-        <div class="flex gap-2 items-center">
-          <ng-icon name="matCalendarMonthSharp" />
-          <div>{{ entry().dateTime | date:"dd.MM.yyyy" }}</div>
-        </div>
-      </div>
-
-      <div class="col-span-4 sm:col-span-2 md:col-span-1 flex my-auto items-center justify-center">
-        <div class="flex gap-2 items-center">
-          <ng-icon name="matStraightenSharp" />
-          <div>{{entry().distance }} km</div>
-        </div>
-      </div>
-
-      <div class="col-span-4 sm:col-span-2 md:col-span-1 flex my-auto items-center justify-center">
-        <div class="flex gap-2 items-center">
-          <ng-icon name="matLocalGasStationSharp" />
-          <div>{{entry().amount }} &#8467;</div>
-        </div>
-      </div>
-
-      <div class="col-span-4 sm:col-span-2 md:col-span-1 flex my-auto items-center justify-center">
-        @if (formattedLiterPer100Km(); as formattedLiterPer100Km) {
-          <div class="flex gap-2 items-center">
-            <ng-icon name="matSpeedSharp" />
-            <div class="flex items-center gap-1">
-              {{ formattedLiterPer100Km }}
-              <app-fraction numerator="&#8467;" [denominator]="'100km'" />
-            </div>
-          </div>
-        }
-      </div>
-    </div>
-  </div>
-  <div class="bg-red-500 text-white rounded-r text-center flex flex-col justify-center">
-
-    <button type="button" title="Löschen" class="reset cursor-pointer primary-color-text p-4 h-full rounded-r"
-      (click)="confirmDeleteEntry()">
-      <ng-icon name="matDeleteSharp"></ng-icon>
-    </button>
-  </div>
-</div>

src/Vegasco-Web/src/app/modules/entries/entries/components/entry-card/entry-card.component.scss

@@ -1,3 +0,0 @@
-.edit-button {
-    cursor: pointer;
-}

src/Vegasco-Web/src/app/modules/entries/entries/components/entry-card/entry-card.component.ts

@@ -1,141 +0,0 @@
-import { DatePipe } from '@angular/common';
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component, computed, DestroyRef, inject, input, output } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { NgIconComponent, provideIcons } from '@ng-icons/core';
-import {
-  matCalendarMonthSharp,
-  matDeleteSharp,
-  matLocalGasStationSharp,
-  matSpeedSharp,
-  matStraightenSharp,
-} from '@ng-icons/material-icons/sharp';
-import { ConsumptionClient } from '@vegasco-web/api/consumptions/consumption-client';
-import { RoutingService } from '@vegasco-web/services/routing.service';
-import { ConfirmationService, MessageService } from 'primeng/api';
-import { ButtonModule } from 'primeng/button';
-import { CardModule } from 'primeng/card';
-import { ConfirmDialogModule } from 'primeng/confirmdialog';
-import { catchError, EMPTY, Observable, tap, throwError } from 'rxjs';
-import { FractionComponent } from "../fraction/fraction.component";
-
-@Component({
-  selector: 'app-entry-card',
-  imports: [
-    ButtonModule,
-    CardModule,
-    ConfirmDialogModule,
-    DatePipe,
-    NgIconComponent,
-    FractionComponent
-  ],
-  providers: [
-    provideIcons({
-      matDeleteSharp,
-      matCalendarMonthSharp,
-      matSpeedSharp,
-      matStraightenSharp,
-      matLocalGasStationSharp,
-    }),
-    ConfirmationService,
-  ],
-  templateUrl: './entry-card.component.html',
-  styleUrl: './entry-card.component.scss'
-})
-export class EntryCardComponent {
-  readonly entry = input.required<GetConsumptionEntriesEntry>();
-
-  protected readonly formattedLiterPer100Km = computed(() => {
-    const entry = this.entry();
-
-    const formatted = entry.literPer100Km
-      ?.toFixed(2)
-      .replace('.', ',');
-    return formatted;
-  })
-
-  readonly entryDeleted = output<GetConsumptionEntriesEntry>();
-
-  private readonly routingService = inject(RoutingService);
-  private readonly consumptionClient = inject(ConsumptionClient);
-  private readonly messageService = inject(MessageService);
-  private readonly confirmationService = inject(ConfirmationService);
-
-  private readonly destroyRef = inject(DestroyRef);
-
-  async navigateToEdit(): Promise<void> {
-    await this.routingService.navigateToEditEntry(this.entry().id);
-  }
-
-  confirmDeleteEntry(): void {
-    const weighedAt = new Date(
-      Date.parse(this.entry().dateTime),
-    ).toLocaleString('de-DE', {
-      year: 'numeric',
-      month: '2-digit',
-      day: '2-digit',
-    });
-
-    this.confirmationService.confirm({
-      closeOnEscape: true,
-      dismissableMask: true,
-      header: 'Bist du sicher?',
-      message: `Möchtest du diesen Eintrag (${weighedAt} für ${this.entry().car.name}) wirklich löschen?`,
-      acceptButtonProps: {
-        label: 'Löschen',
-        severity: 'danger',
-      },
-      rejectButtonProps: {
-        label: 'Abbrechen',
-        outlined: true,
-      },
-      accept: () => this.deleteEntry(),
-    });
-  }
-
-  deleteEntry(): void {
-    this.consumptionClient.delete(this.entry().id)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        tap(() => this.entryDeleted.emit(this.entry())),
-        catchError((error) => this.handleError(error)),
-      )
-      .subscribe();
-  }
-
-  private handleError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => error);
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Löschen des Eintrags ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      case error.status === 400:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Clientfehler',
-          detail:
-            'Die Anwendung scheint falsche Daten an den Server zu senden.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Löschen des Eintrags hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-}

src/Vegasco-Web/src/app/modules/entries/entries/components/fraction/fraction.component.html

@@ -1,9 +0,0 @@
-<div class="flex flex-col items-center text-half-size">
-  <span>
-    {{ numerator() }}
-  </span>
-  <span class="separator"></span>
-  <span>
-    {{ denominator() }}
-  </span>
-</div>

src/Vegasco-Web/src/app/modules/entries/entries/components/fraction/fraction.component.scss

@@ -1,11 +0,0 @@
-.separator {
-    border-bottom-width: 1px;
-    width: 100%
-}
-
-.text-half-size {
-    // Specifically use em here to allow the parent to control the font size
-    // The font size here should be smaller because it is a fraction and would
-    // otherwise look too large
-    font-size: 0.75em;
-}

src/Vegasco-Web/src/app/modules/entries/entries/components/fraction/fraction.component.ts

@@ -1,12 +0,0 @@
-import { Component, input } from '@angular/core';
-
-@Component({
-  selector: 'app-fraction',
-  imports: [],
-  templateUrl: './fraction.component.html',
-  styleUrl: './fraction.component.scss'
-})
-export class FractionComponent {
-  readonly numerator = input.required<number | string>();
-  readonly denominator = input.required<number | string>();
-}

src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html

@@ -1,43 +0,0 @@
-<section>
-  <p-scrollTop />
-  <div class="mb-4 flex gap-2 md:justify-between">
-    <div class="basis-full lg:basis-1/4 md:basis-1/2 p-0">
-      <p-select styleClass="w-full" [formControl]="selectedCar" placeholder="Auto" [showClear]="false"
-        [options]="(cars$ | async)!" optionLabel="name" />
-    </div>
-    <div>
-      <p-button label="Erstellen" routerLink="/entries/create">
-        <ng-icon name="matAddSharp"></ng-icon>
-      </p-button>
-    </div>
-  </div>
-  <div>
-    @if (consumptionEntries$ | async; as entries) {
-    <p-dataView
-      [value]="entries"
-      [paginator]="true"
-      [rows]="25"
-      [rowsPerPageOptions]="[10, 25, 50, 100]"
-      [pageLinks]="0"
-      [showCurrentPageReport]="true"
-      currentPageReportTemplate="{currentPage} / {totalPages}"
-      layout="list"
-    >
-      <ng-template #list let-entries>
-        <div class="flex flex-col gap-2">
-          @for (entry of entries; track entry.id) {
-            <app-entry-card [entry]="entry"
-              (entryDeleted)="onEntryDeleted($event)" />
-          }
-        </div>
-      </ng-template>
-    </p-dataView>
-    } @else {
-    <div class="flex flex-col gap-2">
-      @for (_ of skeletonsIterationSource; track $index) {
-      <p-skeleton height="4rem" styleClass="mb-2" />
-      }
-    </div>
-    }
-  </div>
-</section>

src/Vegasco-Web/src/app/modules/entries/entries/entries.component.scss

@@ -1,3 +0,0 @@
-th, td {
-    padding: 0.5rem;
-}

src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts

@@ -1,171 +0,0 @@
-import { AsyncPipe, CommonModule } from '@angular/common';
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component, DestroyRef, inject, OnInit } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { RouterLink } from '@angular/router';
-import { NgIconComponent, provideIcons } from '@ng-icons/core';
-import {
-  matAddSharp,
-} from '@ng-icons/material-icons/sharp';
-import { CarClient } from '@vegasco-web/api/cars/car-client';
-import { ConsumptionClient } from '@vegasco-web/api/consumptions/consumption-client';
-import { MessageService } from 'primeng/api';
-import { ButtonModule } from 'primeng/button';
-import { DataViewModule } from 'primeng/dataview';
-import { ScrollTopModule } from 'primeng/scrolltop';
-import { SelectModule } from 'primeng/select';
-import { SkeletonModule } from 'primeng/skeleton';
-import {
-  BehaviorSubject,
-  catchError,
-  combineLatest,
-  EMPTY,
-  map,
-  Observable,
-  startWith,
-  tap,
-  throwError
-} from 'rxjs';
-import { SelectedCarService } from '../services/selected-car.service';
-import { EntryCardComponent } from './components/entry-card/entry-card.component';
-
-@Component({
-  selector: 'app-entries',
-  imports: [
-    AsyncPipe,
-    ButtonModule,
-    CommonModule,
-    DataViewModule,
-    EntryCardComponent,
-    NgIconComponent,
-    ReactiveFormsModule,
-    RouterLink,
-    ScrollTopModule,
-    SelectModule,
-    SkeletonModule,
-  ],
-  providers: [
-    provideIcons({
-      matAddSharp,
-    }),
-  ],
-  templateUrl: './entries.component.html',
-  styleUrl: './entries.component.scss'
-})
-export class EntriesComponent implements OnInit {
-  private readonly carClient = inject(CarClient);
-  private readonly consumptionClient = inject(ConsumptionClient);
-  private readonly messageService = inject(MessageService);
-  private readonly selectedCarService = inject(SelectedCarService);
-  private readonly destroyRef = inject(DestroyRef);
-
-  protected readonly consumptionEntries$: Observable<GetConsumptionEntriesEntry[]>;
-  protected readonly cars$: Observable<Car[]>;
-
-  protected readonly skeletonsIterationSource = Array(10).fill(0);
-
-  protected readonly selectedCar = new FormControl<Car | null | undefined>(null);
-
-  private readonly deletedEntries$ = new BehaviorSubject(<string[]>[]);
-
-  constructor() {
-    const entries = this.consumptionClient.getAll()
-      .pipe(
-        takeUntilDestroyed(),
-        map(response => response.consumptions.sort((a, b) => b.dateTime.localeCompare(a.dateTime))),
-        catchError((error) => this.handleGetEntriesError(error))
-      );
-
-    this.consumptionEntries$ = combineLatest([
-      entries,
-      this.selectedCar.valueChanges.pipe(startWith(null)),
-      this.deletedEntries$,
-    ])
-      .pipe(
-        takeUntilDestroyed(),
-        map(([entries, selectedCar, deletedEntries]) => {
-          const nonDeletedEntries =
-            deletedEntries.length === 0
-              ? entries
-              : entries.filter(entry => !deletedEntries.includes(entry.id));
-
-          if (!selectedCar) {
-            return nonDeletedEntries;
-          }
-
-          return nonDeletedEntries.filter(entry => entry.car.id === selectedCar.id);
-        }),
-      );
-
-    this.cars$ = this.carClient.getAll()
-      .pipe(
-        takeUntilDestroyed(),
-        map(response => response.cars),
-        map((cars) => cars
-          .sort((a, b) => a.name.localeCompare(b.name))),
-        tap((cars) => {
-          const selectedCarId = this.selectedCarService.getSelectedCarId();
-
-          if (selectedCarId === null) {
-            const firstCar = cars[0];
-            this.selectedCar.setValue(firstCar);
-            this.selectedCarService.setSelectedCarId(firstCar?.id ?? null);
-            return;
-          }
-
-          const selectedCar = cars.find(car => car.id === selectedCarId);
-          this.selectedCar.setValue(selectedCar ?? null);
-          this.selectedCarService.setSelectedCarId(selectedCar?.id ?? null);
-        }),
-      );
-  }
-
-  ngOnInit(): void {
-    this.selectedCar.valueChanges
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        tap((car) => {
-          this.selectedCarService.setSelectedCarId(car?.id ?? null);
-        })
-      )
-      .subscribe();
-  }
-
-  onEntryDeleted(entry: GetConsumptionEntriesEntry): void {
-    this.deletedEntries$.next([...this.deletedEntries$.value, entry.id]);
-    this.messageService.add({
-      severity: 'success',
-      summary: 'Eintrag gelöscht',
-      detail: 'Der Eintrag wurde erfolgreich gelöscht.',
-    });
-  }
-
-  private handleGetEntriesError(error: unknown): Observable<never> {
-    if (!(error instanceof HttpErrorResponse)) {
-      return throwError(() => new Error('An unexpected error occurred'));
-    }
-
-    switch (true) {
-      case error.status >= 500 && error.status <= 599:
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Serverfehler',
-          detail:
-            'Beim Abrufen der Einträge ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        });
-        break;
-      default:
-        console.error(error);
-        this.messageService.add({
-          severity: 'error',
-          summary: 'Unerwarteter Fehler',
-          detail:
-            'Beim Abrufen der Einträge hat der Server eine unerwartete Antwort zurückgegeben.',
-        });
-        break;
-    }
-
-    return EMPTY;
-  }
-}

src/Vegasco-Web/src/app/modules/entries/services/selected-car.service.ts

@@ -1,33 +0,0 @@
-import { Injectable } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { BehaviorSubject, tap } from "rxjs";
-
-@Injectable({
-    providedIn: "root",
-})
-export class SelectedCarService {
-    static readonly SELECTED_CAR_ID_KEY = "SELECTED_CAR_ID";
-
-    private selectedCarId: string | null = null;
-
-    constructor() {
-        this.loadStoredCarId();
-    }
-
-    private loadStoredCarId(): void {
-        this.selectedCarId = localStorage.getItem(SelectedCarService.SELECTED_CAR_ID_KEY);
-    }
-
-    getSelectedCarId() {
-        return this.selectedCarId;
-    }
-
-    setSelectedCarId(carId: string | null): void {
-        this.selectedCarId = carId;
-        if (carId === null) {
-            localStorage.removeItem(SelectedCarService.SELECTED_CAR_ID_KEY);
-        } else {
-            localStorage.setItem(SelectedCarService.SELECTED_CAR_ID_KEY, carId);
-        }
-    }
-}

src/Vegasco-Web/src/app/services/routing.service.ts

@@ -1,33 +0,0 @@
-import { inject, Injectable } from "@angular/core";
-import { Router } from "@angular/router";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class RoutingService {
-    private readonly router = inject(Router);
-
-    async navigateToEntries(): Promise<void> {
-        await this.router.navigateByUrl('/entries');
-    }
-
-    async navigateToEditEntry(entryId: string): Promise<void> {
-        await this.router.navigate(['entries', 'edit', entryId]);
-    }
-
-    async navigateToCreateEntry(): Promise<void> {
-        await this.router.navigate(['entries', 'create']);
-    }
-
-    async navigateToCars(): Promise<void> {
-        await this.router.navigateByUrl('/cars');
-    }
-
-    async navigateToEditCar(entryId: string): Promise<void> {
-        await this.router.navigate(['cars', 'edit', entryId]);
-    }
-
-    async navigateToCreateCar(): Promise<void> {
-        await this.router.navigate(['cars', 'create']);
-    }
-}

src/Vegasco-Web/src/environments/environment.development.ts

@@ -1,11 +0,0 @@
-import { Environment } from "./environment.interface";
-
-export const environment: Environment = {
-    name: "Dev",
-    isProduction: false,
-    keycloak: {
-        host: "https://login.nuyken.dev",
-        realm: "development",
-        clientId: "vegasco"
-    }
-};

src/Vegasco-Web/src/environments/environment.interface.ts

@@ -1,17 +0,0 @@
-
-/** The app's configuration based on the target environment */
-export interface Environment {
-    /** A name for this configuration, e.g. 'Prod' */
-    name: string;
-    /** Whether this configuration is for production or not */
-    isProduction: boolean;
-    /** Keycloak login configuration */
-    keycloak: {
-        /** The host under which the keycloak is reachable */
-        host: string;
-        /** The keycloak realm in which the client lives */
-        realm: string;
-        /** The app's client id */
-        clientId: string;
-    }
-}

src/Vegasco-Web/src/environments/environment.production.ts

@@ -1,11 +0,0 @@
-import { Environment } from "./environment.interface";
-
-export const environment: Environment = {
-    name: "Prod",
-    isProduction: true,
-    keycloak: {
-        host: "https://login.nuyken.dev",
-        realm: "apps",
-        clientId: "vegasco"
-    }
-};

src/Vegasco-Web/src/environments/environment.ts

@@ -1,11 +0,0 @@
-import { Environment } from "./environment.interface";
-
-export const environment: Environment = {
-    name: "",
-    isProduction: false,
-    keycloak: {
-        host: "",
-        realm: "",
-        clientId: ""
-    }
-};

src/Vegasco-Web/src/index.html

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>VegascoWeb</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>

src/Vegasco-Web/src/main.ts

@@ -1,6 +0,0 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
-import { App } from './app/app';
-
-bootstrapApplication(App, appConfig)
-  .catch((err) => console.error(err));

src/Vegasco-Web/src/styles.scss

@@ -1,39 +0,0 @@
-@use "tailwindcss";
-@plugin "tailwindcss-primeui";
-
-html,
-body {
-    height: 100%;
-    margin: 0;
-}
-
-body {
-    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif
-}
-
-.max-content-width {
-    max-width: 1200px;
-}
-
-.pos-absolute {
-    position: absolute;
-}
-
-.pos-relative {
-    position: relative;
-}
-
-.trbl-0 {
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-}
-
-.primary-color-text {
-    color: var(--primary-color-text);
-}
-
-.visually-hidden {
-    visibility: hidden;
-}

src/Vegasco-Web/tsconfig.app.json

@@ -1,15 +0,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/app",
-    "types": []
-  },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "src/**/*.spec.ts"
-  ]
-}

src/Vegasco-Web/tsconfig.json

@@ -1,40 +0,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "@vegasco-web/*": ["src/app/*"],
-      "@vegasco-web/assets/*": ["assets/*"],
-      "@vegasco-web/environments/*": ["src/environments/*"]
-    },
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    "isolatedModules": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "target": "ES2022",
-    "module": "preserve"
-  },
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "typeCheckHostBindings": true,
-    "strictTemplates": true
-  },
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}

src/Vegasco-Web/tsconfig.spec.json

@@ -1,14 +0,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "include": [
-    "src/**/*.ts"
-  ]
-}

src/Vegasco-Web/webserver.conf.template

@@ -1,12 +0,0 @@
-server {
-    listen 80;
-
-    location ~ ^/api/(.*) {
-        proxy_pass ${services__Api__https__0}/$1;
-    }
-
-    location / {
-        root /usr/share/nginx/html;
-        try_files ${DOLLAR}uri ${DOLLAR}uri/ /index.html =404;
-    }
-}

src/Vegasco.Server.Api/Assembly.cs

@@ -1,3 +0,0 @@
-using StronglyTypedIds;
-
-[assembly: StronglyTypedIdDefaults(Template.Guid, "guid-efcore")]

src/Vegasco.Server.Api/Authentication/JwtOptions.cs

@@ -1,28 +0,0 @@
-using FluentValidation;
-
-namespace Vegasco.Server.Api.Authentication;
-
-public class JwtOptions
-{
-	public const string SectionName = "JWT";
-
-	public string ValidAudience { get; set; } = "";
-
-	public string MetadataUrl { get; set; } = "";
-
-	public string? NameClaimType { get; set; }
-
-	public bool AllowHttpMetadataUrl { get; set; }
-}
-
-public class JwtOptionsValidator : AbstractValidator<JwtOptions>
-{
-	public JwtOptionsValidator()
-	{
-		RuleFor(x => x.ValidAudience)
-			.NotEmpty();
-
-		RuleFor(x => x.MetadataUrl)
-			.NotEmpty();
-	}
-}

src/Vegasco.Server.Api/Authentication/UserAccessor.cs

@@ -1,78 +0,0 @@
-using Microsoft.Extensions.Options;
-using System.Diagnostics.CodeAnalysis;
-using System.Security.Claims;
-
-namespace Vegasco.Server.Api.Authentication;
-
-public sealed class UserAccessor
-{
-	private readonly IHttpContextAccessor _httpContextAccessor;
-	private readonly IOptions<JwtOptions> _jwtOptions;
-
-	/// <summary>
-	/// Stores the username upon first retrieval
-	/// </summary>
-	private string? _cachedUsername;
-
-	/// <summary>
-	/// Stores the id upon first retrieval
-	/// </summary>
-	private string? _cachedId;
-
-	public UserAccessor(IHttpContextAccessor httpContextAccessor, IOptions<JwtOptions> jwtOptions)
-	{
-		_httpContextAccessor = httpContextAccessor;
-		_jwtOptions = jwtOptions;
-	}
-
-	public string GetUsername()
-	{
-		if (string.IsNullOrEmpty(_cachedUsername))
-		{
-			_cachedUsername = GetClaimValue(_jwtOptions.Value.NameClaimType ?? ClaimTypes.Name);
-		}
-
-		return _cachedUsername;
-	}
-
-	public string GetUserId()
-	{
-		if (string.IsNullOrEmpty(_cachedId))
-		{
-			_cachedId = GetClaimValue(ClaimTypes.NameIdentifier);
-		}
-
-		return _cachedId;
-	}
-
-	private string GetClaimValue(string claimType)
-	{
-		HttpContext? httpContext = _httpContextAccessor.HttpContext;
-
-		if (httpContext is null)
-		{
-			ThrowForMissingHttpContext();
-		}
-
-		string? claimValue = httpContext.User.FindFirstValue(claimType);
-
-		if (string.IsNullOrWhiteSpace(claimValue))
-		{
-			ThrowForMissingClaim(claimType);
-		}
-
-		return claimValue;
-	}
-
-	[DoesNotReturn]
-	private static void ThrowForMissingHttpContext()
-	{
-		throw new InvalidOperationException("No HttpContext available.");
-	}
-
-	[DoesNotReturn]
-	private static void ThrowForMissingClaim(string claimType)
-	{
-		throw new InvalidOperationException($"No claim of type '{claimType}' found on the current user.");
-	}
-}

src/Vegasco.Server.Api/Cars/Car.cs

@@ -1,42 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Vegasco.Server.Api.Consumptions;
-using Vegasco.Server.Api.Users;
-
-namespace Vegasco.Server.Api.Cars;
-
-public class Car
-{
-	public CarId Id { get; set; } = CarId.New();
-
-	public string Name { get; set; } = "";
-
-	public string UserId { get; set; } = "";
-
-	public virtual User User { get; set; } = null!;
-
-	public virtual ICollection<Consumption> Consumptions { get; set; } = [];
-}
-
-public class CarTableConfiguration : IEntityTypeConfiguration<Car>
-{
-	public const int NameMaxLength = 50;
-
-	public void Configure(EntityTypeBuilder<Car> builder)
-	{
-		builder.HasKey(x => x.Id);
-
-		builder.Property(x => x.Id)
-			.HasConversion<CarId.EfCoreValueConverter>();
-
-		builder.Property(x => x.Name)
-			.IsRequired()
-			.HasMaxLength(NameMaxLength);
-
-		builder.Property(x => x.UserId)
-			.IsRequired();
-
-		builder.HasOne(x => x.User)
-			.WithMany(x => x.Cars);
-	}
-}

src/Vegasco.Server.Api/Cars/CarId.cs

@@ -1,6 +0,0 @@
-using StronglyTypedIds;
-
-namespace Vegasco.Server.Api.Cars;
-
-[StronglyTypedId]
-public partial struct CarId;

src/Vegasco.Server.Api/Cars/CreateCar.cs

@@ -1,82 +0,0 @@
-using FluentValidation;
-using FluentValidation.Results;
-using Microsoft.EntityFrameworkCore;
-using Vegasco.Server.Api.Authentication;
-using Vegasco.Server.Api.Common;
-using Vegasco.Server.Api.Persistence;
-using Vegasco.Server.Api.Users;
-
-namespace Vegasco.Server.Api.Cars;
-
-public static class CreateCar
-{
-	public record Request(string Name);
-	public record Response(Guid Id, string Name);
-
-	public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
-	{
-		return builder
-			.MapPost("cars", Endpoint)
-			.WithTags("Cars")
-			.WithDescription("Creates a new car")
-			.Produces<Response>(201)
-			.ProducesValidationProblem()
-			.Produces(409);
-	}
-
-	public class Validator : AbstractValidator<Request>
-	{
-		public Validator()
-		{
-			RuleFor(x => x.Name)
-				.NotEmpty()
-				.MaximumLength(CarTableConfiguration.NameMaxLength);
-		}
-	}
-
-	private static async Task<IResult> Endpoint(
-		Request request,
-		IEnumerable<IValidator<Request>> validators,
-		ApplicationDbContext dbContext,
-		UserAccessor userAccessor,
-		CancellationToken cancellationToken)
-	{
-		List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken: cancellationToken);
-		if (failedValidations.Count > 0)
-		{
-			return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
-		}
-
-		string userId = userAccessor.GetUserId();
-
-		User? user = await dbContext.Users.FindAsync([userId], cancellationToken: cancellationToken);
-		if (user is null)
-		{
-			user = new User
-			{
-				Id = userId
-			};
-			await dbContext.Users.AddAsync(user, cancellationToken);
-		}
-
-		Car car = new()
-		{
-			Name = request.Name.Trim(),
-			UserId = userId
-		};
-
-		bool isDuplicate = await dbContext.Cars
-			.AnyAsync(x => x.Name.ToUpper() == request.Name.ToUpper(), cancellationToken);
-
-		if (isDuplicate)
-		{
-			return TypedResults.Conflict();
-		}
-
-		await dbContext.Cars.AddAsync(car, cancellationToken);
-		await dbContext.SaveChangesAsync(cancellationToken);
-
-		Response response = new(car.Id.Value, car.Name);
-		return TypedResults.Created($"/v1/cars/{car.Id}", response);
-	}
-}

src/Vegasco.Server.Api/Cars/DeleteCar.cs

@@ -1,41 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Vegasco.Server.Api.Persistence;
-
-namespace Vegasco.Server.Api.Cars;
-
-public static class DeleteCar
-{
-	public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
-	{
-		return builder
-			.MapDelete("cars/{id:guid}", Endpoint)
-			.WithTags("Cars")
-			.WithDescription("Deletes a car by ID")
-			.Produces(204)
-			.Produces(404);
-	}
-
-	private static async Task<IResult> Endpoint(
-		Guid id,
-		ApplicationDbContext dbContext,
-		ILoggerFactory loggerFactory,
-		CancellationToken cancellationToken)
-	{
-		int rows = await dbContext.Cars
-			.Where(x => x.Id == new CarId(id))
-			.ExecuteDeleteAsync(cancellationToken);
-
-		if (rows == 0)
-		{
-			return TypedResults.NotFound();
-		}
-
-		if (rows > 1)
-		{
-			ILogger logger = loggerFactory.CreateLogger(nameof(DeleteCar));
-			logger.LogWarning("Deleted '{DeletedRowCount}' rows for id '{CarId}'", rows, id);
-		}
-
-		return TypedResults.NoContent();
-	}
-}

src/Vegasco.Server.Api/Cars/GetCar.cs

@@ -1,35 +0,0 @@
-using Microsoft.AspNetCore.Http.HttpResults;
-using Vegasco.Server.Api.Persistence;
-
-namespace Vegasco.Server.Api.Cars;
-
-public static class GetCar
-{
-	public record Response(Guid Id, string Name);
-
-	public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
-	{
-		return builder
-			.MapGet("cars/{id:guid}", Endpoint)
-			.WithDescription("Returns a single car by ID")
-			.WithTags("Cars")
-			.Produces<Response>()
-			.Produces(404);
-	}
-
-	private static async Task<IResult> Endpoint(
-		Guid id,
-		ApplicationDbContext dbContext,
-		CancellationToken cancellationToken)
-	{
-		Car? car = await dbContext.Cars.FindAsync([new CarId(id)], cancellationToken: cancellationToken);
-
-		if (car is null)
-		{
-			return TypedResults.NotFound();
-		}
-
-		Response response = new Response(car.Id.Value, car.Name);
-		return TypedResults.Ok(response);
-	}
-}

src/Vegasco.Server.Api/Cars/GetCars.cs

@@ -1,47 +0,0 @@
-using Microsoft.AspNetCore.Http.HttpResults;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Vegasco.Server.Api.Persistence;
-
-namespace Vegasco.Server.Api.Cars;
-
-public static class GetCars
-{
-	public class ApiResponse
-	{
-		public IEnumerable<ResponseDto> Cars { get; set; } = [];
-	}
-
-	public record ResponseDto(Guid Id, string Name);
-
-	public class Request
-	{
-		[FromQuery(Name = "page")] public int? Page { get; set; }
-		[FromQuery(Name = "pageSize")] public int? PageSize { get; set; }
-	}
-
-	public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
-	{
-		return builder
-			.MapGet("cars", Endpoint)
-			.WithDescription("Returns all cars")
-			.WithTags("Cars")
-			.Produces<ApiResponse>();
-	}
-
-	private static async Task<IResult> Endpoint(
-		[AsParameters] Request request,
-		ApplicationDbContext dbContext,
-		CancellationToken cancellationToken)
-	{
-		List<ResponseDto> cars = await dbContext.Cars
-			.Select(x => new ResponseDto(x.Id.Value, x.Name))
-			.ToListAsync(cancellationToken);
-
-		ApiResponse response = new ApiResponse
-		{
-			Cars = cars
-		};
-		return TypedResults.Ok(response);
-	}
-}

src/Vegasco.Server.Api/Cars/UpdateCar.cs

@@ -1,72 +0,0 @@
-using FluentValidation;
-using FluentValidation.Results;
-using Microsoft.EntityFrameworkCore;
-using Vegasco.Server.Api.Authentication;
-using Vegasco.Server.Api.Common;
-using Vegasco.Server.Api.Persistence;
-
-namespace Vegasco.Server.Api.Cars;
-
-public static class UpdateCar
-{
-	public record Request(string Name);
-	public record Response(Guid Id, string Name);
-
-	public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
-	{
-		return builder
-			.MapPut("cars/{id:guid}", Endpoint)
-			.WithTags("Cars")
-			.WithDescription("Updates a car by ID")
-			.Produces<Response>()
-			.ProducesValidationProblem()
-			.Produces(404)
-			.Produces(409);
-	}
-
-	public class Validator : AbstractValidator<Request>
-	{
-		public Validator()
-		{
-			RuleFor(x => x.Name)
-				.NotEmpty()
-				.MaximumLength(CarTableConfiguration.NameMaxLength);
-		}
-	}
-
-	private static async Task<IResult> Endpoint(
-		Guid id,
-		Request request,
-		IEnumerable<IValidator<Request>> validators,
-		ApplicationDbContext dbContext,
-		UserAccessor userAccessor,
-		CancellationToken cancellationToken)
-	{
-		List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken);
-		if (failedValidations.Count > 0)
-		{
-			return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
-		}
-
-		Car? car = await dbContext.Cars.FindAsync([new CarId(id)], cancellationToken: cancellationToken);
-
-		if (car is null)
-		{
-			return TypedResults.NotFound();
-		}
-
-		bool isDuplicate = await dbContext.Cars
-			.AnyAsync(x => x.Name.ToUpper() == request.Name.ToUpper(), cancellationToken);
-
-		if (isDuplicate)
-		{
-			return TypedResults.Conflict();
-		}
-
-		car.Name = request.Name.Trim();
-		await dbContext.SaveChangesAsync(cancellationToken);
-
-		Response response = new(car.Id.Value, car.Name);
-		return TypedResults.Ok(response);
-	}
-}

src/Vegasco.Server.Api/Common/Constants.cs

@@ -1,9 +0,0 @@
-namespace Vegasco.Server.Api.Common;
-
-public static class Constants
-{
-	public static class Authorization
-	{
-		public const string RequireAuthenticatedUserPolicy = "RequireAuthenticatedUser";
-	}
-}

src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs

@@ -1,157 +0,0 @@
-using Asp.Versioning;
-using FluentValidation;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Extensions.Options;
-using System.Diagnostics;
-using System.Reflection;
-using Vegasco.Server.Api.Authentication;
-using Vegasco.Server.Api.Common;
-using Vegasco.Server.Api.Persistence;
-
-namespace Vegasco.Server.Api.Common;
-
-public static class DependencyInjectionExtensions
-{
-	/// <summary>
-	///     Adds all the Api related services to the Dependency Injection container.
-	/// </summary>
-	/// <param name="builder"></param>
-	public static void AddApiServices(this IHostApplicationBuilder builder)
-	{
-		builder.Services
-			.AddMiscellaneousServices()
-			.AddCustomOpenApi()
-			.AddApiVersioning()
-			.AddAuthenticationAndAuthorization(builder.Environment);
-
-		builder.AddDbContext();
-	}
-
-	private static IServiceCollection AddMiscellaneousServices(this IServiceCollection services)
-	{
-		services.AddSingleton(() =>
-		{
-			string assemblyName = Assembly.GetExecutingAssembly()
-				.GetName()
-				.Name ?? "Vegasco.Server.Api";
-			return new ActivitySource(assemblyName);
-		});
-
-		services.AddResponseCompression();
-
-		services.AddValidatorsFromAssemblies(
-		[
-			typeof(IApiMarker).Assembly
-		], ServiceLifetime.Singleton);
-
-		services.AddHealthChecks();
-
-		services.AddHttpContextAccessor();
-
-		services.AddHostedService<ApplyMigrationsService>();
-
-		services.AddRequestLocalization(o =>
-		{
-			string[] cultures =
-			[
-				"en-US",
-				"en",
-				"de-DE",
-				"de"
-			];
-
-			o.SetDefaultCulture(cultures[0])
-				.AddSupportedCultures(cultures)
-				.AddSupportedUICultures(cultures);
-		});
-
-		return services;
-	}
-
-	private static IServiceCollection AddCustomOpenApi(this IServiceCollection services)
-	{
-		services.AddEndpointsApiExplorer();
-		services.AddOpenApi(o =>
-		{
-			o.CreateSchemaReferenceId = jsonTypeInfo =>
-			{
-				if (string.IsNullOrEmpty(jsonTypeInfo.Type.FullName))
-				{
-					return jsonTypeInfo.Type.Name;
-				}
-
-				string? fullClassName = jsonTypeInfo.Type.FullName;
-
-				if (!string.IsNullOrEmpty(jsonTypeInfo.Type.Namespace))
-				{
-					fullClassName = fullClassName
-						.Replace(jsonTypeInfo.Type.Namespace, "")
-						.TrimStart('.');
-				}
-
-				fullClassName = fullClassName.Replace('+', '_');
-				return fullClassName;
-			};
-		});
-
-		return services;
-	}
-
-	private static IServiceCollection AddApiVersioning(this IServiceCollection services)
-	{
-		services.AddApiVersioning(o =>
-		{
-			o.DefaultApiVersion = new ApiVersion(1);
-			o.ApiVersionReader = new UrlSegmentApiVersionReader();
-			o.ReportApiVersions = true;
-		})
-			.AddApiExplorer(o =>
-			{
-				o.GroupNameFormat = "'v'V";
-				o.SubstituteApiVersionInUrl = true;
-			});
-
-		return services;
-	}
-
-	private static IServiceCollection AddAuthenticationAndAuthorization(this IServiceCollection services, IHostEnvironment environment)
-	{
-		services.AddOptions<JwtOptions>()
-			.BindConfiguration(JwtOptions.SectionName)
-			.ValidateFluently()
-			.ValidateOnStart();
-
-		IOptions<JwtOptions> jwtOptions = services.BuildServiceProvider().GetRequiredService<IOptions<JwtOptions>>();
-
-		services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-			.AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, o =>
-			{
-				o.MetadataAddress = jwtOptions.Value.MetadataUrl;
-
-				o.TokenValidationParameters.ValidAudience = jwtOptions.Value.ValidAudience;
-				o.TokenValidationParameters.ValidateAudience = true;
-
-				if (!string.IsNullOrWhiteSpace(jwtOptions.Value.NameClaimType))
-				{
-					o.TokenValidationParameters.NameClaimType = jwtOptions.Value.NameClaimType;
-				}
-
-				o.RequireHttpsMetadata = !jwtOptions.Value.AllowHttpMetadataUrl && !environment.IsDevelopment();
-			});
-
-		services.AddAuthorizationBuilder()
-			.AddPolicy(Constants.Authorization.RequireAuthenticatedUserPolicy, p => p
-				.RequireAuthenticatedUser()
-				.AddAuthenticationSchemes(JwtBearerDefaults.AuthenticationScheme));
-
-		services.AddScoped<UserAccessor>();
-
-		return services;
-	}
-
-	private static IHostApplicationBuilder AddDbContext(this IHostApplicationBuilder builder)
-	{
-		builder.AddNpgsqlDbContext<ApplicationDbContext>(AppHost.Shared.Constants.Database.Name);
-		return builder;
-	}
-}