From efc0fe0f7512c3d8b8524a032453a4580417472a Mon Sep 17 00:00:00 2001
From: Justine <justine@squi.fr>
Date: Sat, 24 Sep 2022 11:37:24 +0200
Subject: [PATCH] Chgt theme par defaut, chgt emoji

---
 src/app.py                                       |  3 ++-
 src/classes.py                                   |  4 +++-
 src/funcs.py                                     | 11 +++++++++--
 src/static/styles/{0-dracula.css => 0-light.css} |  0
 src/static/styles/{1-light.css => 1-dracula.css} |  0
 src/templates/edit.html                          |  2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)
 rename src/static/styles/{0-dracula.css => 0-light.css} (100%)
 rename src/static/styles/{1-light.css => 1-dracula.css} (100%)

diff --git a/src/app.py b/src/app.py
index e298c86..60ff601 100755
--- a/src/app.py
+++ b/src/app.py
@@ -3,7 +3,7 @@
 from flask import Flask, render_template, Markup, request, redirect, url_for, make_response
 from classes import task
 from datetime import datetime, timedelta
-from funcs import dumptasks, gettasks, cattasks, deltask, findtask, addtask, mktaskdir, exporttasks, getthemes, switchstatus, todotasks, donetasks
+from funcs import *
 from random import choice
 
 #!---------- sq_todo.py ----------
@@ -150,4 +150,5 @@ def edit():
 
 
 if __name__ == '__main__':
+    convertemoji()
     app.run(host="0.0.0.0")
diff --git a/src/classes.py b/src/classes.py
index c9168ba..12651d4 100644
--- a/src/classes.py
+++ b/src/classes.py
@@ -21,7 +21,7 @@ class task:
         if done:
             self.donemark = "✅"
         else:
-            self.donemark = "😓"
+            self.donemark = "⚠️"
 
     def rendertime(self, pretimestamp: int):
         """
@@ -41,6 +41,7 @@ class task:
 
         rendered = f"""
         <hr>
+        <div class="taskcontainer">
         <div class="tasktitle">{self.donemark} {Markup.escape(self.title)}</div>
         <form action="." method="GET" name="{self.createtime}">
         <button type="submit" name="toswitch" value="{self.createtime}" class "taskbutton">Done/Todo</button>|<button type="submit" name="delete" value="{self.createtime}" class="taskbutton" onclick="return confirm('Really ?')">Delete</button>|<button type="submit" name="edit" value="{self.createtime}" class="taskbutton">Edit</button>
@@ -49,6 +50,7 @@ class task:
         <div class="tasktime">Created : {self.rendertime(self.createtime)}
         <br>Modified : {self.rendertime(self.modtime)}</div><br>
         <div class="tasktext">{markdown.markdown(self.text, extensions=['fenced_code', 'codehilite', 'nl2br', 'smarty'])}</div><br>
+        </div>
         """
         return Markup(rendered)
 
diff --git a/src/funcs.py b/src/funcs.py
index 62f7600..eb28246 100644
--- a/src/funcs.py
+++ b/src/funcs.py
@@ -122,7 +122,7 @@ def switchstatus(task):
 
     rightnow = int(time.time())
     if task.donemark == "✅":
-        task.donemark = "😓"
+        task.donemark = "⚠️"
     else:
         task.donemark = "✅"
 
@@ -137,7 +137,7 @@ def todotasks(tasklist):
     buffer = []
     finalstr = ""
     for task in tasklist:
-        if task.donemark == "😓":
+        if task.donemark == "⚠️":
             buffer.append(task)
 
     tasks = sorted(buffer, key=lambda task: task.priority, reverse=True)
@@ -162,6 +162,13 @@ def donetasks(tasklist):
 
     return finalstr
 
+def convertemoji():
+    tasks = gettasks()
+    for task in tasks:
+        if task.donemark not in ["⚠️", "✅"]:
+            task.donemark = "⚠️"
+    dumptasks(tasks)
+
 
 
 
diff --git a/src/static/styles/0-dracula.css b/src/static/styles/0-light.css
similarity index 100%
rename from src/static/styles/0-dracula.css
rename to src/static/styles/0-light.css
diff --git a/src/static/styles/1-light.css b/src/static/styles/1-dracula.css
similarity index 100%
rename from src/static/styles/1-light.css
rename to src/static/styles/1-dracula.css
diff --git a/src/templates/edit.html b/src/templates/edit.html
index 339f4ba..e168842 100644
--- a/src/templates/edit.html
+++ b/src/templates/edit.html
@@ -17,7 +17,7 @@
 			<input type="hidden" name="tasknumber" value="{{ tasknumber }}" />
 			<label for"donemark">Status: </label>
 			<select name="donemark" id="donemark" class="donemarkselect">
-				<option value="😓" {{ todoselected }}>😓</option>
+				<option value="⚠️" {{ todoselected }}>⚠️</option>
 				<option value="✅" {{ doneselected }}>✅</option>
 			</select>
 			<button type="submit" name="submit">OK</button>