From 913bbb7e3d6e3e680f453e9320948a15b4465d84 Mon Sep 17 00:00:00 2001
From: silvankammermann <56345764+silvankammermann@users.noreply.github.com>
Date: Sat, 28 Oct 2023 20:40:04 +0200
Subject: [PATCH 1/2] Add color palette

---
 frontend/src/app/globals.css | 40 +++++++-----------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

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;
 }
 
 /*

From 4c8fa9f7c9e7d7dbcca807519964578dd5a41838 Mon Sep 17 00:00:00 2001
From: Ian Mackerracher <ian.mackerracher@gmail.com>
Date: Sat, 28 Oct 2023 20:42:18 +0200
Subject: [PATCH 2/2] added basic sorting function

---
 .../__pycache__/task_handling.cpython-312.pyc | Bin 2973 -> 3678 bytes
 .../__pycache__/user_handling.cpython-312.pyc | Bin 0 -> 499 bytes
 backend/app.py                                |   9 +------
 backend/task_handling.py                      |  22 +++++++++++++++++-
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 backend/__pycache__/user_handling.cpython-312.pyc

diff --git a/backend/__pycache__/task_handling.cpython-312.pyc b/backend/__pycache__/task_handling.cpython-312.pyc
index dac7acc7bc1c36887ad058ecfb7e68c6f9684201..ca1770dc10e50c6ec669d88b02f75d88ef76fc68 100644
GIT binary patch
delta 1120
zcmaJ<OHUI~6uvWk%%d%X0s@A|s1>LJ0-B%(3aKtMBqgC>0)~*GcYsQn!8?OUQ_?P2
zs4K`UU}K^Y;{zA4cEeKRraTs8LJU6vWv3g@omNp}yvhCM+<VSF^PO|Pr{$lkiarGb
zB7*gHpi_O!FBMfVc&R>o(T6<?%n*mY3uuVP9H4-CKoR?~03II};pCrVLV=AZK`z76
z9EIh9uM76k9e`z&MwppwK!`{tQ;0xm2D1wYyWY9iXe6u{jr05?4jB9u$HY*GOGQK(
zR<EYYhE6hOLK~OIX0*7O&^38XC$gr`Hp+2DlV_%}Vyg0N!kmz&bfU^hI1=ZzEheU>
zbz&-7T#f%C2W)6LC9seD0QnLs!Ga&NQPK?78}x>;-KJtp8uVR8CMV$YjqgY*Q=?c3
zr>cOJIpPE~cO><=k~G3#<h@rR*6;yj(d+*8#;vBVEFwWT_lH>9HL1?o98n*r#86Wu
z#|)dWs^DZo`;#i|Ur7ew=oG*)S7;|oIghcx+LdQbs^NmPP-q2ksOOoJ%W(cb=??m$
z3;;;u^^UFP?#<w4YAe#0Yl>wG{6mcGrG={)3gM^)bFtkp0L7p^mGghI#pCXf>u}#j
zb9Xwq4@JaFi;de{&AwE&h_~df52d?OG{;8|z2M26tl#G93$9phSlN|EbNr>z1D}-b
zae5g4U5j4G>1Z(mV_HVzXr9HOJ*(DJW*u@ZE*ExN=lGWlYklPF`Y<=y4!!Z4bePUc
zGii3MkZ_(&(_RWuI}j(TLX|c`rIm68lcvoiLTt(#B<i^OFvSP;Y3etuTA`c~tahQX
z(kV2=L4#C<#3u+90l5ZXrGy)8x4?+NHZ}mVXwMhO-aO#TSI)1NtoFYed_MT%?#`Lk
zTxHv#i!JwNd%t+C?*gfCnss5DtJ;?;SL&Z#*^wF^x%YgMbzi*grjxebi>Ez3kaNJY
z#p){7Mve$V0o#4g&^1CEL<9=mR*~;)8=VHBWC(qf*9ukUPkm46cqXZaNiW<{<r|&W
Wu&=fBEAMBDkK|&2I)<rn2Jr*EX$}Ga

delta 424
zcmca7GgqANG%qg~0}#v#uuc8IHjz()F>a!|ohnxfYYSr(dkR|%Llj2}JCNi|;ZETI
zigBfI0(sn(jG8<fC#bONGJ<qN0UMBJ2I9|JK+)+8=?t}uH4G_?DNJ*iYMD})Q&=X)
zak(-B`IDD%EoElR;-5T`RalH|HPj47h8_(Th8o6T22D=C$!obKw0V<@QWHxu^Yh|U
z5=&C6m{oF0Zn5Mg=B8G$s3hj46v+ZDD-r<`njDkwaO;R`vfpAWPE9OI&bY+_)RB0L
zwJ0?`wPLa&kF%W(P?;eR7q0{o4GcH9c^h1Ah|8`pzR08B;QE1$fm33J>Js54A<H8d
zMlO!NtY~;a(&z&#vp8FW|3|LL(|C$lI2d>YCM)oIGOnDQ%PYm|05r&Dau2VpIO8n_
zO`cmUS;hHzMW8?^;sg;!laKN$>4NMnasUzbAVLL12m*;;95%W6DWy57c112gE+`C&
XEhbCy8S;N-6JQkhtj5SF2UZOL(CKAB

diff --git a/backend/__pycache__/user_handling.cpython-312.pyc b/backend/__pycache__/user_handling.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a9e206b63c1075f68a50b340586da8f9609b4874
GIT binary patch
literal 499
zcmXv~ze~eF6uwJRP1M>SQba@%Co|O0QSjH$$w35h=~B+zwLQ}$<?dSO*1<nPaB*@I
z{}dNNhjJ(gPHsxKPQDB6gM9CMFW-B4UtaS0B?R$)am2nLf16?+xfz-40l7yMQQSo_
zZeWb4MQ!S|5zRefy71sMEV_7$8urljy&p5?W4(AI(}cH%+Pz6TNt32bJ7>VOT~C>B
zYquphOK2Aap<qPu0n;liQJuczL@FNoj&}Q!iG;*3nxWf;HyJC09U@4mnBYb$!`ZP}
zvH{IA*#Wpm3PZ|5S#$P0>s`XB=e{M3TzhdEMosh0Cp0n2>1l8Ul?*sZf;t-n5f39G
zWmTm#t&(1^su+o@wOVjZ!U)_1X1LiQ;EN~i{T`TWGnK6rYp~G#ZJ7rcp^xSA-ND=P
z)~mB6O3*n6zqu9|jIv`y0eabtC>mxYq6{!~595^fyX;t0pfo<@F2JviG5$mwzYD0e
ZIbJD`ixs_o^5^C9*2tTzV!WO0_y>t}f0h6M

literal 0
HcmV?d00001

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("/<search>", defaults={'search': None})
 @app.route("/get-tasks/<search>", 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