Decentrala/taskmanager
19
0
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Decentrala:b4344d31a85a841c822a5bbd3b3dc86c63e7cf2f
Branches Tags
Decentrala:master Decentrala:fix/relative-path-and-docs Decentrala:front/app-design-init Decentrala:fe_init
..
compare: Decentrala:master
Branches Tags
Decentrala:master Decentrala:fix/relative-path-and-docs Decentrala:front/app-design-init Decentrala:fe_init

9 Commits
b4344d31a8 ... master

Author SHA1 Message Date
Malin Freeborn
cda12028c1 make Makefile 
Every project should have a Makefile ;)
 2024-06-10 20:23:57 +02:00
Malin Freeborn
7ea0a7ddb7 fix typo 2024-06-10 20:23:08 +02:00
fram3d
a2ec1aeebd fix typo 2024-02-14 00:25:59 +01:00
fram3d
004b1a1c37 Merge branch 'fix/relative-path-and-docs' 2024-02-14 00:05:04 +01:00
fram3d
48e98cbfc3 add more user input santitation 2024-02-14 00:04:00 +01:00
coja
e632ca23a5 Merge pull request 'Changed to relative path and updated the documentation' (#6) from fix/relative-path-and-docs into master 
Reviewed-on: #6
 2024-01-28 19:50:48 +00:00
coja
6739e997bc Changed to relative path and updated the documentation 2024-01-21 13:16:44 +01:00
fram3d
33cd9c202e Merge pull request 'Prebaceni *.html fajlovi za stranice u pages folder' (#5) from svitvojimilioni/taskmanager:better-templates into master 
Reviewed-on: #5
 2024-01-19 16:27:43 +00:00
svitvojimilioni
efcab93460 Prebaceni *.html fajlovi za stranice u pages folder 2024-01-19 11:23:04 -05:00
10 changed files with 38 additions and 240 deletions
Expand all files Collapse all files

19
Makefile Normal file
View File

@@ -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

11
README.md
View File

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

0
requirments.txt → requirements.txt
View File

14
taskmanager/routes.py
View File

@@ -1,10 +1,14 @@
import configparser
import os
from flask import render_template, request, redirect from flask import render_template, request, redirect
from taskmanager import app, db from taskmanager import app, db
from taskmanager.functions import * from taskmanager.functions import *
from taskmanager.models 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 = configparser.ConfigParser()
config.read(CONFIG_PATH) config.read(CONFIG_PATH)
@@ -25,7 +29,7 @@ def addtask():
username = request.form['username'] username = request.form['username']
# Input sanitation # Input sanitation
# Task name # Task name
if not taskname.isprintable(): if not taskname.isprintable() or ("<" in taskname and ">" in taskname):
return render_template('pages/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: if len(taskname) < 1 or len(taskname) > 40:
return render_template('pages/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")
@@ -43,7 +47,7 @@ def addtask():
# Task descripton # Task descripton
if taskdesc != '': if taskdesc != '':
if not taskdesc.isprintable(): if not taskdesc.isprintable() or ("<" in taskdesc and ">" in taskdesc):
return render_template('pages/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: if len(taskdesc) > 2000:
return render_template('pages/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")
@@ -72,7 +76,7 @@ def register():
# Contact # Contact
if contact != '': if contact != '':
if not contact.isprintable(): if not contact.isprintable() or ("<" in contact and ">" in contact):
return render_template('pages/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: if len(contact) > 100:
return render_template('pages/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")

41
taskmanager/templates/addtask.html
View File

@@ -1,41 +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>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">
<form action="/addtask" method="POST">
<div class="form-input">
<label for="taskname" class="label">Task name:</label>
<input type="text" name="taskname" id="taskname" required />
</div>
<div class="form-input">
<label for="taskdesc" class="label">Description:</label>
<input type="text" name="taskdesc" id="taskdesc" placeholder="optional"/>
</div>
<div class="form-input">
<label for="username" class="label">Username:</label>
<input type="text" name="username" id="username" placeholder="optional"/>
</div>
<div class="btn-wrap">
<button class="btn">Submit</button>
</div>
</div>
</form>
</main>
</body>
</html>

34
taskmanager/templates/deltask.html
View File

@@ -1,34 +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>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">
<form action="/projects/{{task.id}}/del" method="POST">
<p> Task creator's password <p>
<div class="form-input">
<label for="password" class="label">password:</label>
<input type="password" name="password" id="password" required />
</div>
<div class="btn-wrap">
<button class="btn">DELETE</button>
</div>
</div>
</form>
</main>
</body>
</html>

39
taskmanager/templates/index.html
View File

@@ -1,39 +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 class="current"><a href="/">Home</a></li>
<li><a href="/register">Register</a></li>
</ul>
</nav>
</header>
<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>
<footer>
</footer>
</body>
</html>

54
taskmanager/templates/project.html
View File

@@ -1,54 +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.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>
<label class="label underline">Description</label>
<p>{{task.desc}}</p>
</section>
<section class="section-task">
<div>
<label class="label underline">Users added to this task</label>
{% for user in users %}
<div class="user-info-wrap">
<div><b>Username:</b> {{user.username}}</div>
<div><b>Contact info:</b> {{user.contact}}</div>
</div>
{% endfor %}
</div>
<div>
<label class="label underline"> Add person to task</label>
<div class="form-wrap">
<form action="/projects/{{task.id}}" method="POST">
<div class="form-input">
<label for="username" class="label">Username:</label>
<input type="text" name="username" id="username" required />
</div>
<div class="btn-wrap">
<button class="btn">Submit</button>
</div>
</form>
<p><a href="/projects/{{task.id}}/del">DELETE TASK</a><p>
</div>
</div>
</section>
</main>
<footer>
</footer>
</body>
</html>

40
taskmanager/templates/register.html
View File

@@ -1,40 +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>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">
<div class="form-input">
<label for="username">Username:</label>
<input type="text" name="username" id="username" required />
</div>
<div class="form-input">
<label for="contact">Contact:</label>
<input type="text" name="contact" id="contact" required />
</div>
<div class="form-input">
<label for="password">Password:</label>
<input type="password" name="password" placeholder="optional" id="password"/>
</div>
<div class="btn-wrap">
<button class="btn">Submit</button>
</div>
</form>
</div>
</main>
</body>
</html>

26
taskmanager/templates/response.html
View File

@@ -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>