From ec75d2c0a82889efef49adf9f37677768abf0244 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 25 Jul 2024 09:59:49 +0200 Subject: [PATCH] Updated settings for production version --- misc/BreCalApi.cs | 8 ++--- misc/BreCalApi.yaml | 4 +-- src/BreCalClient/App.config | 6 ++-- src/BreCalClient/BreCalClient.csproj | 2 +- .../Properties/Settings.Designer.cs | 6 ++-- src/BreCalClient/Properties/Settings.settings | 6 ++-- src/BreCalClient/ShipcallControl.xaml | 34 +++++++++---------- src/BreCalClient/ShipcallControl.xaml.cs | 24 ++++++------- src/RoleEditor/App.config | 2 +- src/Setup/Setup.vdproj | 22 ++++++++++-- src/server/BreCal/local_db.py | 2 +- src/server/flaskapp.wsgi | 2 +- 12 files changed, 67 insertions(+), 51 deletions(-) diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index b32a3e1..9e94162 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -4833,7 +4833,7 @@ namespace BreCalClient.misc.Client { Proxy = null; UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp"); - BasePath = "https://brecaltest.bsmd-emswe.eu"; + BasePath = "https://brecal.bsmd-emswe.eu"; DefaultHeaders = new ConcurrentDictionary(); ApiKey = new ConcurrentDictionary(); ApiKeyPrefix = new ConcurrentDictionary(); @@ -4841,8 +4841,8 @@ namespace BreCalClient.misc.Client { { new Dictionary { - {"url", "https://brecaltest.bsmd-emswe.eu"}, - {"description", "Test server hosted on vcup"}, + {"url", "https://brecal.bsmd-emswe.eu"}, + {"description", "Prod server hosted on vcup"}, } } }; @@ -4860,7 +4860,7 @@ namespace BreCalClient.misc.Client IDictionary defaultHeaders, IDictionary apiKey, IDictionary apiKeyPrefix, - string basePath = "https://brecaltest.bsmd-emswe.eu") : this() + string basePath = "https://brecal.bsmd-emswe.eu") : this() { if (string.IsNullOrWhiteSpace(basePath)) throw new ArgumentException("The provided basePath is invalid.", "basePath"); diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml index 02dcf7a..900b7e1 100644 --- a/misc/BreCalApi.yaml +++ b/misc/BreCalApi.yaml @@ -14,8 +14,8 @@ info: name: Use at your own risk url: 'https://www.bsmd.de/license' servers: - - url: 'https://brecaltest.bsmd-emswe.eu' - description: Test server hosted on vcup + - url: 'https://brecal.bsmd-emswe.eu' + description: Prod server hosted on vcup tags: - name: user - name: shipcall diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index 9435c06..dd96a94 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -29,16 +29,16 @@ - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ - https://brecaltest.bsmd-emswe.eu + https://brecal.bsmd-emswe.eu diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index e366ae1..108b004 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -13,7 +13,7 @@ Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico - BreCalTestClient + BreCalClient diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs index 18d33db..fe15701 100644 --- a/src/BreCalClient/Properties/Settings.Designer.cs +++ b/src/BreCalClient/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")] + [global::System.Configuration.DefaultSettingValueAttribute("#203864")] public string BG_COLOR { get { return ((string)(this["BG_COLOR"])); @@ -34,7 +34,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("!!Bremen calling Testversion!!")] + [global::System.Configuration.DefaultSettingValueAttribute("Bremen calling")] public string APP_TITLE { get { return ((string)(this["APP_TITLE"])); @@ -64,7 +64,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://brecaltest.bsmd-emswe.eu")] + [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")] public string API_URL { get { return ((string)(this["API_URL"])); diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings index a86943e..d2a98ce 100644 --- a/src/BreCalClient/Properties/Settings.settings +++ b/src/BreCalClient/Properties/Settings.settings @@ -3,10 +3,10 @@ - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ @@ -15,7 +15,7 @@ - https://brecaltest.bsmd-emswe.eu + https://brecal.bsmd-emswe.eu 800 diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 92f861e..5b050df 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -1,12 +1,12 @@  @@ -49,7 +49,7 @@ - @@ -93,23 +93,23 @@ - + -