From 577d6239aef97b9c5598ca93c9b9279ddfe0b433 Mon Sep 17 00:00:00 2001 From: Sebastian Lobinger <sebastian.lobinger@fu-berlin.de> Date: Fri, 2 Jun 2017 12:12:23 +0200 Subject: [PATCH] remove test_hub folder - not needed --- test_hub/__init__.py | 3 -- test_hub/config/config.yaml | 4 -- test_hub/config/modules.yaml | 1 - test_hub/modules/hallo_module/__init__.py | 5 --- .../modules/hallo_module/languages/de.yaml | 11 ----- .../modules/hallo_module/languages/en.yaml | 13 ------ test_hub/modules/hallo_module/manifest.yaml | 13 ------ .../hallo_module/templates/hallo_module.html | 8 ---- .../hallo_module/templates/subview.html | 8 ---- test_hub/modules/hallo_module/urls.py | 9 ---- test_hub/modules/hallo_module/views.py | 6 --- test_hub/templates/.gitkeep | 0 test_hub/templates/base-struct.html | 28 ------------ test_hub/templates/home.html | 8 ---- test_hub/templates/login.html | 44 ------------------- 15 files changed, 161 deletions(-) delete mode 100644 test_hub/__init__.py delete mode 100644 test_hub/config/config.yaml delete mode 100644 test_hub/config/modules.yaml delete mode 100644 test_hub/modules/hallo_module/__init__.py delete mode 100644 test_hub/modules/hallo_module/languages/de.yaml delete mode 100644 test_hub/modules/hallo_module/languages/en.yaml delete mode 100644 test_hub/modules/hallo_module/manifest.yaml delete mode 100644 test_hub/modules/hallo_module/templates/hallo_module.html delete mode 100644 test_hub/modules/hallo_module/templates/subview.html delete mode 100644 test_hub/modules/hallo_module/urls.py delete mode 100644 test_hub/modules/hallo_module/views.py delete mode 100644 test_hub/templates/.gitkeep delete mode 100644 test_hub/templates/base-struct.html delete mode 100644 test_hub/templates/home.html delete mode 100644 test_hub/templates/login.html diff --git a/test_hub/__init__.py b/test_hub/__init__.py deleted file mode 100644 index 4f78c41..0000000 --- a/test_hub/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from sams_hub import SAMSHub - -hub = SAMSHub(__name__) \ No newline at end of file diff --git a/test_hub/config/config.yaml b/test_hub/config/config.yaml deleted file mode 100644 index cedca4e..0000000 --- a/test_hub/config/config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -DEBUG: true -jinja2_strict_undefined: true -#samsHUB: -# module_base_path: /modules/ # default \ No newline at end of file diff --git a/test_hub/config/modules.yaml b/test_hub/config/modules.yaml deleted file mode 100644 index 9026aee..0000000 --- a/test_hub/config/modules.yaml +++ /dev/null @@ -1 +0,0 @@ -- hallo_module \ No newline at end of file diff --git a/test_hub/modules/hallo_module/__init__.py b/test_hub/modules/hallo_module/__init__.py deleted file mode 100644 index d9384d8..0000000 --- a/test_hub/modules/hallo_module/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from flask_microservices import Router -from . import urls -#from samsHUB.functions import get_enabled_modules - -print(views.hallo_module) diff --git a/test_hub/modules/hallo_module/languages/de.yaml b/test_hub/modules/hallo_module/languages/de.yaml deleted file mode 100644 index 2bf8e11..0000000 --- a/test_hub/modules/hallo_module/languages/de.yaml +++ /dev/null @@ -1,11 +0,0 @@ -module_title: &module_title Hallo Modul -module_name: *module_title -hallo module: >- - Hallo Modul! -beschreibung: >- - Eine Beshreibung zu was auch immer das 'hallo module' macht. -teststring: Ein Teststring -subview_description: >- - Dies ist ein Subview des Hallo Moduls. Das Modul kann vile weitere Subviews - haben, aber dieses ist bietet die Möglichkeit über ein Menü im SAMShub - erreichbar zu sein. \ No newline at end of file diff --git a/test_hub/modules/hallo_module/languages/en.yaml b/test_hub/modules/hallo_module/languages/en.yaml deleted file mode 100644 index 183dfa1..0000000 --- a/test_hub/modules/hallo_module/languages/en.yaml +++ /dev/null @@ -1,13 +0,0 @@ -module_title: &module_title Hello Module -module_name: *module_title -hallo module: >- - Hello Module! -beschreibung: >- - This is the description of what ever this 'hello module' does. -teststring: A Teststring -subview_title: Subview -subview_name: Subentry -subviews_description: >- - This is a Subview of the 'hello module'. The Module may use much more subviews, - but this one is potentialy reachable in a menu of the SAMAShub. -home_string: Start \ No newline at end of file diff --git a/test_hub/modules/hallo_module/manifest.yaml b/test_hub/modules/hallo_module/manifest.yaml deleted file mode 100644 index 9d6bd4a..0000000 --- a/test_hub/modules/hallo_module/manifest.yaml +++ /dev/null @@ -1,13 +0,0 @@ -default_language: en -views: - - url: &hallo-module - function: views.hallo_module -menu: - - url: *hallo-module - name_string: module_title - submenu: - - url: /modules/hallo-module/subview - name_string: subview_name - subviews: - - url: / - name_string: home_string diff --git a/test_hub/modules/hallo_module/templates/hallo_module.html b/test_hub/modules/hallo_module/templates/hallo_module.html deleted file mode 100644 index d615d8a..0000000 --- a/test_hub/modules/hallo_module/templates/hallo_module.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base-struct.html" %} -{% block title %}Index{% endblock %} -{% block head %} {{ super() }} {% endblock %} -{% block content %} - <h1> {{ mod_lang['hallo module'] }}</h1> - <p> {{ mod_lang['beschreibung'] }}</p> -{% endblock %} -{% block header %}samsHUB {{ mod_lang['teststring'] }} {% endblock %} \ No newline at end of file diff --git a/test_hub/modules/hallo_module/templates/subview.html b/test_hub/modules/hallo_module/templates/subview.html deleted file mode 100644 index 5fc6dd1..0000000 --- a/test_hub/modules/hallo_module/templates/subview.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base-struct.html" %} -{% block title %}Index{% endblock %} -{% block head %} {{ super() }} {% endblock %} -{% block content %} - <h1> {{ mod_lang['hallo module'] }} - {{ mod_lang['subview_title'] }}</h1> - <p> {{ mod_lang['subview_description'] }}</p> -{% endblock %} -{% block header %}samsHUB {{ mod_lang['teststring'] }} {% endblock %} \ No newline at end of file diff --git a/test_hub/modules/hallo_module/urls.py b/test_hub/modules/hallo_module/urls.py deleted file mode 100644 index 73a3142..0000000 --- a/test_hub/modules/hallo_module/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from flask_microservices import url -from . import views - -urlpatterns = [ - url('/modules/hallo-module', view_func=views.hallo_module, name='hallo_module') - , url( - '/modules/hallo-module/subview', view_func=views.subview - , name='hallo_module_subview') -] \ No newline at end of file diff --git a/test_hub/modules/hallo_module/views.py b/test_hub/modules/hallo_module/views.py deleted file mode 100644 index 2cc678a..0000000 --- a/test_hub/modules/hallo_module/views.py +++ /dev/null @@ -1,6 +0,0 @@ -from flask import render_template - -def hallo_module(): - return render_template('hallo_module.html') -def subview(): - return render_template('subview.html') \ No newline at end of file diff --git a/test_hub/templates/.gitkeep b/test_hub/templates/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/test_hub/templates/base-struct.html b/test_hub/templates/base-struct.html deleted file mode 100644 index f35722e..0000000 --- a/test_hub/templates/base-struct.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - {% block head %} - <title>samsHub - {% block title %}{% endblock title %}</title> - <link rel="stylesheet" href="/static/style.css" /> - {% endblock head %} -</head> -<body> - <div id="header">{% block header %}{% endblock %}</div> - <div id="global_app_menu"> - <ul> - {% for entry in menu_list recursive%} - <li><a href='{{ entry.url }}'>{{ entry.name }}</a></li> - {% if entry.subentries %} - <ul class="submenu">{{ loop(entry.subentries) }}</ul> - {% endif %} - {% endfor %} - </ul> - </div> - <div id="content">{% block content %}{% endblock %}</div> - <div id="footer"> - {% block footer %} - © Copyright 2008 by <a href="http://domain.invalid/">you</a>. - {% endblock %} - </div> -</body> -</html> \ No newline at end of file diff --git a/test_hub/templates/home.html b/test_hub/templates/home.html deleted file mode 100644 index 6107666..0000000 --- a/test_hub/templates/home.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base-struct.html" %} -{% block title %}Index{% endblock %} -{% block head %} {{ super() }} {% endblock %} -{% block content %} - <h1>Home</h1> - <p>samsHub Startseite: {{ hub_lang['home_wellcome_message']|safe }}</p> -{% endblock %} -{% block header %}samsHUB -{% endblock %} \ No newline at end of file diff --git a/test_hub/templates/login.html b/test_hub/templates/login.html deleted file mode 100644 index 640db25..0000000 --- a/test_hub/templates/login.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "base-struct.html" %} -{% block content %} -<div class="hold-transition login-page" style="padding-bottom: 1px;"> - <div class="login-box"> - <div class="login-logo" style="font-size: 32px; padding-top: 20px;"> - {{ hub_lang['zid_long'] | safe }} - </div> - <!-- /.login-logo --> - <div class="login-box-body"> - <form action="/login" method="post"> - <div class="form-group has-feedback"> - <input name="username" type="username" class="form-control" - placeholder="{{hub_lang['username']}}"> - <span class="fa fa-user form-control-feedback"></span> - </div> - <div class="form-group has-feedback"> - <input name="password" type="password" class="form-control" - placeholder="{{hub_lang['password']}}"> - <span class="fa fa-lock form-control-feedback"></span> - </div> - <div class="row"> - <div class="col-xs-8"> - <div class="checkbox icheck"> - <label> - <input type="checkbox"> Remember me - </label> - </div> - </div> - <!-- /.col --> - <div class="col-xs-4"> - <button type="submit" class="btn btn-primary btn-block btn-flat"> - Sign in</button> - </div> - <!-- /.col --> - </div> - </form> - - </div> - <!-- /.login-box-body --> - </div> - <!-- /.login-box --> -</div> - -{% endblock %} -- GitLab