wip simplify styling

2023-07-27 22:28:44 -07:00 · 2023-07-27 22:28:44 -07:00 · 727a91928e
parent 39fb0e9cf4
commit 727a91928e
14 changed files with 95 additions and 64 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -20,7 +20,7 @@
                }
            },
            "args": [],
-            "cwd": "${workspaceFolder}"
+            "cwd": "${workspaceFolder}/server"
        },
        {
            "type": "lldb",
--- a/notes/.obsidian/workspace.json
+++ b/notes/.obsidian/workspace.json
@ -19,18 +19,6 @@
              }
            }
          },
-          {
-            "id": "bf4491bebf71b124",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Reference Links.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
          {
            "id": "2ace7a49af0f838a",
            "type": "leaf",
@ -54,9 +42,17 @@
                "source": false
              }
            }
+          },
+          {
+            "id": "d2fb2a8515f04361",
+            "type": "leaf",
+            "state": {
+              "type": "empty",
+              "state": {}
+            }
          }
        ],
-        "currentTab": 1
+        "currentTab": 2
      }
    ],
    "direction": "vertical"
@ -85,7 +81,7 @@
            "state": {
              "type": "search",
              "state": {
-                "query": "",
+                "query": "postgres",
                "matchingCase": false,
                "explainSearch": false,
                "collapseAll": false,
@ -102,7 +98,8 @@
              "state": {}
            }
          }
-        ]
+        ],
+        "currentTab": 1
      }
    ],
    "direction": "horizontal",
@ -183,11 +180,12 @@
      "command-palette:Open command palette": false
    }
  },
