From 11dccc04cbd5654ee342159e2cc4acb7709f159f Mon Sep 17 00:00:00 2001
From: OliverT87 <Oliver.Traeger@tn.eckert-bfw.de>
Date: Tue, 27 May 2025 14:24:46 +0200
Subject: [PATCH] =?UTF-8?q?ok,=20Fenster=20ist=20da,=20ich=20komme=20auf?=
 =?UTF-8?q?=20die=20main=20und=20auf=20die=20about=20page=20und=20auch=20v?=
 =?UTF-8?q?on=20da=20zur=C3=BCck=20zur=20main;=20Inhalt=20main=20page=20fe?=
 =?UTF-8?q?hlt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Project_Periodensystem.Controller.csproj  |  2 +-
 .../Project_Periodensystem.Model.csproj       |  2 +-
 .../Project_Periodensystem.Persistence.csproj |  2 +-
 Project_Periodensystem.View/AboutPage.axaml   | 12 +++++
 .../AboutPage.axaml.cs                        | 27 +++++++++++
 Project_Periodensystem.View/App.axaml         |  3 +-
 Project_Periodensystem.View/App.axaml.cs      |  6 ++-
 Project_Periodensystem.View/LandingPage.axaml | 22 +++++++++
 .../LandingPage.axaml.cs                      | 29 ++++++++++++
 Project_Periodensystem.View/MainWindow.axaml  | 22 ++-------
 .../MainWindow.axaml.cs                       | 45 +++++++++----------
 .../PeriodicTablePage.axaml                   | 11 +++++
 .../PeriodicTablePage.axaml.cs                | 29 ++++++++++++
 Project_Periodensystem.View/Program.cs        | 17 +++----
 .../Project_Periodensystem.View.csproj        | 27 +++++------
 program.cs                                    |  0
 16 files changed, 182 insertions(+), 74 deletions(-)
 create mode 100644 Project_Periodensystem.View/AboutPage.axaml
 create mode 100644 Project_Periodensystem.View/AboutPage.axaml.cs
 create mode 100644 Project_Periodensystem.View/LandingPage.axaml
 create mode 100644 Project_Periodensystem.View/LandingPage.axaml.cs
 create mode 100644 Project_Periodensystem.View/PeriodicTablePage.axaml
 create mode 100644 Project_Periodensystem.View/PeriodicTablePage.axaml.cs
 delete mode 100644 program.cs

diff --git a/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj b/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj
index b66d3a2..566ae43 100644
--- a/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj
+++ b/Project_Periodensystem.Controller/Project_Periodensystem.Controller.csproj
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj b/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj
index 125f4c9..fa71b7a 100644
--- a/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj
+++ b/Project_Periodensystem.Model/Project_Periodensystem.Model.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj b/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj
index d11543f..631b156 100644
--- a/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj
+++ b/Project_Periodensystem.Persistence/Project_Periodensystem.Persistence.csproj
@@ -2,7 +2,7 @@
   <!-- PropertyGroup enthält verschiedene Projekteinstellungen -->
   <PropertyGroup>
     <!-- Gibt die Ziel-.NET-Framework-Version an -->
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <!-- Aktiviert implizite Verwendungen, die automatisch häufig verwendete Namespaces importieren -->
     <ImplicitUsings>enable</ImplicitUsings>
     <!-- Aktiviert nullable Referenztypen zur Unterstützung der Nullsicherheitsprüfung -->
diff --git a/Project_Periodensystem.View/AboutPage.axaml b/Project_Periodensystem.View/AboutPage.axaml
new file mode 100644
index 0000000..73c9f0a
--- /dev/null
+++ b/Project_Periodensystem.View/AboutPage.axaml
@@ -0,0 +1,12 @@
+<!-- Datei: Project_Periodensystem.View/AboutPage.axaml -->
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:i="using:Avalonia.Interactivity"
+             x:Class="Project_Periodensystem.View.AboutPage">
+  <Grid>
+    <Button x:Name="BackButton" 
+            Click="BackButton_Click">
+        Back
+    </Button>
+  </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Project_Periodensystem.View/AboutPage.axaml.cs b/Project_Periodensystem.View/AboutPage.axaml.cs
new file mode 100644
index 0000000..5ae8acc
--- /dev/null
+++ b/Project_Periodensystem.View/AboutPage.axaml.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+
+namespace Project_Periodensystem.View
+{
+    public partial class AboutPage : UserControl
+    {
+        public AboutPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+            => AvaloniaXamlLoader.Load(this);
+
+        private void BackButton_Click(object sender, RoutedEventArgs e)
+        {
+            var window = this.GetVisualRoot() as MainWindow;
+            if (window != null)
+            {
+                window.ShowLanding();
+            }
+        }
+    }
+}
diff --git a/Project_Periodensystem.View/App.axaml b/Project_Periodensystem.View/App.axaml
index 2020807..09e0eda 100644
--- a/Project_Periodensystem.View/App.axaml
+++ b/Project_Periodensystem.View/App.axaml
@@ -1,7 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Project_Periodensystem.View.App"
-             RequestedThemeVariant="Light">
+             x:Class="Project_Periodensystem.View.App">
   <Application.Styles>
     <FluentTheme />
   </Application.Styles>
