GottfriedsNackenWebseite/DataAccess/Data/IUserData.cs

@@ -1,12 +0,0 @@
-using DataAccess.Models;
-
-namespace DataAccess.Data;
-
-public interface IUserData
-{
-    Task<IEnumerable<UserModel>> GetUsers();
-    Task<UserModel?> GetUser(int id);
-    Task InsertUser(UserModel user);
-    Task UpdateUser(UserModel user);
-    Task DeleteUser(int id);
-}

GottfriedsNackenWebseite/DataAccess/Data/UserData.cs

@@ -1,43 +0,0 @@
-using DataAccess.DbAccess;
-using DataAccess.Models;
-
-namespace DataAccess.Data;
-
-public class UserData : IUserData
-{
-    private readonly ISqlDataAccess _db;
-
-    public UserData(ISqlDataAccess db)
-    {
-        _db = db;
-    }
-
-    public Task<IEnumerable<UserModel>> GetUsers()
-    {
-        return _db.LoadData<UserModel, dynamic>("dbo.spUser_GetAll", new { });
-    }
-
-    public async Task<UserModel?> GetUser(int id)
-    {
-        IEnumerable<UserModel> results = await _db.LoadData<UserModel, dynamic>(
-            "dbo.spUser_Get", 
-            new { Id = id });
-
-        return results.FirstOrDefault();
-    }
-
-    public Task InsertUser(UserModel user)
-    {
-        return _db.SaveData("dbo.spUser_Insert", new { user.FirstName, user.LastName });
-    }
-
-    public Task UpdateUser(UserModel user)
-    {
-        return _db.SaveData("dbo.spUser_Update", user);
-    }
-
-    public Task DeleteUser(int id)
-    {
-        return _db.SaveData("dbo.spUser_Delete", new { Id = id });
-    }
-}

GottfriedsNackenWebseite/DataAccess/DataAccess.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
-  </ItemGroup>
-
-</Project>

GottfriedsNackenWebseite/DataAccess/DbAccess/ISqlDataAccess.cs

@@ -1,33 +0,0 @@
-namespace DataAccess.DbAccess;
-
-/// <summary>
-/// Stellt Methoden zur Ausführung von CRUD-Operationen bereit.
-/// </summary>
-public interface ISqlDataAccess
-{
-    /// <summary>
-    /// Liest Daten aus der Datenbank (Read Operationen).
-    /// </summary>
-    /// <typeparam name="TData">Typ der Objekte die zurückgegeben werden.</typeparam>
-    /// <typeparam name="TParam">Typ des Objekts das die Parameter für die SQL-Query enthält.</typeparam>
-    /// <param name="storedProcedureName">Name der StoredProcedure die ausgeführt werden soll.</param>
-    /// <param name="parameters">Das Objekt das die Parameter enthält.</param>
-    /// <param name="connectionId">Der Name des ConnectionStrings der für die Verbindung verwendet werden soll.</param>
-    /// <returns>Die Ergebnisse der Anfrage.</returns>
-    Task<IEnumerable<TData>> LoadData<TData, TParam>(
-        string storedProcedureName,
-        TParam parameters,
-        string connectionId = "Default");
-
-    /// <summary>
-    /// Führt eine SQL-Anfrage aus, die keinen Rückgabewert hat (Create, Update und Delete Operationen).
-    /// </summary>
-    /// <typeparam name="TParam">Typ des Objekts das die Parameter für die SQL-Query enthält.</typeparam>
-    /// <param name="storedProcedureName">Name der StoredProcedure die ausgeführt werden soll.</param>
-    /// <param name="parameters">Das Objekt das die Parameter enthält.</param>
-    /// <param name="connectionId">Der Name des ConnectionStrings der für die Verbindung verwendet werden soll.</param>
-    Task SaveData<TParam>(
-        string storedProcedureName,
-        TParam parameters,
-        string connectionId = "Default");
-}

GottfriedsNackenWebseite/DataAccess/DbAccess/SqlDataAccess.cs

@@ -1,38 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Configuration;
-using System.Data;
-using System.Data.SqlClient;
-
-namespace DataAccess.DbAccess;
-
-public class SqlDataAccess : ISqlDataAccess
-{
-    private readonly IConfiguration _config;
-
-    public SqlDataAccess(IConfiguration config)
-    {
-        _config = config;
-    }
-
-    public async Task<IEnumerable<TData>> LoadData<TData, TParam>(
-        string storedProcedureName,
-        TParam parameters,
-        string connectionId = "Default")
-    {
-        using IDbConnection connection = new SqlConnection(_config.GetConnectionString(connectionId));
-
-        return await connection.QueryAsync<TData>(storedProcedureName, parameters,
-            commandType: CommandType.StoredProcedure);
-    }
-
-    public async Task SaveData<TParam>(
-        string storedProcedureName,
-        TParam parameters,
-        string connectionId = "Default")
-    {
-        using IDbConnection connection = new SqlConnection(_config.GetConnectionString(connectionId));
-
-        await connection.ExecuteAsync(storedProcedureName, parameters,
-            commandType: CommandType.StoredProcedure);
-    }
-}

