Tidying up workspace, creating new layers

This commit is contained in:
2025-09-18 07:14:29 +02:00
parent b5be0db52b
commit e65f6c94af
13 changed files with 76 additions and 72 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
**/bin/
**/obj/
**/.vscode/

41
.vscode/tasks.json vendored
View File

@@ -1,41 +0,0 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/Keychain.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/Keychain.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/Keychain.sln"
],
"problemMatcher": "$msCompile"
}
]
}

View File

@@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UI/MainWindow.xml" />
<EmbeddedResource Include="UI/MainWindow/MainWindow.xml" />
</ItemGroup>
</Project>

View File

@@ -1,6 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
namespace App;
namespace Keychain;
class Program
{
@@ -13,7 +13,7 @@ class Program
var application = Adw.Application.New("org.typomustakes.keychain", Gio.ApplicationFlags.FlagsNone);
application.OnActivate += (sender, args) =>
{
var window = new App.UI.MainWindow().Window;
var window = new UI.MainWindow().Window;
window.Application = (Adw.Application)sender;
window.Show();
};
@@ -24,7 +24,7 @@ class Program
private static ServiceProvider SetupServices()
{
var services = new ServiceCollection();
services.AddTransient<IPasswordStoreService, PasswordStoreService>();
//services.AddTransient<IPasswordStoreService, PasswordStoreService>();
return services.BuildServiceProvider();
}
}

View File

@@ -1,7 +1,7 @@
using Adw;
using App.UI.ViewModels;
using Keychain.UI.ViewModels;
namespace App.UI;
namespace Keychain.UI;
public class MainWindow
{
@@ -11,7 +11,7 @@ public class MainWindow
public MainWindow()
{
var builder = new Gtk.Builder("App.UI.MainWindow.xml");
var builder = new Gtk.Builder("Keychain.UI.MainWindow.MainWindow.xml");
var window = builder.GetObject("main_window") as Window;
if (window == null)

View File

@@ -1,6 +1,6 @@
using System.ComponentModel;
namespace App.UI.ViewModels;
namespace Keychain.UI.ViewModels;
public class PasswordStoreShortcut : INotifyPropertyChanged
{

View File

@@ -1,4 +1,4 @@
namespace App.UI.ViewModels;
namespace Keychain.UI.ViewModels;
using Adw;
using Gtk;

View File

@@ -1,22 +1,34 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App", "App\App.csproj", "{A25A29F6-ADDC-4CD6-B3CE-C76BABE108AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A25A29F6-ADDC-4CD6-B3CE-C76BABE108AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A25A29F6-ADDC-4CD6-B3CE-C76BABE108AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A25A29F6-ADDC-4CD6-B3CE-C76BABE108AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A25A29F6-ADDC-4CD6-B3CE-C76BABE108AE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{FAB7F880-FF3D-496B-B1C6-8356BEC56CE3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logic", "Logic\Logic.csproj", "{88F17494-8F7F-4BA5-96C3-13AF462931A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Keychain", "App\Keychain.csproj", "{D4755A56-58E0-46A3-859B-49ACAA3EDAED}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FAB7F880-FF3D-496B-B1C6-8356BEC56CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FAB7F880-FF3D-496B-B1C6-8356BEC56CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAB7F880-FF3D-496B-B1C6-8356BEC56CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FAB7F880-FF3D-496B-B1C6-8356BEC56CE3}.Release|Any CPU.Build.0 = Release|Any CPU
{88F17494-8F7F-4BA5-96C3-13AF462931A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88F17494-8F7F-4BA5-96C3-13AF462931A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88F17494-8F7F-4BA5-96C3-13AF462931A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88F17494-8F7F-4BA5-96C3-13AF462931A9}.Release|Any CPU.Build.0 = Release|Any CPU
{D4755A56-58E0-46A3-859B-49ACAA3EDAED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4755A56-58E0-46A3-859B-49ACAA3EDAED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4755A56-58E0-46A3-859B-49ACAA3EDAED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4755A56-58E0-46A3-859B-49ACAA3EDAED}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

6
Logic/Class1.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Logic;
public class Class1
{
}

9
Logic/Logic.csproj Normal file
View File

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

9
Models/Models.csproj Normal file
View File

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

8
Models/PasswordStore.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Models;
public class PasswordStore
{
private List<FileInfo> passwordFiles;
}