make Makefile

Every project should have a Makefile ;)

Makefile

@@ -0,0 +1,19 @@
+VENV = venv
+PYTHON = $(VENV)/bin/python3
+PIP = $(VENV)/bin/pip
+
+run: $(VENV)/bin/activate
+	$(PYTHON) init_db.py
+	$(PYTHON) run.py
+
+
+$(VENV)/bin/activate: requirements.txt
+	python3 -m venv $(VENV)
+	$(PIP) install -r requirements.txt
+
+
+clean:
+	rm -rf __pycache__
+	rm -rf $(VENV)
+	rm -r taskmanager/__pycache__/
+	rm instance/taskmanager.db

README.md

@@ -10,12 +10,21 @@ Install python and pip on local machine
 pip install virtualenv
 python -m venv venv #/path/to/new/virtual/environment
 source venv/bin/activate #activate virtual env
-pip install -r requirements.txt
+pip install -r requirments.txt
 python3 ./init_db.py #initialize database
 
 python3 ./run.py #run project
 ```
 
+# On database changes
+
+Delete file `/instance/taskmanager.db`
+And reinit the db
+
+```shell
+python3 ./init_db.py  
+```
+
 # Build app
 
 ```bash

taskmanager/routes.py

@@ -1,35 +1,38 @@
+import configparser
+import os
+
 from flask import render_template, request, redirect
+
 from taskmanager import app, db
 from taskmanager.functions import *
 from taskmanager.models import *
-import configparser
 
-CONFIG_PATH = "/var/taskmanager/taskmanager/config.ini"
+PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))
+CONFIG_PATH = os.path.join(PROJECT_PATH, "config.ini")
 
 config = configparser.ConfigParser()
 config.read(CONFIG_PATH)
-
 ADMINPASS = config.get('credentials', 'ADMINPASS')
 
 @app.route('/', methods=['GET'])
 def index():
     tasks = Task.query.all()
-    return render_template('index.html', tasks = tasks)
+    return render_template('pages/index.html', tasks = tasks)
 
 @app.route('/addtask', methods=['GET','POST']) 
 def addtask():
     if request.method == 'GET':
-        return render_template('addtask.html')
+        return render_template('pages/addtask.html')
     elif request.method == 'POST':
         taskname = request.form['taskname']
         taskdesc = request.form['taskdesc']
         username = request.form['username']
         # Input sanitation
         # Task name
-        if not taskname.isprintable():
+        if not taskname.isprintable() or ("<" in taskname and ">" in taskname):
-            return render_template('response.html', response = "Task name has to be made only of letters or numbers.")
+            return render_template('pages/response.html', response = "Task name has to be made only of letters or numbers.")
         if len(taskname) < 1 or len(taskname) > 40:
-            return render_template('response.html', response = "Task name lenght invalid, only smaller then 40 charachters allowed")
+            return render_template('pages/response.html', response = "Task name lenght invalid, only smaller then 40 charachters allowed")
 
         # Username
         if username == "":
@@ -38,28 +41,28 @@ def addtask():
             try:
                 creatorid = User.query.filter_by(username = username).first().id
             except:
-                return render_template('response.html', response = 'No user with this username. Please register')
+                return render_template('pages/response.html', response = 'No user with this username. Please register')
             if creatorid is None:
-                return render_template('response.html', response = 'No user with this username. Please register.')
+                return render_template('pages/response.html', response = 'No user with this username. Please register.')
  
         # Task descripton
         if taskdesc != '':
-            if not taskdesc.isprintable():
+            if not taskdesc.isprintable() or ("<" in taskdesc and ">" in taskdesc):
-                return render_template('response.html', response = "Task description has to be made of printable characters.")
+                return render_template('pages/response.html', response = "Task description has to be made of printable characters.")
             if len(taskdesc) > 2000:
-                return render_template('response.html', response = "Task description lenght invalid, only smaller then 2000 charachters allowed")
+                return render_template('pages/response.html', response = "Task description lenght invalid, only smaller then 2000 charachters allowed")
         sqladdtask = Task(name = taskname, desc = taskdesc, creatorid = creatorid)
         try:
             db.session.add(sqladdtask)
             db.session.commit()