GottfriedsNackenWebseite/DataAccess/Models/UserModel.cs

@@ -1,8 +0,0 @@
-namespace DataAccess.Models;
-
-public class UserModel
-{
-    public int Id { get; set; }
-    public string FirstName { get; set; } = string.Empty;
-    public string LastName { get; set; } = string.Empty;
-}

GottfriedsNackenWebseite/GottfriedsNackenDB/GottfriedsNackenDB.sqlproj

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <Name>GottfriedsNackenDB</Name>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectVersion>4.1</ProjectVersion>
-    <ProjectGuid>{79f8ac31-e467-4f7c-ac3b-cfadc3290750}</ProjectGuid>
-    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
-    <OutputType>Database</OutputType>
-    <RootPath>
-    </RootPath>
-    <RootNamespace>GottfriedsNackenDB</RootNamespace>
-    <AssemblyName>GottfriedsNackenDB</AssemblyName>
-    <ModelCollation>1033, CI</ModelCollation>
-    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
-    <DeployToDatabase>True</DeployToDatabase>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetLanguage>CS</TargetLanguage>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <SqlServerVerification>False</SqlServerVerification>
-    <IncludeCompositeObjects>True</IncludeCompositeObjects>
-    <TargetDatabaseSet>True</TargetDatabaseSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
-    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
-    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <ItemGroup>
-    <Folder Include="Properties" />
-    <Folder Include="dbo" />
-    <Folder Include="dbo\Tables" />
-    <Folder Include="dbo\StoredProcedures" />
-  </ItemGroup>
-  <ItemGroup>
-    <Build Include="dbo\Tables\User.sql" />
-    <Build Include="dbo\StoredProcedures\spUser_GetAll.sql" />
-    <Build Include="dbo\StoredProcedures\spUser_Get.sql" />
-    <Build Include="dbo\StoredProcedures\spUser_Delete.sql" />
-    <Build Include="dbo\StoredProcedures\spUser_Insert.sql" />
-    <Build Include="dbo\StoredProcedures\spUser_Update.sql" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="GottfriedsNackenDB.publish.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PostDeploy Include="Script.PostDeployment.sql" />
-  </ItemGroup>
-</Project>

GottfriedsNackenWebseite/GottfriedsNackenDB/Script.PostDeployment.sql

@@ -1,10 +0,0 @@
-/* Wird nur ausgeführt, wenn es keine Einträge in [dbo].[User] */
-IF not exists (SELECT 1 FROM [dbo].[User])
-BEGIN
-	INSERT INTO [dbo].[User] (FirstName, LastName)
-	VALUES
-		('Gottfried Wilhelm', 'Leibniz'),
-		('Albert', 'Einstein'),
-		('Curry', 'Wurst'),
-		('Brat', 'Wurst')
-END

GottfriedsNackenWebseite/GottfriedsNackenDB/dbo/StoredProcedures/spUser_Delete.sql

@@ -1,8 +0,0 @@
-CREATE PROCEDURE [dbo].[spUser_Delete]
-	@Id int
-AS
-BEGIN
-	DELETE
-	FROM [dbo].[User]
-	WHERE Id = @Id;
-END

GottfriedsNackenWebseite/GottfriedsNackenDB/dbo/StoredProcedures/spUser_Get.sql

@@ -1,8 +0,0 @@
-CREATE PROCEDURE [dbo].[spUser_Get]
-	@Id int
-AS
-BEGIN
-	SELECT Id, FirstName, LastName
-	FROM [dbo].[User]
-	WHERE Id = @Id;
-END

GottfriedsNackenWebseite/GottfriedsNackenDB/dbo/StoredProcedures/spUser_GetAll.sql

@@ -1,6 +0,0 @@
-CREATE PROCEDURE [dbo].[spUser_GetAll]
-AS
-BEGIN
-	SELECT Id, FirstName, LastName
-	FROM [dbo].[User];
-END

GottfriedsNackenWebseite/GottfriedsNackenDB/dbo/StoredProcedures/spUser_Insert.sql

@@ -1,8 +0,0 @@
-CREATE PROCEDURE [dbo].[spUser_Insert]
-	@FirstName nvarchar(50),
-	@LastName nvarchar(50)
-AS
-BEGIN
-	INSERT INTO [dbo].[User] (FirstName, LastName)
-	VALUES (@FirstName, @LastName);
-END

GottfriedsNackenWebseite/GottfriedsNackenDB/dbo/StoredProcedures/spUser_Update.sql

@@ -1,10 +0,0 @@
-CREATE PROCEDURE [dbo].[spUser_Update]
-	@Id int,
-	@FirstName nvarchar(50),
-	@LastName nvarchar(50)
-AS
-BEGIN
-	UPDATE [dbo].[User]
-	SET FirstName = @FirstName, LastName = @LastName
-	WHERE Id = @Id;
-END

