diff --git a/backend/__pycache__/task_handling.cpython-312.pyc b/backend/__pycache__/task_handling.cpython-312.pyc index dac7acc..ca1770d 100644 Binary files a/backend/__pycache__/task_handling.cpython-312.pyc and b/backend/__pycache__/task_handling.cpython-312.pyc differ diff --git a/backend/__pycache__/user_handling.cpython-312.pyc b/backend/__pycache__/user_handling.cpython-312.pyc new file mode 100644 index 0000000..a9e206b Binary files /dev/null and b/backend/__pycache__/user_handling.cpython-312.pyc differ diff --git a/backend/app.py b/backend/app.py index 1d8522e..03f1c24 100644 --- a/backend/app.py +++ b/backend/app.py @@ -18,14 +18,7 @@ @app.route("/", defaults={'search': None}) @app.route("/get-tasks/", methods=["GET"]) def get_tasks(search): - return task_get_tasks(search) - - -# @app.route("/gettasks", methods=["GET"]) -# def get_tasks_all(search): -# tasks = task_get_tasks() -# return tasks - + return task_get_tasks(search, sorting="importance-deadline") @app.route("/add-task", methods=["POST"]) def add_tasks(tasks: list): diff --git a/backend/task_handling.py b/backend/task_handling.py index 20ad82b..265f386 100644 --- a/backend/task_handling.py +++ b/backend/task_handling.py @@ -46,7 +46,24 @@ def set_done(document_id): def set_do_later(document_id): update_status(document_id, "do_later") -def get_tasks(search=""): + +def sort_tasks(sorting, data): + """ + One sorting function for now, can update with more later + """ + + if sorting == "importance": + return sorted(data, key=lambda task: task["importance"], reverse=True) + + + if sorting == "importance-deadline": + return sorted(data, key=lambda task: (task["importance"], task["deadline"]), reverse=True) + + return data + + + +def get_tasks(search="", sorting="deadline"): data = [] search_criteria = { 'creation_date': {'$lt': int(time.time())} @@ -59,6 +76,9 @@ def get_tasks(search=""): obj_i = obj obj_i["_id"] = str(obj_i["_id"]) data.append(obj_i) + + if sorting != "deadline": + data = sort_tasks(sorting, data) return data diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css index f8e4565..44d4ce3 100644 --- a/frontend/src/app/globals.css +++ b/frontend/src/app/globals.css @@ -5,41 +5,15 @@ "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", monospace; - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; + --gradient_up: linear-gradient(360deg, #1D002F 17.82%, rgba(29, 0, 47, 0.726869) 52.51%, rgba(29, 0, 47, 0) 100%); + --gradient_down: linear-gradient(180deg, #1D002F 17.82%, rgba(29, 0, 47, 0.726869) 52.51%, rgba(29, 0, 47, 0) 100%); - --primary-glow: conic-gradient( - from 180deg at 50% 50%, - #16abff33 0deg, - #0885ff33 55deg, - #54d6ff33 120deg, - #0071ff33 160deg, - transparent 360deg - ); - --secondary-glow: radial-gradient( - rgba(255, 255, 255, 1), - rgba(255, 255, 255, 0) - ); - --tile-start-rgb: 239, 245, 249; - --tile-end-rgb: 228, 232, 233; - --tile-border: conic-gradient( - #00000080, - #00000040, - #00000030, - #00000020, - #00000010, - #00000010, - #00000080 - ); - - --callout-rgb: 238, 240, 241; - --callout-border-rgb: 172, 175, 176; - --card-rgb: 180, 185, 188; - --card-border-rgb: 131, 134, 135; - - --color_violet: #3b006a; + --color_darkPurple: #1a002e; + --color_lightPurple: #EDD6FF; + --color_purple: #3b006a; + --color_yellow: #ffc470; + --color_lightYellow: #FFC977; } /*