diff --git a/Project_Periodensystem.View/App.axaml.cs b/Project_Periodensystem.View/App.axaml.cs
index c31d742..1b535e1 100644
--- a/Project_Periodensystem.View/App.axaml.cs
+++ b/Project_Periodensystem.View/App.axaml.cs
@@ -7,12 +7,16 @@ namespace Project_Periodensystem.View
     public partial class App : Application
     {
         public override void Initialize()
-            => AvaloniaXamlLoader.Load(this);
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
 
         public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
                 desktop.MainWindow = new MainWindow();
+            }
 
             base.OnFrameworkInitializationCompleted();
         }
diff --git a/Project_Periodensystem.View/LandingPage.axaml b/Project_Periodensystem.View/LandingPage.axaml
new file mode 100644
index 0000000..8de217f
--- /dev/null
+++ b/Project_Periodensystem.View/LandingPage.axaml
@@ -0,0 +1,22 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="Project_Periodensystem.View.LandingPage">
+  <Grid>
+    <TextBlock Text="Welcome to the periodic table of elements!"
+               HorizontalAlignment="Center"
+               VerticalAlignment="Center"
+               FontSize="32"
+               Foreground="Red"
+               Margin="0,0,0,60"/>
+    <Button x:Name="StartButton" 
+            Content="Start"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Margin="0,60,0,0"
+            Width="160"
+            Height="50"
+            Background="Red"
+            Foreground="White"
+            Click="StartButton_Click"/>
+  </Grid>
+</UserControl>
diff --git a/Project_Periodensystem.View/LandingPage.axaml.cs b/Project_Periodensystem.View/LandingPage.axaml.cs
new file mode 100644
index 0000000..d16c698
--- /dev/null
+++ b/Project_Periodensystem.View/LandingPage.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+
+namespace Project_Periodensystem.View
+{
+    public partial class LandingPage : UserControl
+    {
+        public LandingPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void StartButton_Click(object sender, RoutedEventArgs e)
+        {
+            var window = this.GetVisualRoot() as MainWindow;
+            if (window != null)
+            {
+                window.ShowPeriodicTable();
+            }
+        }
+    }
+}
diff --git a/Project_Periodensystem.View/MainWindow.axaml b/Project_Periodensystem.View/MainWindow.axaml
index 17e0836..38b22eb 100644
--- a/Project_Periodensystem.View/MainWindow.axaml
+++ b/Project_Periodensystem.View/MainWindow.axaml
@@ -1,23 +1,9 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Project_Periodensystem.Controller;assembly=Project_Periodensystem.Controller"
-        xmlns:components="clr-namespace:Project_Periodensystem.View.Components;assembly=Project_Periodensystem.View"
         x:Class="Project_Periodensystem.View.MainWindow"
         Title="Periodensystem"
-        Width="900" Height="650"
-        CanResize="True"
-        Background="#111111">
-
-  <!-- DataContext auf den Controller setzen -->
-  <Window.DataContext>
-    <vm:PeriodensystemController />
-  </Window.DataContext>
-
-  <ScrollViewer HorizontalScrollBarVisibility="Auto"
-                VerticalScrollBarVisibility="Auto">
-    <!-- Canvas mit fester Größe: 18 Spalten × 80px = 1440px, 10 Zeilen × 80px = 800px -->
-    <Canvas x:Name="PeriodicCanvas"
-            Width="1440"
-            Height="800" />
-  </ScrollViewer>
+        Width="900" Height="650">
+    <Grid>
+        <ContentControl x:Name="MainContent"/>
+    </Grid>
 </Window>
