diff --git a/interactive-mining-madoap/madoap/src/madserver.py b/interactive-mining-madoap/madoap/src/madserver.py index 6632488..d6dfdb6 100755 --- a/interactive-mining-madoap/madoap/src/madserver.py +++ b/interactive-mining-madoap/madoap/src/madserver.py @@ -73,6 +73,7 @@ class Application(tornado.web.Application): (r"/save-config-controller", profileCreationHandler), (r"/download-config-controller", profileServeHandler), (r"/upload-profile-controller", profileUploadHandler), + (r"/create-upload-profile", createUploadProfileHandler), (r"/?$", madAppBarHandler), (r"/[^/]+/?$", madAppHandler), (r"/[^/]+/.+$", madAppDataHandler) @@ -481,6 +482,7 @@ class profileCreationHandler(BaseHandler): class profileServeHandler(BaseHandler): + passwordless=True def get(self): try: user_id = self.get_secure_cookie('madgikmining') @@ -698,6 +700,23 @@ class importingTextsControllerHandler(BaseHandler): return +class createUploadProfileHandler(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 not user_id: + # 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 madAppHandler(BaseHandler): def get(self): diff --git a/interactive-mining-madoap/madoap/src/static/favicon.ico b/interactive-mining-madoap/madoap/src/static/favicon.ico index 7789bf7..151eca1 100644 Binary files a/interactive-mining-madoap/madoap/src/static/favicon.ico and b/interactive-mining-madoap/madoap/src/static/favicon.ico differ diff --git a/interactive-mining-madoap/madoap/src/templates/base.html b/interactive-mining-madoap/madoap/src/templates/base.html index 18f5ff8..53a2adf 100644 --- a/interactive-mining-madoap/madoap/src/templates/base.html +++ b/interactive-mining-madoap/madoap/src/templates/base.html @@ -1,6 +1,5 @@ -