diff --git a/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 b/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 index a380bd1..b463937 100644 Binary files a/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 and b/.vs/Server Dashboard/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Server Dashboard/v16/.suo b/.vs/Server Dashboard/v16/.suo index 61eef5f..1aea689 100644 Binary files a/.vs/Server Dashboard/v16/.suo and b/.vs/Server Dashboard/v16/.suo differ diff --git a/Server Dashboard Socket/obj/Debug/netcoreapp3.1/Server Dashboard Socket.csprojAssemblyReference.cache b/Server Dashboard Socket/obj/Debug/netcoreapp3.1/Server Dashboard Socket.csprojAssemblyReference.cache index dd6b784..262f7ca 100644 Binary files a/Server Dashboard Socket/obj/Debug/netcoreapp3.1/Server Dashboard Socket.csprojAssemblyReference.cache and b/Server Dashboard Socket/obj/Debug/netcoreapp3.1/Server Dashboard Socket.csprojAssemblyReference.cache differ diff --git a/Server Dashboard/LoginWindow.xaml b/Server Dashboard/LoginWindow.xaml index cb5da8e..e32092b 100644 --- a/Server Dashboard/LoginWindow.xaml +++ b/Server Dashboard/LoginWindow.xaml @@ -41,7 +41,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/Server Dashboard/Properties/Resources.Designer.cs b/Server Dashboard/Properties/Resources.Designer.cs new file mode 100644 index 0000000..077f61b --- /dev/null +++ b/Server Dashboard/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Server_Dashboard.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Server_Dashboard.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Server Dashboard/Properties/Resources.resx b/Server Dashboard/Properties/Resources.resx new file mode 100644 index 0000000..4fdb1b6 --- /dev/null +++ b/Server Dashboard/Properties/Resources.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Server Dashboard/Server Dashboard.csproj b/Server Dashboard/Server Dashboard.csproj index 42005ec..a49444a 100644 --- a/Server Dashboard/Server Dashboard.csproj +++ b/Server Dashboard/Server Dashboard.csproj @@ -18,23 +18,6 @@ - - - - - - - - - - - - - - - - - @@ -65,23 +48,17 @@ - - - - - - - - - - - Code + + True + True + Resources.resx + True True @@ -89,6 +66,13 @@ + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator diff --git a/Server Dashboard/Views/Dashboard/CRUD Popup/CreateModulePopup.xaml b/Server Dashboard/Views/Dashboard/CRUD Popup/CreateModulePopup.xaml index 9fed71f..b6a46db 100644 --- a/Server Dashboard/Views/Dashboard/CRUD Popup/CreateModulePopup.xaml +++ b/Server Dashboard/Views/Dashboard/CRUD Popup/CreateModulePopup.xaml @@ -6,8 +6,7 @@ xmlns:local="clr-namespace:Server_Dashboard.Views.DashboardPages.ModuleCRUD" xmlns:ap="clr-namespace:Server_Dashboard" xmlns:root="clr-namespace:Server_Dashboard" xmlns:i="http://schemas.microsoft.com/xaml/behaviors" xmlns:svgc="http://sharpvectors.codeplex.com/svgc/" - d:DataContext="{d:DesignInstance Type=root:DashboardModuleViewModel}" - mc:Ignorable="d" ResizeMode="NoResize" Height="700" Width="500" d:WindowStyle="None" ap:CloseProperty.Value="True"> + Height="700" Width="500" WindowStyle="None" Background="Transparent" ResizeMode="CanResize" ap:CloseProperty.Value="True"> @@ -27,7 +26,7 @@ - + @@ -161,9 +160,15 @@ - - - + + + + + + + + + diff --git a/Server Dashboard/Views/DashboardWindow.xaml b/Server Dashboard/Views/DashboardWindow.xaml index 5087ba3..b3cfea0 100644 --- a/Server Dashboard/Views/DashboardWindow.xaml +++ b/Server Dashboard/Views/DashboardWindow.xaml @@ -227,7 +227,7 @@ - +