From 8e93c336a529fc16e9b04f627b8b62c07cd59278 Mon Sep 17 00:00:00 2001 From: sosguns2002 Date: Wed, 7 Jun 2017 15:44:20 +0300 Subject: [PATCH] Basic html structure --- .../madoap/src/madserver.py | 48 +++++++- .../madoap/src/templates/base_v2.html | 106 +----------------- .../madoap/src/templates/configuration.html | 0 .../src/templates/create_upload_profile.html | 9 +- .../madoap/src/templates/save_profile.html | 37 ++++++ .../madoap/src/templates/upload_codes.html | 36 +++++- 6 files changed, 128 insertions(+), 108 deletions(-) delete mode 100644 interactive-mining-madoap/madoap/src/templates/configuration.html diff --git a/interactive-mining-madoap/madoap/src/madserver.py b/interactive-mining-madoap/madoap/src/madserver.py index 642c731..264c6c5 100755 --- a/interactive-mining-madoap/madoap/src/madserver.py +++ b/interactive-mining-madoap/madoap/src/madserver.py @@ -74,6 +74,9 @@ class Application(tornado.web.Application): (r"/download-config-controller", profileServeHandler), (r"/upload-profile-controller", profileUploadHandler), (r"/create-upload-profile", createUploadProfileHandler), + (r"/upload-codes", uploadCodesHandler), + (r"/configure-profile", configureProfileHandler), + (r"/save-profile", saveProfileHandler), (r"/?$", madAppBarHandler), (r"/[^/]+/?$", madAppHandler), (r"/[^/]+/.+$", madAppDataHandler) @@ -745,10 +748,53 @@ class createUploadProfileHandler(BaseHandler): # give him a unique user_id user_id = 'user{0}'.format(datetime.datetime.now().microsecond + (random.randrange(1, 100+1) * 100000)) self.set_secure_cookie('madgikmining', user_id) - # check if he already uploaded his grants ids and inform him via a message self.render('create_upload_profile.html', settings=msettings) +class uploadCodesHandler(BaseHandler): + passwordless=True + # When loading the page first time and evry refresh + def get(self): + if 'data' in self.request.arguments: + return + else: + # check if we already gave client a user_id + user_id = self.get_secure_cookie('madgikmining') + if user_id is None: + return + # check if he already uploaded his grants ids and inform him via a message + self.render('upload_codes.html', settings=msettings) + + +class configureProfileHandler(BaseHandler): + passwordless=True + # When loading the page first time and evry refresh + def get(self): + if 'data' in self.request.arguments: + return + else: + # check if we already gave client a user_id + user_id = self.get_secure_cookie('madgikmining') + if user_id is None: + return + # check if he already uploaded his grants ids and inform him via a message + self.render('configure_profile.html', settings=msettings) + + +class saveProfileHandler(BaseHandler): + passwordless=True + # When loading the page first time and evry refresh + def get(self): + if 'data' in self.request.arguments: + return + else: + # check if we already gave client a user_id + user_id = self.get_secure_cookie('madgikmining') + if user_id is None: + return + # check if he already uploaded his grants ids and inform him via a message + self.render('save_profile.html', settings=msettings) + class madAppHandler(BaseHandler): def get(self): diff --git a/interactive-mining-madoap/madoap/src/templates/base_v2.html b/interactive-mining-madoap/madoap/src/templates/base_v2.html index 4a6b75c..c34a9cf 100644 --- a/interactive-mining-madoap/madoap/src/templates/base_v2.html +++ b/interactive-mining-madoap/madoap/src/templates/base_v2.html @@ -96,48 +96,7 @@
-
-
-
- -
-
- -
+
@@ -173,67 +132,6 @@ -
- -
@@ -258,7 +156,7 @@
-
+
diff --git a/interactive-mining-madoap/madoap/src/templates/configuration.html b/interactive-mining-madoap/madoap/src/templates/configuration.html deleted file mode 100644 index e69de29..0000000 diff --git a/interactive-mining-madoap/madoap/src/templates/create_upload_profile.html b/interactive-mining-madoap/madoap/src/templates/create_upload_profile.html index f16b3ae..f8aa14f 100644 --- a/interactive-mining-madoap/madoap/src/templates/create_upload_profile.html +++ b/interactive-mining-madoap/madoap/src/templates/create_upload_profile.html @@ -3,6 +3,13 @@ {% block content %} Profile create -
or
+ +
+ Create a new mining profile +
+
or
+
+ UPLOAD your existing profile to edit +
{% end %} \ No newline at end of file diff --git a/interactive-mining-madoap/madoap/src/templates/save_profile.html b/interactive-mining-madoap/madoap/src/templates/save_profile.html index e69de29..4e33ac5 100644 --- a/interactive-mining-madoap/madoap/src/templates/save_profile.html +++ b/interactive-mining-madoap/madoap/src/templates/save_profile.html @@ -0,0 +1,37 @@ +{% extends "base_v2.html" %} +{% block save_profile %} class="current" {% end %} +{% block content %} +Save profile + + +
+
+
+
+
+ +
+
+
+
+
+ +
+
+ +
+ + Download profile +
+
or
+
+ LOGIN to save your profile +
+
+
+ +{% end %} \ No newline at end of file diff --git a/interactive-mining-madoap/madoap/src/templates/upload_codes.html b/interactive-mining-madoap/madoap/src/templates/upload_codes.html index eaa3112..e263ef1 100644 --- a/interactive-mining-madoap/madoap/src/templates/upload_codes.html +++ b/interactive-mining-madoap/madoap/src/templates/upload_codes.html @@ -3,8 +3,40 @@ {% block content %} Upload project codes -https://getuikit.com/docs/upload + +
+
+
+
+
+ +
+
+
+
+
-TXT +
+

Upload your project codes you want to match

+
+

+

+ Attach project codes by dropping them here or +

+ + browse file +
+

+

+ TSVTXT + file types +

+

Maximum 10MB upload

+
+
{% end %} \ No newline at end of file