-            return render_template('response.html', response = 'Task added')
+            return render_template('pages/response.html', response = 'Task added')
         except:
-            return render_template('response.html', response = 'Adding task failed')
+            return render_template('pages/response.html', response = 'Adding task failed')
 
 @app.route('/register', methods=['POST', 'GET'])
 def register():
     if request.method == 'GET':
-        return render_template('register.html')
+        return render_template('pages/register.html')
     elif request.method == 'POST':
         username = request.form['username']
         contact = request.form['contact']
@@ -67,34 +70,34 @@ def register():
 
         # Username
         if not username.isalnum():
-            return render_template('response.html', response = "Username has to be made only of letters or numbers.")
+            return render_template('pages/response.html', response = "Username has to be made only of letters or numbers.")
         if len(username) < 1 or len(username) > 40:
-            return render_template('response.html', response = "Username lenght invalid, only smaller then 40 charachters allowed")
+            return render_template('pages/response.html', response = "Username lenght invalid, only smaller then 40 charachters allowed")
 
         # Contact
         if contact != '':
-            if not contact.isprintable():
+            if not contact.isprintable() or ("<" in contact and ">" in contact):
-                return render_template('response.html', response = "Contact information has to be made of printable characters.")
+                return render_template('pages/response.html', response = "Contact information has to be made of printable characters.")
             if len(contact) > 100:
-                return render_template('response.html', response = "Contact lenght invalid, only smaller then 100 charachters allowed")
+                return render_template('pages/response.html', response = "Contact lenght invalid, only smaller then 100 charachters allowed")
 
         # Password
         if password != '':
             if not password.isprintable():
-                return render_template('response.html', response = "Password has to be made of printable characters.")
+                return render_template('pages/response.html', response = "Password has to be made of printable characters.")
             if len(password) > 500:
-                return render_template('response.html', response = "Password lenght invalid, only smaller then 500 charachters allowed")
+                return render_template('pages/response.html', response = "Password lenght invalid, only smaller then 500 charachters allowed")
 
         sqladduser = User(username = username, contact = contact, password = password)
         try:
             db.session.add(sqladduser)
             db.session.commit()
-            return render_template('response.html', response = 'User added')
+            return render_template('pages/response.html', response = 'User added')
         except:
-            return render_template('response.html', response = 'Adding user failed')
+            return render_template('pages/response.html', response = 'Adding user failed')
 
     else:
-        return render_template('response.html', response = 'HTTP request method not recogniezed')
+        return render_template('pages/response.html', response = 'HTTP request method not recogniezed')
 
 
 @app.route('/projects/<int:task_id>', methods=['GET','POST']) 
@@ -102,40 +105,40 @@ def project(task_id:int):
     try:
         task = Task.query.get(task_id)
     except:
-        return render_template('response.html', response = 'Task not found, bad URL')
+        return render_template('pages/response.html', response = 'Task not found, bad URL')
     if task is None:
-        return render_template('response.html', response = 'Task not found, bad URL')
+        return render_template('pages/response.html', response = 'Task not found, bad URL')
     users = gettaskusers(task_id)
     if request.method == 'GET':
-        return render_template("project.html", task = task, users = users)
+        return render_template("pages/project.html", task = task, users = users)
     elif request.method == 'POST':
         # Assigning user to task
         username = request.form['username']
         for user in users:
             if username == user.username:
-                return render_template('response.html', response = 'User already added to task')
+                return render_template('pages/response.html', response = 'User already added to task')
         try:
             userid = User.query.filter_by(username = username).first().id
         except:
-            return render_template('response.html', response = 'User not found, please register.')
+            return render_template('pages/response.html', response = 'User not found, please register.')
         if userid is None:
-            return render_template('response.html', response = 'User not found, please register.')
+            return render_template('pages/response.html', response = 'User not found, please register.')
         sqladduser = TaskUser(userid = userid, taskid = task_id)
         try:
             db.session.add(sqladduser)
             db.session.commit()
-            return render_template('response.html', response = 'User added')
+            return render_template('pages/response.html', response = 'User added')
         except:
-            return render_template('response.html', response = 'Adding user failed')
+            return render_template('pages/response.html', response = 'Adding user failed')
 
 @app.route('/projects/<int:task_id>/del', methods=['GET','POST']) 
 def deltask(task_id:int):
     try:
         task = Task.query.get(task_id)
     except:
-        return render_template('response.html', response = 'Task not found, bad URL')
+        return render_template('pages/response.html', response = 'Task not found, bad URL')
     if task is None:
-        return render_template('response.html', response = 'Task not found, bad URL')
+        return render_template('pages/response.html', response = 'Task not found, bad URL')
     try:
         taskusers = TaskUser.query.filter_by(taskid = task_id).all()
     except:
@@ -147,35 +150,35 @@ def deltask(task_id:int):
                 db.session.delete(task)
                 db.session.commit()
             except:
-                return render_template('response.html', response = 'Deleting task failed')
+                return render_template('pages/response.html', response = 'Deleting task failed')
             try:
                 if taskusers != None:
                     for taskuser in taskusers:
                         db.session.delete(taskuser)
                         db.session.commit()
             except:
-                return render_template('response.html', response = 'Deleting user assignment to task failed')
+                return render_template('pages/response.html', response = 'Deleting user assignment to task failed')
-            return render_template('response.html', response = 'Task deleted')
+            return render_template('pages/response.html', response = 'Task deleted')
         else:
-            return render_template('deltask.html', task = task)
+            return render_template('pages/deltask.html', task = task)
     if request.method == 'POST':
         password = request.form['password']
         if len(password) < 1 or len(password) > 500:
-            return render_template('response.html', response = "Password lenght invalid, only smaller then 500 charachters allowed")
+            return render_template('pages/response.html', response = "Password lenght invalid, only smaller then 500 charachters allowed")
         # Check password
         if password != ADMINPASS and password != User.query.get(creatorid).password:
-            return render_template('response.html', response = 'Wrong password')
+            return render_template('pages/response.html', response = 'Wrong password')
         # Delete task
         try:
             db.session.delete(task)
             db.session.commit()
         except:
-            return render_template('response.html', response = 'Deleting task failed')
+            return render_template('pages/response.html', response = 'Deleting task failed')
         try:
             if taskusers != None:
                 for taskuser in taskusers:
                     db.session.delete(taskuser)
                     db.session.commit()
         except:
-                return render_template('response.html', response = 'Deleting user assignment to task failed')
+                return render_template('pages/response.html', response = 'Deleting user assignment to task failed')
-        return render_template('response.html', response = 'Task deleted')
+        return render_template('pages/response.html', response = 'Task deleted')

taskmanager/templates/includes/footer.html

@@ -0,0 +1,2 @@
+<footer>
+</footer>

taskmanager/templates/includes/header.html

@@ -0,0 +1,8 @@
+<header>
+	<nav class="container">
+		<ul>
+			<li class="current"><a href="/">Home</a></li>
+			<li><a href="/register">Register</a></li>
+		</ul>
+	</nav>
+</header>

taskmanager/templates/includes/index.html

@@ -1,12 +1,5 @@
-<!DOCTYPE html>
+{% extends "layouts/base.html" %}
-<html>
+{% block content %}
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="/static/style.css" />
-	<title>Task manager</title>
-</head>
-<body>
 	<header>
 		<nav class="container">
 			<ul>
@@ -35,5 +28,4 @@
 	</main>
 	<footer>
 	</footer>
-</body>
+{% endblock content %}
-</html>

taskmanager/templates/layouts/base.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<link rel="stylesheet" href="/static/style.css" />
+	<title>Task manager</title>
+</head>
+<body>
+	{% include "includes/header.html" %}
+	{% block content %}
+	{% endblock content %}
+	{% include "includes/footer.html" %}
+</body>
+</html>

taskmanager/templates/pages/addtask.html

