Skip to content

Commit

Permalink
Improved to Singleton
Browse files Browse the repository at this point in the history
  • Loading branch information
JWLMT88 committed Apr 27, 2023
1 parent cf146f2 commit e5cdb4e
Show file tree
Hide file tree
Showing 374 changed files with 386,494 additions and 407 deletions.
3 changes: 3 additions & 0 deletions LABLibary/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<setting name="key" serializeAs="String">
<value>0</value>
</setting>
<setting name="licCode" serializeAs="String">
<value />
</setting>
</LABLibary.Assistant.LicenseValues>
</userSettings>
</configuration>
14 changes: 13 additions & 1 deletion LABLibary/Assistant/LicenseValues.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions LABLibary/Assistant/LicenseValues.settings
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
<Setting Name="key" Type="System.String" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="licCode" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>
8 changes: 5 additions & 3 deletions LABLibary/Assistant/WriteLicense.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ public static string GenerateCode(string productName, string productVersion, Dat
LicenseValues.Default.iv = LABLibary.Converter.StringC.ByteArrayToString(iv);
}

LicenseValues.Default.Save();

// create a plaintext license string
string licenseText = $"{productName}|{productVersion}|{expirationDate.ToString("yyyy-MM-dd")}";
LicenseValues.Default.licCode = licenseText;

LicenseValues.Default.Save();

