From c9ffd01f408b6a6ff40d900e6d9e7c8c75009e32 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 3 May 2020 10:32:07 +0200
Subject: [PATCH] client: refactoring

---
 client/RoadmapClient.py             | 4 ++--
 client/blueprints/Authentication.py | 2 +-
 client/blueprints/Milestones.py     | 8 ++++----
 client/blueprints/Roadmaps.py       | 8 ++++----
 client/blueprints/SubTasks.py       | 6 +++---
 client/blueprints/Tasks.py          | 6 +++---
 client/{ => logic}/AdminWrapper.py  | 0
 client/{ => logic}/ApiRequest.py    | 2 +-
 client/{ => logic}/Constants.py     | 0
 client/{ => logic}/Localization.py  | 0
 client/{ => logic}/UrlBuilder.py    | 0
 client/logic/__init__.py            | 0
 12 files changed, 18 insertions(+), 18 deletions(-)
 rename client/{ => logic}/AdminWrapper.py (100%)
 rename client/{ => logic}/ApiRequest.py (94%)
 rename client/{ => logic}/Constants.py (100%)
 rename client/{ => logic}/Localization.py (100%)
 rename client/{ => logic}/UrlBuilder.py (100%)
 create mode 100644 client/logic/__init__.py

diff --git a/client/RoadmapClient.py b/client/RoadmapClient.py
index 9c982ad..762b7d5 100644
--- a/client/RoadmapClient.py
+++ b/client/RoadmapClient.py
@@ -8,8 +8,8 @@ from TheCodeLabs_FlaskUtils import FlaskBaseApp
 from flask import render_template, redirect
 
 from logic import Constants
-from Localization import LOCALIZATION
-from UrlBuilder import UrlBuilder
+from logic.Localization import LOCALIZATION
+from logic.UrlBuilder import UrlBuilder
 from blueprints import Roadmaps, Authentication, Milestones, Tasks, SubTasks
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/client/blueprints/Authentication.py b/client/blueprints/Authentication.py
index 33329ab..7ca7724 100644
--- a/client/blueprints/Authentication.py
+++ b/client/blueprints/Authentication.py
@@ -1,7 +1,7 @@
 import requests
 from flask import Blueprint, render_template, redirect, url_for, request, session
 
-from Localization import LOCALIZATION
+from logic.Localization import LOCALIZATION
 
 
 def construct_blueprint(urlBuilder):
diff --git a/client/blueprints/Milestones.py b/client/blueprints/Milestones.py
index b004627..68eecbf 100644
--- a/client/blueprints/Milestones.py
+++ b/client/blueprints/Milestones.py
@@ -1,9 +1,9 @@
 import requests
-from flask import Blueprint, render_template, redirect, url_for, request, session
+from flask import Blueprint, render_template, redirect, url_for, request
 
-from AdminWrapper import require_api_token
-from ApiRequest import ApiRequest
-from Localization import LOCALIZATION
+from logic.AdminWrapper import require_api_token
+from logic.ApiRequest import ApiRequest
+from logic.Localization import LOCALIZATION
 
 
 def construct_blueprint(urlBuilder):
diff --git a/client/blueprints/Roadmaps.py b/client/blueprints/Roadmaps.py
index c9d2824..fad8d36 100644
--- a/client/blueprints/Roadmaps.py
+++ b/client/blueprints/Roadmaps.py
@@ -1,9 +1,9 @@
 import requests
-from flask import Blueprint, render_template, redirect, url_for, request, session
+from flask import Blueprint, render_template, redirect, url_for, request
 
-from AdminWrapper import require_api_token
-from ApiRequest import ApiRequest
-from Localization import LOCALIZATION
+from logic.AdminWrapper import require_api_token
+from logic.ApiRequest import ApiRequest
+from logic.Localization import LOCALIZATION
 
 
 def construct_blueprint(urlBuilder):
diff --git a/client/blueprints/SubTasks.py b/client/blueprints/SubTasks.py
index b6147b3..630ed59 100644
--- a/client/blueprints/SubTasks.py
+++ b/client/blueprints/SubTasks.py
@@ -1,9 +1,9 @@
 import requests
 from flask import Blueprint, render_template, redirect, url_for, request
 
-from AdminWrapper import require_api_token
-from ApiRequest import ApiRequest
-from Localization import LOCALIZATION
+from logic.AdminWrapper import require_api_token
+from logic.ApiRequest import ApiRequest
+from logic.Localization import LOCALIZATION
 
 
 def construct_blueprint(urlBuilder):
diff --git a/client/blueprints/Tasks.py b/client/blueprints/Tasks.py
index 45133c4..edbb80a 100644
--- a/client/blueprints/Tasks.py
+++ b/client/blueprints/Tasks.py
@@ -1,9 +1,9 @@
 import requests
 from flask import Blueprint, render_template, redirect, url_for, request
 
-from AdminWrapper import require_api_token
-from ApiRequest import ApiRequest
-from Localization import LOCALIZATION
+from logic.AdminWrapper import require_api_token
+from logic.ApiRequest import ApiRequest
+from logic.Localization import LOCALIZATION
 
 
 def construct_blueprint(urlBuilder):
diff --git a/client/AdminWrapper.py b/client/logic/AdminWrapper.py
similarity index 100%
rename from client/AdminWrapper.py
rename to client/logic/AdminWrapper.py
diff --git a/client/ApiRequest.py b/client/logic/ApiRequest.py
similarity index 94%
rename from client/ApiRequest.py
rename to client/logic/ApiRequest.py
index bc6acb6..9ae76ba 100644
--- a/client/ApiRequest.py
+++ b/client/logic/ApiRequest.py
@@ -1,6 +1,6 @@
 from flask import render_template, session, redirect, url_for
 
-from Localization import LOCALIZATION
+from logic.Localization import LOCALIZATION
 
 
 class ApiRequest:
diff --git a/client/Constants.py b/client/logic/Constants.py
similarity index 100%
rename from client/Constants.py
rename to client/logic/Constants.py
diff --git a/client/Localization.py b/client/logic/Localization.py
similarity index 100%
rename from client/Localization.py
rename to client/logic/Localization.py
diff --git a/client/UrlBuilder.py b/client/logic/UrlBuilder.py
similarity index 100%
rename from client/UrlBuilder.py
rename to client/logic/UrlBuilder.py
diff --git a/client/logic/__init__.py b/client/logic/__init__.py
new file mode 100644
index 0000000..e69de29
-- 
GitLab