@@ -1,20 +1,5 @@
-<!DOCTYPE html>
+{% extends "layouts/base.html" %}
-<html>
+{% block content %}
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="/static/style.css" />
-	<title>Add new task</title>
-</head>
-<body>
-	<header>
-		<nav class="container">
-			<ul>
-				<li class="current"><a href="/">Home</a></li>
-				<li><a href="/register">Register</a></li>
-			</ul>
-		</nav>
-	</header>
 	<main class="container page page-addtask">
 		<h1>Create new task</h1>
 		<div class="form-wrap">
@@ -37,5 +22,4 @@
 			</div>
 		</form>
 	</main>
-</body>
+{% endblock content %}
-</html>

taskmanager/templates/pages/deltask.html

@@ -1,20 +1,6 @@
-<!DOCTYPE html>
+{% extends "layouts/base.html" %}
-<html>
+{% block content %}
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="/static/style.css" />
-	<title>Delete task</title>
-</head>
 <body>
-	<header>
-		<nav class="container">
-			<ul>
-				<li class="current"><a href="/">Home</a></li>
-				<li><a href="/register">Register</a></li>
-			</ul>
-		</nav>
-	</header>
 	<main class="container page page-addtask">
 		<h1>Create new task</h1>
 		<div class="form-wrap">
@@ -30,5 +16,4 @@
 			</div>
 		</form>
 	</main>
-</body>
+{% endblock content %}
-</html>

taskmanager/templates/pages/index.html

@@ -0,0 +1,21 @@
+{% extends "layouts/base.html" %}
+{% block content %}
+	<main class="container page page-index">
+		<section>
+			<div class="btn">
+				<a href="/addtask">Add new task</a>
+			</div>
+			<div class="tasks-wrap">
+				<h1>Tasks</h1>
+				{% for task in tasks %}
+				<div class="task">
+					<a href="/projects/{{task.id}}"> 
+						<div>{{task.id}}.</div>
+						<div>{{task.name}}</div> 
+					</a>
+				</div>
+				{% endfor %}
+			</div>
+		</section>
+	</main>
+{% endblock content %}

taskmanager/templates/pages/project.html

@@ -1,20 +1,5 @@
-<!DOCTYPE html>
+{% extends "layouts/base.html" %}
-<html>
+{% block content %}
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="/static/style.css" />
-	<title>{{task.name}}</title>
-</head>
-<body>
-	<header>
-		<nav class="container">
-			<ul>
-				<li><a href="/">Home</a></li>
-				<li><a href="/register">Register</a></li>
-			</ul>
-		</nav>
-	</header>
 	<main class="container page page-project">
 		<section >
 			<h1>{{task.name}}</h1>
@@ -48,7 +33,4 @@
 			</div>
 		</section>
 	</main>
-	<footer>
+{% endblock content %}
-	</footer>
-</body>
-</html>

taskmanager/templates/pages/register.html

@@ -1,20 +1,5 @@
-<!DOCTYPE html>
+{% extends "layouts/base.html" %}
-<html>
+{% block content %}
-<head>	
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="/static/style.css" />
-	<title>Register</title>
-</head>
-<body>
-	<header>
-		<nav class="container">
-			<ul>
-				<li><a href="/">Home</a></li>
-				<li class="current"><a href="/register">Register</a></li>
-			</ul>
-		</nav>
-	</header>
 	<main class="container page page-register">
 		<div class="form-wrap">
 			<form action="/register" method="POST">
@@ -36,5 +21,4 @@
 			</form>
 		</div>
 	</main>
-</body>
+{% endblock content %}
-</html>

taskmanager/templates/pages/response.html

@@ -0,0 +1,8 @@
+{% extends "layouts/base.html" %}
+{% block content %}
+	<main class="container page page-project">
+		<section >
+			<p>{{response}}<p>
+		</section>
+	</main>
+{% endblock content %}

taskmanager/templates/response.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="/static/style.css" />
-	<title>Task Manager</title>
-</head>
-<body>
-	<header>
-		<nav class="container">
-			<ul>
-				<li><a href="/">Home</a></li>
-				<li><a href="/register">Register</a></li>
-			</ul>
-		</nav>
-	</header>
-	<main class="container page page-project">
-		<section >
-			<p>{{response}}<p>
-		</section>
-	</main>
-	<footer>
-	</footer>
-</body>
-</html>