GottfriedsNackenWebseite/GottfriedsNackenDB/dbo/Tables/User.sql

@@ -1,6 +0,0 @@
-CREATE TABLE [dbo].[User]
-(
-	[Id] INT NOT NULL PRIMARY KEY IDENTITY, 
-    [FirstName] NVARCHAR(50) NOT NULL,
-    [LastName] NVARCHAR(50) NOT NULL
-)

GottfriedsNackenWebseite/GottfriedsNackenUtility/GottfriedsNackenUtility.csproj

@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>

GottfriedsNackenWebseite/GottfriedsNackenUtility/MathHelper.cs

@@ -1,32 +0,0 @@
-using System.Numerics;
-
-namespace GottfriedsNackenUtility;
-
-/// <summary>
-/// Bietet nütliche mathematische Funktionen.
-/// </summary>
-public static class MathHelper
-{
-    /// <summary>
-    /// Enumeriert die Zahlen der Fibonacci-Folge.
-    /// </summary>
-    /// <remarks>
-    /// Der Datentyp ist <see cref="BigInteger"/>, da es ein paar Fibonacci-Zahlen gibt die nicht von <see cref="int"/> dargestellt werden können.
-    /// </remarks>
-    public static IEnumerable<BigInteger> Fibonacci()
-    {
-        BigInteger i = 0;
-        BigInteger j = 1;
-
-        while (true)
-        {
-            BigInteger fib = i + j;
-
-            i = j;
-            j = fib;
-
-            yield return fib;
-        }
-    }
-}
-

GottfriedsNackenWebseite/GottfriedsNackenUtility/SusHelper.cs

@@ -1,42 +0,0 @@
-using System.Numerics;
-
-namespace GottfriedsNackenUtility;
-
-/// <summary>
-/// Hier sind suspiziöse Funktionen versteckt.
-/// </summary>
-public static class SusHelper
-{
-    /// <summary>
-    /// Dies ist der ausgeklügelste fake-Fortschrittbalkensalgorithmus den die Welt je erblickt hat.
-    /// </summary>
-    /// <remarks>
-    /// Dieser Task läuft in einer Endlosschleife und MUSS mit Hilfe des Abbruchtokens abgebrochen werden!
-    /// </remarks>
-    /// <param name="progressChangedCallback">Das callback das aufgerufen wird, wenn der Fortschritt sich geändert hat.
-    /// Gibt einen Int zwischen 0 und 100 zurück oder -1, wenn der Fortschrittsbalken auf einen "indefinite" Zustand wechseln soll.</param>
-    /// <param name="cancellationToken">Ein Abbruchtoken, das beim Warten auf den Abschluss der Aufgabe überwacht werden soll.</param>
-    public static async Task UpdateDefinitelyNotFakeProgress(Action<int> progressChangedCallback, CancellationToken cancellationToken)
-    {
-        try
-        {
-            foreach (BigInteger fibonacci in MathHelper.Fibonacci())
-            {
-                await Task.Delay(250 + (int)(fibonacci % 420), cancellationToken);
-
-                if (cancellationToken.IsCancellationRequested)
-                    break;
-
-                if (fibonacci.IsEven && (int)(fibonacci % 42) == 0)
-                {
-                    progressChangedCallback(-1);
-                    await Task.Delay(1337, cancellationToken);
-                    continue;
-                }
-
-                progressChangedCallback((int)(fibonacci % 69));
-            }
-        }
-        catch (TaskCanceledException) { }
-    }
-}

GottfriedsNackenWebseite/GottfriedsNackenWebseite.sln

