diff --git a/var/www/Flask_server.py b/var/www/Flask_server.py index 3989043f..56360a5e 100755 --- a/var/www/Flask_server.py +++ b/var/www/Flask_server.py @@ -27,11 +27,33 @@ cfg = Flask_config.cfg Flask_config.app = Flask(__name__, static_url_path='/static/') app = Flask_config.app +# ========= HEADER GENERATION ======== + +# Get headers items that should be ignored (not displayed) +toIgnoreModule = set() +try: + with open('templates/ignored_modules.txt', 'r') as f: + lines = f.read().splitlines() + for line in lines: + toIgnoreModule.add(line) + +except IOError: + f = open('templates/ignored_modules.txt', 'w') + f.close() + + +print(toIgnoreModule) # Dynamically import routes and functions from modules # Also, prepare header.html to_add_to_header_dico = {} for root, dirs, files in os.walk('modules/'): sys.path.append(join(root)) + + # Ignore the module + curr_dir = root.split('/')[1] + if curr_dir in toIgnoreModule: + continue + for name in files: module_name = root.split('/')[-2] if name.startswith('Flask_') and name.endswith('.py'): diff --git a/var/www/modules/skeleton/Flask_skeleton.py b/var/www/modules/rawSkeleton/Flask_rawSkeleton.py similarity index 68% rename from var/www/modules/skeleton/Flask_skeleton.py rename to var/www/modules/rawSkeleton/Flask_rawSkeleton.py index 4b110f64..75862630 100644 --- a/var/www/modules/skeleton/Flask_skeleton.py +++ b/var/www/modules/rawSkeleton/Flask_rawSkeleton.py @@ -13,7 +13,7 @@ import Flask_config app = Flask_config.app cfg = Flask_config.cfg -skeleton = Blueprint('skeleton', __name__, template_folder='templates') +rawSkeleton = Blueprint('rawSkeleton', __name__, template_folder='templates') # ============ FUNCTIONS ============ def one(): @@ -21,10 +21,10 @@ def one(): # ============= ROUTES ============== -@skeleton.route("/skeleton/", methods=['GET']) +@rawSkeleton.route("/rawSkeleton/", methods=['GET']) def skeleton_page(): - return render_template("skeleton.html") + return render_template("rawSkeleton.html") # ========= REGISTRATION ========= -app.register_blueprint(skeleton) +app.register_blueprint(rawSkeleton) diff --git a/var/www/modules/rawSkeleton/templates/header_rawSkeleton.html b/var/www/modules/rawSkeleton/templates/header_rawSkeleton.html new file mode 100644 index 00000000..b96b89a8 --- /dev/null +++ b/var/www/modules/rawSkeleton/templates/header_rawSkeleton.html @@ -0,0 +1 @@ +
  • rawSkeleton page
    • diff --git a/var/www/modules/skeleton/templates/skeleton.html b/var/www/modules/rawSkeleton/templates/rawSkeleton.html similarity index 94% rename from var/www/modules/skeleton/templates/skeleton.html rename to var/www/modules/rawSkeleton/templates/rawSkeleton.html index 81180040..7d1cf3ca 100644 --- a/var/www/modules/skeleton/templates/skeleton.html +++ b/var/www/modules/rawSkeleton/templates/rawSkeleton.html @@ -25,13 +25,13 @@ {% include 'navbar.html' %}
    -

    Text

    +

    Raw skeleton webpage

    diff --git a/var/www/modules/skeleton/templates/header_skeleton.html b/var/www/modules/skeleton/templates/header_skeleton.html deleted file mode 100644 index e333c2d4..00000000 --- a/var/www/modules/skeleton/templates/header_skeleton.html +++ /dev/null @@ -1 +0,0 @@ -
  • Skeleton page
    • diff --git a/var/www/templates/header.html b/var/www/templates/header.html index ad5508ce..19146bef 100644 --- a/var/www/templates/header.html +++ b/var/www/templates/header.html @@ -25,7 +25,6 @@ -
  • Skeleton page
    • - + diff --git a/var/www/templates/header_base.html b/var/www/templates/header_base.html new file mode 100644 index 00000000..118cf44f --- /dev/null +++ b/var/www/templates/header_base.html @@ -0,0 +1,11 @@ +
    + +
    diff --git a/var/www/templates/ignored_modules.txt b/var/www/templates/ignored_modules.txt new file mode 100644 index 00000000..742bc5fc --- /dev/null +++ b/var/www/templates/ignored_modules.txt @@ -0,0 +1 @@ +rawSkeleton diff --git a/var/www/templates/navbar.html b/var/www/templates/navbar.html new file mode 100644 index 00000000..7d0bb43f --- /dev/null +++ b/var/www/templates/navbar.html @@ -0,0 +1,19 @@ +
    + +