Clean up database names (#21)

- Moved user edit to "my info" (#19)

src/admin-theme/_layout.liquid

@@ -23,7 +23,7 @@
         {%- endif %}
         <ul class="navbar-nav flex-grow-1 justify-content-end">
           {% if is_logged_on -%}
-            {{ "admin/user/edit" | nav_link: "Edit User" }}
+            {{ "admin/user/my-info" | nav_link: "My Info" }}
             <li class="nav-item">
               <a class="nav-link" href="{{ "user/log-off" | relative_link }}" hx-boost="false">Log Off</a>
             </li>

src/admin-theme/custom-feed-edit.liquid

@@ -111,9 +111,9 @@
             <div class="row">
               <div class="col-12 col-md-5 col-lg-4 offset-lg-1 pb-3">
                 <div class="form-floating">
-                  <input type="text" name="iTunesCategory" id="itunesCategory" class="form-control"
-                         placeholder="iTunes Category" required value="{{ model.itunes_category }}">
-                  <label for="itunesCategory">iTunes Category</label>
+                  <input type="text" name="AppleCategory" id="appleCategory" class="form-control"
+                         placeholder="iTunes Category" required value="{{ model.apple_category }}">
+                  <label for="appleCategory">iTunes Category</label>
                   <span class="form-text fst-italic">
                     <a href="https://www.thepodcasthost.com/planning/itunes-podcast-categories/" target="_blank"
                        rel="noopener">
@@ -124,9 +124,9 @@
               </div>
               <div class="col-12 col-md-4 pb-3">
                 <div class="form-floating">
-                  <input type="text" name="iTunesSubcategory" id="itunesSubcategory" class="form-control"
-                         placeholder="iTunes Subcategory" value="{{ model.itunes_subcategory }}">
-                  <label for="itunesSubcategory">iTunes Subcategory</label>
+                  <input type="text" name="AppleSubcategory" id="appleSubcategory" class="form-control"
+                         placeholder="iTunes Subcategory" value="{{ model.apple_subcategory }}">
+                  <label for="appleSubcategory">iTunes Subcategory</label>
                 </div>
               </div>
               <div class="col-12 col-md-3 col-lg-2 pb-3">

src/admin-theme/my-info.liquid

@@ -1,8 +1,21 @@
 <h2 class="my-3">{{ page_title }}</h2>
 <article>
-  <form action="{{ "admin/user/save" | relative_link }}" method="post">
+  <form action="{{ "admin/user/my-info" | relative_link }}" method="post">
     <input type="hidden" name="{{ csrf.form_field_name }}" value="{{ csrf.request_token }}">
+    <div class="d-flex flex-row flex-wrap justify-content-around">
+      <div class="text-center mb-3 lh-sm">
+        <strong class="text-decoration-underline">Access Level</strong><br>{{ access_level }}
+      </div>
+      <div class="text-center mb-3 lh-sm">
+        <strong class="text-decoration-underline">Created</strong><br>{{ created_on | date: "MMMM d, yyyy" }}
+      </div>
+      <div class="text-center mb-3 lh-sm">
+        <strong class="text-decoration-underline">Last Log On</strong><br>
+        {{ last_seen_on | date: "MMMM d, yyyy" }} at {{ last_seen_on | date: "h:mmtt" | downcase }}
+      </div>
+    </div>
     <div class="container">
+      <div class="row"><div class="col"><hr class="mt-0"></div></div>
       <div class="row mb-3">
         <div class="col-12 col-md-6 col-lg-4 pb-3">
           <div class="form-floating">
@@ -28,8 +41,8 @@
       </div>
       <div class="row mb-3">
         <div class="col">
-          <fieldset class="container">
-            <legend>Change Password</legend>
+          <fieldset class="p-2">
+            <legend class="ps-1">Change Password</legend>
             <div class="row">
               <div class="col">
                 <p class="form-text">Optional; leave blank to keep your current password</p>

src/admin-theme/page-list.liquid

@@ -20,7 +20,7 @@
           <div class="{{ title_col }}">
             {{ pg.title }}
             {%- if pg.is_default %} &nbsp; <span class="badge bg-success">HOME PAGE</span>{% endif -%}
-            {%- if pg.show_in_page_list %} &nbsp; <span class="badge bg-primary">IN PAGE LIST</span> {% endif -%}<br>
+            {%- if pg.is_in_page_list %} &nbsp; <span class="badge bg-primary">IN PAGE LIST</span> {% endif -%}<br>
             <small>
               {%- capture pg_link %}{% unless pg.is_default %}{{ pg.permalink }}{% endunless %}{% endcapture -%}
               <a href="{{ pg_link | relative_link }}" target="_blank">View Page</a>

src/admin-theme/settings.liquid

@@ -36,14 +36,14 @@
         </div>
         <div class="col-12 col-md-6 col-xl-4 offset-xl-1 pb-3">
           <div class="form-floating">
-            <select name="ThemePath" id="themePath" class="form-control" required>
+            <select name="ThemeId" id="themeId" class="form-control" required>
               {% for theme in themes -%}
-                <option value="{{ theme[0] }}"{% if model.theme_path == theme[0] %} selected="selected"{% endif %}>
+                <option value="{{ theme[0] }}"{% if model.theme_id == theme[0] %} selected="selected"{% endif %}>
                   {{ theme[1] }}
                 </option>
               {%- endfor %}
             </select>
-            <label for="themePath">Theme</label>
+            <label for="themeId">Theme</label>
           </div>
         </div>
         <div class="col-12 col-md-6 offset-md-1 col-xl-4 offset-xl-0 pb-3">

src/admin-theme/wwwroot/admin.js

@@ -331,4 +331,16 @@ htmx.on("htmx:afterOnLoad", function (evt) {
     Admin.showMessage(evt.detail.xhr.getResponseHeader("x-message"))
     Admin.dismissSuccesses()
   }
-})
+})
+
+htmx.on("htmx:responseError", function (evt) {
+  /** @type {XMLHttpRequest} */
+  const xhr = evt.detail.xhr
+  const hdrs = xhr.getAllResponseHeaders()
+  // Show messages if there were any in the response
+  if (hdrs.indexOf("x-message") >= 0) {
+    Admin.showMessage(evt.detail.xhr.getResponseHeader("x-message"))
+  } else {
+    Admin.showMessage(`danger|||${xhr.status}: ${xhr.statusText}`)
+  }
+})