@@ -5,12 +5,6 @@ VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GottfriedsNackenWebseite", "GottfriedsNackenWebseite\GottfriedsNackenWebseite.csproj", "{464DD643-DAD9-4E16-BB24-36F789ED4C15}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GottfriedsNackenUtility", "GottfriedsNackenUtility\GottfriedsNackenUtility.csproj", "{0122762F-9961-4D28-8AA9-0D6AE7630208}"
-EndProject
-Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "GottfriedsNackenDB", "GottfriedsNackenDB\GottfriedsNackenDB.sqlproj", "{79F8AC31-E467-4F7C-AC3B-CFADC3290750}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataAccess", "DataAccess\DataAccess.csproj", "{023715EE-C9DB-417F-9B77-28BF48A30D41}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,20 +15,6 @@ Global
 		{464DD643-DAD9-4E16-BB24-36F789ED4C15}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{464DD643-DAD9-4E16-BB24-36F789ED4C15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{464DD643-DAD9-4E16-BB24-36F789ED4C15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0122762F-9961-4D28-8AA9-0D6AE7630208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0122762F-9961-4D28-8AA9-0D6AE7630208}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0122762F-9961-4D28-8AA9-0D6AE7630208}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0122762F-9961-4D28-8AA9-0D6AE7630208}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79F8AC31-E467-4F7C-AC3B-CFADC3290750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79F8AC31-E467-4F7C-AC3B-CFADC3290750}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79F8AC31-E467-4F7C-AC3B-CFADC3290750}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{79F8AC31-E467-4F7C-AC3B-CFADC3290750}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79F8AC31-E467-4F7C-AC3B-CFADC3290750}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79F8AC31-E467-4F7C-AC3B-CFADC3290750}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{023715EE-C9DB-417F-9B77-28BF48A30D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{023715EE-C9DB-417F-9B77-28BF48A30D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{023715EE-C9DB-417F-9B77-28BF48A30D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{023715EE-C9DB-417F-9B77-28BF48A30D41}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GottfriedsNackenWebseite/GottfriedsNackenWebseite/Components/WordleComponent.razor

@@ -1,25 +1,15 @@
 @using System.Diagnostics
 
 <!-- Hidden Alerts -->
-<div hidden="@(_alert == AlertState.None)">
+<div hidden="@hideAlert">
     <MudContainer MaxWidth="MaxWidth.Small">
         <MudGrid>
             <MudItem xs="1"></MudItem>
             <MudItem xs="8">
-                @if (_alert == AlertState.Correct)
+                <MudAlert Severity="Severity.Success">Korrekt!</MudAlert>
-                {
-                    <MudAlert Severity="Severity.Success">Korrekt!</MudAlert>
-                }
-                else if (_alert == AlertState.Invalid)
-                {
-                    <MudAlert Severity="Severity.Error">Eingabe ungültig!</MudAlert>
-                }
             </MudItem>
             <MudItem xs="2">
-                @if (_alert == AlertState.Correct)
+                <MudIconButton Icon="@Icons.Filled.Replay" Color="Color.Primary" aria-label="nochmal spielen" OnClick="@PlayAgain"></MudIconButton>
-                {
-                    <MudIconButton Icon="@Icons.Filled.Replay" Color="Color.Primary" aria-label="nochmal spielen" OnClick="@PlayAgain" />
-                }
             </MudItem>
             <MudItem xs="1"></MudItem>
         </MudGrid>
@@ -29,7 +19,7 @@
 <!-- Matrix mit Buchstabenfeldern -->
 <div class="d-flex justify-center mt-2 mb-2">
     <div>
-        @foreach (CharData[] guess in _previousGuesses)
+        @foreach (CharData[] guess in PreviousGuesses)
         {
             <div class="d-flex mb-2">
                 @foreach (CharData cd in guess)
@@ -58,35 +48,25 @@
     </div>
 </div>
 
-@*
+<p>@Input</p>
-<MudTextField T="string" FullWidth="true" Immediate="true" @bind-Value="Input" Label="Bla" Variant="Variant.Outlined" MaxLength="ColumnCount" Counter="ColumnCount" />
+
-<MudTextField T="string" FullWidth="true" Immediate="true" @bind-Value="Input" Label="Blub" Variant="Variant.Outlined" MaxLength="ColumnCount" Counter="ColumnCount" />
-*@
 <!-- Input dialogue feld -->
-<MudContainer MaxWidth="MaxWidth.Small">
+<MudContainer MaxWidth="MaxWidth.Small" @onkeyup="@Check4Enter">
     <MudGrid Spacing="2">
-        <MudItem xs="1" />
+        <MudItem xs="1"></MudItem>
         <MudItem xs="8">
-            <MudTextField @ref="_textField" T="string" FullWidth="true" Immediate="true" @bind-Value="Input" Label="Dein Tipp:" Variant="Variant.Outlined" MaxLength="ColumnCount" Mask="@InputMask" Counter="ColumnCount" OnKeyDown="OnKeyDown" />
+            <MudTextField Class="" @ref="textField" T="string" FullWidth="true" Immediate="true" @bind-Value="@_input" Label="Dein Tipp:" Variant="Variant.Outlined" MaxLength="5" Mask="@InputMask" Counter="ColumnCount" />
-            @*<input Type="text" value="@Input"/>*@
         </MudItem>
         <MudItem xs="2">
-            <MudButton style="height: 56px; margin-top: 6px;" Class="justify-center" Disabled="Input.Length != ColumnCount"
+            <MudButton style="height: 56px; margin-top: 6px;" Class="justify-center" Disabled="_input.Length != ColumnCount"
-                       Size="Size.Large" Variant="Variant.Outlined" EndIcon="@Icons.Material.Filled.Send" Color="Color.Primary" OnClick=@OnEnterGuessClick>OK</MudButton>
+                       Size="Size.Large" Variant="Variant.Outlined" EndIcon="@Icons.Material.Filled.Send" Color="Color.Primary" OnClick=@ButtonOnClick>OK</MudButton>
         </MudItem>
-        <MudItem xs="1" />
+        <MudItem xs="1"></MudItem>
     </MudGrid>
 </MudContainer>
 
 @code {
 
-    private enum AlertState
-    {
-        None,
-        Correct,
-        Invalid
-    }
-
     public enum CharState
     {
         None,
@@ -106,88 +86,112 @@
             State = state;
         }
     }
+    
+    private string _input = string.Empty;
+    
+    [Parameter]
+    public string Input
+    {
+        get => _input;
+        set => _input = value;
+    }
 
-    private bool _found = false;
+    public async Task SetText(string text)
+    {
+        textField.SetText(text);
+    }
 
-    private AlertState _alert = AlertState.None;
+    public bool hideAlert = true;
 
-    private List<CharData[]> _previousGuesses = new();
+    public MudTextField<string> textField;
 
-    private MudTextField<string> _textField = default!;
+    public List<CharData[]> PreviousGuesses = new();
+
+    private bool found = false;
+    private int _columnCount;
+    private string? _secret = null;
+    private IMask _inputMask = new RegexMask(@"^[A-Za-z]{0,5}$");
+    private Func<string, bool>? _checkInput;
+    private Func<string>? _generateSecret;
 
     [Parameter]
-    public string Input { get; set; } = String.Empty;
+    public int ColumnCount
+    {
+        get => _columnCount;
+        set => _columnCount = value;
+    }
 
     [Parameter]
-    public int ColumnCount { get; set; }
+    public string? Secret
-
+    {
-    public string? Secret { get; set; } = null;
+        get => _secret;
+        set => _secret = value;
+    }
 
     [Parameter]
-    public IMask InputMask { get; set; } = new RegexMask("^.*$");
+    public IMask InputMask
+    {
+        get => _inputMask;
+        set => _inputMask = value;
+    }
 
-    /// <summary>
-    /// Prüft ob die getätigte Eingabe eine mögliche Lösung ist.
-    /// </summary>
     [Parameter]
-    public Func<string, bool> CheckInput { get; set; } = _ => true;
+    public Func<string, bool>? CheckInput
+    {
+        get => _checkInput;
+        set => _checkInput = value;
+    }
+
+    [Parameter]
+    public Func<string>? GenerateSecret
+    {
+        get => _generateSecret;
+        set => _generateSecret = value;
+    }
 
     /// <summary>
     /// Wird ausgelöst wenn eine Eingabe getätigt und validiert wurde.
     /// </summary>
-    [Parameter]
+    public event EventHandler<CharData[]>? InputValidated;
-    public EventCallback<CharData[]> InputValidated { get; set; }
 
-    /// <summary>
+    public void Check4Enter(KeyboardEventArgs e)
-    /// Wird ausgelöst wenn ein neues Secret generiert werden muss.
-    /// </summary>
-    [Parameter]
-    public EventCallback GenerateSecret { get; set; }
-
-    public async Task OnKeyDown(KeyboardEventArgs e)
     {
-        _alert = AlertState.None;
-
         if (e.Code == "Enter" || e.Code == "NumpadEnter")
         {
-            if(_found)
+            if(found)
             {
-                await PlayAgain();
+                PlayAgain();
             }
             else
             {
-                await OnEnterGuessClick();   
+                ButtonOnClick();   
             }
         }
     }
 
-    public async Task OnEnterGuessClick()
+    public void ButtonOnClick()
     {
-        if (Input.Length != ColumnCount || _found) return;
+        if (Input.Length != ColumnCount || found) return;
 
-        if (!CheckInput(Input))
+        if (CheckInput != null && !CheckInput(Input))
+            return; // TODO: Eingabe ungültig!
+
+        if (Secret == null && GenerateSecret != null)
+            Secret = GenerateSecret();
+
+        if(TestInput(Input))
         {
-            _alert = AlertState.Invalid;
+            found = true;
-            StateHasChanged();
+            hideAlert = false;
-            return;
         }
 
-        if (Secret == null)
+        textField.Clear();
-            await GenerateSecret.InvokeAsync();
-
-        if(await TestInput(Input))
-        {
-            _found = true;
-            _alert = AlertState.Correct;
-        }
-
-        await _textField.Clear();
     }
 
     /// <summary>
     /// Prüft ob die Eingabe korrekt ist.
     /// </summary>
-    private async Task<bool> TestInput(string input)
+    private bool TestInput(string input)
     {
         CharData[] validatedInput = new CharData[ColumnCount];
 
@@ -217,19 +221,20 @@
             validatedInput[i] = new CharData(guessedChar, state);
         }
 
-        _previousGuesses.Add(validatedInput);
+        PreviousGuesses.Add(validatedInput);
 
-        await InputValidated.InvokeAsync(validatedInput);
+        InputValidated?.Invoke(this, validatedInput);
 
         return correct;
     }
 
-    public async Task PlayAgain()
+    public void PlayAgain()
     {
-        _previousGuesses.Clear();
+        PreviousGuesses.Clear();
-        _alert = AlertState.None;
+        hideAlert = true;
-        _found = false;
+        found = false;
-
+        
-        await GenerateSecret.InvokeAsync();
+        if (GenerateSecret != null)
+            Secret = GenerateSecret();
     }
 }

GottfriedsNackenWebseite/GottfriedsNackenWebseite/Components/WordleKeyboardComponent.razor

@@ -1,4 +1,5 @@
-<!-- Matrix mit Buchstabenfeldern -->
+
+<!-- Matrix mit Buchstabenfeldern -->
 <div class="d-flex justify-center mt-2 mb-2">
     <div>
         @{
@@ -12,30 +13,28 @@
                         char key = Keys[index];
 
                         char upperKey = char.ToUpper(key);
-                        
-                        _knownKeyStates.TryGetValue(upperKey, out var keyState);
 
-                        if (keyState == WordleComponent.CharState.Correct)
+                        if (_correctKeys.Contains(upperKey))
                         {
-                            <MudButton Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" Color="Color.Success">
+                            <MudButton Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" Color="Color.Success" @onclick="() => ButtonPressed(key)">
                                 <MudText Typo="Typo.h5">@upperKey</MudText>
                             </MudButton>
                         }
-                        else if (keyState == WordleComponent.CharState.Misplaced)
+                        else if (_misplacedKeys.Contains(upperKey))
                         {
-                            <MudButton Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" Color="Color.Warning">
+                            <MudButton Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" Color="Color.Warning" @onclick="() => ButtonPressed(key)">
                                 <MudText Typo="Typo.h5">@upperKey</MudText>
                             </MudButton>
                         }
-                        else if (keyState == WordleComponent.CharState.Wrong)
+                        else if (_wrongKeys.Contains(upperKey))
                         {
-                            <MudButton Disabled="true" Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" Color="Color.Error">
+                            <MudButton Disabled="true" Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" Color="Color.Error" @onclick="() => ButtonPressed(key)">
                                 <MudText Typo="Typo.h5">@upperKey</MudText>
                             </MudButton>
                         }
                         else
                         {
-                            <MudButton Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em">
+                            <MudButton Variant="Variant.Outlined" Class="mr-2" Style="width: 5em; height: 5em" @onclick="() => ButtonPressed(key)">
                                 <MudText Typo="Typo.h5">@upperKey</MudText>
                             </MudButton>
                         }
@@ -50,9 +49,13 @@
     
     [Parameter]
     public char[] Keys { get; set; } = Array.Empty<char>();
-
-    private Dictionary<char, WordleComponent.CharState> _knownKeyStates = new();
     
+    private List<char> _correctKeys = new();
+    
+    private List<char> _misplacedKeys = new();
+    
+    private List<char> _wrongKeys = new();
+
     [Parameter]
     public int KeysPerRow { get; set; } = 10;
 
@@ -66,36 +69,4 @@
     {
         await KeyPressed.InvokeAsync(c);
     }
-
-    public void UpdateKeyInfo(WordleComponent.CharData cd)
-    {
-        _knownKeyStates.TryGetValue(cd.Char, out var oldState);
-
-        WordleComponent.CharState newState = WordleComponent.CharState.None;
-        
-        switch (cd.State)
-        {
-            case WordleComponent.CharState.Correct:
-                newState = WordleComponent.CharState.Correct;
-                break;
-            case WordleComponent.CharState.Misplaced:
-                // Den besseren Zustand nicht durch schlechteren ersetzen
-                if (oldState != WordleComponent.CharState.Correct)
-                {
-                    newState = WordleComponent.CharState.Misplaced;
-                }
-                break;
-            case WordleComponent.CharState.Wrong:
-                newState = WordleComponent.CharState.Wrong;
-                break;
-        }
-
-        _knownKeyStates[cd.Char] = newState;
-    }
-
-    public void ResetKeyInfo()
-    {
-        _knownKeyStates.Clear();
-        StateHasChanged();
-    }
 }

GottfriedsNackenWebseite/GottfriedsNackenWebseite/GottfriedsNackenWebseite.csproj

@@ -17,9 +17,4 @@
     <PackageReference Include="MudBlazor" Version="6.0.7" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
-    <ProjectReference Include="..\GottfriedsNackenUtility\GottfriedsNackenUtility.csproj" />
-  </ItemGroup>
-
 </Project>

GottfriedsNackenWebseite/GottfriedsNackenWebseite/Pages/DatabaseTest.razor

@@ -1,96 +0,0 @@
-@page "/databasetest"
-
-@using DataAccess.Data
-@using DataAccess.Models
-@inject IUserData _userData
-
-<PageTitle>Database Test</PageTitle>
-
-<MudContainer MaxWidth="MaxWidth.Small">
-    <MudTable Items="@_users" Hover="true" Breakpoint="Breakpoint.Sm" Loading="_loading">
-        <ToolBarContent>
-            <MudText Typo="Typo.h6">Nutzer</MudText>
-            <MudSpacer />
-            <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="RefreshUserList" />
-        </ToolBarContent>
-
-        <HeaderContent>
-            <MudTh>Id</MudTh>
-            <MudTh>First Name</MudTh>
-            <MudTh>Last Name</MudTh>
-            <MudTh/>
-        </HeaderContent>
-        <RowTemplate>
-            <MudTd DataLabel="Nr">@context.Id</MudTd>
-            <MudTd DataLabel="First Name">@context.FirstName</MudTd>
-            <MudTd DataLabel="Last Name">@context.LastName</MudTd>
-            <MudTd>
-                <MudIconButton Icon="@Icons.Material.Filled.Delete" OnClick="() => DeleteUser(context)" />
-            </MudTd>
-        </RowTemplate>
-
-        <PagerContent>
-            <MudTablePager/>
-        </PagerContent>
-    </MudTable>
-    
-    <MudPaper Class="pa-4 mt-2">
-        <MudForm @bind-IsValid="_newUserValid" >
-
-            <MudText Typo="Typo.h4">Neuen Nutzer erstellen:</MudText>
-            <MudTextField T="string" Label="Vorname" @bind-Value="_newUser.FirstName" Immediate="true" Required="true" RequiredError="Vorname muss angegeben werden!"/>
-            <MudTextField T="string" Label="Nachname" @bind-Value="_newUser.LastName" Immediate="true" Required="true" RequiredError="Nachname muss angegeben werden!"/>
-            <MudButton Class="mt-2" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_newUserValid" OnClick="AddUser">Hinzufügen</MudButton>
-        </MudForm>
-    </MudPaper>
-
-</MudContainer>
-
-@code {
-    private bool _newUserValid;
-
-    private UserModel _newUser = new();
-
-    private bool _loading;
-
-    private IEnumerable<UserModel> _users = Enumerable.Empty<UserModel>();
-
-    protected override async Task OnInitializedAsync()
-    {
-        await RefreshUserList();
-
-        await base.OnInitializedAsync();
-    }
-
-    private async Task RefreshUserList()
-    {
-        _loading = true;
-
-        try
-        {
-            _users = await _userData.GetUsers();
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"Failed to load users. Exception: {e}");
-        }
-
-        _loading = false;
-    }
-
-    private async Task AddUser()
-    {
-        await _userData.InsertUser(_newUser);
-
-        await RefreshUserList();
-
-        _newUser = new UserModel();
-    }
-    
-    private async Task DeleteUser(UserModel user)
-    {
-        await _userData.DeleteUser(user.Id);
-        
-        await RefreshUserList();
-    }
-}

GottfriedsNackenWebseite/GottfriedsNackenWebseite/Pages/Numberle.razor

@@ -1,50 +1,29 @@
 @page "/numberle"
 
 @using GottfriedsNackenWebseite.Components
-@using GottfriedsNackenWebseite.Numberle
-@using GottfriedsNackenUtility
 @using System.Diagnostics
-@using System.Numerics
+@using GottfriedsNackenWebseite.Numberle
 
 <PageTitle>Nacken Numberle</PageTitle>
 <MudText Align="Align.Center" Class="mt-2 mb-2"> Gebe eine (korrekte) mathematische Gleichung ein:</MudText>
 
-<WordleComponent ColumnCount="8" GenerateSecret="OnGenerateNewSecret" InputMask="@_inputMask" CheckInput="CheckInput" InputValidated="OnInputValidated" @ref="_wordle" />
+<WordleComponent ColumnCount="8" GenerateSecret="GenerateSecret" InputMask="@_inputMask" CheckInput="CheckInput" @ref="_wordle" />
 
-<WordleKeyboardComponent @ref="_keyboard" KeyPressed="KeyboardKeyPressed" Keys="Chars" />
+<WordleKeyboardComponent KeyPressed="KeyboardKeyPressed" Keys="Chars" />
-
-<MudOverlay @bind-Visible="_showLoadingOverlay" DarkBackground="true">
-    <MudCard>
-        <MudCardHeader>
-            <MudText Typo="Typo.h5">Bitte warten...</MudText>
-        </MudCardHeader>
-        <MudCardContent>
-            <MudText>Erzeuge eine unknackbare Formel mit roher Gewalt!</MudText>
-            <MudProgressLinear Color="Color.Secondary" Indeterminate="_progress < 0" Value="_progress" Class="my-7"/>
-        </MudCardContent>
-    </MudCard>
-</MudOverlay>
 
 @code
 {
-    private static readonly IMask _inputMask = new RegexMask(@"^[0-9+\-*/=]{0,8}$");
+    private IMask _inputMask = new RegexMask(@"^[0-9+\-*/=]{0,8}$");
 
-    private readonly Parser _parser = new();
+    private Parser _parser = new();
 
-    private WordleComponent _wordle = default!;
+    private WordleComponent _wordle;
-    private WordleKeyboardComponent _keyboard = default!;
-
-    private bool _showLoadingOverlay;
-    private int _progress;
 
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
     }
 
-    /// <summary>
-    /// Prüft ob input eine gültige Gleichung ist.
-    /// </summary>
     private bool CheckInput(string input)
     {
         try
@@ -57,7 +36,7 @@
 
             (decimal value, int equalSigns) = CrunchyValidaty(ast);
 
-            // Wir akzeptieren nur, wenn es exakt ein Gleichheitszeichen gibt und die Gleichung erfüllt ist.
+            // Wir akzeptieren nur, wenn es exakt ein Gleichheitszeichen gibt und diese erfüllt ist.
             return value == 1 && equalSigns == 1;
         }
         catch
@@ -105,55 +84,12 @@
         return (0, 0);
     }
 