-  "active": "bf4491bebf71b124",
+  "active": "f0bf5d4eb29cb6da",
  "lastOpenFiles": [
+    "Reference Links.md",
+    "2023-07-26.md",
    "Diesel.md",
    "Areas/Observability.md",
-    "Reference Links.md",
    "MVP.md",
    "Tera.md",
    "Areas/Federation.md",
--- a/notes/2023-07-26.md
+++ b/notes/2023-07-26.md
--- a/notes/Reference
+++ b/notes/Reference
@ -13,6 +13,11 @@ https://docs.rs/axum-template/latest/axum_template/
 ## Semantic markup
 https://www.w3schools.com/html/html5_semantic_elements.asp

+## css
+lexyeevee's "css for css baby" series
+https://cohost.org/lexyeevee/post/2157975-css-for-css-baby-4
+
+
 # Webserver
 ## [[Axum]]
 https://github.com/tokio-rs/axum/tree/v0.6.x
--- a/server/src/paths/mod.rs
+++ b/server/src/paths/mod.rs
@ -17,7 +17,7 @@ pub mod Profile {
    use super::*;
    //pub const NEW: &str = concatcp!(PROFILE, "/new");
 }
-pub const STATIC: &str = concatcp!(BASE, "/static");
+pub const STATIC: &str = concatcp!(BASE, "/static/");
 pub const MANAGE_PROFILES: &str = concatcp!(BASE, "/my_profiles");
 pub mod ManageProfiles {
    use super::*;
--- a/server/static/style.css
+++ b/server/static/style.css
@ -0,0 +1,33 @@
+
+.box {
+    border: 1px solid black;
+}
+
+#page-grid {
+    grid:
+        "alert alert"
+        "header header"
+        "sidebar body"
+        "footer footer"
+        / 1fr 3fr;
+}
+
+.header {
+    grid-area: header;
+}
+
+.body {
+    grid-area: body;
+}
+
+.sidebar {
+    grid-area: sidebar;
+}
+
+.footer {
+    grid-area: footer;
+}
+
+.alert {
+    grid-area: alert;
+}
--- a/server/templates/admin/board_add.html
+++ b/server/templates/admin/board_add.html
@ -2,7 +2,7 @@
 {% include "header/user_control.html" %}
 {% include "form_macros.html" %}

-<div class="container mx-auto">
+<div class="body box">
  <div>
    {{help_text}}
  </div>
--- a/server/templates/error.html
+++ b/server/templates/error.html
@ -1,2 +1,4 @@
+<div class="body box">
 <h1>oh no!</h1>
-<pre>{{error_debug_repr}}</pre>
+<pre>{{error_debug_repr}}</pre>
+</div>
--- a/server/templates/footer.html
+++ b/server/templates/footer.html
@ -1,13 +1,16 @@
  </div>
  {% if hide_header_controls %}
  {% else %}
-  <nav class="drawer-side">
-    <label for="my-drawer-3" class="drawer-overlay"></label> 
-    <ul class="menu p-4 w-80 h-full bg-base-200">
-      {% include "header/user_control_links.html" %}
-    </ul>
-    
-  </nav>
+  <div class="sidebar box">
+    <nav class="drawer-side">
+      <label for="my-drawer-3" class="drawer-overlay"></label> 
+      <ul class="menu p-4 w-80 h-full bg-base-200">
+        {% include "header/user_control_links.html" %}
+      </ul>
+      
+    </nav>
+  </div>
  {% endif %}
+  </div>
  </body>
 </html>
--- a/server/templates/generic_forms/item_create_modify.html
+++ b/server/templates/generic_forms/item_create_modify.html
@ -1,7 +1,7 @@
 {% include "header.html" %}
 {% include "header/user_control.html" %}

-<div class="container mx-auto">
+<div class="body box">
  <form method="post">
  <div>
    {{help_text}}
--- a/server/templates/generic_forms/table.html
+++ b/server/templates/generic_forms/table.html
@ -10,7 +10,7 @@

 -->

-<div class="container mx-auto">
+<div class="body box">
  <div>
    {{table_help_text}}
  </div>
--- a/server/templates/header.html
+++ b/server/templates/header.html
@ -5,9 +5,8 @@
    <title>another forum</title>
    <meta name="description" content="it's another forum!">

-    <link href="https://cdn.jsdelivr.net/npm/daisyui@3.1.7/dist/full.css" rel="stylesheet" type="text/css" />
-    <script src="https://cdn.tailwindcss.com"></script>
    <link href="/static/style.css" rel="stylesheet" type="text/css" />

  </head>
-  <body>
+  <body>
+    <div id="page-grid">
--- a/server/templates/header/user_control.html
+++ b/server/templates/header/user_control.html
@ -1,30 +1,21 @@
-    <header>
-      <div class="drawer">
-        <input id="my-drawer-3" type="checkbox" class="drawer-toggle" /> 
-        <div class="drawer-content flex flex-col">
-          <!-- Navbar -->
-          <div class="w-full navbar bg-base-300">
-            <div class="flex-none lg:hidden">
-              <label for="my-drawer-3" class="btn btn-square btn-ghost">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="inline-block w-6 h-6 stroke-current"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
-              </label>
-            </div> 
-            <div class="flex-1 px-2 mx-2"><a href="#top" class="link link-primary">Untitled Forum Zone</a></div>
-            {% if hide_header_controls %}
-            {% else %}
-            <nav class="flex-none hidden lg:block">
-              <ul class="menu menu-horizontal">
-                {% include "header/user_control_links.html" %}
-              </ul>
-            </nav>
-            {% endif %}
-          </div>
-    </header>
-    <a id="top" />
-    {% if alert_text %}
-    <!-- Todo: choose appropriate semantic html tags so that the contents of this are apparent -->
-    <div class="alert">
-      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
-      <span>{{alert_text}}</span>
-    </div>
-    {% endif %}
+      <div class="header box">
+        <div class="flex-1 px-2 mx-2"><a href="#top" class="link link-primary">Untitled Forum Zone</a></div>
+          {% if hide_header_controls %}
+          {% else %}
+          <nav class="flex-none hidden lg:block">
+            <ul class="menu menu-horizontal">
+              {% include "header/user_control_links.html" %}
+            </ul>
+          </nav>
+          {% endif %}
+        </div>
+
+        {% if alert_text %}
+        <!-- Todo: choose appropriate semantic html tags so that the contents of this are apparent -->
+        <div class="alert">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+          <span>{{alert_text}}</span>
+        </div>
+        {% endif %}
+      </div>
+    <a id="top" />
--- a/server/templates/navigation/board_index.html
+++ b/server/templates/navigation/board_index.html
@ -1,7 +1,7 @@
 {% include "header.html" %}
 {% include "header/user_control.html" %}

-<div class="overflow-x-auto">
+<div class="body box">
  <table class="table table-zebra">
    <!-- head -->
    <thead>