diff --git a/Project_Periodensystem.View/MainWindow.axaml.cs b/Project_Periodensystem.View/MainWindow.axaml.cs
index a1eeb4d..f7a13dd 100644
--- a/Project_Periodensystem.View/MainWindow.axaml.cs
+++ b/Project_Periodensystem.View/MainWindow.axaml.cs
@@ -1,46 +1,41 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Project_Periodensystem.Controller;
-using Project_Periodensystem.View.Components;
 
 namespace Project_Periodensystem.View
 {
     public partial class MainWindow : Window
     {
-        private readonly PeriodensystemController _controller;
+        private readonly ContentControl mainContent;
 
         public MainWindow()
         {
             InitializeComponent();
-            _controller = new PeriodensystemController();
-            DataContext = _controller;
-            PopulateCanvas();
+            var content = this.Find<ContentControl>("MainContent");
+            if (content == null)
+                throw new System.Exception("MainContent control not found.");
+            
+            mainContent = content;
+            ShowLanding(); // Show initial page
         }
 
         private void InitializeComponent()
-            => AvaloniaXamlLoader.Load(this);
-
-        private void PopulateCanvas()
         {
-            // Holt den Canvas aus dem XAML (muss existieren!)
-            var canvas = this.FindControl<Canvas>("PeriodicCanvas");
-            if (canvas == null)
-                return;
+            AvaloniaXamlLoader.Load(this);
+        }
 
-            foreach (var element in _controller.Elements)
-            {
-                // Neues Tile für jedes Element
-                var tile = new ElementTile
-                {
-                    DataContext = element
-                };
+        public void ShowLanding()
+        {
+            mainContent.Content = new LandingPage();
+        }
 
-                // Position setzen: Column × 80px, Row × 80px
-                Canvas.SetLeft(tile, element.Column * 80);
-                Canvas.SetTop(tile,  element.Row    * 80);
+        public void ShowPeriodicTable()
+        {
+            mainContent.Content = new PeriodicTablePage();
+        }
 
-                canvas.Children.Add(tile);
-            }
+        public void ShowAbout()
+        {
+            mainContent.Content = new AboutPage();
         }
     }
 }
diff --git a/Project_Periodensystem.View/PeriodicTablePage.axaml b/Project_Periodensystem.View/PeriodicTablePage.axaml
new file mode 100644
index 0000000..45ba1d9
--- /dev/null
+++ b/Project_Periodensystem.View/PeriodicTablePage.axaml
@@ -0,0 +1,11 @@
+<!-- PeriodicTablePage.axaml -->
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="Project_Periodensystem.View.PeriodicTablePage">
+  <Grid>
+    <Button Name="AboutButton" 
+            Click="AboutButton_Click">
+        About
+    </Button>
+  </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Project_Periodensystem.View/PeriodicTablePage.axaml.cs b/Project_Periodensystem.View/PeriodicTablePage.axaml.cs
new file mode 100644
index 0000000..54a3d89
--- /dev/null
+++ b/Project_Periodensystem.View/PeriodicTablePage.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+
+namespace Project_Periodensystem.View
+{
+    public partial class PeriodicTablePage : UserControl
+    {
+        public PeriodicTablePage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private void AboutButton_Click(object sender, RoutedEventArgs e)
+        {
+            var window = this.GetVisualRoot() as MainWindow;
+            if (window != null)
+            {
+                window.ShowAbout();
+            }
+        }
+    }
+}
diff --git a/Project_Periodensystem.View/Program.cs b/Project_Periodensystem.View/Program.cs
index 3887d6b..47d1bb8 100644
--- a/Project_Periodensystem.View/Program.cs
+++ b/Project_Periodensystem.View/Program.cs
@@ -1,18 +1,19 @@
-using System;
-using Avalonia;
+using Avalonia;
 
 namespace Project_Periodensystem.View
 {
-    class Program
+    internal static class Program
     {
-        [STAThread]
+        [System.STAThread] // <-- Das ist korrekt!
         public static void Main(string[] args)
-            => BuildAvaloniaApp()
-               .StartWithClassicDesktopLifetime(args);
+        {
+            BuildAvaloniaApp()
+                .StartWithClassicDesktopLifetime(args);
+        }
 
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
-                         .UsePlatformDetect()
-                         .LogToTrace();
+                .UsePlatformDetect()
+                .LogToTrace();
     }
 }
diff --git a/Project_Periodensystem.View/Project_Periodensystem.View.csproj b/Project_Periodensystem.View/Project_Periodensystem.View.csproj
index 39e1e1a..0dab29c 100644
--- a/Project_Periodensystem.View/Project_Periodensystem.View.csproj
+++ b/Project_Periodensystem.View/Project_Periodensystem.View.csproj
@@ -1,32 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-
-    <!-- Wichtig: Sagt MSBuild, dass Avalonia benutzt wird -->
-    <UseAvalonia>true</UseAvalonia>
-
-    <!-- Optional, für bessere Performance bei Bindings -->
-    <AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
+    <UseWPF>false</UseWPF>
+    <UseWindowsForms>false</UseWindowsForms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.6" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.6" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.6" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.6">
-      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
-      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Avalonia" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Project_Periodensystem.Controller\Project_Periodensystem.Controller.csproj" />
+    <ProjectReference Include="..\Project_Periodensystem.Model\Project_Periodensystem.Model.csproj" />
+    <ProjectReference Include="..\Project_Periodensystem.Persistence\Project_Periodensystem.Persistence.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/program.cs b/program.cs
deleted file mode 100644
index e69de29..0000000