-    /// <summary>
-    /// Die Zeichen aus denen eine Antwort besteht.
-    /// </summary>
     private static readonly char[] Chars = {
         '=', '+', '-', '*', '/',
         '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
     };
 
-    /// <summary>
+    private string GenerateSecret()
-    /// Generiert ein neues Geheimnis und zeigt während dessen den Ladebalken an.
-    /// </summary>
-    /// <returns></returns>
-    private async Task OnGenerateNewSecret()
-    {
-        _keyboard.ResetKeyInfo();
-
-        CancellationTokenSource cts = new CancellationTokenSource();
-
-        Task? amazingTask = null;
-
-        try
-        {
-            // Ladebalkenaktualisierer starten
-            amazingTask = SusHelper.UpdateDefinitelyNotFakeProgress(progress =>
-            {
-                _progress = progress;
-                StateHasChanged();
-            }, cts.Token);
-
-            _showLoadingOverlay = true;
-
-            _wordle.Secret = await Task.Run(GenerateFormula);
-
-            _showLoadingOverlay = false;
-        }
-        finally
-        {
-            // Ladebalkenaktualisierer stoppen
-            cts.Cancel();
-            if (amazingTask != null)
-                await amazingTask;
-        }
-    }
-
-    /// <summary>
-    /// Erzeugt eine neue (gültige) Formel.
-    /// </summary>
-    /// <returns>Die Formel</returns>
-    private string GenerateFormula()
     {
         int charCount = 8;
 
@@ -163,8 +99,6 @@
         int equalsIndex = Random.Shared.Next(1, charCount - 1);
         formula[equalsIndex] = '=';
 
-        // Ersetzt das Zeichen mit Index "index" durch einen Zufälligen wert.
-        // TODO: ein etwas gewiefterer Algorithmus würde nicht schaden.
         void PlaceRandomChar(int index)
         {
             char left = (index > 0) ? formula[index - 1] : '\0';
@@ -193,26 +127,13 @@
                 Debug.WriteLine(str);
 
                 if (CheckInput(str))
-                {
                     return str;
-                }
             }
         }
     }
 
     private async Task KeyboardKeyPressed(char key)
     {
-        // TODO: Virtuelles Keyboard
+        await _wordle.SetText(_wordle.Input + key); //Input += key;
-        //await _wordle.SetText(_wordle.Input + key); //Input += key;
-        await Task.CompletedTask;
-    }
-
-    private void OnInputValidated(WordleComponent.CharData[] data)
-    {
-        // Auswertung in das Keyboard packen
-        foreach (WordleComponent.CharData cd in data)
-        {
-            _keyboard.UpdateKeyInfo(cd);    
-        }
     }
 }

