diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 29d27f6..1d41b60 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -11,6 +11,7 @@ jobs:
sudo apt-get update -y -qq
sudo apt-get install zip
sudo sh -c "echo '192.168.1.253 descartes.local' >> /etc/hosts"
+ sudo sh -c "echo '192.168.1.253 build.ladose.net' >> /etc/hosts"
- name: GetDNS
run: |
cat /etc/resolv.conf
@@ -35,8 +36,8 @@ jobs:
dotnet build --configuration Release --os win LaDOSE.DesktopApp.Avalonia
- name: Zip file
run: |
- zip -r build-winx64.zip LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/win-x64/
- zip -r build-linux64.zip LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/linux-x64/
+ zip -rj build-winx64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/win-x64/
+ zip -rj build-linux64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/linux-x64/
- name: Upload Artifact Windows
uses: actions/upload-artifact@v3
with:
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/LaDOSE.DesktopApp.Avalonia.csproj b/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/LaDOSE.DesktopApp.Avalonia.csproj
index 84a806d..556a59c 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/LaDOSE.DesktopApp.Avalonia.csproj
+++ b/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/LaDOSE.DesktopApp.Avalonia.csproj
@@ -23,6 +23,8 @@
+
+
@@ -30,4 +32,11 @@
+
+
+
+
+ PreserveNewest
+
+
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/Program.cs b/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/Program.cs
index 1348484..597f1ad 100644
--- a/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/Program.cs
+++ b/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/Program.cs
@@ -2,7 +2,9 @@
using Avalonia.ReactiveUI;
using System;
using System.ComponentModel;
+using System.IO;
using LaDOSE.REST;
+using Microsoft.Extensions.Configuration;
using Splat;
// using Xilium.CefGlue;
// using Xilium.CefGlue.Common;
@@ -26,10 +28,15 @@ sealed class Program
private static void RegisterDependencies(IMutableDependencyResolver currentMutable, IReadonlyDependencyResolver current)
{
+ var builder = new ConfigurationBuilder()
+ .AddJsonFile("settings.json", optional: true, reloadOnChange: true).Build();
+ var restUrl = builder["REST:Url"].ToString();
+ var restUser = builder["REST:User"].ToString();
+ var restPassword = builder["REST:Password"].ToString();
currentMutable.RegisterLazySingleton(()=>
{
var restService = new RestService();
- restService.Connect(new Uri("http://localhost:5000"),"dev","dev");
+ restService.Connect(new Uri(restUrl),restUser,restPassword);
return restService;
});
}
diff --git a/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/settings.json b/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/settings.json
new file mode 100644
index 0000000..7de67d1
--- /dev/null
+++ b/LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/settings.json
@@ -0,0 +1,7 @@
+{
+ "REST": {
+ "Url": "http://localhost:5000",
+ "User": "user",
+ "Password": "password"
+ }
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 10e5a78..b683b17 100644
--- a/README.md
+++ b/README.md
@@ -2,26 +2,22 @@

-# Dependencies
## Server
-
-.netcore 2
-AutoMapper
-Newtonsoft.Json
-Pomelo.EF
-
-## Discord
-
-DSharpPlus
+.Net Core 6
+PostgreSQL
## Desktop
.Net Framework 4.6.1
Caliburn Micro
-[Microsoft Visual Studio Installer Projects](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects#overview)
-## Challonge
+## Cross Plateform Desktop Client
+
+.Net Core 6
+
+
+## Challonge Provider is a modified version of this
[ChallongeCSharpDriver](https://github.com/francoislg/ChallongeCSharpDriver)
-Modified to work with .net core
\ No newline at end of file
+Modified to work with .net core