From 131528021d6ec955a17efdcd6e60cd65b534913d Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 26 Nov 2023 17:37:31 +0100 Subject: [PATCH] set everything to blue, meaning prod version 1.0.0 --- misc/BreCalApi.cs | 6 +++--- misc/BreCalApi.yaml | 2 +- src/BreCalClient/App.config | 6 +++--- src/BreCalClient/BreCalClient.csproj | 2 +- src/BreCalClient/Properties/Settings.Designer.cs | 4 ++-- src/BreCalClient/Properties/Settings.settings | 4 ++-- src/BreCalClient/ShipcallControl.xaml | 2 +- src/BreCalClient/ShipcallControl.xaml.cs | 12 ++++++------ src/RoleEditor/App.config | 2 +- src/server/BreCal/local_db.py | 2 +- src/server/flaskapp.wsgi | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index c52f38d..3e64937 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -3582,7 +3582,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(); @@ -3590,7 +3590,7 @@ namespace BreCalClient.misc.Client { { new Dictionary { - {"url", "https://brecaltest.bsmd-emswe.eu"}, + {"url", "https://brecal.bsmd-emswe.eu"}, {"description", "Test server hosted on vcup"}, } } @@ -3609,7 +3609,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 738816a..917cd3a 100644 --- a/misc/BreCalApi.yaml +++ b/misc/BreCalApi.yaml @@ -14,7 +14,7 @@ info: servers: # tutorial: https://idratherbewriting.com/learnapidoc/pubapis_openapi_step3_servers_object.html - - url: "https://brecaltest.bsmd-emswe.eu/" + - url: "https://brecal.bsmd-emswe.eu/" description: "Test server hosted on vcup" paths: diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index 0800667..9c0e112 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -11,13 +11,13 @@ - https://brecaltest.bsmd-emswe.eu + https://brecal.bsmd-emswe.eu - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 0bcecc1..d691a03 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 6f08fee..891919a 100644 --- a/src/BreCalClient/Properties/Settings.Designer.cs +++ b/src/BreCalClient/Properties/Settings.Designer.cs @@ -34,7 +34,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"])); @@ -43,7 +43,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"])); diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings index 4833674..8bb93c9 100644 --- a/src/BreCalClient/Properties/Settings.settings +++ b/src/BreCalClient/Properties/Settings.settings @@ -6,10 +6,10 @@ https://brecal.bsmd-emswe.eu - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index eb07fe8..63a7bcb 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:p = "clr-namespace:BreCalClient.Resources" xmlns:sets="clr-namespace:BreCalClient.Properties" - xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient" + xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient" mc:Ignorable="d" d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded"> diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index 0173bb7..3f67dbb 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -174,13 +174,13 @@ namespace BreCalClient switch (this.ShipcallControlModel?.Shipcall?.Type) { case 1: // incoming - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_down_red.png")); break; case 2: // outgoing - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_up_blue.png")); break; case 3: // shifting - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_right_green.png")); break; default: break; @@ -189,13 +189,13 @@ namespace BreCalClient switch(this.ShipcallControlModel?.LightMode) { case ShipcallControlModel.TrafficLightMode.GREEN: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/check.png")); break; case ShipcallControlModel.TrafficLightMode.YELLOW: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/sign_warning.png")); break; case ShipcallControlModel.TrafficLightMode.RED: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/delete2.png")); break; default: break; diff --git a/src/RoleEditor/App.config b/src/RoleEditor/App.config index bd2b4e4..7c6ee29 100644 --- a/src/RoleEditor/App.config +++ b/src/RoleEditor/App.config @@ -8,7 +8,7 @@ - Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306 + Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling;Port=33306 diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py index 4afd51b..33e03e3 100644 --- a/src/server/BreCal/local_db.py +++ b/src/server/BreCal/local_db.py @@ -10,7 +10,7 @@ def initPool(instancePath): try: global config_path if(config_path == None): - config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json'); + config_path = os.path.join(instancePath,'../../../secure/connection_data_prod.json'); print (config_path) diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi index 9dec941..6296d8f 100644 --- a/src/server/flaskapp.wsgi +++ b/src/server/flaskapp.wsgi @@ -2,7 +2,7 @@ import os import sys import logging -sys.path.insert(0, '/var/www/brecal_test/src/server') +sys.path.insert(0, '/var/www/brecal/src/server') sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/') import schedule