// encrypt the license string using AES-256 CBC mode
byte[] encrypted = EncryptStringToBytes_Aes(licenseText, key, iv);
Expand Down Expand Up @@ -123,7 +125,6 @@ public static byte[] EncryptStringToBytes_Aes(string plainText, byte[] key, byte
{
byte[] encrypted;

// Create an Aes object with the specified key and IV.
using (Aes aesAlg = Aes.Create())
{
aesAlg.Key = key;
Expand Down Expand Up @@ -184,7 +185,8 @@ public static bool DecodeLicense(string licenseCode, out string productName, out
{
key = LABLibary.Converter.ByteC.StringToByteArray(LicenseValues.Default.key);
iv = LABLibary.Converter.ByteC.StringToByteArray(LicenseValues.Default.iv);
licenseText = DecryptStringFromBytes_Aes(encrypted, key, iv);
//licenseText = DecryptStringFromBytes_Aes(encrypted, key, iv);
licenseText = LicenseValues.Default.licCode;
}
catch (CryptographicException)
{
Expand Down
3 changes: 2 additions & 1 deletion LABLibary/DesktopApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public void Start()

public void RecevMessage()
{
/*
while (true)
{
try
Expand All @@ -68,7 +69,7 @@ public void RecevMessage()
}
}
catch { }
}
}*/

}

Expand Down
5 changes: 4 additions & 1 deletion LABLibary/Forms/InfoDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Net.Mime;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
Expand All @@ -28,7 +29,8 @@ namespace LABLibary.Forms
[Localizable(true)]
public class InfoDialog
{
public static void Show(string message, string title = "Info")

public static void Show(string message, string title = "Info", ContentType type = default)
{
var info = new System.Windows.Forms.Form()
{
Expand All @@ -47,6 +49,7 @@ public static void Show(string message, string title = "Info")
var txtBox = new TextBox()
{
Text = message,
AllowDrop = false,
Location = new Point(12, 12),
Multiline = true,
Dock = DockStyle.Fill,
Expand Down
Binary file modified LABLibary/bin/Debug/LABLibary.1.0.0.nupkg
Binary file not shown.
Binary file modified LABLibary/bin/Debug/net7.0/LABLibary.dll
Binary file not shown.
3 changes: 3 additions & 0 deletions LABLibary/bin/Debug/net7.0/LABLibary.dll.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<setting name="key" serializeAs="String">
<value>0</value>
</setting>
<setting name="licCode" serializeAs="String">
<value />
</setting>
</LABLibary.Assistant.LicenseValues>
</userSettings>
</configuration>
Binary file modified LABLibary/bin/Debug/net7.0/LABLibary.pdb
Binary file not shown.
Binary file modified LABLibary/obj/Debug/net7.0/LABLibary.dll
Binary file not shown.
Binary file modified LABLibary/obj/Debug/net7.0/LABLibary.pdb
Binary file not shown.
Binary file modified LABLibary/obj/Debug/net7.0/ref/LABLibary.dll
Binary file not shown.
Binary file modified LABLibary/obj/Debug/net7.0/refint/LABLibary.dll
Binary file not shown.
2 changes: 2 additions & 0 deletions LABLibary/obj/LABLibary.csproj.nuget.dgspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -26,6 +27,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
2 changes: 2 additions & 0 deletions LABLibary/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -394,6 +395,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion LABLibary/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "vc0+jqS9fE6FVamWZfCcrOtD17sMX/+qV3WGlEtX7/1QjgHMN7IcNFzKBEcK4mo/Fi/5NXfR9YGbkbc2YgPNQQ==",
"dgSpecHash": "vcaVRFcxRsSJLS3T0QcAtrHvmIv7zbgbH+7qnV1L940ERYlqY0mKEHphboRLPj2MQsMr4AVgdSd5i/K4EX51jQ==",
"success": true,
"projectFilePath": "C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\LABLibary\\LABLibary.csproj",
"expectedPackageFiles": [
Expand Down
Binary file modified Project/bin/Debug/net6.0-windows/ICSharpCode.TextEditor.dll
Binary file not shown.
Binary file modified Project/bin/Debug/net6.0-windows/ICSharpCode.TextEditor.pdb
Binary file not shown.
Binary file modified Project/obj/Debug/net6.0-windows/ICSharpCode.TextEditor.dll
Binary file not shown.
Binary file modified Project/obj/Debug/net6.0-windows/ICSharpCode.TextEditor.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"documents":{"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\*":"https://raw.githubusercontent.com/JW-Limited/LILO-LocalServer/dea7b89ba0f3cb7a172aefe98c7d9916a6554420/*"}}
{"documents":{"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\*":"https://raw.githubusercontent.com/JW-Limited/LILO-LocalServer/cf146f203283bc8a3a233ed95eaba240f9af71c8/*"}}
Binary file modified Project/obj/Debug/net6.0-windows/ref/ICSharpCode.TextEditor.dll
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions Project/obj/ICSharpCode.TextEditor.csproj.nuget.dgspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -27,6 +28,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
2 changes: 2 additions & 0 deletions Project/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -212,6 +213,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion Project/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "UQBgJXuyrqtvWqGnMXoXH4tF6ubkOxCDiXsBUp4h2YaUKKjLPmdIsDVpkVSXGLhBgl7yieTcsp5Pd9NG/8JBYw==",
"dgSpecHash": "23lY8jXQbVBCgwwmhNfARNa4ivNaVU2I8osL8ocCXt73nqJ9bBWX7+c4Gvqd4PrsUUb+7kD5kqYTPlr2ZBHqmA==",
"success": true,
"projectFilePath": "C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\Project\\ICSharpCode.TextEditor.csproj",
"expectedPackageFiles": [
Expand Down
Binary file modified Server/bin/Debug/Server.exe
Binary file not shown.
Binary file modified Server/bin/Debug/Server.pdb
Binary file not shown.
Binary file modified Server/obj/Debug/Server.exe
Binary file not shown.
Binary file modified Server/obj/Debug/Server.pdb
Binary file not shown.
34 changes: 34 additions & 0 deletions api.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified srvlocal/.vs/ProjectEvaluation/srvlocal.metadata.v7.bin
Binary file not shown.
Binary file modified srvlocal/.vs/ProjectEvaluation/srvlocal.projects.v7.bin
Binary file not shown.
Binary file modified srvlocal/.vs/srvlocal/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified srvlocal/.vs/srvlocal/v17/.futdcache.v2
Binary file not shown.
Binary file modified srvlocal/.vs/srvlocal/v17/.suo
Binary file not shown.
Binary file modified srvlocal/.vs/srvlocal/v17/Preview/Browse.VC.db
Binary file not shown.
Binary file modified srvlocal/.vs/srvlocal/v17/TestStore/0/000.testlog
Binary file not shown.
Binary file modified srvlocal/.vs/srvlocal/v17/fileList.bin
Binary file not shown.
6 changes: 6 additions & 0 deletions srvlocal/NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="Telerik UI for WinForms 2023.1.314" value="C:\Program Files (x86)\Progress\Telerik UI for WinForms R1 2023\Bin70\NuGet" />
</packageSources>
</configuration>
Binary file modified srvlocal/bin/Debug/net7.0-windows/LABLibary.dll
Binary file not shown.
3 changes: 3 additions & 0 deletions srvlocal/bin/Debug/net7.0-windows/LABLibary.dll.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<setting name="key" serializeAs="String">
<value>0</value>
</setting>
<setting name="licCode" serializeAs="String">
<value />
</setting>
</LABLibary.Assistant.LicenseValues>
</userSettings>
</configuration>
Binary file modified srvlocal/bin/Debug/net7.0-windows/LABLibary.pdb
Binary file not shown.
Binary file modified srvlocal/bin/Debug/net7.0-windows/Server.exe
Binary file not shown.
Binary file modified srvlocal/bin/Debug/net7.0-windows/Server.pdb
Binary file not shown.
Binary file modified srvlocal/bin/Debug/net7.0-windows/srvlocal.dll
Binary file not shown.
Binary file modified srvlocal/bin/Debug/net7.0-windows/srvlocal.pdb
Binary file not shown.
Binary file modified srvlocal/bin/Debug/srvlocal.1.0.0.nupkg
Binary file not shown.
8 changes: 8 additions & 0 deletions srvlocal/customer_script.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- Script Date: 26.04.2023 13:39 - ErikEJ.SqlCeScripting version 3.5.2.94
CREATE TABLE [customers] (
[Id] INTEGER NOT NULL
, [name] TEXT NOT NULL
, [email] TEXT NULL
, [password_hash] TEXT NOT NULL
, CONSTRAINT [PK_customers] PRIMARY KEY ([Id])
);
14 changes: 14 additions & 0 deletions srvlocal/customer_script_add.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
INSERT
INTO
[customers](
[id],
[name],
[email],
[password_hash],
[password_unhashed])
VALUES(
1,
'admin',
'ceo@jwlmt.com',
'd033e22ae348aeb5660fc2140aec35850c4da997',
'admin');
Binary file not shown.
Binary file modified srvlocal/obj/Debug/net7.0-windows/srvlocal.dll
Binary file not shown.
Binary file modified srvlocal/obj/Debug/net7.0-windows/srvlocal.pdb
Binary file not shown.
2 changes: 2 additions & 0 deletions srvlocal/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2262,6 +2262,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -2271,6 +2272,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion srvlocal/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "ieG/CVVRjIvSTFNxpZ2uXivN+WTZGZl77wrgOb6WHZx9M3Jzc2ncdk2teOJaupt4wC0+K8RcAbHWwC2zXi0PnQ==",
"dgSpecHash": "TZ04HHRqycaB3KeoC9gFrkbUc32Yi4Me20qrrbX55SXY3idHW9GCJap29nWGYMkTin89v28Yjch79Co28ToHbw==",
"success": true,
"projectFilePath": "C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\srvlocal.csproj",
"expectedPackageFiles": [
Expand Down
4 changes: 4 additions & 0 deletions srvlocal/obj/srvlocal.csproj.nuget.dgspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -41,6 +42,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down Expand Up @@ -128,6 +130,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -137,6 +140,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
Binary file added srvlocal/srvlocalDB.db
Binary file not shown.
2 changes: 2 additions & 0 deletions srvlocal_bibo/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -979,6 +980,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion srvlocal_bibo/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "ZZX/YP7g/xeMtq1Eusu2vk6GcsrcuHwsOu9CB8m89z5/50kRcFL7Y4TIMCFF+h4dckIFCz1US+9mWySNR8q7cw==",
"dgSpecHash": "rKlVMKMkfxCcHCHA9LLVW6igeY3o4BlL273Q6FBip3Yjhil96zE3KQIB/wzSgUZ00qc8aJH/DJjPzChXaLKhww==",
"success": true,
"projectFilePath": "C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal_bibo\\srvlocal_bibo.csproj",
"expectedPackageFiles": [
Expand Down
2 changes: 2 additions & 0 deletions srvlocal_bibo/obj/srvlocal_bibo.csproj.nuget.dgspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\joeva\\Documents\\GitHub\\LILO-LocalServer\\srvlocal\\NuGet.Config",
"C:\\Users\\joeva\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
Expand All @@ -26,6 +27,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files (x86)\\Progress\\Telerik UI for WinForms R1 2023\\Bin70\\NuGet": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
Expand Down
Loading

0 comments on commit e5cdb4e

Please sign in to comment.