diff --git a/app/__pycache__/forms.cpython-311.pyc b/app/__pycache__/forms.cpython-311.pyc index 34fd422..10728c1 100644 Binary files a/app/__pycache__/forms.cpython-311.pyc and b/app/__pycache__/forms.cpython-311.pyc differ diff --git a/app/__pycache__/routes.cpython-311.pyc b/app/__pycache__/routes.cpython-311.pyc index c5ae448..18f4d6e 100644 Binary files a/app/__pycache__/routes.cpython-311.pyc and b/app/__pycache__/routes.cpython-311.pyc differ diff --git a/app/routes.py b/app/routes.py index 5b5129f..c513f99 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,8 +1,13 @@ import requests +import shutil import itertools import re import os import csv +import glob +import pathlib +from flask_socketio import SocketIO +from datetime import datetime, timezone from .forms import TemplateForm from functools import wraps from flask import ( @@ -19,12 +24,15 @@ from werkzeug.utils import secure_filename from app import app, forms # Upload folder -UPLOAD_FOLDER = "/Users/normrasmussen/Documents/Projects/CSM_webapp/app/static/files" -# UPLOAD_FOLDER = 'static/files' +UPLOAD_FOLDER = "/Users/normrasmussen/Documents/Projects/CSM_webapp/app/static/files/csv" +TEMPLATES_FOLDER = "/Users/normrasmussen/Documents/Projects/CSM_webapp/app/static/files/templates/" app.config["UPLOAD_FOLDER"] = UPLOAD_FOLDER +app.config["TEMPLATES_FOLDER"] = TEMPLATES_FOLDER ALLOWED_EXTENSIONS = {"csv"} # Global Variables +socketio = SocketIO(app) +specials = '"!@#$%^&[]*()-+?_=,<>/"' url = "https://api.northpass.com/" @@ -72,7 +80,6 @@ def ask_key(): Without this key, no other functions will work. It also assigns the api key to the session and clears the session upon each reload. """ - specials = '"!@#$%^&*()-+?_=,<>/"' if request.method == "POST": session["key"] = request.form.get("apikey") if any(char in specials for char in session["key"]) or re.search( @@ -104,6 +111,19 @@ def render_home(): @app.route("/clear_session", methods=["GET", "POST"]) def clear_session(): if session.get("key"): + if session.get("client_path"): + client = session["client_path"] + print(client) + wildcard = glob.glob(client + '_*') + print(wildcard) + for directory in wildcard: + print(directory) + try: + shutil.rmtree(directory) + print(directory) + except OSError: + print(OSError) + print("Error?") session.clear() error = "Session Cleared!" return render_template("index.html", error=error, title="Home, New session") @@ -118,7 +138,6 @@ def table(): @app.route("/upload_file", methods=["GET", "POST"]) @key_required def upload_file(): - print("Uploading CSV") if request.method == "POST": if "file" not in request.files: flash("No file found or uploaded") @@ -312,6 +331,8 @@ def load_templates(): nextlink = data["links"] for response in data["data"]: last_updated = response["attributes"]["updated_at"].split("T") + full_updated = response["attributes"]["updated_at"] + g.full_updated = datetime.fromisoformat(full_updated) last_updated = last_updated[0] name, body, last_updated = ( response["attributes"]["name"], @@ -340,7 +361,6 @@ def templates(): if request.form["submit-template"]: name = request.form.get("template_name") body = request.form.get("body") - g.last_template = name if body == "": error = ( "Ooph. Looks like you didn't load the changes before submitting." @@ -355,15 +375,18 @@ def templates(): } payload = {"custom_template": {"name": name, "body": body}} response = requests.post(url + endpoint, json=payload, headers=headers) - return check_templates(response) + return check_templates(response, name) return load_templates() -def check_templates(response): - print(response) +def check_templates(response, name): response = str(response) if "201" in response: - error = "Success! Templates Uploaded." + error = ( + f"Success! The {name} template was successfully uploaded for " + + session["school"] + + "." + ) button = "Undo" return render_template( "templates.html", title="Templates Added", error=error, button=button @@ -380,16 +403,25 @@ def check_templates(response): def save_templates_backup(templates): - g.client_path = os.path.join(UPLOAD_FOLDER, session["school"]) - if os.path.exists(g.client_path): + session["client_path"] = os.path.join(TEMPLATES_FOLDER, session["school"]) + if any(char in specials for char in session["client_path"]): + for char in specials: + session["sanitized_path"] = session["client_path"].replace(char,"") + print(session["sanitized_path"]) + else: + session["sanitized_path"] = session["client_path"] + print(session["client_path"]) + today = datetime.now(timezone.utc) + if os.path.exists(session["client_path"]): pass else: - os.mkdir(g.client_path) + path = session["client_path"] + "_" + str(today) + os.mkdir(path) for tupe in templates: file_name = tupe[0] + ".liquid" file_body = tupe[1] - complete_path = os.path.join(g.client_path, file_name) + complete_path = os.path.join(path, file_name) with open(complete_path, "w+") as temp: temp.write(file_body) @@ -399,12 +431,18 @@ def save_templates_backup(templates): @app.route("/undo_template", methods=["POST"]) @key_required def undo_template(): - print(g.client_path) - template_path = os.path.join(g.client_path, g.last_template) if request.method == "POST": if request.form["undo_templates"]: - if os.path.exists(template_path): - print(template_path) + pass + +@socketio.on("disconnect") +def test_disconnect(): + print("Client disconnected") + + +@socketio.on("connect") +def test_connect(): + print("connection established") @app.route("/cmtest", methods=["GET", "POST"]) diff --git a/app/static/files/[Sandbox] Norm's Academy/_cards_course.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_cards_course.html.liquid deleted file mode 100644 index 7d08608..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_cards_course.html.liquid +++ /dev/null @@ -1,49 +0,0 @@ - -
- {% if course.ribbon %} -
- {{ course.ribbon }} -
- {% endif %} - -
-

- {{ course.name }} -

-
- {{ course.full_description }} -
- -
- {% t shared.progress, count: course.progress %} -
-
- {{course.categories.first.name}} -
-
-
- - diff --git a/app/static/files/[Sandbox] Norm's Academy/_cards_featured_course.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_cards_featured_course.html.liquid deleted file mode 100644 index 70cba72..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_cards_featured_course.html.liquid +++ /dev/null @@ -1,44 +0,0 @@ -
-
-
-
- -
-
-
-
-
-

- {{ course.name }} -

-
- {{ course.full_description }} -
- -
- - {% if course.enrolled? == false %} - {% t shared.enroll %} - {% elsif course.started? == false %} - {% t shared.start, key: current_school.course_vocabulary %} - {% elsif course.completed? %} - {% t shared.course.view, key: current_school.course_vocabulary %} - {% else %} - {% t shared.continue %} - {% endif %} - -
-
- {% t shared.progress, count: course.progress %} -
-
-
-
-
-
-
-
diff --git a/app/static/files/[Sandbox] Norm's Academy/_course_details.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_course_details.html.liquid deleted file mode 100644 index e69de29..0000000 diff --git a/app/static/files/[Sandbox] Norm's Academy/_footer.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_footer.html.liquid deleted file mode 100644 index 79a0481..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_footer.html.liquid +++ /dev/null @@ -1,80 +0,0 @@ - diff --git a/app/static/files/[Sandbox] Norm's Academy/_head.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_head.html.liquid deleted file mode 100644 index bde9ff3..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_head.html.liquid +++ /dev/null @@ -1,11 +0,0 @@ -{% styles default %} -{% styles colors %} -{% styles custom %} - - - - - - - - diff --git a/app/static/files/[Sandbox] Norm's Academy/_header.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_header.html.liquid deleted file mode 100644 index 56b76c5..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_header.html.liquid +++ /dev/null @@ -1,183 +0,0 @@ -
-
-
- {% if current_person.signed_in? %} - - - {% endif %} -
- {% if current_school.logo_url %} -

- - {{ current_school.name }} - -

- {% else %} - - {{ current_school.name }} - - {% endif %} - -
- -
- - {% if current_person.signed_in? %} -
-
- - -
-
-
- - -
- {% else %} -
- {% endif %} - -
- -
-
- {{ website_navigation.name }} - - {% endfor %} -
- {% unless current_school.sso_active? %} - - {% t .profile_settings %} - - {% endunless %} - - {% t .sign_out %} - -
-
-
- -{% include "messages" %} - diff --git a/app/static/files/[Sandbox] Norm's Academy/_section_faqs.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_section_faqs.html.liquid deleted file mode 100644 index 7e6d46f..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_section_faqs.html.liquid +++ /dev/null @@ -1,109 +0,0 @@ -
-
-
- Frequently Asked Questions -
-
-
-
-
-
- -
Q: I'm not in shape. Can I still go to a climbing gym?
-
-
-
-

A: Absolutely. Climbing is a wonderful full-body and full-mind workout. If you're looking to get in shapre but tired of pumping iron, climbing is a fantastic option.

-
-
-
-
-
- -
Q: I'm scared of heights. Should I try climbing?
-
-
-
-

A: Many climbers have a fear of heights! However, it goes away when you use your own strength and technique to get to the top of a wall. Start small by climbing in a gym first.

-
-
-
-
-
- -
Q: Should I hire someone to belay me at a gym?
-
-
-
-

A: You absolutely can as a quick introduction. However, what would be even better is to grab a friend and take a belay class at your local gym.

-
-
-
-
-
-
-
- -
Q: What is bouldering?
-
-
-
-

A: Great question! Bouldering is a form of climbing, done on shorter walls. You use a crash pad under your climb to cushion your fall. Be warned, bouldering is much more powerful and has a steeper learning curve.

-
-
-
-
-
- -
Q: What are those people with all that gear hanging from their harness doing?
-
-
-
-

A: Chances are you saw a trad climber! Short for traditional climbing, that gear serves as removable protection. When the climbing pair is done with the climb, nothing is left on the rock.

-
-
-
-
-
- -
Q: None of my friends are interested in climbing. How can I find partners?
-
-
-
-

A:The best way to meet people is to join a gym a start climbing! Climbers are social and you'll start meeting people. You can also use online resources like Mountain Project's Partner Finder.

-
-
-
-
-
- -
-/ - - - \ No newline at end of file diff --git a/app/static/files/[Sandbox] Norm's Academy/_section_instructors.html.liquid b/app/static/files/[Sandbox] Norm's Academy/_section_instructors.html.liquid deleted file mode 100644 index 2433e20..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/_section_instructors.html.liquid +++ /dev/null @@ -1,91 +0,0 @@ -
-
-
- Recommended Gear -
-
- - -
- - - - \ No newline at end of file diff --git a/app/static/files/[Sandbox] Norm's Academy/catalog.html.liquid b/app/static/files/[Sandbox] Norm's Academy/catalog.html.liquid deleted file mode 100644 index 8ce1105..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/catalog.html.liquid +++ /dev/null @@ -1,39 +0,0 @@ -{% include "header" %} -{% include "course_version_outdated_alert", courses: courses.in_catalog %} -
-
-
-
-
- Menlo Security Resrouces -
-
- Resources to help you make the most of your Security Training -
-
-
-{% include "sub_navigation" %} - {% include "courses_catalog" %} - -{% include "footer" %} - - - - - \ No newline at end of file diff --git a/app/static/files/[Sandbox] Norm's Academy/community.html.liquid b/app/static/files/[Sandbox] Norm's Academy/community.html.liquid deleted file mode 100644 index 9157fd7..0000000 --- a/app/static/files/[Sandbox] Norm's Academy/community.html.liquid +++ /dev/null @@ -1,33 +0,0 @@ - {% include 'header' %} -
-
-

Explore

-
- {% include 'sub_navigation' %} -
- -
-
-{% include 'footer' %} - - - \ No newline at end of file diff --git a/app/static/files/Amyris-12-21T1630.csv b/app/static/files/csv/Amyris-12-21T1630.csv similarity index 100% rename from app/static/files/Amyris-12-21T1630.csv rename to app/static/files/csv/Amyris-12-21T1630.csv diff --git a/app/static/files/FLASK-TEST_-_Sheet1.csv b/app/static/files/csv/FLASK-TEST_-_Sheet1.csv similarity index 100% rename from app/static/files/FLASK-TEST_-_Sheet1.csv rename to app/static/files/csv/FLASK-TEST_-_Sheet1.csv diff --git a/app/static/files/FLASK-TEST_-_Sheet1_1.csv b/app/static/files/csv/FLASK-TEST_-_Sheet1_1.csv similarity index 100% rename from app/static/files/FLASK-TEST_-_Sheet1_1.csv rename to app/static/files/csv/FLASK-TEST_-_Sheet1_1.csv