From 267a1427c3c1a9f9375caf893674ced205a6681b Mon Sep 17 00:00:00 2001
From: schrumpel <Âgit@f0ck.it>
Date: Tue, 28 Nov 2023 22:24:40 +0100
Subject: [PATCH 1/2] profile

---
 public/s/css/f0ck.css      | 14 ++++++++++++++
 views/admin.html           | 18 ++++++++++++++----
 views/snippets/navbar.html |  8 +++-----
 views/user.html            | 20 +++++++++++++++-----
 4 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/public/s/css/f0ck.css b/public/s/css/f0ck.css
index c702d35..e82a53b 100644
--- a/public/s/css/f0ck.css
+++ b/public/s/css/f0ck.css
@@ -2842,3 +2842,17 @@ ul.navbar-nav-guests li.nav-item {
 img#f0ck-image, div.imageDoor, div.posts a, video {
     animation: 1s ease-out 0s 1 fadeIn;
 }
+
+/* profile */
+.profile_head {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  align-items: center;
+  background: var(--nav-bg);
+  padding: 5px;
+}
+    
+.layersoffear {
+  display: grid;
+  padding-left: 20px;
+}
\ No newline at end of file
diff --git a/views/admin.html b/views/admin.html
index b1fddab..a144f8e 100644
--- a/views/admin.html
+++ b/views/admin.html
@@ -1,12 +1,22 @@
 @include(snippets/header)
 <div id="main">
   <div class="container">
-    <h1>Henlo, {{ session.user }}</h1>
-    <p>Hier entsteht eine Internetpräsenz!</p>
-    <img src="/s/img/favicon.gif" alt="f0ck bash">
-    <p>@if(typeof totals !== "undefined")
+    <h1>ADMINBEREICH</h1>
+    <h5>Hallo, {{ session.user }}</h5>
+    <span>Hier entsteht eine Internetpräsenz!</span><br>
+    <hr>
+    <p>f0ck stats: @if(typeof totals !== "undefined")
     total: {{ totals.total }} | tagged: {{ totals.tagged }} | untagged: {{ totals.untagged }} | sfw: {{ totals.sfw }} | nsfw: {{ totals.nsfw }}
     @endif</p>
+    <hr>
+    <div class="admintools">
+      <p>Adminwerkzeuge</p>
+      <ul>
+        <li><a href="/admin/log">Logs</a></li>
+        <li><a href="/admin/recover">Recover f0cks</a></li>
+        <li><a href="/admin/sessions">Sessions</a></li>
+      </ul>
+    </div>
   </div>
 </div>
 @include(snippets/footer)
diff --git a/views/snippets/navbar.html b/views/snippets/navbar.html
index a4d5451..d67235d 100644
--- a/views/snippets/navbar.html
+++ b/views/snippets/navbar.html
@@ -8,15 +8,13 @@
             <img src="@if(session.avatar)/t/{{ session.avatar }}.webp@else/s/img/ava/default.png@endif" class="avatar" /><span>{{ session.user }}</span>
           </a>
           <ul class="dropdown-menu">
-            <li><a href="/admin/log">logfile</a></li>
-            <li><a href="/admin/sessions">all sessions</a></li>
-            <li><a href="/admin/recover">recover</a></li>
             <li><a href="/user/{{ session.user.toLowerCase() }}/f0cks">my f0cks</a></li>
             <li><a href="/user/{{ session.user.toLowerCase() }}/favs">my favs</a></li>
-            <li><a href="/settings">settings</a></li>
             <li><a href="/search">search</a></li>
+            <li><a href="/admin">Admin</a></li>
             <li><a href="/about">About</a></li>
-            <li><a href="/ranking">Ranking</a></li>
+            <li><a href="/ranking">ranking</a></li>
+            <li><a href="/settings">settings</a></li>
             <li><a href="/logout">logout</a></li>
           </ul>
         </li>
diff --git a/views/user.html b/views/user.html
index ee3bf8c..8930e95 100644
--- a/views/user.html
+++ b/views/user.html
@@ -1,10 +1,20 @@
 @include(snippets/header)
 <div id="main">
-  <h1>{{ user.user }}@if(user.avatar)&nbsp;<a href="/{{ user.avatar }}"><img src="/t/{{ user.avatar }}.webp" style="width: 24px" /></a>@endif</h1>
-  <p>ID: {{ user.user_id }}</p>
-  <p>{{ count.f0cks }} f0ck{{ count.f0cks == 1 ? '' : 's' }}</p>
-  <p>{{ count.favs }} fav{{ count.favs == 1 ? '' : 's' }}</p>
-  <p>Joined: {{ user.created_at }}</p>
+  <div class="profile_head">
+    @if(user.avatar)
+      <div class="profile_head_avatar">
+        <img src="/t/{{ user.avatar }}.webp" style="display: grid;width: 55px" />
+      </div>
+    @endif
+    <div class="layersoffear">
+      <div class="profile_head_username">
+        <span>{{ user.user }}</span>
+      </div>
+      <div class="profile_head_user_stats">
+        ID: {{ user.user_id }} {{ count.f0cks }} f0ck{{ count.f0cks == 1 ? '' : 's' }} {{ count.favs }} fav{{ count.favs == 1 ? '' : 's' }} Joined: {{ user.created_at }}
+      </div>
+    </div>
+  </div>
 
   <h2>f0cks:</h2>
   @if('items' in f0cks)

From 5d79243fe1951e360eed1f403e2b55c99029df16 Mon Sep 17 00:00:00 2001
From: schrumpel <Âgit@f0ck.it>
Date: Tue, 28 Nov 2023 22:27:44 +0100
Subject: [PATCH 2/2] f0ck conflicts...

---
 public/s/css/f0ck.css | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/public/s/css/f0ck.css b/public/s/css/f0ck.css
index e82a53b..879043c 100644
--- a/public/s/css/f0ck.css
+++ b/public/s/css/f0ck.css
@@ -2843,6 +2843,24 @@ img#f0ck-image, div.imageDoor, div.posts a, video {
     animation: 1s ease-out 0s 1 fadeIn;
 }
 
+/* f0ckgle */
+.f0ckgle {
+  display: grid;
+  align-content: center;
+  height: calc(100vh - 12cm);
+}
+
+.search-title {
+  text-align: center;
+  font-size: xxx-large;
+}
+
+.admin-search input {
+  padding: 15px;
+  border: 1px solid var(--accent);
+  min-width: 30%;
+}
+
 /* profile */
 .profile_head {
   display: grid;