diff --git a/.env b/.env new file mode 100644 index 0000000..9f4f825 --- /dev/null +++ b/.env @@ -0,0 +1,9 @@ +GAME_EXPO_DOMAIN = expo.leggy.dev +GAME_EXPO_SECRETE_KEY = leggy + +POSTGRES_USER = leggy +POSTGRES_PASSWORD = leggy +POSTGRES_DB = leggy + +THE_FRONT_ROOMS_DOMAIN = tfr.leggy.dev +THE_FRONT_ROOMS_SECRETE_KEY = leggy diff --git a/.gitignore b/.gitignore index 34e8ab8..72d71e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -.idea/ -.vscode/ +/.idea/ +/.vscode/ + .uuid +.env diff --git a/Caddy/Caddyfile b/Caddy/Caddyfile index a753aa7..00a4f62 100644 --- a/Caddy/Caddyfile +++ b/Caddy/Caddyfile @@ -1,9 +1,9 @@ -{$DOMAIN_HIGHSCORE} { - reverse_proxy highscore:8000 +{$THE_FRONT_ROOMS_DOMAIN} { + reverse_proxy tfr:8000 encode gzip } -{$DOMAIN_EXPO} { +{$GAME_EXPO_DOMAIN} { reverse_proxy expo:5000 encode gzip } diff --git a/DV8-Expo/website/static/gen/packed.css b/DV8-Expo/website/static/gen/packed.css deleted file mode 100644 index 2b49315..0000000 --- a/DV8-Expo/website/static/gen/packed.css +++ /dev/null @@ -1 +0,0 @@ -:root{--primary:43,43,43;--secondary:240,240,245;--primary-button:242,96,34;--secondary-button:191,85,40;--accent:194,165,136;--radius:.3rem;--main-font:'Rubik',sans-serif;--monospace-font:'JetBrains Mono',monospace;--nav:35,35,35}@keyframes glow{0%{opacity:0}50%{opacity:1}100%{opacity:0}}@keyframes gradient{0%{background-position:0 0}25%{background-position:100% 50%}50%{background-position:0 100%}75%{background-position:50% 25%}100%{background-position:0 50%}}@keyframes title-change{0%{transform:translateX(-3rem);opacity:0;filter:blur(0.2rem)}100%{transform:translateX(0);opacity:1;filter:blur(0)}}@media(max-width:600px){@keyframes title-change{0%{transform:translateY(-0.5rem);opacity:0}100%{transform:translateY(0);opacity:1}}}nav{padding-left:1rem;padding-right:.5rem;width:100%;height:3rem;display:flex;flex-direction:row;align-items:center;position:fixed;top:0;left:0;font-weight:bold;font-family:var(--main-font);font-size:1.1rem;white-space:nowrap;color:RGB(var(--primary));overflow:hidden;z-index:100;transition:color .1s ease-in-out}nav::before{content:"";position:absolute;inset:0;background:RGB(var(--nav));transform:translateY(-3rem);transition:transform .2s ease-in-out;z-index:-1}nav>span{width:100%}nav>ul{margin:0;padding:0;height:3rem;list-style:none;display:flex;flex-direction:row;align-items:center}nav>ul>li>a{margin:0 .75rem;padding:.1rem .5rem;text-decoration:none;color:inherit;transition:color .1s ease-in-out}nav>ul>li>a:hover{color:RGB(var(--accent))}nav>.title{height:3rem;display:flex;flex-direction:row;align-items:center;justify-content:center}nav>.title>p{margin:auto;font-size:inherit;color:inherit;transition:color .1s ease-in-out}nav>.title>p>span{font-family:var(--monospace-font);color:RGB(var(--accent))}nav.scrolled{color:RGB(var(--secondary))}nav.scrolled::before{transform:translateY(0)}@media(max-width:600px){nav{padding-right:1rem;height:6rem;top:-3rem;display:flex;flex-direction:column;justify-content:center;transition:top .2s ease-in-out}nav>.title{opacity:1}nav>.title>p{font-size:1.3rem}nav.scrolled{top:0}}header{padding:0 1rem;height:100vh;max-height:30rem;display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;font-family:var(--main-font);color:RGB(var(--primary))}header>h1{margin:0;font-size:3rem}header>h1>span{font-family:var(--monospace-font);font-weight:normal;color:RGB(var(--accent))}header>p{margin:0;font-size:1.2rem}header>img{margin-bottom:1rem;width:40rem;height:auto;max-width:100%;max-height:30rem}header>i{margin:1rem 0 0;font-size:1.2rem;animation:glow 3s ease-in-out infinite}section{margin:3rem auto 0;max-width:85rem;display:flex;flex-direction:column;gap:1rem;scroll-margin-top:4rem}section>h2{margin:0;font-size:2rem;font-weight:bold}section>p{margin:0;font-size:1rem}@media(max-width:600px){section{scroll-margin-top:7rem;text-align:center;justify-content:center}}.login{padding:.5rem;background-color:RGB(var(--primary));color:RGB(var(--secondary));border-radius:var(--radius)}.login>p{margin:0 0 .5rem;padding:.5rem;background-color:RGB(var(--accent));color:RGB(var(--primary));border-radius:calc(calc(var(--radius) - .5rem) / 2)}.login>p:first-child{border-top-left-radius:calc(var(--radius) - .5rem);border-top-right-radius:calc(var(--radius) - .5rem)}.login>form{display:flex;flex-direction:row}.login>form>input{padding:.5rem 1rem;width:100%;font-size:1rem;font-family:var(--monospace-font);background-color:RGB(var(--secondary));color:RGB(var(--primary));border-radius:calc(calc(var(--radius) - .5rem) / 2) 0 0 calc(var(--radius) - .5rem);border:none;transition:transform .1s ease-in-out,border-radius .1s ease-in-out}.login>form>input:hover,.login>form>input:focus-visible{outline:none}.login>form>button{padding:.5rem 1rem;font-size:1rem;background-color:RGB(var(--primary-button));color:RGB(var(--primary));border-radius:0 calc(calc(var(--radius) - .5rem) / 2) calc(var(--radius) - .5rem) 0;border:none;transition:transform .1s ease-in-out,border-radius .1s ease-in-out}.login>form>button:hover,.login>form>button:focus-visible{outline:none;background-color:RGB(var(--secondary-button))}.games{margin-top:1rem;display:flex;flex-direction:row;flex-wrap:wrap;gap:1rem}.game-box{margin:0 auto;padding:1rem;width:16rem;height:0;position:relative;display:flex;flex-direction:column;font-family:var(--main-font);font-size:1rem;text-decoration:none;text-align:center;background-color:RGB(var(--primary));color:RGB(var(--secondary));border-radius:var(--radius);box-shadow:0 .2rem 1rem 0 RGB(var(--primary));transition:box-shadow .1s ease-in-out,transform .25s ease-in-out;overflow:hidden}.game-box .background{position:absolute;inset:0;width:100%;height:100%;object-fit:cover;opacity:.3;filter:blur(0.25rem);z-index:+1}.game-box::after{content:'';position:absolute;inset:0;background-image:linear-gradient(to top,transparent,RGB(var(--primary)));z-index:+2}.game-box>div{position:relative;height:100%;display:flex;flex-direction:column;gap:.5rem;font-weight:bold;z-index:+3}.game-box>div .logo{margin:0 auto 1rem;width:auto;height:auto;max-width:100%;max-height:40%;display:block;border-radius:calc(var(--radius) / 2)}.game-box>div>h2{margin:0;font-size:2rem;color:RGB(var(--accent))}.game-box>div>p{margin:0}.game-box>div>span{height:100%}.game-box>div>ul{margin:0;padding:0;list-style:none;display:flex;flex-direction:row;flex-wrap:wrap;gap:.5rem}.game-box>div>ul>li{margin:0;padding:.25rem .5rem;font-size:.9rem;font-weight:normal;background-color:RGBA(var(--accent),0.5);color:RGB(var(--secondary));border-radius:var(--radius)}.game-box:hover{box-shadow:0 .25rem 1.25rem 0 RGB(var(--primary));transform:scale(1.03) translateY(-0.25rem)}@media(max-width:600px){.game-box{margin-bottom:2rem;padding:.75rem;width:14rem}.game-box>div .logo{margin-bottom:.5rem;max-height:25%}.game-box>div>h2{font-size:1.5rem}}*{box-sizing:border-box}html{font-family:var(--main-font);background-color:RGB(var(--secondary));color:RGB(var(--primary))}body{margin:0;padding:0;min-height:100vh;display:grid;grid-template-rows:1fr auto}.background{background-color:RGB(var(--secondary));position:absolute;inset:0;overflow:hidden;z-index:1}.background>img{position:absolute;inset:-5%;width:110%;height:110%;object-fit:cover;filter:blur(0.25rem);opacity:.6}.background::after{content:'';position:absolute;inset:0;background-image:linear-gradient(to top,RGB(var(--secondary)) 3%,RGBA(var(--primary),0.1));z-index:+1}main{padding:3rem 2rem 2rem;position:relative;z-index:2}@media(max-width:600px){main{padding:3rem 1rem 1rem}}footer{margin:auto 0 0;padding:.5rem;position:relative;display:flex;justify-content:center;align-items:center;background-color:RGB(var(--nav));color:RGB(var(--secondary));z-index:2}footer>p{margin:0;font-size:.8rem;font-family:var(--monospace-font);text-align:center;color:RGB(var(--secondary))}footer>p>a{margin:0;font-size:inherit;font-family:inherit;color:RGB(var(--accent));text-decoration:none;cursor:pointer}footer>p>a:hover{text-decoration:underline} \ No newline at end of file diff --git a/DV8-Expo/website/static/gen/packed.js b/DV8-Expo/website/static/gen/packed.js deleted file mode 100644 index 18e035b..0000000 --- a/DV8-Expo/website/static/gen/packed.js +++ /dev/null @@ -1,8 +0,0 @@ -function keepRatio(){let games=document.querySelectorAll(".game-box");games.forEach((game)=>{game.style.height=(game.offsetWidth*1.5)+"px";});} -window.onscroll=()=>{scrollFunction();checkSection();};window.onload=()=>{keepRatio() -resizeNav();scrollFunction();checkSection();};window.onresize=()=>{keepRatio() -resizeNav();checkSection();};const defaultTitle="DV8 Game Expo 2023";let navSpacing=(5*16);let prevElement=null;function resizeNav(){if(window.innerWidth>600){navSpacing=(5*16);}else{navSpacing=(8*16);}} -function scrollFunction(){let nav=document.querySelector("nav");let scrollHeight=0;if(document.body.scrollTop>scrollHeight||document.documentElement.scrollTop>scrollHeight){nav.classList.add("scrolled");}else{nav.classList.remove("scrolled");}} -function checkSection(){let navTitle=document.querySelector(".title > p");let sections=document.querySelectorAll("section");if((window.pageYOffset+navSpacing){navTitle.style.animation="";},200);return;} -sections.forEach((section)=>{let top=section.offsetTop;let bottom=section.offsetTop+section.offsetHeight;if((window.pageYOffset+navSpacing)>=top&&window.pageYOffset<(bottom-navSpacing)){if(prevElement===section)return;navTitle.innerHTML=section.id.split("_").join(" ");navTitle.style.animation="title-change 0.2s ease-in-out";prevElement=section;setTimeout(()=>{navTitle.style.animation="";},200);}});} -document.querySelectorAll("nav > ul > li > a").forEach((element)=>{element.onclick=()=>{let anchor=location.hash.split("#")[1].toString();let element=document.getElementById(anchor);if(element===null){window.scrollTo({top:0,behavior:"smooth"});}else{window.scrollTo({top:(element.offsetTop+navSpacing),behavior:"smooth"});}}}); \ No newline at end of file diff --git a/DV8-Expo/.gitignore b/GameExpo/.gitignore similarity index 100% rename from DV8-Expo/.gitignore rename to GameExpo/.gitignore diff --git a/DV8-Expo/Dockerfile b/GameExpo/Dockerfile similarity index 100% rename from DV8-Expo/Dockerfile rename to GameExpo/Dockerfile diff --git a/DV8-Expo/README.md b/GameExpo/README.md similarity index 100% rename from DV8-Expo/README.md rename to GameExpo/README.md diff --git a/DV8-Expo/requirements.txt b/GameExpo/requirements.txt similarity index 100% rename from DV8-Expo/requirements.txt rename to GameExpo/requirements.txt diff --git a/DV8-Expo/run.sh b/GameExpo/run.sh similarity index 100% rename from DV8-Expo/run.sh rename to GameExpo/run.sh diff --git a/DV8-Expo/website/__init__.py b/GameExpo/website/__init__.py similarity index 88% rename from DV8-Expo/website/__init__.py rename to GameExpo/website/__init__.py index c62deee..aaaee49 100644 --- a/DV8-Expo/website/__init__.py +++ b/GameExpo/website/__init__.py @@ -6,11 +6,11 @@ from website.config import INSTANCE_DIR, MIGRATION_DIR from website import routes -app = Flask(__name__) # instance_path=INSTANCE_DIR +app = Flask(__name__, instance_path=INSTANCE_DIR) app.config.from_pyfile("config.py") db.init_app(app) -migrate.init_app(app, db) # directory=MIGRATION_DIR +migrate.init_app(app, db, directory=MIGRATION_DIR) with app.app_context(): db.create_all() diff --git a/DV8-Expo/website/config.py b/GameExpo/website/config.py similarity index 100% rename from DV8-Expo/website/config.py rename to GameExpo/website/config.py diff --git a/DV8-Expo/website/extensions.py b/GameExpo/website/extensions.py similarity index 100% rename from DV8-Expo/website/extensions.py rename to GameExpo/website/extensions.py diff --git a/DV8-Expo/website/models.py b/GameExpo/website/models.py similarity index 100% rename from DV8-Expo/website/models.py rename to GameExpo/website/models.py diff --git a/DV8-Expo/website/routes.py b/GameExpo/website/routes.py similarity index 100% rename from DV8-Expo/website/routes.py rename to GameExpo/website/routes.py diff --git a/DV8-Expo/website/static/images/backgrounds/1.png b/GameExpo/website/static/images/backgrounds/1.png similarity index 100% rename from DV8-Expo/website/static/images/backgrounds/1.png rename to GameExpo/website/static/images/backgrounds/1.png diff --git a/DV8-Expo/website/static/images/default.jpg b/GameExpo/website/static/images/default.jpg similarity index 100% rename from DV8-Expo/website/static/images/default.jpg rename to GameExpo/website/static/images/default.jpg diff --git a/DV8-Expo/website/static/images/logos/1.png b/GameExpo/website/static/images/logos/1.png similarity index 100% rename from DV8-Expo/website/static/images/logos/1.png rename to GameExpo/website/static/images/logos/1.png diff --git a/DV8-Expo/website/static/images/logos/2.jpg b/GameExpo/website/static/images/logos/2.jpg similarity index 100% rename from DV8-Expo/website/static/images/logos/2.jpg rename to GameExpo/website/static/images/logos/2.jpg diff --git a/DV8-Expo/website/static/js/games.js b/GameExpo/website/static/js/games.js similarity index 100% rename from DV8-Expo/website/static/js/games.js rename to GameExpo/website/static/js/games.js diff --git a/DV8-Expo/website/static/js/main.js b/GameExpo/website/static/js/main.js similarity index 100% rename from DV8-Expo/website/static/js/main.js rename to GameExpo/website/static/js/main.js diff --git a/DV8-Expo/website/static/js/nav.js b/GameExpo/website/static/js/nav.js similarity index 100% rename from DV8-Expo/website/static/js/nav.js rename to GameExpo/website/static/js/nav.js diff --git a/DV8-Expo/website/static/sass/animations.sass b/GameExpo/website/static/sass/animations.sass similarity index 100% rename from DV8-Expo/website/static/sass/animations.sass rename to GameExpo/website/static/sass/animations.sass diff --git a/DV8-Expo/website/static/sass/header.sass b/GameExpo/website/static/sass/header.sass similarity index 100% rename from DV8-Expo/website/static/sass/header.sass rename to GameExpo/website/static/sass/header.sass diff --git a/DV8-Expo/website/static/sass/nav.sass b/GameExpo/website/static/sass/nav.sass similarity index 100% rename from DV8-Expo/website/static/sass/nav.sass rename to GameExpo/website/static/sass/nav.sass diff --git a/DV8-Expo/website/static/sass/sections.sass b/GameExpo/website/static/sass/sections.sass similarity index 100% rename from DV8-Expo/website/static/sass/sections.sass rename to GameExpo/website/static/sass/sections.sass diff --git a/DV8-Expo/website/static/sass/styles.sass b/GameExpo/website/static/sass/styles.sass similarity index 100% rename from DV8-Expo/website/static/sass/styles.sass rename to GameExpo/website/static/sass/styles.sass diff --git a/DV8-Expo/website/templates/base.html b/GameExpo/website/templates/base.html similarity index 100% rename from DV8-Expo/website/templates/base.html rename to GameExpo/website/templates/base.html diff --git a/DV8-Expo/website/templates/editor.html b/GameExpo/website/templates/editor.html similarity index 100% rename from DV8-Expo/website/templates/editor.html rename to GameExpo/website/templates/editor.html diff --git a/DV8-Expo/website/templates/game.html b/GameExpo/website/templates/game.html similarity index 100% rename from DV8-Expo/website/templates/game.html rename to GameExpo/website/templates/game.html diff --git a/DV8-Expo/website/templates/index.html b/GameExpo/website/templates/index.html similarity index 100% rename from DV8-Expo/website/templates/index.html rename to GameExpo/website/templates/index.html diff --git a/DV8-Expo/website/templates/login.html b/GameExpo/website/templates/login.html similarity index 100% rename from DV8-Expo/website/templates/login.html rename to GameExpo/website/templates/login.html diff --git a/Highscore-Server/server/config.py b/Highscore-Server/server/config.py deleted file mode 100644 index b41e3b3..0000000 --- a/Highscore-Server/server/config.py +++ /dev/null @@ -1,24 +0,0 @@ -import os - - -# Purely to make the code a bit more readable -def env(key): - return os.getenv(key) - - -SECRET_KEY = env("FLASK_KEY") -BEARER_TOKEN = env("BEARER_TOKEN") - -user = env("DB_USER") -password = env("DB_PASSWORD") -host = env("DB_HOST") -database = env("DB_NAME") - -SQLALCHEMY_DATABASE_URI = ( - f"postgresql+psycopg2://{user}:{password}@{host}:5432/{database}" -) -SQLALCHEMY_TRACK_MODIFICATIONS = False -SQLALCHEMY_POOL_RECYCLE = 621 - -MIGRATION_DIR = "/data/storage/migrations" -INSTANCE_DIR = "/data/storage/instance" diff --git a/Highscore-Server/.gitignore b/TFR/.gitignore similarity index 100% rename from Highscore-Server/.gitignore rename to TFR/.gitignore diff --git a/Highscore-Server/Dockerfile b/TFR/Dockerfile similarity index 100% rename from Highscore-Server/Dockerfile rename to TFR/Dockerfile diff --git a/Highscore-Server/README.md b/TFR/README.md similarity index 100% rename from Highscore-Server/README.md rename to TFR/README.md diff --git a/Highscore-Server/requirements.txt b/TFR/requirements.txt similarity index 100% rename from Highscore-Server/requirements.txt rename to TFR/requirements.txt diff --git a/Highscore-Server/run.sh b/TFR/run.sh similarity index 93% rename from Highscore-Server/run.sh rename to TFR/run.sh index c3aa82b..62baf97 100644 --- a/Highscore-Server/run.sh +++ b/TFR/run.sh @@ -26,4 +26,4 @@ fi # Start server!!!! echo "Starting server..." -gunicorn --bind highscore:8000 server:app +gunicorn --bind tfr:8000 server:app diff --git a/Highscore-Server/server/__init__.py b/TFR/server/__init__.py similarity index 100% rename from Highscore-Server/server/__init__.py rename to TFR/server/__init__.py diff --git a/Highscore-Server/server/api.py b/TFR/server/api.py similarity index 59% rename from Highscore-Server/server/api.py rename to TFR/server/api.py index 1585c91..a676ec6 100644 --- a/Highscore-Server/server/api.py +++ b/TFR/server/api.py @@ -5,7 +5,6 @@ from flask_login import login_required, current_user from server.models import Tokens, Scores from server.extensions import db -from server.config import BEARER_TOKEN blueprint = Blueprint("api", __name__, url_prefix="/api") @@ -40,20 +39,30 @@ def tokens(): return jsonify({"success": "Token added!"}), 200 -@blueprint.route("/post", methods=["POST"]) +@blueprint.route("/post", methods=["GET", "POST"]) def post(): + if request.method == "GET": + return """ +
+ + + + +
+ """ + form = request.form if not form: return "Invalid form", 400 - if not request.headers.get("Authentication"): + if not form["token"]: return "Invalid authentication", 401 - if not isinstance(form["score"], int): - return "Score must be an integer", 400 + # if not isinstance(form["score"], int): + # return "Score must be an integer", 400 if int(form["score"]) < 0: return "Score must be greater than 0", 400 - if form["difficulty"] not in [0, 1, 2, 3, 4]: + if int(form["difficulty"]) not in [0, 1, 2, 3, 4]: # 0 = Easy, Level 1 # 1 = Easy, Level 2 # 2 = Easy, Level 3 @@ -61,38 +70,17 @@ def post(): # 4 = Hard return "Invalid difficulty", 400 - if token_data := Tokens.query.filter_by( - token=request.headers.get("Authentication") - ).first(): - # User is authenticated - # This is a registered user - + if token := Tokens.query.filter_by(token=form["token"]).first(): + # Yupeee, authenticated score = Scores( - score=form["score"], - difficulty=form["difficulty"], - achievements=form["achievements"], - user_id=token_data.holder, - ) - db.session.add(score) - db.session.commit() - - return "Success!", 200 - elif request.headers.get("Authentication") == BEARER_TOKEN: - # User is not authenticated, but has the correct token - # This is an anonymous user - - if not form["playerName"] or len(form["playerId"]) != 4: - return "Invalid player name", 400 - - score = Scores( - anonymous=True, - username=form["playerName"], - score=form["score"], - difficulty=form["difficulty"], + score=int(form["score"]), + difficulty=int(form["difficulty"]), + scorer=token.holder, ) db.session.add(score) db.session.commit() return "Success!", 200 + # L no authentication :3 return "Authentication failed", 401 diff --git a/Highscore-Server/server/auth.py b/TFR/server/auth.py similarity index 100% rename from Highscore-Server/server/auth.py rename to TFR/server/auth.py diff --git a/TFR/server/config.py b/TFR/server/config.py new file mode 100644 index 0000000..b6fed09 --- /dev/null +++ b/TFR/server/config.py @@ -0,0 +1,15 @@ +import os + +SECRET_KEY = os.getenv("FLASK_KEY") + +user = os.getenv("DB_USER") +password = os.getenv("DB_PASSWORD") +host = os.getenv("DB_HOST") +db = os.getenv("DB_NAME") + +SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{user}:{password}@{host}:5432/{db}" +SQLALCHEMY_TRACK_MODIFICATIONS = False +SQLALCHEMY_POOL_RECYCLE = 621 + +MIGRATION_DIR = "/data/storage/migrations" +INSTANCE_DIR = "/data/storage/instance" diff --git a/Highscore-Server/server/extensions.py b/TFR/server/extensions.py similarity index 100% rename from Highscore-Server/server/extensions.py rename to TFR/server/extensions.py diff --git a/Highscore-Server/server/models.py b/TFR/server/models.py similarity index 89% rename from Highscore-Server/server/models.py rename to TFR/server/models.py index c10687a..43666fe 100644 --- a/Highscore-Server/server/models.py +++ b/TFR/server/models.py @@ -17,9 +17,6 @@ class Scores(db.Model): id = db.Column(db.Integer, primary_key=True) - anonymous = db.Column(db.Boolean, nullable=False, default=False) - username = db.Column(db.String(32), nullable=True) - score = db.Column(db.Float, nullable=False) difficulty = db.Column(db.Integer, nullable=False) scored_at = db.Column( @@ -28,7 +25,7 @@ class Scores(db.Model): server_default=db.func.now(), ) - scorer = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=True) + scorer = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False) class Users(db.Model, UserMixin): diff --git a/Highscore-Server/server/static/bg.png b/TFR/server/static/bg.png similarity index 100% rename from Highscore-Server/server/static/bg.png rename to TFR/server/static/bg.png diff --git a/Highscore-Server/server/static/error-images/1.jpg b/TFR/server/static/error-images/1.jpg similarity index 100% rename from Highscore-Server/server/static/error-images/1.jpg rename to TFR/server/static/error-images/1.jpg diff --git a/Highscore-Server/server/static/error-images/2.jpg b/TFR/server/static/error-images/2.jpg similarity index 100% rename from Highscore-Server/server/static/error-images/2.jpg rename to TFR/server/static/error-images/2.jpg diff --git a/Highscore-Server/server/static/error-images/3.jpg b/TFR/server/static/error-images/3.jpg similarity index 100% rename from Highscore-Server/server/static/error-images/3.jpg rename to TFR/server/static/error-images/3.jpg diff --git a/Highscore-Server/server/static/gen/scripts.js b/TFR/server/static/gen/scripts.js similarity index 100% rename from Highscore-Server/server/static/gen/scripts.js rename to TFR/server/static/gen/scripts.js diff --git a/Highscore-Server/server/static/gen/styles.css b/TFR/server/static/gen/styles.css similarity index 100% rename from Highscore-Server/server/static/gen/styles.css rename to TFR/server/static/gen/styles.css diff --git a/Highscore-Server/server/static/js/main.js b/TFR/server/static/js/main.js similarity index 100% rename from Highscore-Server/server/static/js/main.js rename to TFR/server/static/js/main.js diff --git a/Highscore-Server/server/static/sass/style.sass b/TFR/server/static/sass/style.sass similarity index 100% rename from Highscore-Server/server/static/sass/style.sass rename to TFR/server/static/sass/style.sass diff --git a/Highscore-Server/server/static/title.png b/TFR/server/static/title.png similarity index 100% rename from Highscore-Server/server/static/title.png rename to TFR/server/static/title.png diff --git a/Highscore-Server/server/templates/about.html b/TFR/server/templates/about.html similarity index 100% rename from Highscore-Server/server/templates/about.html rename to TFR/server/templates/about.html diff --git a/Highscore-Server/server/templates/account.html b/TFR/server/templates/account.html similarity index 100% rename from Highscore-Server/server/templates/account.html rename to TFR/server/templates/account.html diff --git a/Highscore-Server/server/templates/auth.html b/TFR/server/templates/auth.html similarity index 100% rename from Highscore-Server/server/templates/auth.html rename to TFR/server/templates/auth.html diff --git a/Highscore-Server/server/templates/base.html b/TFR/server/templates/base.html similarity index 94% rename from Highscore-Server/server/templates/base.html rename to TFR/server/templates/base.html index 4673178..cbc02b1 100644 --- a/Highscore-Server/server/templates/base.html +++ b/TFR/server/templates/base.html @@ -34,7 +34,7 @@
- The Front Rooms logo + The Front Rooms logo