Merge pull request #11 from Sav22999/new-release

2.1
Sav22999 · Oct 8, 2023 · 768e285 · 768e285
2 parents 307ea3b + b511560
commit 768e285
Show file tree

Hide file tree

Showing 18 changed files with 503 additions and 234 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -39,4 +39,4 @@ You can open an issue and there you must describe the feedback, the bug or the n
 
 See folder <code>screenshots</code> to see screenshots also of the older versions.
 
-<img src="screenshots/1.2/1.png" width="400px"></img><img src="screenshots/1.2/2.png" width="400px"></img><img src="screenshots/1.2/3.png" width="400px"></img>
+<img src=“screenshots/2.0/1.png" width="400px"></img><img src="screenshots/2.0/2.png" width="400px"></img><img src="screenshots/2.0/3.png" width="400px"></img>
diff --git a/all-websites/index.html b/all-websites/index.html
@@ -6,23 +6,33 @@
 <head>
     <meta charset="utf-8">
     <link rel="stylesheet" href="../css/style.css"/>
+    <title>Limite: all time spent</title>
+    <link rel="icon" href="../img/icon.svg"/>
 </head>
 
 <body>
 <div id="all-websites-dedication-section">
-    <h1>All time spent</h1>
+    <h1 id="title-all-time-spent">All time spent</h1>
     <div class="section text-align-right sticky-section" id="actions">
         <input type="button" value="Export data…" id="export-data-button" class="button button-export"/>
         <input type="button" value="Import data…" id="import-data-button" class="button button-import"/>
         <input type="button" value="Refresh data" id="refresh-data-button" class="button button-refresh"/>
         <input type="button" value="Delete all data" id="delete-all-data-button" class="button button-delete"/>
     </div>
     <div id="navigator-days">
-        <label id="from-to-date-label"></label>
-        <input type="button" value="Today" id="go-today-button" class="button button-invert-colors button-go-today"/>
-        <input type="button" value="Newer" id="go-newer-button" class="button button-invert-colors button-newer"/>
-        <input type="button" value="Older" id="go-older-button" class="button button-invert-colors button-older"/>
-        <input type="button" value="Last" id="go-last-button" class="button button-invert-colors button-go-last-day"/>
+        <span id="search-container">
+            <input type="search" value="" placeholder="Search…" id="search-all-websites-text"
+                   class="textbox search-box"/>
+        </span>
+        <span id="nav-days-container">
+            <label id="from-to-date-label"></label>
+            <input type="button" value="Today" id="go-today-button"
+                   class="button button-invert-colors button-go-today"/>
+            <input type="button" value="Newer" id="go-newer-button" class="button button-invert-colors button-newer"/>
+            <input type="button" value="Older" id="go-older-button" class="button button-invert-colors button-older"/>
+            <input type="button" value="Last" id="go-last-button"
+                   class="button button-invert-colors button-go-last-day"/>
+        </span>
     </div>
     <span id="all-websites-sections"></span>
     <div id="background-opacity"></div>

diff --git a/css/style.css b/css/style.css
@@ -336,6 +336,65 @@ textarea {
     z-index: 4;
 }
 
+.th-sort-by-column {
+    cursor: pointer;
+    transition: 0s;
+}
+
+.th-sort-by-column:hover {
+    background-color: #2c96ff;
+}
+
+.th-sort-by-column-sel {
+    padding-right: 25px;
+    background-repeat: no-repeat;
+    background-position: right 5px center;
+    background-size: 20px auto;
+}
+
+.sort-by-column-asc {
+    background-image: url("/img/sort-asc.svg");
+}
+
+.sort-by-column-desc {
+    background-image: url("/img/sort-desc.svg");
+}
+
+#search-container {
+    grid-area: search;
+    text-align: left;
+    overflow: visible;
+}
+
+#nav-days-container {
+    grid-area: days;
+    text-align: right;
+    overflow: visible;
+}
+
+#filters-container {
+    grid-area: filters;
+    text-align: center;
+    overflow: visible;
+}
+
+#search-all-websites-text {
+    width: 100%;
+    min-width: 300px;
+    margin: 0px;
+    background-color: #2c96ff;
+    color: #ffffff;
+    opacity: 0.8;
+    border: 0px solid transparent;
+    padding: 4px 10px;
+}
+
+#search-all-websites-text:active, #search-all-websites-text:focus {
+    background-color: #6ab4ff;
+    box-shadow: 0px 0px 0px 2px #ffffffaa;
+    color: #ffffff;
+}
+
 #navigator-days {
     background-color: #0080ff;
     margin: 5px;
@@ -349,11 +408,12 @@ textarea {
     width: auto;
     height: auto;
     padding: 5px;
-    text-align: right;
+    display: grid;
+    grid-template-areas: "search days";
 }
 
 .nav-days-fixed {
-    background-color: #0080ffaa !important;
+    background-color: #0080ffdd !important;
     border-radius: 5px !important;
 }
 
@@ -634,10 +694,14 @@ h3 {
 
 .float-right {
     float: right;
+    overflow: visible;
+    text-align: right;
 }
 
 .float-left {
     float: left;
+    overflow: visible;
+    text-align: left;
 }
 
 .margin-right-5-px {
@@ -673,7 +737,7 @@ h3 {
 }
 
 /*categories*/
-.other-category, .social-category, .travel-category, .news-category, .education-category, .shopping-category, .search-category, .reference-category, .entertainment-category, .adults-category, .sav22999-category, .develop-category, .messaging-category, .games-category, .health-category {
+.other-category, .social-category, .travel-category, .news-category, .education-category, .shopping-category, .search-category, .reference-category, .entertainment-category, .adults-category, .sav22999-category, .develop-category, .messaging-category, .games-category, .health-category, .cloud-category {
     background-color: transparent;
     background-repeat: no-repeat;
     background-size: auto 100%;
@@ -739,6 +803,11 @@ h3 {
     background-image: url("../img/categories/games.svg");
 }
 
+.cloud-category {
+    background-image: url("../img/categories/cloud.svg");
+    background-size: auto 110%;
+}
+
 .health-category {
     background-image: url("../img/categories/health.svg");
 }
diff --git a/img/categories/cloud.svg b/img/categories/cloud.svg
diff --git a/img/sort-asc.svg b/img/sort-asc.svg
diff --git a/img/sort-desc.svg b/img/sort-desc.svg