Added basic configuration set up.

dayeya · Apr 12, 2024 · c8b937e · c8b937e
1 parent 4291245
commit c8b937e
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 17 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Sqli.iml b/.idea/Sqli.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/templates/home.html b/app/templates/home.html
@@ -9,9 +9,9 @@
 <body>
     <div class="container">
         <h1 class="header">Welcome to my website!</h1>
-        <div class"links">
-            <a class="link" href="http://192.168.1.218:8080/login">Login</a>
-            <a class="link" href="http://192.168.1.218:8080/register">Register</a>
+        <div class="links">
+            <a class="link" href="http://{{ip}}:{{port}}/login">Login</a>
+            <a class="link" href="http://{{ip}}:{{port}}/register">Register</a>
         </div>
     </div>
 </body>

diff --git a/app/templates/login.html b/app/templates/login.html
@@ -12,6 +12,6 @@ <h1>Login</h1>
         <input type="text" placeholder="Enter password" name = "password"/>
         <input type="submit" value="Submit"/>
     </form>
-    <a href="http://192.168.1.218:8080/register">Don't have an account? Register!</a></br>
+    <a href="http://{{ip}}:{{port}}/register">Don't have an account? Register!</a></br>
 </body>
 </html>
diff --git a/app/templates/register.html b/app/templates/register.html
@@ -12,6 +12,6 @@ <h1>Register!</h1>
         <input type="text" placeholder="Enter password" name = "password"/>
         <p><input type="submit" value="Submit" /></p>
     </form>
-    <a href="http://192.168.1.218:8080/login">Have an account? Login!</a></br>
+    <a href="http://{{ip}}:{{port}}/login">Have an account? Login!</a></br>
 </body>
 </html>
diff --git a/app/views.py b/app/views.py
@@ -1,22 +1,37 @@
+from pathlib import Path
 from flask import Blueprint
 from flask import render_template, request
-
-from .user import User
 from datetime import datetime
-from .db_handling import DB
 
+from app.user import User
+from app.db_handling import DB
+from app_config import get_configuration_from_section
+
+
+INI_FILE = Path("app.ini")
+
+
+def get_proxy_configuration():
+    config = get_configuration_from_section("PROXY", INI_FILE)
+    if not config.getboolean(option="proxy_enabled"):
+        return "127.0.0.1", 50000
+    return config["ip"], config["port"]
+
+
+IP, PORT = get_proxy_configuration()
 views = Blueprint('views', __name__)
 
+
 @views.route('/')
 def home() -> str:
-    return render_template("home.html")
+    return render_template("home.html", ip=IP, port=PORT)
+
 
 @views.route('/login', methods=['GET', 'POST'])
 def login() -> str:
     """
     Logs into DB, return an HTML template.
     """
-    msg = None
     if request.method == "GET":
         user_name = request.args.get('user_name')
         password = request.args.get('password')
@@ -30,14 +45,15 @@ def login() -> str:
         msg = "You are unable to log in, please register before logging in."
 
     if request.method == "GET" and not user_name and not password:
-        return render_template("login.html")
+        return render_template("login.html", ip=IP, port=PORT)
 
     return render_template("user_page.html", boolean=True, form_data=user_data, msg=msg)
 
+
 @views.route('/register', methods=['GET', 'POST'])
 def register() -> str: 
     """
-    Regiters a new user into DB, return an HTML template.
+    Registers a new user into DB, return an HTML template.
     """
     user_name, password = "", ""
     if request.method == "GET":
@@ -52,12 +68,13 @@ def register() -> str:
     DB.add_user(user)
 
     if request.method == "GET" and not user_name and not password:
-        return render_template("register.html")
+        return render_template("register.html", ip=IP, port=PORT)
 
     return render_template("user_page.html", boolean=True, msg='Registered successfully!', form_data={
         user.name: [user.password, user.registration]
     })
-
+
+
 @views.route('/user', methods=['GET', 'POST'])
 def show_user() -> str:
     """
@@ -68,4 +85,4 @@ def show_user() -> str:
         return render_template("user_page.html", boolean=True, form_data=user_data)
 
     # Get method returns into home.html
-    return render_template("home.html")
+    return render_template("home.html", ip=IP, port=PORT)
diff --git a/main.py b/main.py
@@ -1,8 +1,10 @@
 from app.website import create_app
 
-def main():
+
+def main() -> None:
     app = create_app()
     app.run(host='127.0.0.1', port=50000, debug=True)
-
+
+
 if __name__ == '__main__':
     main()