Refactor excessive do notation. Complete oldschool and gibberish generators. Add frontend functionality for selecting from multiple generator styles. Add config requirement for admin email. Add admin email to header.

2022-08-07 16:22:09 -05:00
parent 3c4c4f8d30
commit 2a4787fc84
16 changed files with 197 additions and 159 deletions
--- a/views/cassius/style.cassius
+++ b/views/cassius/style.cassius
@ -13,6 +13,9 @@ body
  font-size:  20px
  text-align: left

+header
+  text-align: right
+
 h2
  font-family:    monaco, Consolas, monospace
  text-transform: uppercase
@ -38,18 +41,6 @@ a
 .title h1
  margin: 0.1em 0 0.1em 0

-.footer
-  position:   absolute
-  text-align: right
-  bottom:     0
-  width:      75%
-  height:     2.5em
-
-.footer a
-  all:    unset
-  cursor: pointer
-  color:  #{colorThree}
-
 .htmx-indicator
  display: none

@ -57,6 +48,9 @@ a
  color:   #{colorOne}
  opacity: 1

+.generators
+  margin: 0 0 0.5em 0
+
 .logo
  margin:     4% 3% 0 0
  font-size:  1.2vw
@ -142,6 +136,9 @@ a
  color:   #{colorThree}
  opacity: 0.5

+.genNew .numberInput
+  margin: 0 0 0.5em 0
+
 .genResult
  color: #{colorFour}

@ -178,6 +175,9 @@ a

  .genButton
    width: 80%
+  
+  .generators
+    text-align: left

  .mainInput
    width:      95% 
@ -188,7 +188,7 @@ a
    width: 25%

  .title
-    margin:    8% auto 2% auto
+    margin:    4% auto 2% auto
    font-size: 3em
  
  .title h1
--- a/views/gen.hamlet
+++ b/views/gen.hamlet
@ -1,41 +1,50 @@
 <div #generators .column>
  <h2>Generators
-  <h3 .genResult>#{genPw} 
-  <button .genButton
-    hx-get="/gen"
-    hx-target="#generators"
-    hx-swap="outerHTML"
-  />
-    Generate New
-  <br />
-
-  <button .genButton
-    hx-post="/new"
-    hx-target="#requestedPw"
-    hx-swap="outerHTML"
-    hx-include="[id='generators']"
-    *{hsGeneratedSharing}
-  />
-    Share Password
-    <img class="htmx-indicator" src="/loading.svg" />
-
-  <div .validForm>
-    Valid for:
+  <h3>Random, Classic, XKCD
+  <form id="genForm">
+    <div .generators">
+      <input type="radio" id="gibberish" name="newSec" value="#{show genGibberish}">
+      <label for="gibberish" .genResult>#{show genGibberish}
+      <br />
+      <input type="radio" id="oldschool" name="newSec" value="#{show genOldschool}">
+      <label for="oldschool" .genResult>#{show genOldschool}
+      <br />
+      <input type="radio" id="xkcd" name="newSec" value="#{show genXkcd}">
+      <label for="xkcd" .genResult>#{show genXkcd}
+    <button .genButton
+      hx-get="/gen"
+      hx-target="#generators"
+      hx-swap="outerHTML"
+    />
+      Generate New
    <br />
-    <input .numberInput
-      name="newSecDuration"
-      type="number"
-      min="1"
-      max="90"
-      value="20"
-      onkeyup="if (value < 1 || value > 90) { value = 0 }"
-    /> days
-    <input .numberInput
-      name="newSecViews"
-      type="number"
-      min="1"
-      max="60"
-      value="20"
-      onkeyup="if (value < 1 || value > 60) { value = 0 }"
-    /> views
+
+    <div .validForm>
+      <h3>Share Generated Password
+      Valid for:
+      <br />
+      <input .numberInput
+        name="newSecDuration"
+        type="number"
+        min="1"
+        max="90"
+        value="20"
+        onkeyup="if (value < 1 || value > 90) { value = 0 }"
+      /> days
+      <input .numberInput
+        name="newSecViews"
+        type="number"
+        min="1"
+        max="60"
+        value="20"
+        onkeyup="if (value < 1 || value > 60) { value = 0 }"
+      /> views
+    <button .genButton
+      hx-post="/new"
+      hx-target="#requestedPw"
+      hx-swap="outerHTML"
+      hx-include="[name='newSec']"
+    />
+      Share Password
+      <img class="htmx-indicator" src="/loading.svg" />

--- a/views/index.hamlet
+++ b/views/index.hamlet
@ -9,6 +9,11 @@ $doctype 5

  <body>

+    <header>
+      <a href="https://git.eversole.co/James/Purr">
+        Made with &#9829;
+      | <a href="mailto:#{email}">Contact
+
    <div #title .title>
      <h1>
        <a #titleLink .titleLink href="/">Purr
@ -91,7 +96,3 @@ $doctype 5
          hx-swap="outerHTML"
        />
          Load Generators
-
-    <footer .footer #footer>
-      <a href="https://git.eversole.co/James/Purr">
-        Made With &#9829;