GottfriedsNackenWebseite/GottfriedsNackenWebseite/Program.cs

@@ -1,5 +1,3 @@
-using DataAccess.Data;
-using DataAccess.DbAccess;
 using GottfriedsNackenWebseite.Data;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
@@ -13,9 +11,6 @@ builder.Services.AddServerSideBlazor();
 builder.Services.AddSingleton<WeatherForecastService>();
 builder.Services.AddMudServices();
 
-builder.Services.AddSingleton<ISqlDataAccess, SqlDataAccess>();
-builder.Services.AddSingleton<IUserData, UserData>();
-
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.

GottfriedsNackenWebseite/GottfriedsNackenWebseite/Shared/NavMenu.razor

@@ -23,9 +23,6 @@
     <MudNavLink Href="numberle" Match=NavLinkMatch.Prefix>
         Nacken Numberle
     </MudNavLink>
-    <MudNavLink Href="databasetest" Match=NavLinkMatch.Prefix>
-        Datenbank Test
-    </MudNavLink>
 </MudNavMenu>
 @*
 <div class="top-row ps-3 navbar navbar-dark">

GottfriedsNackenWebseite/GottfriedsNackenWebseite/appsettings.Development.json

@@ -1,9 +1,9 @@
 {
-    "DetailedErrors": true,
+  "DetailedErrors": true,
-    "Logging": {
+  "Logging": {
-        "LogLevel": {
+    "LogLevel": {
-            "Default": "Information",
+      "Default": "Information",
-            "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning"
-        }
+    }
-    },
+  }
 }

GottfriedsNackenWebseite/GottfriedsNackenWebseite/appsettings.json

@@ -1,12 +1,9 @@
 {
-    "Logging": {
+  "Logging": {
-        "LogLevel": {
+    "LogLevel": {
-            "Default": "Information",
+      "Default": "Information",
-            "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning"
-        }
-    },
-    "AllowedHosts": "*",
-    "ConnectionStrings": {
-        "Default": "PLACEHOLDER"
     }
+  },
+  "AllowedHosts": "*"
 }