diff --git a/.gitignore b/.gitignore index 5967294..52746af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **/bin/ **/obj/ +**/.vscode/ diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index c79a575..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -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" - } - ] -} \ No newline at end of file diff --git a/App/App.csproj b/App/Keychain.csproj similarity index 87% rename from App/App.csproj rename to App/Keychain.csproj index 9a5dfe9..1f637bd 100644 --- a/App/App.csproj +++ b/App/Keychain.csproj @@ -13,7 +13,7 @@ - + diff --git a/App/Program.cs b/App/Program.cs index f54c071..737b9bf 100644 --- a/App/Program.cs +++ b/App/Program.cs @@ -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(); + //services.AddTransient(); return services.BuildServiceProvider(); } } \ No newline at end of file diff --git a/App/UI/MainWindow.cs b/App/UI/MainWindow/MainWindow.cs similarity index 93% rename from App/UI/MainWindow.cs rename to App/UI/MainWindow/MainWindow.cs index e9654b1..715248f 100644 --- a/App/UI/MainWindow.cs +++ b/App/UI/MainWindow/MainWindow.cs @@ -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) diff --git a/App/UI/MainWindow.xml b/App/UI/MainWindow/MainWindow.xml similarity index 100% rename from App/UI/MainWindow.xml rename to App/UI/MainWindow/MainWindow.xml diff --git a/App/UI/ViewModels/PasswordStoreShortcut.cs b/App/UI/ViewModels/PasswordStoreShortcut.cs index f5940a8..9b6792c 100644 --- a/App/UI/ViewModels/PasswordStoreShortcut.cs +++ b/App/UI/ViewModels/PasswordStoreShortcut.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace App.UI.ViewModels; +namespace Keychain.UI.ViewModels; public class PasswordStoreShortcut : INotifyPropertyChanged { diff --git a/App/UI/ViewModels/PasswordStoreShortcutCollection.cs b/App/UI/ViewModels/PasswordStoreShortcutCollection.cs index e96a65f..029c95a 100644 --- a/App/UI/ViewModels/PasswordStoreShortcutCollection.cs +++ b/App/UI/ViewModels/PasswordStoreShortcutCollection.cs @@ -1,4 +1,4 @@ -namespace App.UI.ViewModels; +namespace Keychain.UI.ViewModels; using Adw; using Gtk; diff --git a/Keychain.sln b/Keychain.sln index 176695e..85c6cc3 100644 --- a/Keychain.sln +++ b/Keychain.sln @@ -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 diff --git a/Logic/Class1.cs b/Logic/Class1.cs new file mode 100644 index 0000000..1bb841d --- /dev/null +++ b/Logic/Class1.cs @@ -0,0 +1,6 @@ +namespace Logic; + +public class Class1 +{ + +} diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj new file mode 100644 index 0000000..125f4c9 --- /dev/null +++ b/Logic/Logic.csproj @@ -0,0 +1,9 @@ + + + + net9.0 + enable + enable + + + diff --git a/Models/Models.csproj b/Models/Models.csproj new file mode 100644 index 0000000..125f4c9 --- /dev/null +++ b/Models/Models.csproj @@ -0,0 +1,9 @@ + + + + net9.0 + enable + enable + + + diff --git a/Models/PasswordStore.cs b/Models/PasswordStore.cs new file mode 100644 index 0000000..b2e7931 --- /dev/null +++ b/Models/PasswordStore.cs @@ -0,0 +1,8 @@ +namespace Models; + +public class PasswordStore +{ + private List passwordFiles; + +} +