From 9ceb37a8af07afb8585b8416da08a0b2fc3ee242 Mon Sep 17 00:00:00 2001
From: Airikr <hi@airikr.me>
Date: Sat, 16 Nov 2024 12:37:44 +0100
Subject: [PATCH] Improvements

---
 css/desktop.css         | 100 +++++++++++++++++++++++++++-------------
 functions/endecrypt.php |   2 +-
 site-settings.php       |  10 ++--
 3 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/css/desktop.css b/css/desktop.css
index 3ba69a0..f345811 100755
--- a/css/desktop.css
+++ b/css/desktop.css
@@ -20,24 +20,39 @@
 
 /* Variables for the universal theme */
 :root {
-	--main: #272e33;
-	--text: #e8e5d5;
-	--link_focused: #2e383c;
-	--line: #475258;
-	--form_bg: #2e383c;
+	--main: #1a1b26;
+	--text: #c0caf5;
+	--line: #414868;
+	--highlight: #171721;
+	--image: #444663;
 
-	--field_bg: #1e2326;
-	--field_border: #414b50;
-	--field_border_focused: #9da9a0;
-	--submit_bg: #7fbbb3;
-	--submit_text: #1e2326;
+	--field_bg: #1f1f2c;
+	--field_bg_hover: #2c2c3e;
+	--field_bg_inactive: #1a1b26;
+	--field_border: #414868;
+	--field_border_hover: #4c547a;
+	--field_border_inactive: #414868;
+	--field_text: #c0caf5;
+	--field_text_inactive: #777e98;
 
-	--red: #e67e80;
-	--red_underline: #613537;
-	--green: #a7c080;
-	--blue: #7fbbb3;
-	--yellow: #dbbc7f;
-	--orange: #E69875;
+	--summary_open: #171721;
+	--summary_closed: #171721;
+	--calendar_day: #414868;
+	--calendar_day_highlight: #ff9e64;
+	--calendar_day_today: #7aa2f7;
+
+	--transparent_30: rgba(26, 27, 38, .7);
+	--transparent_20: rgba(26, 27, 38, .8);
+	--transparent_10: rgba(26, 27, 38, .9);
+
+	--red: #f7768e;
+	--green: #9ece6a;
+	--blue: #7aa2f7;
+	--purple: #bb9af7;
+	--orange: #ff9e64;
+	--yellow: #e0af68;
+	--dark: #414868;
+	--white: #ffffff;
 
 	--icon_select: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-selector" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="rgba(255,255,255,1)" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M8 9l4 -4l4 4"></path><path d="M16 15l-4 4l-4 -4"></path></svg>');
 
@@ -163,33 +178,46 @@ select {
 	background-color: var(--field_bg);
 	border: 1px solid var(--field_border);
 	border-radius: 3px;
-	color: var(--text);
+	color: var(--field_text);
 	font-family: var(--font);
 	font-size: var(--fontsize);
 	outline: none;
 	resize: none;
-	padding: 5px;
-	width: calc(100% - (6px * 2));
+	padding: 8px 10px;
+	width: calc(100% - (11px * 2));
 }
 
-input:not([type="checkbox"]):focus,
-textarea:focus,
-select:focus {
-	border: 1px solid var(--field_border_focused);
+input::placeholder,
+textarea::placeholder,
+select::placeholder {
+	color: var(--text);
 }
 
 input[disabled],
 textarea[disabled],
 select[disabled] {
-	background-color: var(--main);
-	border: 1px dashed var(--field_border);
+	background-color: var(--field_bg_inactive);
+	border: 1px dashed var(--field_border_inactive);
+	color: var(--field_text_inactive);
 	cursor: not-allowed;
 }
 
-input[type="submit"] {
-	background-color: var(--submit_bg);
-	border: 1px solid var(--submit_bg);
-	color: var(--submit_text);
+input:not([disabled]):not([readonly]):active,
+input:not([disabled]):not([readonly]):hover,
+textarea:not([disabled]):not([readonly]):active,
+textarea:not([disabled]):not([readonly]):hover,
+select:not([disabled]):active,
+select:not([disabled]):hover {
+	background-color: var(--field_bg_hover);
+	border: 1px solid var(--field_border_hover);
+}
+
+input[type="submit"],
+input[type="submit"]:active,
+input[type="submit"]:hover {
+	background-color: var(--green) !important;
+	border: 1px solid var(--green) !important;
+	color: var(--main);
 	cursor: pointer;
 	font-weight: 700;
 	padding: 5px 10px;
@@ -228,13 +256,20 @@ input[type="date"] {
 	appearance: none;
 }
 
+input[readonly] {
+	border: 1px dashed var(--line);
+}
+
 input, textarea {
 	caret-color: var(--yellow);
 }
 
 textarea {
-	height: 100px;
-	width: calc(100% - 12px);
+	height: 250px;
+	min-height: 130px;
+	resize: vertical;
+	vertical-align: top;
+	width: calc(100% - 21px - 2px);
 }
 
 select {
@@ -244,8 +279,7 @@ select {
 	background-repeat: no-repeat;
 	background-position: center right 8px;
 	cursor: pointer;
-	padding: 5px;
-	width: calc(100% - (6px * 2) + 12px);
+	width: calc(100% - 21px - 2px);
 }
 
 h1 {
diff --git a/functions/endecrypt.php b/functions/endecrypt.php
index 7912246..f9e0c83 100755
--- a/functions/endecrypt.php
+++ b/functions/endecrypt.php
@@ -21,7 +21,7 @@
 				if($encrypt == true) {
 					return Symmetric::encrypt(new HiddenString($string), $enckey);
 				} else {
-					return Symmetric::decrypt($string, $enckey);
+					return Symmetric::decrypt($string, $enckey)->getString();
 				}
 
 			} else {
diff --git a/site-settings.php b/site-settings.php
index 0e12cc3..b82d411 100755
--- a/site-settings.php
+++ b/site-settings.php
@@ -1,5 +1,7 @@
 <?php session_start();
 
+	use ParagonIE\Halite\KeyFactory;
+
 	require_once 'site-config.php';
 
 	ini_set('display_errors', ($debugging == false ? 0 : 1));
@@ -29,9 +31,11 @@
 		require_once 'vendor/autoload.php';
 		$Parsedown = new Parsedown();
 
-		$oldmask = umask(0);
-		mkdir($dir_files, 0777, true);
-		umask($oldmask);
+		if(!file_exists($dir_files)) {
+			$oldmask = umask(0);
+			mkdir($dir_files, 0777, true);
+			umask($oldmask);
+		}
 
 		if(!file_exists($dir_files.'/encryption.key')) {
 			$enckey = KeyFactory::generateEncryptionKey();