improve accessibility even more

.credo.exs

@@ -157,17 +157,17 @@
         #
         # Controversial and experimental checks (opt-in, just replace `false` with `[]`)
         #
-        {Credo.Check.Consistency.MultiAliasImportRequireUse, false},
-        {Credo.Check.Consistency.UnusedVariableNames, false},
+        {Credo.Check.Consistency.MultiAliasImportRequireUse, []},
+        {Credo.Check.Consistency.UnusedVariableNames, [force: :meaningful]},
         {Credo.Check.Design.DuplicatedCode, false},
         {Credo.Check.Readability.AliasAs, false},
         {Credo.Check.Readability.BlockPipe, false},
         {Credo.Check.Readability.ImplTrue, false},
         {Credo.Check.Readability.MultiAlias, false},
-        {Credo.Check.Readability.SeparateAliasRequire, false},
+        {Credo.Check.Readability.SeparateAliasRequire, []},
         {Credo.Check.Readability.SinglePipe, false},
         {Credo.Check.Readability.Specs, false},
-        {Credo.Check.Readability.StrictModuleLayout, false},
+        {Credo.Check.Readability.StrictModuleLayout, []},
         {Credo.Check.Readability.WithCustomTaggedTuple, false},
         {Credo.Check.Refactor.ABCSize, false},
         {Credo.Check.Refactor.AppendSingleItem, false},
@@ -176,9 +176,9 @@
         {Credo.Check.Refactor.NegatedIsNil, false},
         {Credo.Check.Refactor.PipeChainStart, false},
         {Credo.Check.Refactor.VariableRebinding, false},
-        {Credo.Check.Warning.LeakyEnvironment, false},
-        {Credo.Check.Warning.MapGetUnsafePass, false},
-        {Credo.Check.Warning.UnsafeToAtom, false}
+        {Credo.Check.Warning.LeakyEnvironment, []},
+        {Credo.Check.Warning.MapGetUnsafePass, []},
+        {Credo.Check.Warning.UnsafeToAtom, []}
 
         #
         # Custom checks can be created using `mix credo.gen.check`.

.drone.yml

@@ -13,20 +13,24 @@ steps:
     mount:
       - _build
       - deps
-      - assets/node_modules/
+      - .npm
+      - .mix
 
 - name: test
   image: elixir:1.14.1-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/memex_test
     HOST: testing.example.tld
+    MIX_HOME: /drone/src/.mix
+    MIX_ARCHIVES: /drone/src/.mix/archives
+    MIX_ENV: test
   commands:
-  - apk add --no-cache build-base npm git python3
-  - mix local.rebar --force
-  - mix local.hex --force
+  - apk add --no-cache build-base npm git
+  - mix local.rebar --force --if-missing
+  - mix local.hex --force --if-missing
   - mix deps.get
-  - mix deps.compile
-  - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
+  - npm set cache .npm
+  - npm --prefix ./assets ci --no-audit --prefer-offline
   - npm run --prefix ./assets deploy
   - mix do phx.digest, gettext.extract
   - mix test.all
@@ -76,7 +80,8 @@ steps:
     mount:
       - _build
       - deps
-      - assets/node_modules/
+      - .npm
+      - .mix
 
 services:
 - name: database

.tool-versions

@@ -1,3 +1,3 @@
 elixir 1.14.1-otp-25
 erlang 25.1.2
-nodejs 16.18.0
+nodejs 18.9.1

assets/css/app.scss

@@ -25,17 +25,18 @@ $fa-font-path: "@fortawesome/fontawesome-free/webfonts";
   100% { scale: 1.0; opacity: 1; }
 }
 
-.phx-connected > #disconnect, #loading {
+// disconnect toast
+.phx-connected > #disconnect {
   opacity: 0 !important;
   pointer-events: none;
 }
 
-.phx-loading:not(.phx-error) > #loading, .phx-error > #disconnect {
+.phx-error > #disconnect {
   opacity: 0.95 !important;
 }
 
 .invalid-feedback {
-  color: #a94442;
+  color: #f36c69;
   display: block;
   margin: -1rem 0 2rem;
 }

assets/css/components.scss

@@ -11,6 +11,7 @@
   }
 
   .checkbox {
+    @apply bg-primary-900;
     -ms-transform: scale(1.5);
     -moz-transform: scale(1.5);
     -webkit-transform: scale(1.5);
@@ -26,25 +27,31 @@
 
   .btn {
     @apply focus:outline-none px-4 py-2 rounded-lg;
-    @apply shadow-sm focus:shadow-lg;
+    @apply shadow-sm active:shadow-lg;
     @apply border;
     @apply transition-all duration-300 ease-in-out;
   }
 
   .btn-primary {
-    @apply bg-primary-900 focus:bg-primary-900 active:bg-primary-800;
+    @apply bg-primary-900 active:bg-primary-800;
     @apply border-primary-900 hover:border-primary-800 active:border-primary-700;
     @apply text-primary-400;
   }
 
+  .btn-secondary {
+    @apply bg-primary-800 active:bg-primary-700;
+    @apply border-primary-800 hover:border-primary-700 active:border-primary-600;
+    @apply text-primary-400;
+  }
+
   .btn-alert {
-    @apply bg-red-700 focus:bg-red-800 active:bg-red-900;
-    @apply border-red-700 focus:border-red-800 active:border-red-900;
+    @apply bg-red-800 active:bg-red-900;
+    @apply border-red-800 active:border-red-900;
     @apply text-primary-300;
   }
 
   .hr {
-    @apply mx-auto border border-primary-600 w-full max-w-2xl;
+    @apply mx-auto border border-primary-600 w-full max-w-3xl;
   }
 
   .link {

assets/js/app.js

@@ -25,31 +25,25 @@ import 'phoenix_html'
 // Establish Phoenix Socket and LiveView configuration.
 import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
-import topbar from '../vendor/topbar'
+import topbar from 'topbar'
+import Date from './date'
+import DateTime from './datetime'
 import MaintainAttrs from './maintain_attrs'
-import Alpine from 'alpinejs'
 
 const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 let csrfToken
 if (csrfTokenElement) { csrfToken = csrfTokenElement.getAttribute('content') }
 const liveSocket = new LiveSocket('/live', Socket, {
-  dom: {
-    onBeforeElUpdated (from, to) {
-      if (from._x_dataStack) { window.Alpine.clone(from, to) }
-    }
-  },
   params: { _csrf_token: csrfToken },
-  hooks: { MaintainAttrs }
+  hooks: { Date, DateTime, MaintainAttrs }
 })
 
-// alpine.js
-window.Alpine = Alpine
-Alpine.start()
-
 // Show progress bar on live navigation and form submits
 topbar.config({ barThickness: 1, barColors: { 0: '#fff' }, shadowColor: 'rgba(0, 0, 0, .3)' })
 window.addEventListener('phx:page-loading-start', info => topbar.show())
 window.addEventListener('phx:page-loading-stop', info => topbar.hide())
+window.addEventListener('submit', info => topbar.show())
+window.addEventListener('beforeunload', info => topbar.show())
 
 // connect if there are any LiveViews on the page
 liveSocket.connect()

assets/js/date.js

@@ -0,0 +1,11 @@
+export default {
+  displayDate (el) {
+    const date =
+      Intl.DateTimeFormat([], { timeZone: 'Etc/UTC', dateStyle: 'short' })
+        .format(new Date(el.dateTime))
+
+    el.innerText = date
+  },
+  mounted () { this.displayDate(this.el) },
+  updated () { this.displayDate(this.el) }
+}

assets/js/datetime.js

@@ -0,0 +1,11 @@
+export default {
+  displayDateTime (el) {
+    const date =
+      Intl.DateTimeFormat([], { dateStyle: 'short', timeStyle: 'long' })
+        .format(new Date(el.dateTime))
+
+    el.innerText = date
+  },
+  mounted () { this.displayDateTime(this.el) },
+  updated () { this.displayDateTime(this.el) }
+}

assets/package.json

@@ -2,6 +2,10 @@
   "repository": {},
   "description": " ",
   "license": "MIT",
+  "engines": {
+    "node": "v18.9.1",
+    "npm": "8.19.1"
+  },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",
     "watch": "webpack --mode development --watch --watch-options-stdin",
@@ -9,37 +13,35 @@
     "test": "standard"
   },
   "dependencies": {
-    "@fontsource/nunito-sans": "^4.5.8",
-    "@fortawesome/fontawesome-free": "^6.1.1",
-    "alpinejs": "^3.10.2",
+    "@fontsource/nunito-sans": "^4.5.10",
+    "@fortawesome/fontawesome-free": "^6.3.0",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",
     "phoenix_live_view": "file:../deps/phoenix_live_view",
-    "topbar": "^1.0.1"
+    "topbar": "^2.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "autoprefixer": "^10.4.7",
-    "babel-loader": "^8.2.5",
-    "copy-webpack-plugin": "^10.2.4",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^3.4.1",
+    "@babel/core": "^7.21.3",
+    "@babel/preset-env": "^7.20.2",
+    "autoprefixer": "^10.4.14",
+    "babel-loader": "^9.1.2",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.3",
+    "css-minimizer-webpack-plugin": "^4.2.2",
     "file-loader": "^6.2.0",
-    "hard-source-webpack-plugin": "^0.13.1",
-    "mini-css-extract-plugin": "^2.6.0",
-    "node-sass": "^7.0.1",
-    "postcss": "^8.4.13",
-    "postcss-import": "^14.1.0",
-    "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "^7.5.0",
-    "sass-loader": "^12.6.0",
+    "mini-css-extract-plugin": "^2.7.5",
+    "npm-check-updates": "^16.7.12",
+    "postcss": "^8.4.21",
+    "postcss-import": "^15.1.0",
+    "postcss-loader": "^7.1.0",
+    "postcss-preset-env": "^8.0.1",
+    "sass": "^1.59.3",
+    "sass-loader": "^13.2.1",
     "standard": "^17.0.0",
-    "style-loader": "^3.3.1",
-    "tailwindcss": "^3.0.24",
-    "terser-webpack-plugin": "^5.3.1",
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.9.0"
+    "tailwindcss": "^3.2.7",
+    "terser-webpack-plugin": "^5.3.7",
+    "webpack": "^5.76.2",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.13.1"
   }
 }

assets/vendor/topbar.js

@@ -1,157 +0,0 @@
-/**
- * @license MIT
- * topbar 1.0.0, 2021-01-06
- * https://buunguyen.github.io/topbar
- * Copyright (c) 2021 Buu Nguyen
- */
-(function (window, document) {
-  "use strict";
-
-  // https://gist.github.com/paulirish/1579671
-  (function () {
-    var lastTime = 0;
-    var vendors = ["ms", "moz", "webkit", "o"];
-    for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-      window.requestAnimationFrame =
-        window[vendors[x] + "RequestAnimationFrame"];
-      window.cancelAnimationFrame =
-        window[vendors[x] + "CancelAnimationFrame"] ||
-        window[vendors[x] + "CancelRequestAnimationFrame"];
-    }
-    if (!window.requestAnimationFrame)
-      window.requestAnimationFrame = function (callback, element) {
-        var currTime = new Date().getTime();
-        var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-        var id = window.setTimeout(function () {
-          callback(currTime + timeToCall);
-        }, timeToCall);
-        lastTime = currTime + timeToCall;
-        return id;
-      };
-    if (!window.cancelAnimationFrame)
-      window.cancelAnimationFrame = function (id) {
-        clearTimeout(id);
-      };
-  })();
-
-  var canvas,
-    progressTimerId,
-    fadeTimerId,
-    currentProgress,
-    showing,
-    addEvent = function (elem, type, handler) {
-      if (elem.addEventListener) elem.addEventListener(type, handler, false);
-      else if (elem.attachEvent) elem.attachEvent("on" + type, handler);
-      else elem["on" + type] = handler;
-    },
-    options = {
-      autoRun: true,
-      barThickness: 3,
-      barColors: {
-        0: "rgba(26,  188, 156, .9)",
-        ".25": "rgba(52,  152, 219, .9)",
-        ".50": "rgba(241, 196, 15,  .9)",
-        ".75": "rgba(230, 126, 34,  .9)",
-        "1.0": "rgba(211, 84,  0,   .9)",
-      },
-      shadowBlur: 10,
-      shadowColor: "rgba(0,   0,   0,   .6)",
-      className: null,
-    },
-    repaint = function () {
-      canvas.width = window.innerWidth;
-      canvas.height = options.barThickness * 5; // need space for shadow
-
-      var ctx = canvas.getContext("2d");
-      ctx.shadowBlur = options.shadowBlur;
-      ctx.shadowColor = options.shadowColor;
-
-      var lineGradient = ctx.createLinearGradient(0, 0, canvas.width, 0);
-      for (var stop in options.barColors)
-        lineGradient.addColorStop(stop, options.barColors[stop]);
-      ctx.lineWidth = options.barThickness;
-      ctx.beginPath();
-      ctx.moveTo(0, options.barThickness / 2);
-      ctx.lineTo(
-        Math.ceil(currentProgress * canvas.width),
-        options.barThickness / 2
-      );
-      ctx.strokeStyle = lineGradient;
-      ctx.stroke();
-    },
-    createCanvas = function () {
-      canvas = document.createElement("canvas");
-      var style = canvas.style;
-      style.position = "fixed";
-      style.top = style.left = style.right = style.margin = style.padding = 0;
-      style.zIndex = 100001;
-      style.display = "none";
-      if (options.className) canvas.classList.add(options.className);
-      document.body.appendChild(canvas);
-      addEvent(window, "resize", repaint);
-    },
-    topbar = {
-      config: function (opts) {
-        for (var key in opts)
-          if (options.hasOwnProperty(key)) options[key] = opts[key];
-      },
-      show: function () {
-        if (showing) return;
-        showing = true;
-        if (fadeTimerId !== null) window.cancelAnimationFrame(fadeTimerId);
-        if (!canvas) createCanvas();
-        canvas.style.opacity = 1;
-        canvas.style.display = "block";
-        topbar.progress(0);
-        if (options.autoRun) {
-          (function loop() {
-            progressTimerId = window.requestAnimationFrame(loop);
-            topbar.progress(
-              "+" + 0.05 * Math.pow(1 - Math.sqrt(currentProgress), 2)
-            );
-          })();
-        }
-      },
-      progress: function (to) {
-        if (typeof to === "undefined") return currentProgress;
-        if (typeof to === "string") {
-          to =
-            (to.indexOf("+") >= 0 || to.indexOf("-") >= 0
-              ? currentProgress
-              : 0) + parseFloat(to);
-        }
-        currentProgress = to > 1 ? 1 : to;
-        repaint();
-        return currentProgress;
-      },
-      hide: function () {
-        if (!showing) return;
-        showing = false;
-        if (progressTimerId != null) {
-          window.cancelAnimationFrame(progressTimerId);
-          progressTimerId = null;
-        }
-        (function loop() {
-          if (topbar.progress("+.1") >= 1) {
-            canvas.style.opacity -= 0.05;
-            if (canvas.style.opacity <= 0.05) {
-              canvas.style.display = "none";
-              fadeTimerId = null;
-              return;
-            }
-          }
-          fadeTimerId = window.requestAnimationFrame(loop);
-        })();
-      },
-    };
-
-  if (typeof module === "object" && typeof module.exports === "object") {
-    module.exports = topbar;
-  } else if (typeof define === "function" && define.amd) {
-    define(function () {
-      return topbar;
-    });
-  } else {
-    this.topbar = topbar;
-  }
-}.call(this, window, document));

changelog.md

@@ -1,3 +1,45 @@
+# v0.1.10
+- Improve accessibility
+- Code quality improvements
+- Fix dates displaying incorrectly
+- Add links to readme for github mirror
+- Add license (whoops)
+
+# v0.1.9
+- Improve server log
+- Style 大一點
+- Various minor improvements
+
+# v0.1.8
+- Fix bug with public registration
+- Improve templates
+- Improve invites, record usage
+- Fix padding on more pages when using chrome
+- Add oban metrics to server log and live dashboard
+
+# v0.1.7
+- Update dependencies
+- Show topbar on form submit/page refresh
+- Make loading/reconnection less intrusive
+- Add QR code for invite link
+
+# v0.1.6
+- fix formatting in note/context/step contents
+- add json export for data
+
+# v0.1.5
+- fix overflow on note/contexts/step contents
+
+# v0.1.4
+- fix docker-compose
+- fix newlines in note/context/step contents
+- fix user invite page
+- improve tagging logic
+
+# v0.1.3
+- backlink to other notes in notes
+- search tags on click
+
 # v0.1.2
 - fix more typos
 - add to faq

config/config.exs

@@ -11,6 +11,8 @@ config :memex,
   ecto_repos: [Memex.Repo],
   generators: [binary_id: true]
 
+config :memex, Memex.Accounts, registration: System.get_env("REGISTRATION", "invite")
+
 # Configures the endpoint
 config :memex, MemexWeb.Endpoint,
   url: [scheme: "https", host: System.get_env("HOST") || "localhost", port: "443"],
@@ -18,8 +20,7 @@ config :memex, MemexWeb.Endpoint,
   secret_key_base: "KH59P0iZixX5gP/u+zkxxG8vAAj6vgt0YqnwEB5JP5K+E567SsqkCz69uWShjE7I",
   render_errors: [view: MemexWeb.ErrorView, accepts: ~w(html json), layout: false],
   pubsub_server: Memex.PubSub,
-  live_view: [signing_salt: "zOLgd3lr"],
-  registration: System.get_env("REGISTRATION") || "invite"
+  live_view: [signing_salt: "zOLgd3lr"]
 
 config :memex, Memex.Application, automigrate: false
 

config/dev.exs

@@ -64,8 +64,9 @@ config :memex, MemexWeb.Endpoint,
     ]
   ]
 
-# Do not include metadata nor timestamps in development logs
-config :logger, :console, format: "[$level] $message\n"
+config :logger, :console,
+  format: "[$level] $message $metadata\n\n",
+  metadata: [:data]
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/runtime.exs

@@ -13,17 +13,18 @@ if System.get_env("PHX_SERVER") && System.get_env("RELEASE_NAME") do
 end
 
 # Set default locale
-config :gettext, :default_locale, System.get_env("LOCALE") || "en_US"
+config :gettext, :default_locale, System.get_env("LOCALE", "en_US")
 
 maybe_ipv6 = if System.get_env("ECTO_IPV6") == "true", do: [:inet6], else: []
 
 database_url =
   if config_env() == :test do
-    System.get_env("TEST_DATABASE_URL") ||
+    System.get_env(
+      "TEST_DATABASE_URL",
       "ecto://postgres:postgres@localhost/memex_test#{System.get_env("MIX_TEST_PARTITION")}"
+    )
   else
-    System.get_env("DATABASE_URL") ||
-      "ecto://postgres:postgres@memex-db/memex"
+    System.get_env("DATABASE_URL", "ecto://postgres:postgres@memex-db/memex")
   end
 
 host =
@@ -38,7 +39,7 @@ interface =
 config :memex, Memex.Repo,
   # ssl: true,
   url: database_url,
-  pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
+  pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
   socket_options: maybe_ipv6
 
 config :memex, MemexWeb.Endpoint,
@@ -47,10 +48,13 @@ config :memex, MemexWeb.Endpoint,
     # See the documentation on https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html
     # for details about using IPv6 vs IPv4 and loopback vs public addresses.
     ip: interface,
-    port: String.to_integer(System.get_env("PORT") || "4000")
+    port: String.to_integer(System.get_env("PORT", "4000"))
   ],
-  server: true,
-  registration: System.get_env("REGISTRATION") || "invite"
+  server: true
+
+if config_env() in [:dev, :prod] do
+  config :memex, Memex.Accounts, registration: System.get_env("REGISTRATION", "invite")
+end
 
 if config_env() == :prod do
   # The secret key base is used to sign/encrypt cookies and other secrets.
@@ -74,12 +78,12 @@ if config_env() == :prod do
   config :memex, Memex.Mailer,
     adapter: Swoosh.Adapters.SMTP,
     relay: System.get_env("SMTP_HOST") || raise("No SMTP_HOST set!"),
-    port: System.get_env("SMTP_PORT") || 587,
+    port: System.get_env("SMTP_PORT", "587"),
     username: System.get_env("SMTP_USERNAME") || raise("No SMTP_USERNAME set!"),
     password: System.get_env("SMTP_PASSWORD") || raise("No SMTP_PASSWORD set!"),
     ssl: System.get_env("SMTP_SSL") == "true",
-    email_from: System.get_env("EMAIL_FROM") || "no-reply@#{System.get_env("HOST")}",
-    email_name: System.get_env("EMAIL_NAME") || "memEx"
+    email_from: System.get_env("EMAIL_FROM", "no-reply@#{System.get_env("HOST")}"),
+    email_name: System.get_env("EMAIL_NAME", "memEx")
 
   # ## Using releases
   #

config/test.exs

@@ -22,6 +22,9 @@ config :memex, MemexWeb.Endpoint,
 # In test we don't send emails.
 config :memex, Memex.Mailer, adapter: Swoosh.Adapters.Test
 
+# Don't require invites for signups
+config :memex, Memex.Accounts, registration: "public"
+
 # Print only warnings and errors during test
 config :logger, level: :warn
 

de.tbx

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE martif PUBLIC "ISO 12200:1999A//DTD MARTIF core (DXFcdV04)//EN" "TBXcdv04.dtd">
+<martif type="TBX">
+<martifHeader>
+<fileDesc>
+<sourceDesc><p>Translate Toolkit</p></sourceDesc>
+</fileDesc>
+</martifHeader>
+<text><body></body></text>
+</martif>

docker-compose.yml

@@ -2,8 +2,7 @@ version: '3'
 
 services:
   memex:
-    build:
-      context: .
+    image: shibaobun/memex
     container_name: memex
     restart: always
     environment:

lib/license.md

@@ -0,0 +1,660 @@
+### GNU AFFERO GENERAL PUBLIC LICENSE
+
+Version 3, 19 November 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains
+free software for all its users.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing
+under this license.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public
+License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your
+version supports such interaction) an opportunity to receive the
+Corresponding Source of your version by providing access to the
+Corresponding Source from a network server at no charge, through some
+standard or customary means of facilitating copying of software. This
+Corresponding Source shall include the Corresponding Source for any
+work covered by version 3 of the GNU General Public License that is
+incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Affero General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU Affero General Public License as
+        published by the Free Software Foundation, either version 3 of the
+        License, or (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU Affero General Public License for more details.
+
+        You should have received a copy of the GNU Affero General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for
+the specific requirements.
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU AGPL, see <https://www.gnu.org/licenses/>.

lib/memex/accounts.ex

@@ -5,7 +5,7 @@ defmodule Memex.Accounts do
 
   import Ecto.Query, warn: false
   alias Memex.{Mailer, Repo}
-  alias Memex.Accounts.{User, UserToken}
+  alias Memex.Accounts.{Invite, Invites, User, UserToken}
   alias Ecto.{Changeset, Multi}
   alias Oban.Job
 
@@ -24,14 +24,16 @@ defmodule Memex.Accounts do
 
   """
   @spec get_user_by_email(email :: String.t()) :: User.t() | nil
-  def get_user_by_email(email) when is_binary(email), do: Repo.get_by(User, email: email)
+  def get_user_by_email(email) when is_binary(email) do
+    Repo.get_by(User, email: email)
+  end
 
   @doc """
   Gets a user by email and password.
 
   ## Examples
 
-      iex> get_user_by_email_and_password("foo@example.com", "correct_password")
+      iex> get_user_by_email_and_password("foo@example.com", "valid_password")
       %User{}
 
       iex> get_user_by_email_and_password("foo@example.com", "invalid_password")
@@ -53,28 +55,30 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> get_user!(123)
-      %User{}
+      iex> get_user!(user_id)
+      user
 
-      iex> get_user!(456)
+      iex> get_user!()
       ** (Ecto.NoResultsError)
 
   """
-  @spec get_user!(User.t()) :: User.t()
-  def get_user!(id), do: Repo.get!(User, id)
+  @spec get_user!(User.id()) :: User.t()
+  def get_user!(id) do
+    Repo.get!(User, id)
+  end
 
   @doc """
   Returns all users grouped by role.
 
   ## Examples
 
-      iex> list_users_by_role(%User{id: 123, role: :admin})
-      [admin: [%User{}], user: [%User{}, %User{}]]
+      iex> list_all_users_by_role(user1)
+      %{admin: [%User{role: :admin}], user: [%User{role: :user}]}
 
   """
-  @spec list_all_users_by_role(User.t()) :: %{String.t() => [User.t()]}
+  @spec list_all_users_by_role(User.t()) :: %{User.role() => [User.t()]}
   def list_all_users_by_role(%User{role: :admin}) do
-    Repo.all(from u in User, order_by: u.email) |> Enum.group_by(fn user -> user.role end)
+    Repo.all(from u in User, order_by: u.email) |> Enum.group_by(fn %{role: role} -> role end)
   end
 
   @doc """
@@ -82,13 +86,12 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> list_users_by_role(%User{id: 123, role: :admin})
-      [%User{}]
+      iex> list_users_by_role(:admin)
+      [%User{role: :admin}]
 
   """
-  @spec list_users_by_role(User.role()) :: [User.t()]
-  def list_users_by_role(role) do
-    role = role |> to_string()
+  @spec list_users_by_role(:admin) :: [User.t()]
+  def list_users_by_role(:admin = role) do
     Repo.all(from u in User, where: u.role == ^role, order_by: u.email)
   end
 
@@ -99,26 +102,36 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> register_user(%{field: value})
-      {:ok, %User{}}
+      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
+      {:ok, %User{email: "foo@example.com"}}
 
-      iex> register_user(%{field: bad_value})
+      iex> register_user(%{email: "foo@example"})
       {:error, %Changeset{}}
 
   """
-  @spec register_user(attrs :: map()) :: {:ok, User.t()} | {:error, User.changeset()}
-  def register_user(attrs) do
+  @spec register_user(attrs :: map()) ::
+          {:ok, User.t()} | {:error, :invalid_token | User.changeset()}
+  @spec register_user(attrs :: map(), Invite.token() | nil) ::
+          {:ok, User.t()} | {:error, :invalid_token | User.changeset()}
+  def register_user(attrs, invite_token \\ nil) do
     Multi.new()
     |> Multi.one(:users_count, from(u in User, select: count(u.id), distinct: true))
-    |> Multi.insert(:add_user, fn %{users_count: count} ->
+    |> Multi.run(:use_invite, fn _changes_so_far, _repo ->
+      if allow_registration?() and invite_token |> is_nil() do
+        {:ok, nil}
+      else
+        Invites.use_invite(invite_token)
+      end
+    end)
+    |> Multi.insert(:add_user, fn %{users_count: count, use_invite: invite} ->
       # if no registered users, make first user an admin
-      role = if count == 0, do: "admin", else: "user"
-
-      User.registration_changeset(attrs) |> User.role_changeset(role)
+      role = if count == 0, do: :admin, else: :user
+      User.registration_changeset(attrs, invite) |> User.role_changeset(role)
     end)
     |> Repo.transaction()
     |> case do
       {:ok, %{add_user: user}} -> {:ok, user}
+      {:error, :use_invite, :invalid_token, _changes_so_far} -> {:error, :invalid_token}
       {:error, :add_user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
@@ -128,14 +141,18 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> change_user_registration(user)
-      %Changeset{data: %User{}}
+      iex> change_user_registration()
+      %Changeset{}
+
+      iex> change_user_registration(%{password: "hi"}
+      %Changeset{}
 
   """
   @spec change_user_registration() :: User.changeset()
   @spec change_user_registration(attrs :: map()) :: User.changeset()
-  def change_user_registration(attrs \\ %{}),
-    do: User.registration_changeset(attrs, hash_password: false)
+  def change_user_registration(attrs \\ %{}) do
+    User.registration_changeset(attrs, nil, hash_password: false)
+  end
 
   ## Settings
 
@@ -144,24 +161,29 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> change_user_email(user)
-      %Changeset{data: %User{}}
+      iex> change_user_email(%User{email: "foo@example.com"})
+      %Changeset{}
 
   """
+  @spec change_user_email(User.t()) :: User.changeset()
   @spec change_user_email(User.t(), attrs :: map()) :: User.changeset()
-  def change_user_email(user, attrs \\ %{}), do: User.email_changeset(user, attrs)
+  def change_user_email(user, attrs \\ %{}) do
+    User.email_changeset(user, attrs)
+  end
 
   @doc """
   Returns an `%Changeset{}` for changing the user role.
 
   ## Examples
 
-      iex> change_user_role(user)
-      %Changeset{data: %User{}}
+      iex> change_user_role(%User{}, :user)
+      %Changeset{}
 
   """
   @spec change_user_role(User.t(), User.role()) :: User.changeset()
-  def change_user_role(user, role), do: User.role_changeset(user, role)
+  def change_user_role(user, role) do
+    User.role_changeset(user, role)
+  end
 
   @doc """
   Emulates that the email will change without actually changing
@@ -169,14 +191,14 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> apply_user_email(user, "valid password", %{email: ...})
+      iex> apply_user_email(user, "valid_password", %{email: "new_email@account.com"})
       {:ok, %User{}}
 
-      iex> apply_user_email(user, "invalid password", %{email: ...})
+      iex> apply_user_email(user, "invalid password", %{email: "new_email@account"})
       {:error, %Changeset{}}
 
   """
-  @spec apply_user_email(User.t(), password :: String.t(), attrs :: map()) ::
+  @spec apply_user_email(User.t(), email :: String.t(), attrs :: map()) ::
           {:ok, User.t()} | {:error, User.changeset()}
   def apply_user_email(user, password, attrs) do
     user
@@ -200,7 +222,7 @@ defmodule Memex.Accounts do
          {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
       :ok
     else
-      _ -> :error
+      _error_tuple -> :error
     end
   end
 
@@ -218,8 +240,8 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> deliver_update_email_instructions(user, current_email, &Routes.user_update_email_url(conn, :edit, &1))
-      {:ok, %{to: ..., body: ...}}
+      iex> deliver_update_email_instructions(user, "new_foo@example.com", fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :update_email, user_id: ^user_id, attrs: %{url: "example url"}}}
 
   """
   @spec deliver_update_email_instructions(User.t(), current_email :: String.t(), function) ::
@@ -236,27 +258,31 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> change_user_password(user)
-      %Changeset{data: %User{}}
+      iex> change_user_password(%User{})
+      %Changeset{}
 
   """
   @spec change_user_password(User.t(), attrs :: map()) :: User.changeset()
-  def change_user_password(user, attrs \\ %{}),
-    do: User.password_changeset(user, attrs, hash_password: false)
+  def change_user_password(user, attrs \\ %{}) do
+    User.password_changeset(user, attrs, hash_password: false)
+  end
 
   @doc """
   Updates the user password.
 
   ## Examples
 
-      iex> update_user_password(user, "valid password", %{password: ...})
+      iex> reset_user_password(user, %{
+      ...>   password: "new password",
+      ...>   password_confirmation: "new password"
+      ...> })
       {:ok, %User{}}
 
-      iex> update_user_password(user, "invalid password", %{password: ...})
+      iex> update_user_password(user, "invalid password", %{password: "123"})
       {:error, %Changeset{}}
 
   """
-  @spec update_user_password(User.t(), password :: String.t(), attrs :: map()) ::
+  @spec update_user_password(User.t(), String.t(), attrs :: map()) ::
           {:ok, User.t()} | {:error, User.changeset()}
   def update_user_password(user, password, attrs) do
     changeset =
@@ -270,54 +296,59 @@ defmodule Memex.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _} -> {:error, changeset}
+      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
 
   @doc """
-  Returns an `%Changeset{}` for changing the user locale.
+  Returns an `Ecto.Changeset.t()` for changing the user locale.
 
   ## Examples
 
-      iex> change_user_locale(user)
-      %Changeset{data: %User{}}
+      iex> change_user_locale(%User{})
+      %Changeset{}
 
   """
   @spec change_user_locale(User.t()) :: User.changeset()
-  def change_user_locale(%{locale: locale} = user), do: User.locale_changeset(user, locale)
+  def change_user_locale(%{locale: locale} = user) do
+    User.locale_changeset(user, locale)
+  end
 
   @doc """
   Updates the user locale.
 
   ## Examples
 
-      iex> update_user_locale(user, "valid locale")
+      iex> update_user_locale(user, "en_US")
       {:ok, %User{}}
 
-      iex> update_user_password(user, "invalid locale")
-      {:error, %Changeset{}}
-
   """
   @spec update_user_locale(User.t(), locale :: String.t()) ::
           {:ok, User.t()} | {:error, User.changeset()}
-  def update_user_locale(user, locale),
-    do: user |> User.locale_changeset(locale) |> Repo.update()
+  def update_user_locale(user, locale) do
+    user |> User.locale_changeset(locale) |> Repo.update()
+  end
 
   @doc """
   Deletes a user. must be performed by an admin or the same user!
 
   ## Examples
 
-      iex> delete_user!(user_to_delete, %User{id: 123, role: :admin})
+      iex> delete_user!(user, %User{id: 123, role: :admin})
       %User{}
 
-      iex> delete_user!(%User{id: 123}, %User{id: 123})
+      iex> delete_user!(user, user)
       %User{}
 
   """
   @spec delete_user!(user_to_delete :: User.t(), User.t()) :: User.t()
-  def delete_user!(user, %User{role: :admin}), do: user |> Repo.delete!()
-  def delete_user!(%User{id: user_id} = user, %User{id: user_id}), do: user |> Repo.delete!()
+  def delete_user!(user, %User{role: :admin}) do
+    user |> Repo.delete!()
+  end
+
+  def delete_user!(%User{id: user_id} = user, %User{id: user_id}) do
+    user |> Repo.delete!()
+  end
 
   ## Session
 
@@ -345,7 +376,7 @@ defmodule Memex.Accounts do
   """
   @spec delete_session_token(token :: String.t()) :: :ok
   def delete_session_token(token) do
-    Repo.delete_all(UserToken.token_and_context_query(token, "session"))
+    UserToken.token_and_context_query(token, "session") |> Repo.delete_all()
     :ok
   end
 
@@ -354,20 +385,49 @@ defmodule Memex.Accounts do
   """
   @spec allow_registration?() :: boolean()
   def allow_registration? do
-    Application.get_env(:memex, MemexWeb.Endpoint)[:registration] == "public" or
+    Application.get_env(:memex, Memex.Accounts)[:registration] == "public" or
       list_users_by_role(:admin) |> Enum.empty?()
   end
 
+  @doc """
+  Returns an atom representing the current configured registration mode
+  """
+  @spec registration_mode() :: :public | :invite_only
+  def registration_mode do
+    case Application.get_env(:memex, Memex.Accounts)[:registration] do
+      "public" -> :public
+      _other -> :invite_only
+    end
+  end
+
   @doc """
   Checks if user is an admin
+
+  ## Examples
+
+      iex> is_admin?(%User{role: :admin})
+      true
+
+      iex> is_admin?(%User{})
+      false
+
   """
   @spec is_admin?(User.t()) :: boolean()
   def is_admin?(%User{id: user_id}) do
-    Repo.exists?(from u in User, where: u.id == ^user_id and u.role == :admin)
+    Repo.exists?(from u in User, where: u.id == ^user_id, where: u.role == :admin)
   end
 
   @doc """
   Checks to see if user has the admin role
+
+  ## Examples
+
+      iex> is_already_admin?(%User{role: :admin})
+      true
+
+      iex> is_already_admin?(%User{})
+      false
+
   """
   @spec is_already_admin?(User.t() | nil) :: boolean()
   def is_already_admin?(%User{role: :admin}), do: true
@@ -380,10 +440,10 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> deliver_user_confirmation_instructions(user, &Routes.user_confirmation_url(conn, :confirm, &1))
-      {:ok, %{to: ..., body: ...}}
+      iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :welcome, user_id: ^user_id, attrs: %{url: "example url"}}}
 
-      iex> deliver_user_confirmation_instructions(confirmed_user, &Routes.user_confirmation_url(conn, :confirm, &1))
+      iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
       {:error, :already_confirmed}
 
   """
@@ -405,14 +465,14 @@ defmodule Memex.Accounts do
   If the token matches, the user account is marked as confirmed
   and the token is deleted.
   """
-  @spec confirm_user(token :: String.t()) :: {:ok, User.t()} | atom()
+  @spec confirm_user(token :: String.t()) :: {:ok, User.t()} | :error
   def confirm_user(token) do
     with {:ok, query} <- UserToken.verify_email_token_query(token, "confirm"),
          %User{} = user <- Repo.one(query),
          {:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do
       {:ok, user}
     else
-      _ -> :error
+      _error_tuple -> :error
     end
   end
 
@@ -430,8 +490,8 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> deliver_user_reset_password_instructions(user, &Routes.user_reset_password_url(conn, :edit, &1))
-      {:ok, %{to: ..., body: ...}}
+      iex> deliver_user_reset_password_instructions(user, fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :reset_password, user_id: ^user_id, attrs: %{url: "example url"}}}
 
   """
   @spec deliver_user_reset_password_instructions(User.t(), function()) :: Job.t()
@@ -447,7 +507,7 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> get_user_by_reset_password_token("validtoken")
+      iex> get_user_by_reset_password_token(encoded_token)
       %User{}
 
       iex> get_user_by_reset_password_token("invalidtoken")
@@ -460,7 +520,7 @@ defmodule Memex.Accounts do
          %User{} = user <- Repo.one(query) do
       user
     else
-      _ -> nil
+      _error_tuple -> nil
     end
   end
 
@@ -469,7 +529,10 @@ defmodule Memex.Accounts do
 
   ## Examples
 
-      iex> reset_user_password(user, %{password: "new long password", password_confirmation: "new long password"})
+      iex> reset_user_password(user, %{
+      ...>   password: "new password",
+      ...>   password_confirmation: "new password"
+      ...> })
       {:ok, %User{}}
 
       iex> reset_user_password(user, %{password: "valid", password_confirmation: "not the same"})
@@ -485,7 +548,7 @@ defmodule Memex.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _} -> {:error, changeset}
+      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
 end

lib/memex/accounts/invite.ex

@@ -1,4 +1,4 @@
-defmodule Memex.Invites.Invite do
+defmodule Memex.Accounts.Invite do
   @moduledoc """
   An invite, created by an admin to allow someone to join their instance. An
   invite can be enabled or disabled, and can have an optional number of uses if
@@ -7,8 +7,8 @@ defmodule Memex.Invites.Invite do
 
   use Ecto.Schema
   import Ecto.Changeset
-  alias Ecto.{Changeset, UUID}
-  alias Memex.{Accounts.User, Invites.Invite}
+  alias Ecto.{Association, Changeset, UUID}
+  alias Memex.Accounts.User
 
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -18,40 +18,46 @@ defmodule Memex.Invites.Invite do
     field :uses_left, :integer, default: nil
     field :disabled_at, :naive_datetime
 
-    belongs_to :user, User
+    belongs_to :created_by, User
+
+    has_many :users, User
 
     timestamps()
   end
 
-  @type t :: %Invite{
+  @type t :: %__MODULE__{
           id: id(),
           name: String.t(),
-          token: String.t(),
+          token: token(),
           uses_left: integer() | nil,
           disabled_at: NaiveDateTime.t(),
-          user: User.t(),
-          user_id: User.id(),
+          created_by: User.t() | nil | Association.NotLoaded.t(),
+          created_by_id: User.id() | nil,
+          users: [User.t()] | Association.NotLoaded.t(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_invite :: %Invite{}
+  @type new_invite :: %__MODULE__{}
   @type id :: UUID.t()
+  @type changeset :: Changeset.t(t() | new_invite())
+  @type token :: String.t()
 
   @doc false
-  @spec create_changeset(new_invite(), attrs :: map()) :: Changeset.t(new_invite())
-  def create_changeset(invite, attrs) do
-    invite
-    |> cast(attrs, [:name, :token, :uses_left, :disabled_at, :user_id])
-    |> validate_required([:name, :token, :user_id])
+  @spec create_changeset(User.t(), token(), attrs :: map()) :: changeset()
+  def create_changeset(%User{id: user_id}, token, attrs) do
+    %__MODULE__{}
+    |> change(token: token, created_by_id: user_id)
+    |> cast(attrs, [:name, :uses_left, :disabled_at])
+    |> validate_required([:name, :token, :created_by_id])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 
   @doc false
-  @spec update_changeset(t() | new_invite(), attrs :: map()) :: Changeset.t(t() | new_invite())
+  @spec update_changeset(t() | new_invite(), attrs :: map()) :: changeset()
   def update_changeset(invite, attrs) do
     invite
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name, :token, :user_id])
+    |> validate_required([:name])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 end

lib/memex/accounts/invites.ex

@@ -0,0 +1,208 @@
+defmodule Memex.Accounts.Invites do
+  @moduledoc """
+  The Invites context.
+  """
+
+  import Ecto.Query, warn: false
+  alias Ecto.Multi
+  alias Memex.Accounts.{Invite, User}
+  alias Memex.Repo
+
+  @invite_token_length 20
+
+  @doc """
+  Returns the list of invites.
+
+  ## Examples
+
+      iex> list_invites(%User{id: 123, role: :admin})
+      [%Invite{}, ...]
+
+  """
+  @spec list_invites(User.t()) :: [Invite.t()]
+  def list_invites(%User{role: :admin}) do
+    Repo.all(from i in Invite, order_by: i.name)
+  end
+
+  @doc """
+  Gets a single invite for a user
+
+  Raises `Ecto.NoResultsError` if the Invite does not exist.
+
+  ## Examples
+
+      iex> get_invite!(123, %User{id: 123, role: :admin})
+      %Invite{}
+
+      > get_invite!(456, %User{id: 123, role: :admin})
+      ** (Ecto.NoResultsError)
+
+  """
+  @spec get_invite!(Invite.id(), User.t()) :: Invite.t()
+  def get_invite!(id, %User{role: :admin}) do
+    Repo.get!(Invite, id)
+  end
+
+  @doc """
+  Returns if an invite token is still valid
+
+  ## Examples
+
+      iex> valid_invite_token?("valid_token")
+      %Invite{}
+
+      iex> valid_invite_token?("invalid_token")
+      nil
+  """
+  @spec valid_invite_token?(Invite.token() | nil) :: boolean()
+  def valid_invite_token?(token) when token in [nil, ""], do: false
+
+  def valid_invite_token?(token) do
+    Repo.exists?(
+      from i in Invite,
+        where: i.token == ^token,
+        where: i.disabled_at |> is_nil()
+    )
+  end
+
+  @doc """
+  Uses invite by decrementing uses_left, or marks invite invalid if it's been
+  completely used.
+  """
+  @spec use_invite(Invite.token()) :: {:ok, Invite.t()} | {:error, :invalid_token}
+  def use_invite(invite_token) do
+    Multi.new()
+    |> Multi.run(:invite, fn _changes_so_far, _repo ->
+      invite_token |> get_invite_by_token()
+    end)
+    |> Multi.update(:decrement_invite, fn %{invite: invite} ->
+      decrement_invite_changeset(invite)
+    end)
+    |> Repo.transaction()
+    |> case do
+      {:ok, %{decrement_invite: invite}} -> {:ok, invite}
+      {:error, :invite, :invalid_token, _changes_so_far} -> {:error, :invalid_token}
+    end
+  end
+
+  @spec get_invite_by_token(Invite.token() | nil) :: {:ok, Invite.t()} | {:error, :invalid_token}
+  defp get_invite_by_token(token) when token in [nil, ""], do: {:error, :invalid_token}
+
+  defp get_invite_by_token(token) do
+    Repo.one(
+      from i in Invite,
+        where: i.token == ^token,
+        where: i.disabled_at |> is_nil()
+    )
+    |> case do
+      nil -> {:error, :invalid_token}
+      invite -> {:ok, invite}
+    end
+  end
+
+  @spec get_use_count(Invite.t(), User.t()) :: non_neg_integer() | nil
+  def get_use_count(%Invite{id: invite_id} = invite, user) do
+    [invite] |> get_use_counts(user) |> Map.get(invite_id)
+  end
+
+  @spec get_use_counts([Invite.t()], User.t()) ::
+          %{optional(Invite.id()) => non_neg_integer()}
+  def get_use_counts(invites, %User{role: :admin}) do
+    invite_ids = invites |> Enum.map(fn %{id: invite_id} -> invite_id end)
+
+    Repo.all(
+      from u in User,
+        where: u.invite_id in ^invite_ids,
+        group_by: u.invite_id,
+        select: {u.invite_id, count(u.id)}
+    )
+    |> Map.new()
+  end
+
+  @spec decrement_invite_changeset(Invite.t()) :: Invite.changeset()
+  defp decrement_invite_changeset(%Invite{uses_left: nil} = invite) do
+    invite |> Invite.update_changeset(%{})
+  end
+
+  defp decrement_invite_changeset(%Invite{uses_left: 1} = invite) do
+    now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+    invite |> Invite.update_changeset(%{uses_left: 0, disabled_at: now})
+  end
+
+  defp decrement_invite_changeset(%Invite{uses_left: uses_left} = invite) do
+    invite |> Invite.update_changeset(%{uses_left: uses_left - 1})
+  end
+
+  @doc """
+  Creates a invite.
+
+  ## Examples
+
+      iex> create_invite(%User{id: 123, role: :admin}, %{field: value})
+      {:ok, %Invite{}}
+
+      iex> create_invite(%User{id: 123, role: :admin}, %{field: bad_value})
+      {:error, %Changeset{}}
+
+  """
+  @spec create_invite(User.t(), attrs :: map()) ::
+          {:ok, Invite.t()} | {:error, Invite.changeset()}
+  def create_invite(%User{role: :admin} = user, attrs) do
+    token =
+      :crypto.strong_rand_bytes(@invite_token_length)
+      |> Base.url_encode64()
+      |> binary_part(0, @invite_token_length)
+
+    Invite.create_changeset(user, token, attrs) |> Repo.insert()
+  end
+
+  @doc """
+  Updates a invite.
+
+  ## Examples
+
+      iex> update_invite(invite, %{field: new_value}, %User{id: 123, role: :admin})
+      {:ok, %Invite{}}
+
+      iex> update_invite(invite, %{field: bad_value}, %User{id: 123, role: :admin})
+      {:error, %Changeset{}}
+
+  """
+  @spec update_invite(Invite.t(), attrs :: map(), User.t()) ::
+          {:ok, Invite.t()} | {:error, Invite.changeset()}
+  def update_invite(invite, attrs, %User{role: :admin}) do
+    invite |> Invite.update_changeset(attrs) |> Repo.update()
+  end
+
+  @doc """
+  Deletes a invite.
+
+  ## Examples
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      {:ok, %Invite{}}
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      {:error, %Changeset{}}
+
+  """
+  @spec delete_invite(Invite.t(), User.t()) ::
+          {:ok, Invite.t()} | {:error, Invite.changeset()}
+  def delete_invite(invite, %User{role: :admin}) do
+    invite |> Repo.delete()
+  end
+
+  @doc """
+  Deletes a invite.
+
+  ## Examples
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      %Invite{}
+
+  """
+  @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
+  def delete_invite!(invite, %User{role: :admin}) do
+    invite |> Repo.delete!()
+  end
+end

lib/memex/accounts/user.ex

@@ -6,9 +6,19 @@ defmodule Memex.Accounts.User do
   use Ecto.Schema
   import Ecto.Changeset
   import MemexWeb.Gettext
-  alias Ecto.{Changeset, UUID}
-  alias Memex.Invites.Invite
+  alias Ecto.{Association, Changeset, UUID}
+  alias Memex.Accounts.{Invite, User}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :email,
+             :confirmed_at,
+             :role,
+             :locale,
+             :inserted_at,
+             :updated_at
+           ]}
   @derive {Inspect, except: [:password]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -20,27 +30,31 @@ defmodule Memex.Accounts.User do
     field :role, Ecto.Enum, values: [:admin, :user], default: :user
     field :locale, :string
 
-    has_many :invites, Invite, on_delete: :delete_all
+    has_many :created_invites, Invite, foreign_key: :created_by_id
+
+    belongs_to :invite, Invite
 
     timestamps()
   end
 
-  @type t :: %__MODULE__{
+  @type t :: %User{
           id: id(),
           email: String.t(),
           password: String.t(),
           hashed_password: String.t(),
           confirmed_at: NaiveDateTime.t(),
           role: role(),
-          invites: [Invite.t()],
           locale: String.t() | nil,
+          created_invites: [Invite.t()] | Association.NotLoaded.t(),
+          invite: Invite.t() | nil | Association.NotLoaded.t(),
+          invite_id: Invite.id() | nil,
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_user :: %__MODULE__{}
+  @type new_user :: %User{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_user())
-  @type role :: :user | :admin | String.t()
+  @type role :: :admin | :user
 
   @doc """
   A user changeset for registration.
@@ -59,22 +73,22 @@ defmodule Memex.Accounts.User do
       validations on a LiveView form), this option can be set to `false`.
       Defaults to `true`.
   """
-  @spec registration_changeset(attrs :: map()) :: changeset()
-  @spec registration_changeset(attrs :: map(), opts :: keyword()) :: changeset()
-  def registration_changeset(attrs, opts \\ []) do
-    %__MODULE__{}
+  @spec registration_changeset(attrs :: map(), Invite.t() | nil) :: changeset()
+  @spec registration_changeset(attrs :: map(), Invite.t() | nil, opts :: keyword()) :: changeset()
+  def registration_changeset(attrs, invite, opts \\ []) do
+    %User{}
     |> cast(attrs, [:email, :password, :locale])
+    |> put_change(:invite_id, if(invite, do: invite.id))
     |> validate_email()
     |> validate_password(opts)
   end
 
   @doc """
   A user changeset for role.
-
   """
   @spec role_changeset(t() | new_user() | changeset(), role()) :: changeset()
   def role_changeset(user, role) do
-    user |> cast(%{"role" => role}, [:role])
+    user |> change(role: role)
   end
 
   @spec validate_email(changeset()) :: changeset()
@@ -89,7 +103,8 @@ defmodule Memex.Accounts.User do
     |> unique_constraint(:email)
   end
 
-  @spec validate_password(changeset(), opts :: keyword()) :: changeset()
+  @spec validate_password(changeset(), opts :: keyword()) ::
+          changeset()
   defp validate_password(changeset, opts) do
     changeset
     |> validate_required([:password])
@@ -167,12 +182,12 @@ defmodule Memex.Accounts.User do
   `Bcrypt.no_user_verify/0` to avoid timing attacks.
   """
   @spec valid_password?(t(), String.t()) :: boolean()
-  def valid_password?(%__MODULE__{hashed_password: hashed_password}, password)
+  def valid_password?(%User{hashed_password: hashed_password}, password)
       when is_binary(hashed_password) and byte_size(password) > 0 do
     Bcrypt.verify_pass(password, hashed_password)
   end
 
-  def valid_password?(_, _) do
+  def valid_password?(_invalid_user, _invalid_password) do
     Bcrypt.no_user_verify()
     false
   end

lib/memex/accounts/user_notifier.ex

@@ -1,77 +0,0 @@
-defmodule Memex.Accounts.UserNotifier do
-  @moduledoc """
-  Contains templates and messages for user messages
-  """
-
-  # For simplicity, this module simply logs messages to the terminal.
-  # You should replace it by a proper email or notification tool, such as:
-  #
-  #   * Swoosh - https://hexdocs.pm/swoosh
-  #   * Bamboo - https://hexdocs.pm/bamboo
-  #
-  defp deliver(to, body) do
-    require Logger
-    Logger.debug(body)
-    {:ok, %{to: to, body: body}}
-  end
-
-  @doc """
-  Deliver instructions to confirm account.
-  """
-  def deliver_confirmation_instructions(user, url) do
-    deliver(user.email, """
-
-    ==============================
-
-    Hi #{user.email},
-
-    You can confirm your account by visiting the URL below:
-
-    #{url}
-
-    If you didn't create an account with us, please ignore this.
-
-    ==============================
-    """)
-  end
-
-  @doc """
-  Deliver instructions to reset a user password.
-  """
-  def deliver_reset_password_instructions(user, url) do
-    deliver(user.email, """
-
-    ==============================
-
-    Hi #{user.email},
-
-    You can reset your password by visiting the URL below:
-
-    #{url}
-
-    If you didn't request this change, please ignore this.
-
-    ==============================
-    """)
-  end
-
-  @doc """
-  Deliver instructions to update a user email.
-  """
-  def deliver_update_email_instructions(user, url) do
-    deliver(user.email, """
-
-    ==============================
-
-    Hi #{user.email},
-
-    You can change your email by visiting the URL below:
-
-    #{url}
-
-    If you didn't request this change, please ignore this.
-
-    ==============================
-    """)
-  end
-end

lib/memex/accounts/user_token.ex

@@ -5,6 +5,8 @@ defmodule Memex.Accounts.UserToken do
 
   use Ecto.Schema
   import Ecto.Query
+  alias Ecto.{Association, UUID}
+  alias Memex.Accounts.User
 
   @hash_algorithm :sha256
   @rand_size 32
@@ -22,11 +24,25 @@ defmodule Memex.Accounts.UserToken do
     field :token, :binary
     field :context, :string
     field :sent_to, :string
-    belongs_to :user, Memex.Accounts.User
+
+    belongs_to :user, User
 
     timestamps(updated_at: false)
   end
 
+  @type t :: %__MODULE__{
+          id: id(),
+          token: token(),
+          context: String.t(),
+          sent_to: String.t(),
+          user: User.t() | Association.NotLoaded.t(),
+          user_id: User.id() | nil,
+          inserted_at: NaiveDateTime.t()
+        }
+  @type new_user_token :: %__MODULE__{}
+  @type id :: UUID.t()
+  @type token :: binary()
+
   @doc """
   Generates a token that will be stored in a signed place,
   such as session or cookie. As they are signed, those
@@ -34,7 +50,7 @@ defmodule Memex.Accounts.UserToken do
   """
   def build_session_token(user) do
     token = :crypto.strong_rand_bytes(@rand_size)
-    {token, %Memex.Accounts.UserToken{token: token, context: "session", user_id: user.id}}
+    {token, %__MODULE__{token: token, context: "session", user_id: user.id}}
   end
 
   @doc """
@@ -69,7 +85,7 @@ defmodule Memex.Accounts.UserToken do
     hashed_token = :crypto.hash(@hash_algorithm, token)
 
     {Base.url_encode64(token, padding: false),
-     %Memex.Accounts.UserToken{
+     %__MODULE__{
        token: hashed_token,
        context: context,
        sent_to: sent_to,
@@ -129,17 +145,17 @@ defmodule Memex.Accounts.UserToken do
   Returns the given token with the given context.
   """
   def token_and_context_query(token, context) do
-    from Memex.Accounts.UserToken, where: [token: ^token, context: ^context]
+    from __MODULE__, where: [token: ^token, context: ^context]
   end
 
   @doc """
   Gets all tokens for the given user for the given contexts.
   """
   def user_and_contexts_query(user, :all) do
-    from t in Memex.Accounts.UserToken, where: t.user_id == ^user.id
+    from t in __MODULE__, where: t.user_id == ^user.id
   end
 
   def user_and_contexts_query(user, [_ | _] = contexts) do
-    from t in Memex.Accounts.UserToken, where: t.user_id == ^user.id and t.context in ^contexts
+    from t in __MODULE__, where: t.user_id == ^user.id and t.context in ^contexts
   end
 end

lib/memex/application.ex

@@ -4,6 +4,7 @@ defmodule Memex.Application do
   @moduledoc false
 
   use Application
+  alias Memex.Logger
 
   @impl true
   def start(_type, _args) do
@@ -17,16 +18,24 @@ defmodule Memex.Application do
       # Start the Endpoint (http/https)
       MemexWeb.Endpoint,
       # Add Oban
-      {Oban, oban_config()}
+      {Oban, oban_config()},
+      Memex.Repo.Migrator
       # Start a worker by calling: Memex.Worker.start_link(arg)
       # {Memex.Worker, arg}
     ]
 
-    # Automatically migrate on start in prod
-    children =
-      if Application.get_env(:memex, Memex.Application, automigrate: false)[:automigrate],
-        do: children ++ [Memex.Repo.Migrator],
-        else: children
+    # Oban events logging https://hexdocs.pm/oban/Oban.html#module-reporting-errors
+    :ok =
+      :telemetry.attach_many(
+        "oban-logger",
+        [
+          [:oban, :job, :exception],
+          [:oban, :job, :start],
+          [:oban, :job, :stop]
+        ],
+        &Logger.handle_event/4,
+        []
+      )
 
     # See https://hexdocs.pm/elixir/Supervisor.html
     # for other strategies and supported options

lib/memex/contexts.ex

@@ -4,7 +4,6 @@ defmodule Memex.Contexts do
   """
 
   import Ecto.Query, warn: false
-  alias Ecto.Changeset
   alias Memex.{Accounts.User, Contexts.Context, Repo}
 
   @doc """
@@ -230,17 +229,12 @@ defmodule Memex.Contexts do
     context |> Context.update_changeset(attrs, user)
   end
 
-  @doc """
-  Gets a canonical string representation of the `:tags` field for a Note
-  """
-  @spec get_tags_string(Context.t() | Context.changeset() | [String.t()] | nil) :: String.t()
-  def get_tags_string(nil), do: ""
-  def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
-  def get_tags_string(%Context{tags: tags}), do: tags |> get_tags_string()
+  @spec is_owner_or_admin?(Context.t(), User.t()) :: boolean()
+  def is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
+  def is_owner_or_admin?(_context, %{role: :admin}), do: true
+  def is_owner_or_admin?(_context, _other_user), do: false
 
-  def get_tags_string(%Changeset{} = changeset) do
-    changeset
-    |> Changeset.get_field(:tags)
-    |> get_tags_string()
-  end
+  @spec is_owner?(Context.t(), User.t()) :: boolean()
+  def is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
+  def is_owner?(_context, _other_user), do: false
 end

lib/memex/contexts/context.ex

@@ -9,6 +9,15 @@ defmodule Memex.Contexts.Context do
   alias Ecto.{Changeset, UUID}
   alias Memex.{Accounts.User, Repo}
 
+  @derive {Jason.Encoder,
+           only: [
+             :slug,
+             :content,
+             :tags,
+             :visibility,
+             :inserted_at,
+             :updated_at
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "contexts" do
@@ -18,7 +27,7 @@ defmodule Memex.Contexts.Context do
     field :tags_string, :string, virtual: true
     field :visibility, Ecto.Enum, values: [:public, :private, :unlisted]
 
-    belongs_to :user, User
+    field :user_id, :binary_id
 
     timestamps()
   end
@@ -27,9 +36,8 @@ defmodule Memex.Contexts.Context do
           slug: slug(),
           content: String.t(),
           tags: [String.t()] | nil,
-          tags_string: String.t(),
+          tags_string: String.t() | nil,
           visibility: :public | :private | :unlisted,
-          user: User.t() | Ecto.Association.NotLoaded.t(),
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
@@ -66,16 +74,38 @@ defmodule Memex.Contexts.Context do
     |> unsafe_validate_unique(:slug, Repo)
   end
 
-  defp cast_tags_string(changeset, %{"tags_string" => tags_string})
-       when tags_string |> is_binary() do
-    tags =
-      tags_string
-      |> String.split(",", trim: true)
-      |> Enum.map(fn str -> str |> String.trim() end)
-      |> Enum.sort()
-
-    changeset |> change(tags: tags)
+  defp cast_tags_string(changeset, attrs) do
+    changeset
+    |> put_change(:tags_string, changeset |> get_field(:tags) |> get_tags_string())
+    |> cast(attrs, [:tags_string])
+    |> validate_format(:tags_string, ~r/^[\p{L}\p{N}\-\,]+$/,
+      message:
+        dgettext(
+          "errors",
+          "invalid format: only numbers, letters and hyphen are accepted. tags must be comma-delimited"
+        )
+    )
+    |> cast_tags()
   end
 
-  defp cast_tags_string(changeset, _attrs), do: changeset
+  defp cast_tags(%{valid?: false} = changeset), do: changeset
+
+  defp cast_tags(%{valid?: true} = changeset) do
+    tags = changeset |> get_field(:tags_string) |> process_tags()
+    changeset |> put_change(:tags, tags)
+  end
+
+  defp process_tags(tags_string) when tags_string |> is_binary() do
+    tags_string
+    |> String.split(",", trim: true)
+    |> Enum.map(fn str -> str |> String.trim() end)
+    |> Enum.reject(fn str -> str |> is_nil() end)
+    |> Enum.sort()
+  end
+
+  defp process_tags(_other_tags_string), do: []
+
+  @spec get_tags_string([String.t()] | nil) :: String.t()
+  def get_tags_string(nil), do: ""
+  def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
 end

lib/memex/invites.ex

@@ -1,173 +0,0 @@
-defmodule Memex.Invites do
-  @moduledoc """
-  The Invites context.
-  """
-
-  import Ecto.Query, warn: false
-  alias Ecto.Changeset
-  alias Memex.{Accounts.User, Invites.Invite, Repo}
-
-  @invite_token_length 20
-
-  @doc """
-  Returns the list of invites.
-
-  ## Examples
-
-      iex> list_invites(%User{id: 123, role: :admin})
-      [%Invite{}, ...]
-
-  """
-  @spec list_invites(User.t()) :: [Invite.t()]
-  def list_invites(%User{role: :admin}) do
-    Repo.all(from i in Invite, order_by: i.name)
-  end
-
-  @doc """
-  Gets a single invite.
-
-  Raises `Ecto.NoResultsError` if the Invite does not exist.
-
-  ## Examples
-
-      iex> get_invite!(123, %User{id: 123, role: :admin})
-      %Invite{}
-
-      iex> get_invite!(456, %User{id: 123, role: :admin})
-      ** (Ecto.NoResultsError)
-
-  """
-  @spec get_invite!(Invite.id(), User.t()) :: Invite.t()
-  def get_invite!(id, %User{role: :admin}) do
-    Repo.get!(Invite, id)
-  end
-
-  @doc """
-  Returns a valid invite or nil based on the attempted token
-
-  ## Examples
-
-      iex> get_invite_by_token("valid_token")
-      %Invite{}
-
-      iex> get_invite_by_token("invalid_token")
-      nil
-  """
-  @spec get_invite_by_token(token :: String.t() | nil) :: Invite.t() | nil
-  def get_invite_by_token(nil), do: nil
-  def get_invite_by_token(""), do: nil
-
-  def get_invite_by_token(token) do
-    Repo.one(
-      from(i in Invite,
-        where: i.token == ^token and i.disabled_at |> is_nil()
-      )
-    )
-  end
-
-  @doc """
-  Uses invite by decrementing uses_left, or marks invite invalid if it's been
-  completely used.
-  """
-  @spec use_invite!(Invite.t()) :: Invite.t()
-  def use_invite!(%Invite{uses_left: nil} = invite), do: invite
-
-  def use_invite!(%Invite{uses_left: uses_left} = invite) do
-    new_uses_left = uses_left - 1
-
-    attrs =
-      if new_uses_left <= 0 do
-        now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
-        %{"uses_left" => 0, "disabled_at" => now}
-      else
-        %{"uses_left" => new_uses_left}
-      end
-
-    invite |> Invite.update_changeset(attrs) |> Repo.update!()
-  end
-
-  @doc """
-  Creates a invite.
-
-  ## Examples
-
-      iex> create_invite(%User{id: 123, role: :admin}, %{field: value})
-      {:ok, %Invite{}}
-
-      iex> create_invite(%User{id: 123, role: :admin}, %{field: bad_value})
-      {:error, %Changeset{}}
-
-  """
-  @spec create_invite(User.t(), attrs :: map()) ::
-          {:ok, Invite.t()} | {:error, Changeset.t(Invite.new_invite())}
-  def create_invite(%User{id: user_id, role: :admin}, attrs) do
-    token =
-      :crypto.strong_rand_bytes(@invite_token_length)
-      |> Base.url_encode64()
-      |> binary_part(0, @invite_token_length)
-
-    attrs = attrs |> Map.merge(%{"user_id" => user_id, "token" => token})
-
-    %Invite{} |> Invite.create_changeset(attrs) |> Repo.insert()
-  end
-
-  @doc """
-  Updates a invite.
-
-  ## Examples
-
-      iex> update_invite(invite, %{field: new_value}, %User{id: 123, role: :admin})
-      {:ok, %Invite{}}
-
-      iex> update_invite(invite, %{field: bad_value}, %User{id: 123, role: :admin})
-      {:error, %Changeset{}}
-
-  """
-  @spec update_invite(Invite.t(), attrs :: map(), User.t()) ::
-          {:ok, Invite.t()} | {:error, Changeset.t(Invite.t())}
-  def update_invite(invite, attrs, %User{role: :admin}),
-    do: invite |> Invite.update_changeset(attrs) |> Repo.update()
-
-  @doc """
-  Deletes a invite.
-
-  ## Examples
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      {:ok, %Invite{}}
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      {:error, %Changeset{}}
-
-  """
-  @spec delete_invite(Invite.t(), User.t()) ::
-          {:ok, Invite.t()} | {:error, Changeset.t(Invite.t())}
-  def delete_invite(invite, %User{role: :admin}), do: invite |> Repo.delete()
-
-  @doc """
-  Deletes a invite.
-
-  ## Examples
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      %Invite{}
-
-  """
-  @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
-  def delete_invite!(invite, %User{role: :admin}), do: invite |> Repo.delete!()
-
-  @doc """
-  Returns an `%Changeset{}` for tracking invite changes.
-
-  ## Examples
-
-      iex> change_invite(invite)
-      %Changeset{data: %Invite{}}
-
-  """
-  @spec change_invite(Invite.t() | Invite.new_invite()) ::
-          Changeset.t(Invite.t() | Invite.new_invite())
-  @spec change_invite(Invite.t() | Invite.new_invite(), attrs :: map()) ::
-          Changeset.t(Invite.t() | Invite.new_invite())
-  def change_invite(invite, attrs \\ %{}), do: invite |> Invite.update_changeset(attrs)
-end

lib/memex/logger.ex

@@ -0,0 +1,63 @@
+defmodule Memex.Logger do
+  @moduledoc """
+  Custom logger for telemetry events
+
+  Oban implementation taken from
+  https://hexdocs.pm/oban/Oban.html#module-reporting-errors
+  """
+
+  require Logger
+
+  def handle_event([:oban, :job, :exception], measure, %{stacktrace: stacktrace} = meta, _config) do
+    data =
+      get_oban_job_data(meta, measure)
+      |> Map.put(:stacktrace, Exception.format_stacktrace(stacktrace))
+      |> pretty_encode()
+
+    Logger.error(meta.reason, data: data)
+  end
+
+  def handle_event([:oban, :job, :start], measure, meta, _config) do
+    data = get_oban_job_data(meta, measure) |> pretty_encode()
+    Logger.info("Started oban job", data: data)
+  end
+
+  def handle_event([:oban, :job, :stop], measure, meta, _config) do
+    data = get_oban_job_data(meta, measure) |> pretty_encode()
+    Logger.info("Finished oban job", data: data)
+  end
+
+  def handle_event([:oban, :job, unhandled_event], measure, meta, _config) do
+    data =
+      get_oban_job_data(meta, measure)
+      |> Map.put(:event, unhandled_event)
+      |> pretty_encode()
+
+    Logger.warning("Unhandled oban job event", data: data)
+  end
+
+  def handle_event(unhandled_event, measure, meta, config) do
+    data =
+      pretty_encode(%{
+        event: unhandled_event,
+        meta: meta,
+        measurements: measure,
+        config: config
+      })
+
+    Logger.warning("Unhandled telemetry event", data: data)
+  end
+
+  defp get_oban_job_data(%{job: job}, measure) do
+    %{
+      job: job |> Map.take([:id, :args, :meta, :queue, :worker]),
+      measurements: measure
+    }
+  end
+
+  defp pretty_encode(data) do
+    data
+    |> Jason.encode!()
+    |> Jason.Formatter.pretty_print()
+  end
+end

lib/memex/notes.ex

@@ -4,7 +4,6 @@ defmodule Memex.Notes do
   """
 
   import Ecto.Query, warn: false
-  alias Ecto.Changeset
   alias Memex.{Accounts.User, Notes.Note, Repo}
 
   @doc """
@@ -230,17 +229,12 @@ defmodule Memex.Notes do
     note |> Note.update_changeset(attrs, user)
   end
 
-  @doc """
-  Gets a canonical string representation of the `:tags` field for a Note
-  """
-  @spec get_tags_string(Note.t() | Note.changeset() | [String.t()] | nil) :: String.t()
-  def get_tags_string(nil), do: ""
-  def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
-  def get_tags_string(%Note{tags: tags}), do: tags |> get_tags_string()
+  @spec is_owner_or_admin?(Note.t(), User.t()) :: boolean()
+  def is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
+  def is_owner_or_admin?(_context, %{role: :admin}), do: true
+  def is_owner_or_admin?(_context, _other_user), do: false
 
-  def get_tags_string(%Changeset{} = changeset) do
-    changeset
-    |> Changeset.get_field(:tags)
-    |> get_tags_string()
-  end
+  @spec is_owner?(Note.t(), User.t()) :: boolean()
+  def is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
+  def is_owner?(_context, _other_user), do: false
 end

lib/memex/notes/note.ex

@@ -8,6 +8,15 @@ defmodule Memex.Notes.Note do
   alias Ecto.{Changeset, UUID}
   alias Memex.{Accounts.User, Repo}
 
+  @derive {Jason.Encoder,
+           only: [
+             :slug,
+             :content,
+             :tags,
+             :visibility,
+             :inserted_at,
+             :updated_at
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "notes" do
@@ -17,7 +26,7 @@ defmodule Memex.Notes.Note do
     field :tags_string, :string, virtual: true
     field :visibility, Ecto.Enum, values: [:public, :private, :unlisted]
 
-    belongs_to :user, User
+    field :user_id, :binary_id
 
     timestamps()
   end
@@ -26,9 +35,8 @@ defmodule Memex.Notes.Note do
           slug: slug(),
           content: String.t(),
           tags: [String.t()] | nil,
-          tags_string: String.t(),
+          tags_string: String.t() | nil,
           visibility: :public | :private | :unlisted,
-          user: User.t() | Ecto.Association.NotLoaded.t(),
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
@@ -65,16 +73,38 @@ defmodule Memex.Notes.Note do
     |> unsafe_validate_unique(:slug, Repo)
   end
 
-  defp cast_tags_string(changeset, %{"tags_string" => tags_string})
-       when tags_string |> is_binary() do
-    tags =
-      tags_string
-      |> String.split(",", trim: true)
-      |> Enum.map(fn str -> str |> String.trim() end)
-      |> Enum.sort()
-
-    changeset |> change(tags: tags)
+  defp cast_tags_string(changeset, attrs) do
+    changeset
+    |> put_change(:tags_string, changeset |> get_field(:tags) |> get_tags_string())
+    |> cast(attrs, [:tags_string])
+    |> validate_format(:tags_string, ~r/^[\p{L}\p{N}\-\,]+$/,
+      message:
+        dgettext(
+          "errors",
+          "invalid format: only numbers, letters and hyphen are accepted. tags must be comma-delimited"
+        )
+    )
+    |> cast_tags()
   end
 
-  defp cast_tags_string(changeset, _attrs), do: changeset
+  defp cast_tags(%{valid?: false} = changeset), do: changeset
+
+  defp cast_tags(%{valid?: true} = changeset) do
+    tags = changeset |> get_field(:tags_string) |> process_tags()
+    changeset |> put_change(:tags, tags)
+  end
+
+  defp process_tags(tags_string) when tags_string |> is_binary() do
+    tags_string
+    |> String.split(",", trim: true)
+    |> Enum.map(fn str -> str |> String.trim() end)
+    |> Enum.reject(fn str -> str |> is_nil() end)
+    |> Enum.sort()
+  end
+
+  defp process_tags(_other_tags_string), do: []
+
+  @spec get_tags_string([String.t()] | nil) :: String.t()
+  def get_tags_string(nil), do: ""
+  def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
 end

lib/memex/pipelines.ex

@@ -4,7 +4,6 @@ defmodule Memex.Pipelines do
   """
 
   import Ecto.Query, warn: false
-  alias Ecto.Changeset
   alias Memex.{Accounts.User, Pipelines.Pipeline, Repo}
 
   @doc """
@@ -232,17 +231,12 @@ defmodule Memex.Pipelines do
     pipeline |> Pipeline.update_changeset(attrs, user)
   end
 
-  @doc """
-  Gets a canonical string representation of the `:tags` field for a Pipeline
-  """
-  @spec get_tags_string(Pipeline.t() | Pipeline.changeset() | [String.t()] | nil) :: String.t()
-  def get_tags_string(nil), do: ""
-  def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
-  def get_tags_string(%Pipeline{tags: tags}), do: tags |> get_tags_string()
+  @spec is_owner_or_admin?(Pipeline.t(), User.t()) :: boolean()
+  def is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
+  def is_owner_or_admin?(_context, %{role: :admin}), do: true
+  def is_owner_or_admin?(_context, _other_user), do: false
 
-  def get_tags_string(%Changeset{} = changeset) do
-    changeset
-    |> Changeset.get_field(:tags)
-    |> get_tags_string()
-  end
+  @spec is_owner?(Pipeline.t(), User.t()) :: boolean()
+  def is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
+  def is_owner?(_context, _other_user), do: false
 end

lib/memex/pipelines/pipeline.ex

@@ -8,6 +8,16 @@ defmodule Memex.Pipelines.Pipeline do
   alias Ecto.{Changeset, UUID}
   alias Memex.{Accounts.User, Pipelines.Steps.Step, Repo}
 
+  @derive {Jason.Encoder,
+           only: [
+             :slug,
+             :description,
+             :tags,
+             :visibility,
+             :inserted_at,
+             :steps,
+             :updated_at
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "pipelines" do
@@ -17,7 +27,7 @@ defmodule Memex.Pipelines.Pipeline do
     field :tags_string, :string, virtual: true
     field :visibility, Ecto.Enum, values: [:public, :private, :unlisted]
 
-    belongs_to :user, User
+    field :user_id, :binary_id
 
     has_many :steps, Step, preload_order: [asc: :position]
 
@@ -28,9 +38,8 @@ defmodule Memex.Pipelines.Pipeline do
           slug: slug(),
           description: String.t(),
           tags: [String.t()] | nil,
-          tags_string: String.t(),
+          tags_string: String.t() | nil,
           visibility: :public | :private | :unlisted,
-          user: User.t() | Ecto.Association.NotLoaded.t(),
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
@@ -67,16 +76,38 @@ defmodule Memex.Pipelines.Pipeline do
     |> unsafe_validate_unique(:slug, Repo)
   end
 
-  defp cast_tags_string(changeset, %{"tags_string" => tags_string})
-       when tags_string |> is_binary() do
-    tags =
-      tags_string
-      |> String.split(",", trim: true)
-      |> Enum.map(fn str -> str |> String.trim() end)
-      |> Enum.sort()
-
-    changeset |> change(tags: tags)
+  defp cast_tags_string(changeset, attrs) do
+    changeset
+    |> put_change(:tags_string, changeset |> get_field(:tags) |> get_tags_string())
+    |> cast(attrs, [:tags_string])
+    |> validate_format(:tags_string, ~r/^[\p{L}\p{N}\-\,]+$/,
+      message:
+        dgettext(
+          "errors",
+          "invalid format: only numbers, letters and hyphen are accepted. tags must be comma-delimited"
+        )
+    )
+    |> cast_tags()
   end
 
-  defp cast_tags_string(changeset, _attrs), do: changeset
+  defp cast_tags(%{valid?: false} = changeset), do: changeset
+
+  defp cast_tags(%{valid?: true} = changeset) do
+    tags = changeset |> get_field(:tags_string) |> process_tags()
+    changeset |> put_change(:tags, tags)
+  end
+
+  defp process_tags(tags_string) when tags_string |> is_binary() do
+    tags_string
+    |> String.split(",", trim: true)
+    |> Enum.map(fn str -> str |> String.trim() end)
+    |> Enum.reject(fn str -> str |> is_nil() end)
+    |> Enum.sort()
+  end
+
+  defp process_tags(_other_tags_string), do: []
+
+  @spec get_tags_string([String.t()] | nil) :: String.t()
+  def get_tags_string(nil), do: ""
+  def get_tags_string(tags) when tags |> is_list(), do: tags |> Enum.join(",")
 end

lib/memex/pipelines/step.ex

@@ -7,6 +7,14 @@ defmodule Memex.Pipelines.Steps.Step do
   alias Ecto.{Changeset, UUID}
   alias Memex.{Accounts.User, Pipelines.Pipeline}
 
+  @derive {Jason.Encoder,
+           only: [
+             :title,
+             :content,
+             :position,
+             :inserted_at,
+             :updated_at
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "steps" do
@@ -15,7 +23,7 @@ defmodule Memex.Pipelines.Steps.Step do
     field :position, :integer
 
     belongs_to :pipeline, Pipeline
-    belongs_to :user, User
+    field :user_id, :binary_id
 
     timestamps()
   end
@@ -26,7 +34,6 @@ defmodule Memex.Pipelines.Steps.Step do
           position: non_neg_integer(),
           pipeline: Pipeline.t() | Ecto.Association.NotLoaded.t(),
           pipeline_id: Pipeline.id(),
-          user: User.t() | Ecto.Association.NotLoaded.t(),
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()

lib/memex/release.ex

@@ -7,7 +7,9 @@ defmodule Memex.Release do
 
   def rollback(repo, version) do
     load_app()
-    {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
+
+    {:ok, _fun_return, _apps} =
+      Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
   end
 
   defp load_app do
@@ -18,7 +20,8 @@ defmodule Memex.Release do
     load_app()
 
     for repo <- Application.fetch_env!(@app, :ecto_repos) do
-      {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
+      {:ok, _fun_return, _apps} =
+        Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
     end
   end
 end

lib/memex/repo/migrator.ex

@@ -6,17 +6,20 @@ defmodule Memex.Repo.Migrator do
   use GenServer
   require Logger
 
-  def start_link(_) do
+  def start_link(_opts) do
     GenServer.start_link(__MODULE__, [], [])
   end
 
-  def init(_) do
-    migrate!()
-    {:ok, nil}
+  def init(_opts) do
+    {:ok, if(automigrate_enabled?(), do: migrate!())}
   end
 
   def migrate! do
     path = Application.app_dir(:memex, "priv/repo/migrations")
     Ecto.Migrator.run(Memex.Repo, path, :up, all: true)
   end
+
+  defp automigrate_enabled? do
+    Application.get_env(:memex, Memex.Application, automigrate: false)[:automigrate]
+  end
 end

lib/memex_web.ex

@@ -45,8 +45,7 @@ defmodule MemexWeb do
 
   def live_view do
     quote do
-      use Phoenix.LiveView,
-        layout: {MemexWeb.LayoutView, :live}
+      use Phoenix.LiveView, layout: {MemexWeb.LayoutView, :live}
 
       on_mount MemexWeb.InitAssigns
       unquote(view_helpers())
@@ -73,15 +72,16 @@ defmodule MemexWeb do
     quote do
       use Phoenix.Router
 
+      import Phoenix.{Controller, LiveView.Router}
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Plug.Conn
-      import Phoenix.Controller
-      import Phoenix.LiveView.Router
     end
   end
 
   def channel do
     quote do
       use Phoenix.Channel
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import MemexWeb.Gettext
     end
   end
@@ -89,16 +89,15 @@ defmodule MemexWeb do
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.HTML
 
-      # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
-      import Phoenix.Component
-      import MemexWeb.LiveHelpers
-
+      # Import LiveView and .heex helpers (live_render, link, <.form>, etc)
       # Import basic rendering functionality (render, render_layout, etc)
-      import Phoenix.View
+      import Phoenix.{Component, View}
+      import MemexWeb.{ErrorHelpers, Gettext, CoreComponents, ViewHelpers}
 
-      import MemexWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       alias MemexWeb.Endpoint
       alias MemexWeb.Router.Helpers, as: Routes
     end

lib/memex_web/components/context_content.ex

@@ -1,44 +0,0 @@
-defmodule MemexWeb.Components.ContextContent do
-  @moduledoc """
-  Display the content for a context
-  """
-  use MemexWeb, :component
-  alias Memex.Contexts.Context
-  alias Phoenix.HTML
-
-  attr :context, Context, required: true
-
-  def context_content(assigns) do
-    ~H"""
-    <div
-      id={"show-context-content-#{@context.id}"}
-      class="input input-primary h-128 min-h-128 inline-block"
-      phx-hook="MaintainAttrs"
-      phx-update="ignore"
-      readonly
-      phx-no-format
-    ><p class="inline"><%= add_links_to_content(@context.content) %></p></div>
-    """
-  end
-
-  defp add_links_to_content(content) do
-    Regex.replace(
-      ~r/\[\[([\p{L}\p{N}\-]+)\]\]/,
-      content,
-      fn _whole_match, slug ->
-        link =
-          HTML.Link.link(
-            "[[#{slug}]]",
-            to: Routes.note_show_path(Endpoint, :show, slug),
-            class: "link inline",
-            data: [qa: "context-note-#{slug}"]
-          )
-          |> HTML.Safe.to_iodata()
-          |> IO.iodata_to_binary()
-
-        "</p>#{link}<p class=\"inline\">"
-      end
-    )
-    |> HTML.raw()
-  end
-end

lib/memex_web/components/contexts_table_component.ex

@@ -40,7 +40,7 @@ defmodule MemexWeb.Components.ContextsTableComponent do
       if actions == [] or current_user |> is_nil() do
         []
       else
-        [%{label: nil, key: :actions, sortable: false}]
+        [%{label: gettext("actions"), key: :actions, sortable: false}]
       end
 
     columns = [
@@ -92,11 +92,7 @@ defmodule MemexWeb.Components.ContextsTableComponent do
     assigns = %{slug: slug}
 
     slug_block = ~H"""
-    <.link
-      navigate={Routes.context_show_path(Endpoint, :show, @slug)}
-      class="link"
-      data-qa={"context-show-#{@slug}"}
-    >
+    <.link navigate={Routes.context_show_path(Endpoint, :show, @slug)} class="link">
       <%= @slug %>
     </.link>
     """
@@ -105,7 +101,19 @@ defmodule MemexWeb.Components.ContextsTableComponent do
   end
 
   defp get_value_for_key(:tags, %{tags: tags}, _additional_data) do
-    tags |> Enum.join(", ")
+    assigns = %{tags: tags}
+
+    ~H"""
+    <div class="flex flex-wrap justify-center space-x-1">
+      <.link
+        :for={tag <- @tags}
+        patch={Routes.context_index_path(Endpoint, :search, tag)}
+        class="link"
+      >
+        <%= tag %>
+      </.link>
+    </div>
+    """
   end
 
   defp get_value_for_key(:actions, context, %{actions: actions}) do

lib/memex_web/components/core_components.ex

@@ -0,0 +1,183 @@
+defmodule MemexWeb.CoreComponents do
+  @moduledoc """
+  Provides core UI components.
+  """
+  use Phoenix.Component
+  import MemexWeb.{Gettext, ViewHelpers}
+  alias Memex.{Accounts, Accounts.Invite, Accounts.User}
+  alias Memex.Contexts.Context
+  alias Memex.Notes.Note
+  alias Memex.Pipelines.Steps.Step
+  alias MemexWeb.{Endpoint, HomeLive}
+  alias MemexWeb.Router.Helpers, as: Routes
+  alias Phoenix.HTML
+  alias Phoenix.LiveView.JS
+
+  embed_templates("core_components/*")
+
+  attr :title_content, :string, default: nil
+  attr :current_user, User, default: nil
+
+  def topbar(assigns)
+
+  attr :return_to, :string, required: true
+  slot(:inner_block)
+
+  @doc """
+  Renders a live component inside a modal.
+
+  The rendered modal receives a `:return_to` option to properly update
+  the URL when the modal is closed.
+
+  ## Examples
+
+      <.modal return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}>
+        <.live_component
+          module={<%= inspect context.web_module %>.<%= inspect Module.concat(schema.web_namespace, schema.alias) %>Live.FormComponent}
+          id={@<%= schema.singular %>.id || :new}
+          title={@page_title}
+          action={@live_action}
+          return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}
+          <%= schema.singular %>: @<%= schema.singular %>
+        />
+      </.modal>
+  """
+  def modal(assigns)
+
+  defp hide_modal(js \\ %JS{}) do
+    js
+    |> JS.hide(to: "#modal", transition: "fade-out")
+    |> JS.hide(to: "#modal-bg", transition: "fade-out")
+    |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
+  end
+
+  attr :action, :string, required: true
+  attr :value, :boolean, required: true
+  attr :id, :string, default: nil
+  slot(:inner_block)
+
+  @doc """
+  A toggle button element that can be directed to a liveview or a
+  live_component's `handle_event/3`.
+
+  ## Examples
+
+  <.toggle_button action="my_liveview_action" value={@some_value}>
+    <span>Toggle me!</span>
+  </.toggle_button>
+  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
+    <span>Whatever you want</span>
+  </.toggle_button>
+  """
+  def toggle_button(assigns)
+
+  attr :user, User, required: true
+  slot(:inner_block, required: true)
+
+  def user_card(assigns)
+
+  attr :invite, Invite, required: true
+  attr :use_count, :integer, default: nil
+  attr :current_user, User, required: true
+  slot(:inner_block)
+  slot(:code_actions)
+
+  def invite_card(assigns)
+
+  attr :id, :string, required: true
+  attr :datetime, :any, required: true, doc: "A `DateTime` struct or nil"
+
+  @doc """
+  Phoenix.Component for a <time> element that renders the naivedatetime in the
+  user's local timezone
+  """
+  def datetime(assigns)
+
+  @spec cast_datetime(NaiveDateTime.t() | nil) :: String.t()
+  defp cast_datetime(%NaiveDateTime{} = datetime) do
+    datetime |> DateTime.from_naive!("Etc/UTC") |> DateTime.to_iso8601(:extended)
+  end
+
+  defp cast_datetime(_datetime), do: ""
+
+  attr :id, :string, required: true
+  attr :date, :any, required: true, doc: "A `Date` struct or nil"
+
+  @doc """
+  Phoenix.Component for a <date> element that renders the Date in the user's
+  local timezone
+  """
+  def date(assigns)
+
+  attr :content, :string, required: true
+  attr :filename, :string, default: "qrcode", doc: "filename without .png extension"
+  attr :image_class, :string, default: "w-64 h-max"
+  attr :width, :integer, default: 384, doc: "width of png to generate"
+
+  @doc """
+  Creates a downloadable QR Code element
+  """
+  def qr_code(assigns)
+
+  attr :note, Note, required: true
+
+  def note_content(assigns)
+
+  attr :context, Context, required: true
+
+  def context_content(assigns)
+
+  attr :step, Step, required: true
+
+  def step_content(assigns)
+
+  defp add_links_to_content(content, data_qa_prefix) do
+    # replace links
+
+    # link regex from
+    # https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url
+    # and modified with additional schemes from
+    # https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
+
+    content =
+      Regex.replace(
+        ~r<((file|git|https?|ipfs|ipns|irc|jabber|magnet|mailto|mumble|tel|udp|xmpp):\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))>,
+        content,
+        fn _whole_match, link ->
+          link =
+            HTML.Link.link(
+              link,
+              to: link,
+              class: "link inline",
+              target: "_blank",
+              rel: "noopener noreferrer"
+            )
+            |> HTML.Safe.to_iodata()
+            |> IO.iodata_to_binary()
+
+          "</p>#{link}<p class=\"inline\">"
+        end
+      )
+
+    content =
+      Regex.replace(
+        ~r/\[\[([\p{L}\p{N}\-]+)\]\]/,
+        content,
+        fn _whole_match, slug ->
+          link =
+            HTML.Link.link(
+              "[[#{slug}]]",
+              to: Routes.note_show_path(Endpoint, :show, slug),
+              class: "link inline",
+              data: [qa: "#{data_qa_prefix}-#{slug}"]
+            )
+            |> HTML.Safe.to_iodata()
+            |> IO.iodata_to_binary()
+
+          "</p>#{link}<p class=\"inline\">"
+        end
+      )
+
+    content |> HTML.raw()
+  end
+end

lib/memex_web/components/core_components/context_content.html.heex

@@ -0,0 +1,8 @@
+<div
+  id={"show-context-content-#{@context.id}"}
+  class="input input-primary h-128 min-h-128 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto"
+  phx-hook="MaintainAttrs"
+  phx-update="ignore"
+  readonly
+  phx-no-format
+><p class="inline"><%= add_links_to_content(@context.content, "context-note") %></p></div>

lib/memex_web/components/core_components/date.html.heex

@@ -0,0 +1,3 @@
+<time :if={@date} id={@id} datetime={Date.to_iso8601(@date, :extended)} phx-hook="Date">
+  <%= Date.to_iso8601(@date, :extended) %>
+</time>

lib/memex_web/components/core_components/datetime.html.heex

@@ -0,0 +1,3 @@
+<time :if={@datetime} id={@id} datetime={cast_datetime(@datetime)} phx-hook="DateTime">
+  <%= cast_datetime(@datetime) %>
+</time>

lib/memex_web/components/core_components/invite_card.html.heex

@@ -0,0 +1,48 @@
+<div class="px-8 py-4 flex flex-col justify-center items-center space-y-4
+  bg-primary-900
+  border border-gray-400 rounded-lg shadow-lg hover:shadow-md
+  transition-all duration-300 ease-in-out">
+  <h1 class="title text-xl">
+    <%= @invite.name %>
+  </h1>
+
+  <%= if @invite.disabled_at |> is_nil() do %>
+    <h2 class="title text-md">
+      <%= if @invite.uses_left do %>
+        <%= gettext(
+          "uses left: %{uses_left_count}",
+          uses_left_count: @invite.uses_left
+        ) %>
+      <% else %>
+        <%= gettext("uses left: unlimited") %>
+      <% end %>
+    </h2>
+  <% else %>
+    <h2 class="title text-md">
+      <%= gettext("invite disabled") %>
+    </h2>
+  <% end %>
+
+  <.qr_code
+    content={Routes.user_registration_url(Endpoint, :new, invite: @invite.token)}
+    filename={@invite.name}
+  />
+
+  <h2 :if={@use_count && @use_count != 0} class="title text-md">
+    <%= gettext("uses: %{uses_count}", uses_count: @use_count) %>
+  </h2>
+
+  <div class="flex flex-row flex-wrap justify-center items-center">
+    <code
+      id={"code-#{@invite.id}"}
+      class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all
+        text-primary-400 bg-primary-800"
+      phx-no-format
+    ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
+    <%= if @code_actions, do: render_slot(@code_actions) %>
+  </div>
+
+  <div :if={@inner_block} class="flex space-x-4 justify-center items-center">
+    <%= render_slot(@inner_block) %>
+  </div>
+</div>

lib/memex_web/components/core_components/modal.html.heex

@@ -0,0 +1,43 @@
+<.link
+  id="modal-bg"
+  patch={@return_to}
+  class="fade-in fixed z-10 left-0 top-0
+    w-full h-full overflow-hidden
+    p-8 flex flex-col justify-center items-center cursor-auto"
+  style="background-color: rgba(0,0,0,0.4);"
+  phx-remove={hide_modal()}
+  aria-label={gettext("close modal")}
+>
+  <span class="hidden"></span>
+</.link>
+
+<div
+  id="modal"
+  class="fixed z-10 left-0 top-0 pointer-events-none
+    w-full h-full overflow-hidden
+    p-4 sm:p-8 flex flex-col justify-center items-center"
+>
+  <div
+    id="modal-content"
+    class="fade-in-scale max-w-3xl max-h-3xl relative w-full
+      pointer-events-auto overflow-hidden
+      px-8 py-4 sm:py-8 flex flex-col justify-start items-stretch
+      bg-primary-800 text-primary-400 border-primary-900 border-2 rounded-lg"
+  >
+    <.link
+      patch={@return_to}
+      id="close"
+      class="absolute top-8 right-10
+        text-gray-500 hover:text-gray-800
+        transition-all duration-500 ease-in-out"
+      phx-remove={hide_modal()}
+      aria-label={gettext("close modal")}
+    >
+      <i class="fa-fw fa-lg fas fa-times"></i>
+    </.link>
+
+    <div class="overflow-x-hidden overflow-y-auto w-full p-8 flex flex-col space-y-4 justify-start items-stretch">
+      <%= render_slot(@inner_block) %>
+    </div>
+  </div>
+</div>

lib/memex_web/components/core_components/note_content.html.heex

@@ -0,0 +1,8 @@
+<div
+  id={"show-note-content-#{@note.id}"}
+  class="input input-primary h-128 min-h-128 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto"
+  phx-hook="MaintainAttrs"
+  phx-update="ignore"
+  readonly
+  phx-no-format
+><p class="inline"><%= add_links_to_content(@note.content, "note-link") %></p></div>

lib/memex_web/components/core_components/qr_code.html.heex

@@ -0,0 +1,3 @@
+<a href={qr_code_image(@content)} download={@filename <> ".png"}>
+  <img class={@image_class} alt={@filename} src={qr_code_image(@content)} />
+</a>

lib/memex_web/components/core_components/step_content.html.heex

@@ -0,0 +1,8 @@
+<div
+  id={"show-step-content-#{@step.id}"}
+  class="input input-primary h-32 min-h-32 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto"
+  phx-hook="MaintainAttrs"
+  phx-update="ignore"
+  readonly
+  phx-no-format
+><p class="inline"><%= add_links_to_content(@step.content, "step-context") %></p></div>

lib/memex_web/components/core_components/toggle_button.html.heex

@@ -0,0 +1,30 @@
+<label for={@id || @action} class="inline-flex relative items-center cursor-pointer">
+  <input
+    id={@id || @action}
+    type="checkbox"
+    value={@value}
+    checked={@value}
+    class="sr-only peer"
+    aria-labelledby={"#{@id || @action}-label"}
+    {
+      if assigns |> Map.has_key?(:target),
+        do: %{"phx-click": @action, "phx-value-value": @value, "phx-target": @target},
+        else: %{"phx-click": @action, "phx-value-value": @value}
+    }
+  />
+  <div class="w-11 h-6 bg-gray-300 rounded-full peer
+    peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800
+    peer-checked:bg-gray-600
+    peer-checked:after:translate-x-full peer-checked:after:border-white
+    after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300
+    after:border after:rounded-full after:h-5 after:w-5
+    after:transition-all after:duration-250 after:ease-in-out
+    transition-colors duration-250 ease-in-out">
+  </div>
+  <span
+    id={"#{@id || @action}-label"}
+    class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"
+  >
+    <%= render_slot(@inner_block) %>
+  </span>
+</label>

lib/memex_web/components/core_components/topbar.html.heex

@@ -0,0 +1,115 @@
+<nav role="navigation" class="mb-8 px-8 py-4 w-full bg-primary-900 text-primary-400">
+  <div class="flex flex-col sm:flex-row justify-between items-center">
+    <div class="mb-4 sm:mb-0 sm:mr-8 flex flex-row justify-start items-center space-x-2">
+      <.link
+        navigate={Routes.live_path(Endpoint, HomeLive)}
+        class="mx-2 my-1 leading-5 text-xl text-primary-400 hover:underline"
+      >
+        <%= gettext("memEx") %>
+      </.link>
+
+      <%= if @title_content do %>
+        <span class="mx-2 my-1">
+          |
+        </span>
+        <%= @title_content %>
+      <% end %>
+    </div>
+
+    <hr class="mb-2 sm:hidden hr-light" />
+
+    <ul class="flex flex-row flex-wrap justify-center items-center
+      text-lg text-primary-400 text-ellipsis">
+      <li class="mx-2 my-1">
+        <.link
+          navigate={Routes.note_index_path(Endpoint, :index)}
+          class="text-primary-400 hover:underline truncate"
+        >
+          <%= gettext("notes") %>
+        </.link>
+      </li>
+
+      <li class="mx-2 my-1">
+        <.link
+          navigate={Routes.context_index_path(Endpoint, :index)}
+          class="text-primary-400 hover:underline truncate"
+        >
+          <%= gettext("contexts") %>
+        </.link>
+      </li>
+
+      <li class="mx-2 my-1">
+        <.link
+          navigate={Routes.pipeline_index_path(Endpoint, :index)}
+          class="text-primary-400 hover:underline truncate"
+        >
+          <%= gettext("pipelines") %>
+        </.link>
+      </li>
+
+      <li class="mx-2 my-1 border-left border border-primary-700">​</li>
+
+      <%= if @current_user do %>
+        <li :if={@current_user |> Accounts.is_already_admin?()} class="mx-2 my-1">
+          <.link
+            navigate={Routes.invite_index_path(Endpoint, :index)}
+            class="text-primary-400 hover:underline"
+          >
+            <%= gettext("invites") %>
+          </.link>
+        </li>
+
+        <li class="mx-2 my-1">
+          <.link
+            navigate={Routes.user_settings_path(Endpoint, :edit)}
+            class="text-primary-400 hover:underline truncate"
+          >
+            <%= @current_user.email %>
+          </.link>
+        </li>
+        <li class="mx-2 my-1">
+          <.link
+            href={Routes.user_session_path(Endpoint, :delete)}
+            method="delete"
+            data-confirm={dgettext("prompts", "are you sure you want to log out?")}
+            aria-label={gettext("log out")}
+          >
+            <i class="fas fa-sign-out-alt"></i>
+          </.link>
+        </li>
+        <li
+          :if={
+            @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2)
+          }
+          class="mx-2 my-1"
+        >
+          <.link
+            navigate={Routes.live_dashboard_path(Endpoint, :home)}
+            class="text-primary-400 hover:underline"
+            aria-label={gettext("live dashboard")}
+          >
+            <i class="fas fa-gauge"></i>
+          </.link>
+        </li>
+      <% else %>
+        <li :if={Accounts.allow_registration?()} class="mx-2 my-1">
+          <.link
+            href={Routes.user_registration_path(Endpoint, :new)}
+            class="text-primary-400 hover:underline truncate"
+          >
+            <%= dgettext("actions", "register") %>
+          </.link>
+        </li>
+
+        <li class="mx-2 my-1">
+          <.link
+            href={Routes.user_session_path(Endpoint, :new)}
+            class="text-primary-400 hover:underline truncate"
+          >
+            <%= dgettext("actions", "log in") %>
+          </.link>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</nav>

lib/memex_web/components/core_components/user_card.html.heex

@@ -0,0 +1,37 @@
+<div
+  id={"user-#{@user.id}"}
+  class="px-8 py-4 flex flex-col justify-center items-center text-center
+    bg-primary-900
+    border border-gray-400 rounded-lg shadow-lg hover:shadow-md
+    transition-all duration-300 ease-in-out"
+>
+  <h1 class="px-4 py-2 rounded-lg title text-xl break-all">
+    <%= @user.email %>
+  </h1>
+
+  <h3 class="px-4 py-2 rounded-lg title text-lg">
+    <p>
+      <%= if @user.confirmed_at do %>
+        <%= gettext(
+          "user confirmed on%{confirmed_datetime}",
+          confirmed_datetime: ""
+        ) %>
+        <.datetime id={"#{@user.id}-confirmed-at"} datetime={@user.confirmed_at} />
+      <% else %>
+        <%= gettext("email unconfirmed") %>
+      <% end %>
+    </p>
+
+    <p>
+      <%= gettext(
+        "user registered on%{registered_datetime}",
+        registered_datetime: ""
+      ) %>
+      <.datetime id={"#{@user.id}-inserted-at"} datetime={@user.inserted_at} />
+    </p>
+  </h3>
+
+  <div :if={@inner_block} class="px-4 py-2 flex space-x-4 justify-center items-center">
+    <%= render_slot(@inner_block) %>
+  </div>
+</div>

lib/memex_web/components/invite_card.ex

@@ -1,49 +0,0 @@
-defmodule MemexWeb.Components.InviteCard do
-  @moduledoc """
-  Display card for an invite
-  """
-
-  use MemexWeb, :component
-
-  def invite_card(assigns) do
-    ~H"""
-    <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
-      border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-      transition-all duration-300 ease-in-out">
-      <h1 class="title text-xl">
-        <%= @invite.name %>
-      </h1>
-
-      <%= if @invite.disabled_at |> is_nil() do %>
-        <h2 class="title text-md">
-          <%= gettext("Uses Left:") %>
-          <%= @invite.uses_left || gettext("unlimited") %>
-        </h2>
-      <% else %>
-        <h2 class="title text-md">
-          <%= gettext("invite disabled") %>
-        </h2>
-      <% end %>
-
-      <div class="flex flex-row flex-wrap justify-center items-center">
-        <code
-          id={"code-#{@invite.id}"}
-          class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
-        >
-          <%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %>
-        </code>
-
-        <%= if @code_actions do %>
-          <%= render_slot(@code_actions) %>
-        <% end %>
-      </div>
-
-      <%= if @inner_block do %>
-        <div class="flex space-x-4 justify-center items-center">
-          <%= render_slot(@inner_block) %>
-        </div>
-      <% end %>
-    </div>
-    """
-  end
-end

lib/memex_web/components/notes_table_component.ex

@@ -40,7 +40,7 @@ defmodule MemexWeb.Components.NotesTableComponent do
       if actions == [] or current_user |> is_nil() do
         []
       else
-        [%{label: nil, key: :actions, sortable: false}]
+        [%{label: gettext("actions"), key: :actions, sortable: false}]
       end
 
     columns = [
@@ -92,11 +92,7 @@ defmodule MemexWeb.Components.NotesTableComponent do
     assigns = %{slug: slug}
 
     slug_block = ~H"""
-    <.link
-      navigate={Routes.note_show_path(Endpoint, :show, @slug)}
-      class="link"
-      data-qa={"note-show-#{@slug}"}
-    >
+    <.link navigate={Routes.note_show_path(Endpoint, :show, @slug)} class="link">
       <%= @slug %>
     </.link>
     """
@@ -105,7 +101,15 @@ defmodule MemexWeb.Components.NotesTableComponent do
   end
 
   defp get_value_for_key(:tags, %{tags: tags}, _additional_data) do
-    tags |> Enum.join(", ")
+    assigns = %{tags: tags}
+
+    ~H"""
+    <div class="flex flex-wrap justify-center space-x-1">
+      <.link :for={tag <- @tags} patch={Routes.note_index_path(Endpoint, :search, tag)} class="link">
+        <%= tag %>
+      </.link>
+    </div>
+    """
   end
 
   defp get_value_for_key(:actions, note, %{actions: actions}) do

lib/memex_web/components/pipelines_table_component.ex

@@ -40,7 +40,7 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
       if actions == [] or current_user |> is_nil() do
         []
       else
-        [%{label: nil, key: :actions, sortable: false}]
+        [%{label: gettext("actions"), key: :actions, sortable: false}]
       end
 
     columns = [
@@ -93,11 +93,7 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
     assigns = %{slug: slug}
 
     slug_block = ~H"""
-    <.link
-      navigate={Routes.pipeline_show_path(Endpoint, :show, @slug)}
-      class="link"
-      data-qa={"pipeline-show-#{@slug}"}
-    >
+    <.link navigate={Routes.pipeline_show_path(Endpoint, :show, @slug)} class="link">
       <%= @slug %>
     </.link>
     """
@@ -118,7 +114,19 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
   end
 
   defp get_value_for_key(:tags, %{tags: tags}, _additional_data) do
-    tags |> Enum.join(", ")
+    assigns = %{tags: tags}
+
+    ~H"""
+    <div class="flex flex-wrap justify-center space-x-1">
+      <.link
+        :for={tag <- @tags}
+        patch={Routes.pipeline_index_path(Endpoint, :search, tag)}
+        class="link"
+      >
+        <%= tag %>
+      </.link>
+    </div>
+    """
   end
 
   defp get_value_for_key(:actions, pipeline, %{actions: actions}) do

lib/memex_web/components/step_content.ex

@@ -1,44 +0,0 @@
-defmodule MemexWeb.Components.StepContent do
-  @moduledoc """
-  Display the content for a step
-  """
-  use MemexWeb, :component
-  alias Memex.Pipelines.Steps.Step
-  alias Phoenix.HTML
-
-  attr :step, Step, required: true
-
-  def step_content(assigns) do
-    ~H"""
-    <div
-      id={"show-step-content-#{@step.id}"}
-      class="input input-primary h-32 min-h-32 inline-block"
-      phx-hook="MaintainAttrs"
-      phx-update="ignore"
-      readonly
-      phx-no-format
-    ><p class="inline"><%= add_links_to_content(@step.content) %></p></div>
-    """
-  end
-
-  defp add_links_to_content(content) do
-    Regex.replace(
-      ~r/\[\[([\p{L}\p{N}\-]+)\]\]/,
-      content,
-      fn _whole_match, slug ->
-        link =
-          HTML.Link.link(
-            "[[#{slug}]]",
-            to: Routes.context_show_path(Endpoint, :show, slug),
-            class: "link inline",
-            data: [qa: "step-context-#{slug}"]
-          )
-          |> HTML.Safe.to_iodata()
-          |> IO.iodata_to_binary()
-
-        "</p>#{link}<p class=\"inline\">"
-      end
-    )
-    |> HTML.raw()
-  end
-end

lib/memex_web/components/table_component.ex

@@ -33,7 +33,8 @@ defmodule MemexWeb.Components.TableComponent do
                 optional(:class) => String.t(),
                 optional(:row_class) => String.t(),
                 optional(:alternate_row_class) => String.t(),
-                optional(:sortable) => false
+                optional(:sortable) => false,
+                optional(:type) => module()
               }),
             required(:rows) =>
               list(%{
@@ -60,7 +61,8 @@ defmodule MemexWeb.Components.TableComponent do
         :asc
       end
 
-    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode)
+    type = columns |> Enum.find(%{}, fn %{key: key} -> key == initial_key end) |> Map.get(:type)
+    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode, type)
 
     socket =
       socket
@@ -68,6 +70,7 @@ defmodule MemexWeb.Components.TableComponent do
       |> assign(
         columns: columns,
         rows: rows,
+        key: initial_key,
         last_sort_key: initial_key,
         sort_mode: initial_sort_mode
       )
@@ -81,7 +84,14 @@ defmodule MemexWeb.Components.TableComponent do
   def handle_event(
         "sort_by",
         %{"sort-key" => key},
-        %{assigns: %{rows: rows, last_sort_key: last_sort_key, sort_mode: sort_mode}} = socket
+        %{
+          assigns: %{
+            columns: columns,
+            rows: rows,
+            last_sort_key: last_sort_key,
+            sort_mode: sort_mode
+          }
+        } = socket
       ) do
     key = key |> String.to_existing_atom()
 
@@ -92,11 +102,28 @@ defmodule MemexWeb.Components.TableComponent do
         {_new_sort_key, _last_sort_mode} -> :asc
       end
 
-    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
+    type =
+      columns |> Enum.find(%{}, fn %{key: column_key} -> column_key == key end) |> Map.get(:type)
+
+    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode, type)
     {:noreply, socket |> assign(last_sort_key: key, sort_mode: sort_mode, rows: rows)}
   end
 
-  defp sort_by_custom_sort_value_or_value(rows, key, sort_mode) do
+  defp sort_by_custom_sort_value_or_value(rows, key, sort_mode, type)
+       when type in [Date, DateTime] do
+    rows
+    |> Enum.sort_by(
+      fn row ->
+        case row |> Map.get(key) do
+          {custom_sort_key, _value} -> custom_sort_key
+          value -> value
+        end
+      end,
+      {sort_mode, type}
+    )
+  end
+
+  defp sort_by_custom_sort_value_or_value(rows, key, sort_mode, _type) do
     rows
     |> Enum.sort_by(
       fn row ->

lib/memex_web/components/table_component.html.heex

@@ -4,14 +4,15 @@
       <tr>
         <%= for %{key: key, label: label} = column <- @columns do %>
           <%= if column |> Map.get(:sortable, true) do %>
-            <th class={"p-2 #{column[:class]}"}>
+            <th class={["p-2", column[:class]]}>
               <span
                 class="cursor-pointer flex justify-center items-center space-x-2"
                 phx-click="sort_by"
                 phx-value-sort-key={key}
                 phx-target={@myself}
               >
-                <span><%= label %></span>
+                <i class="w-0 float-right fas fa-sm fa-chevron-up opacity-0"></i>
+                <span class={if @last_sort_key == key, do: "underline"}><%= label %></span>
                 <%= if @last_sort_key == key do %>
                   <%= case @sort_mode do %>
                     <% :asc -> %>
@@ -25,7 +26,7 @@
               </span>
             </th>
           <% else %>
-            <th class={"p-2 #{column[:class]}"}>
+            <th class={["p-2 cursor-not-allowed", column[:class]]}>
               <%= label %>
             </th>
           <% end %>
@@ -33,20 +34,19 @@
       </tr>
     </thead>
     <tbody>
-      <%= for {values, i} <- @rows |> Enum.with_index() do %>
-        <tr class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}>
-          <%= for %{key: key} = value <- @columns do %>
-            <td class={"p-2 #{value[:class]}"}>
-              <%= case values |> Map.get(key) do %>
-                <% {_custom_sort_value, value} -> %>
-                  <%= value %>
-                <% value -> %>
-                  <%= value %>
-              <% end %>
-            </td>
+      <tr
+        :for={{values, i} <- @rows |> Enum.with_index()}
+        class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}
+      >
+        <td :for={%{key: key} = value <- @columns} class={["p-2", value[:class]]}>
+          <%= case values |> Map.get(key) do %>
+            <% {_custom_sort_value, value} -> %>
+              <%= value %>
+            <% value -> %>
+              <%= value %>
           <% end %>
-        </tr>
-      <% end %>
+        </td>
+      </tr>
     </tbody>
   </table>
 </div>

lib/memex_web/components/topbar.ex

@@ -1,134 +0,0 @@
-defmodule MemexWeb.Components.Topbar do
-  @moduledoc """
-  Component that renders a topbar with user functions/links
-  """
-
-  use MemexWeb, :component
-
-  alias Memex.Accounts
-  alias MemexWeb.HomeLive
-
-  def topbar(assigns) do
-    assigns =
-      %{results: [], title_content: nil, flash: nil, current_user: nil} |> Map.merge(assigns)
-
-    ~H"""
-    <nav role="navigation" class="mb-8 px-8 py-4 w-full bg-primary-900 text-primary-400">
-      <div class="flex flex-col sm:flex-row justify-between items-center">
-        <div class="mb-4 sm:mb-0 sm:mr-8 flex flex-row justify-start items-center space-x-2">
-          <.link
-            navigate={Routes.live_path(Endpoint, HomeLive)}
-            class="mx-2 my-1 leading-5 text-xl text-primary-400 hover:underline"
-          >
-            <%= gettext("memEx") %>
-          </.link>
-
-          <%= if @title_content do %>
-            <span class="mx-2 my-1">
-              |
-            </span>
-            <%= @title_content %>
-          <% end %>
-        </div>
-
-        <hr class="mb-2 sm:hidden hr-light" />
-
-        <ul class="flex flex-row flex-wrap justify-center items-center
-          text-lg text-primary-400 text-ellipsis">
-          <li class="mx-2 my-1">
-            <.link
-              navigate={Routes.note_index_path(Endpoint, :index)}
-              class="text-primary-400 text-primary-400 hover:underline truncate"
-            >
-              <%= gettext("notes") %>
-            </.link>
-          </li>
-
-          <li class="mx-2 my-1">
-            <.link
-              navigate={Routes.context_index_path(Endpoint, :index)}
-              class="text-primary-400 text-primary-400 hover:underline truncate"
-            >
-              <%= gettext("contexts") %>
-            </.link>
-          </li>
-
-          <li class="mx-2 my-1">
-            <.link
-              navigate={Routes.pipeline_index_path(Endpoint, :index)}
-              class="text-primary-400 text-primary-400 hover:underline truncate"
-            >
-              <%= gettext("pipelines") %>
-            </.link>
-          </li>
-
-          <li class="mx-2 my-1 border-left border border-primary-700">​</li>
-
-          <%= if @current_user do %>
-            <%= if @current_user |> Accounts.is_already_admin?() do %>
-              <li class="mx-2 my-1">
-                <.link
-                  navigate={Routes.invite_index_path(Endpoint, :index)}
-                  class="text-primary-400 text-primary-400 hover:underline"
-                >
-                  <%= gettext("invites") %>
-                </.link>
-              </li>
-            <% end %>
-
-            <li class="mx-2 my-1">
-              <.link
-                navigate={Routes.user_settings_path(Endpoint, :edit)}
-                class="text-primary-400 text-primary-400 hover:underline truncate"
-              >
-                <%= @current_user.email %>
-              </.link>
-            </li>
-
-            <li class="mx-2 my-1">
-              <.link
-                href={Routes.user_session_path(Endpoint, :delete)}
-                method="delete"
-                data-confirm={dgettext("prompts", "are you sure you want to log out?")}
-              >
-                <i class="fas fa-sign-out-alt"></i>
-              </.link>
-            </li>
-
-            <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
-              <li class="mx-2 my-1">
-                <.link
-                  navigate={Routes.live_dashboard_path(Endpoint, :home)}
-                  class="text-primary-400 text-primary-400 hover:underline"
-                >
-                  <i class="fas fa-gauge"></i>
-                </.link>
-              </li>
-            <% end %>
-          <% else %>
-            <%= if Accounts.allow_registration?() do %>
-              <li class="mx-2 my-1">
-                <.link
-                  navigate={Routes.user_registration_path(Endpoint, :new)}
-                  class="text-primary-400 text-primary-400 hover:underline truncate"
-                >
-                  <%= dgettext("actions", "register") %>
-                </.link>
-              </li>
-            <% end %>
-
-            <li class="mx-2 my-1">
-              <.link
-                navigate={Routes.user_session_path(Endpoint, :new)}
-                class="text-primary-400 text-primary-400 hover:underline truncate"
-              >
-                <%= dgettext("actions", "log in") %>
-              </.link>
-            </li>
-          <% end %>
-        </ul>
-      </div>
-    </nav>
-    """
-  end
-end

lib/memex_web/components/user_card.ex

@@ -1,46 +0,0 @@
-defmodule MemexWeb.Components.UserCard do
-  @moduledoc """
-  Display card for a user
-  """
-
-  use MemexWeb, :component
-
-  def user_card(assigns) do
-    ~H"""
-    <div
-      id={"user-#{@user.id}"}
-      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center text-center
-          border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-          transition-all duration-300 ease-in-out"
-    >
-      <h1 class="px-4 py-2 rounded-lg title text-xl break-all">
-        <%= @user.email %>
-      </h1>
-
-      <h3 class="px-4 py-2 rounded-lg title text-lg">
-        <p>
-          <%= if @user.confirmed_at |> is_nil() do %>
-            <%= gettext("email unconfirmed") %>
-          <% else %>
-            <%= gettext(
-              "user was confirmed at %{relative_datetime}",
-              relative_datetime: @user.confirmed_at |> display_datetime()
-            ) %>
-          <% end %>
-        </p>
-
-        <p>
-          <%= gettext("User registered on") %>
-          <%= @user.inserted_at |> display_datetime() %>
-        </p>
-      </h3>
-
-      <%= if @inner_block do %>
-        <div class="px-4 py-2 flex space-x-4 justify-center items-center">
-          <%= render_slot(@inner_block) %>
-        </div>
-      <% end %>
-    </div>
-    """
-  end
-end

lib/memex_web/controllers/export_controller.ex

@@ -0,0 +1,17 @@
+defmodule MemexWeb.ExportController do
+  use MemexWeb, :controller
+  alias Memex.{Contexts, Notes, Pipelines, Pipelines.Steps}
+
+  def export(%{assigns: %{current_user: current_user}} = conn, %{"mode" => "json"}) do
+    pipelines =
+      Pipelines.list_pipelines(current_user)
+      |> Enum.map(fn pipeline -> Steps.preload_steps(pipeline, current_user) end)
+
+    json(conn, %{
+      user: current_user,
+      notes: Notes.list_notes(current_user),
+      contexts: Contexts.list_contexts(current_user),
+      pipelines: pipelines
+    })
+  end
+end

lib/memex_web/controllers/user_registration_controller.ex

@@ -1,14 +1,12 @@
 defmodule MemexWeb.UserRegistrationController do
   use MemexWeb, :controller
   import MemexWeb.Gettext
-  alias Memex.{Accounts, Invites}
+  alias Memex.{Accounts, Accounts.Invites}
   alias MemexWeb.HomeLive
 
   def new(conn, %{"invite" => invite_token}) do
-    invite = Invites.get_invite_by_token(invite_token)
-
-    if invite do
-      conn |> render_new(invite)
+    if Invites.valid_invite_token?(invite_token) do
+      conn |> render_new(invite_token)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -27,19 +25,17 @@ defmodule MemexWeb.UserRegistrationController do
   end
 
   # renders new user registration page
-  defp render_new(conn, invite \\ nil) do
+  defp render_new(conn, invite_token \\ nil) do
     render(conn, "new.html",
       changeset: Accounts.change_user_registration(),
-      invite: invite,
+      invite_token: invite_token,
       page_title: gettext("register")
     )
   end
 
   def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do
-    invite = Invites.get_invite_by_token(invite_token)
-
-    if invite do
-      conn |> create_user(attrs, invite)
+    if Invites.valid_invite_token?(invite_token) do
+      conn |> create_user(attrs, invite_token)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -57,24 +53,25 @@ defmodule MemexWeb.UserRegistrationController do
     end
   end
 
-  defp create_user(conn, %{"user" => user_params}, invite \\ nil) do
-    case Accounts.register_user(user_params) do
+  defp create_user(conn, %{"user" => user_params}, invite_token \\ nil) do
+    case Accounts.register_user(user_params, invite_token) do
       {:ok, user} ->
-        unless invite |> is_nil() do
-          invite |> Invites.use_invite!()
-        end
-
         Accounts.deliver_user_confirmation_instructions(
           user,
           &Routes.user_confirmation_url(conn, :confirm, &1)
         )
 
         conn
-        |> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
+        |> put_flash(:info, dgettext("prompts", "please check your email to verify your account"))
         |> redirect(to: Routes.user_session_path(Endpoint, :new))
 
+      {:error, :invalid_token} ->
+        conn
+        |> put_flash(:error, dgettext("errors", "sorry, this invite was not found or expired"))
+        |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+
       {:error, %Ecto.Changeset{} = changeset} ->
-        conn |> render("new.html", changeset: changeset, invite: invite)
+        conn |> render("new.html", changeset: changeset, invite_token: invite_token)
     end
   end
 end

lib/memex_web/controllers/user_settings_controller.ex

@@ -7,7 +7,7 @@ defmodule MemexWeb.UserSettingsController do
   plug :assign_email_and_password_changesets
 
   def edit(conn, _params) do
-    render(conn, "edit.html", page_title: gettext("Settings"))
+    render(conn, "edit.html", page_title: gettext("settings"))
   end
 
   def update(%{assigns: %{current_user: user}} = conn, %{
@@ -28,7 +28,7 @@ defmodule MemexWeb.UserSettingsController do
           :info,
           dgettext(
             "prompts",
-            "A link to confirm your email change has been sent to the new address."
+            "a link to confirm your email change has been sent to the new address."
           )
         )
         |> redirect(to: Routes.user_settings_path(conn, :edit))
@@ -46,7 +46,7 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_password(user, password, user_params) do
       {:ok, user} ->
         conn
-        |> put_flash(:info, dgettext("prompts", "Password updated successfully."))
+        |> put_flash(:info, dgettext("prompts", "password updated successfully."))
         |> put_session(:user_return_to, Routes.user_settings_path(conn, :edit))
         |> UserAuth.log_in_user(user)
 
@@ -62,7 +62,7 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_locale(user, locale) do
       {:ok, _user} ->
         conn
-        |> put_flash(:info, dgettext("prompts", "Language updated successfully."))
+        |> put_flash(:info, dgettext("prompts", "language updated successfully."))
         |> redirect(to: Routes.user_settings_path(conn, :edit))
 
       {:error, changeset} ->
@@ -74,14 +74,14 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_email(user, token) do
       :ok ->
         conn
-        |> put_flash(:info, dgettext("prompts", "Email changed successfully."))
+        |> put_flash(:info, dgettext("prompts", "email changed successfully."))
         |> redirect(to: Routes.user_settings_path(conn, :edit))
 
       :error ->
         conn
         |> put_flash(
           :error,
-          dgettext("errors", "Email change link is invalid or it has expired.")
+          dgettext("errors", "email change link is invalid or it has expired.")
         )
         |> redirect(to: Routes.user_settings_path(conn, :edit))
     end
@@ -92,11 +92,11 @@ defmodule MemexWeb.UserSettingsController do
       current_user |> Accounts.delete_user!(current_user)
 
       conn
-      |> put_flash(:error, dgettext("prompts", "Your account has been deleted"))
+      |> put_flash(:error, dgettext("prompts", "your account has been deleted"))
       |> redirect(to: Routes.live_path(conn, HomeLive))
     else
       conn
-      |> put_flash(:error, dgettext("errors", "Unable to delete user"))
+      |> put_flash(:error, dgettext("errors", "unable to delete user"))
       |> redirect(to: Routes.user_settings_path(conn, :edit))
     end
   end

lib/memex_web/live/context_live/form_component.ex

@@ -1,16 +1,18 @@
 defmodule MemexWeb.ContextLive.FormComponent do
   use MemexWeb, :live_component
-
+  alias Ecto.Changeset
   alias Memex.Contexts
 
   @impl true
   def update(%{context: context, current_user: current_user} = assigns, socket) do
     changeset = Contexts.change_context(context, current_user)
 
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign(:changeset, changeset)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(:changeset, changeset)
+
+    {:ok, socket}
   end
 
   @impl true
@@ -19,10 +21,13 @@ defmodule MemexWeb.ContextLive.FormComponent do
         %{"context" => context_params},
         %{assigns: %{context: context, current_user: current_user}} = socket
       ) do
+    changeset = context |> Contexts.change_context(context_params, current_user)
+
     changeset =
-      context
-      |> Contexts.change_context(context_params, current_user)
-      |> Map.put(:action, :validate)
+      case changeset |> Changeset.apply_action(:validate) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
 
     {:noreply, assign(socket, :changeset, changeset)}
   end
@@ -37,16 +42,18 @@ defmodule MemexWeb.ContextLive.FormComponent do
          :edit,
          context_params
        ) do
-    case Contexts.update_context(context, context_params, current_user) do
-      {:ok, %{slug: slug}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{slug} saved", slug: slug))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Contexts.update_context(context, context_params, current_user) do
+        {:ok, %{slug: slug}} ->
+          socket
+          |> put_flash(:info, gettext("%{slug} saved", slug: slug))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, :changeset, changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, :changeset, changeset)
+      end
+
+    {:noreply, socket}
   end
 
   defp save_context(
@@ -54,15 +61,17 @@ defmodule MemexWeb.ContextLive.FormComponent do
          :new,
          context_params
        ) do
-    case Contexts.create_context(context_params, current_user) do
-      {:ok, %{slug: slug}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{slug} created", slug: slug))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Contexts.create_context(context_params, current_user) do
+        {:ok, %{slug: slug}} ->
+          socket
+          |> put_flash(:info, gettext("%{slug} created", slug: slug))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, changeset: changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, changeset: changeset)
+      end
+
+    {:noreply, socket}
   end
 end

lib/memex_web/live/context_live/form_component.html.heex

@@ -11,7 +11,8 @@
   >
     <%= text_input(f, :slug,
       class: "input input-primary",
-      placeholder: gettext("slug")
+      placeholder: gettext("slug"),
+      aria_label: gettext("slug")
     ) %>
     <%= error_tag(f, :slug) %>
 
@@ -20,7 +21,8 @@
       class: "input input-primary h-64 min-h-64",
       phx_hook: "MaintainAttrs",
       phx_update: "ignore",
-      placeholder: gettext("use [[note-slug]] to link to a note")
+      placeholder: gettext("use [[note-slug]] to link to a note"),
+      aria_label: gettext("use [[note-slug]] to link to a note")
     ) %>
     <%= error_tag(f, :content) %>
 
@@ -28,15 +30,15 @@
       id: "tags-input",
       class: "input input-primary",
       placeholder: gettext("tag1,tag2"),
-      phx_update: "ignore",
-      value: Contexts.get_tags_string(@changeset)
+      aria_label: gettext("tag1,tag2")
     ) %>
     <%= error_tag(f, :tags_string) %>
 
     <div class="flex justify-center items-stretch space-x-4">
       <%= select(f, :visibility, Ecto.Enum.values(Memex.Contexts.Context, :visibility),
         class: "grow input input-primary",
-        prompt: gettext("select privacy")
+        prompt: gettext("select privacy"),
+        aria_label: gettext("select privacy")
       ) %>
 
       <%= submit(dgettext("actions", "save"),

lib/memex_web/live/context_live/index.ex

@@ -1,6 +1,6 @@
 defmodule MemexWeb.ContextLive.Index do
   use MemexWeb, :live_view
-  alias Memex.{Accounts.User, Contexts, Contexts.Context}
+  alias Memex.{Contexts, Contexts.Context}
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
@@ -59,14 +59,13 @@ defmodule MemexWeb.ContextLive.Index do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
     {:noreply, socket |> push_patch(to: Routes.context_index_path(Endpoint, :index))}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    {:noreply,
-     socket |> push_patch(to: Routes.context_index_path(Endpoint, :search, search_term))}
+    redirect_to = Routes.context_index_path(Endpoint, :search, search_term)
+    {:noreply, socket |> push_patch(to: redirect_to)}
   end
 
   defp display_contexts(%{assigns: %{current_user: current_user, search: search}} = socket)
@@ -77,13 +76,4 @@ defmodule MemexWeb.ContextLive.Index do
   defp display_contexts(%{assigns: %{search: search}} = socket) do
     socket |> assign(contexts: Contexts.list_public_contexts(search))
   end
-
-  @spec is_owner_or_admin?(Context.t(), User.t()) :: boolean()
-  defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner_or_admin?(_context, %{role: :admin}), do: true
-  defp is_owner_or_admin?(_context, _other_user), do: false
-
-  @spec is_owner?(Context.t(), User.t()) :: boolean()
-  defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner?(_context, _other_user), do: false
 end

lib/memex_web/live/context_live/index.html.heex

@@ -5,7 +5,8 @@
 
   <.form
     :let={f}
-    for={:search}
+    for={%{}}
+    as={:search}
     phx-change="search"
     phx-submit="search"
     class="self-stretch flex flex-col items-stretch"
@@ -13,6 +14,7 @@
     <%= text_input(f, :search_term,
       class: "input input-primary",
       value: @search,
+      role: "search",
       phx_debounce: 300,
       placeholder: gettext("search")
     ) %>
@@ -30,46 +32,44 @@
       contexts={@contexts}
     >
       <:actions :let={context}>
-        <%= if is_owner?(context, @current_user) do %>
-          <.link
-            patch={Routes.context_index_path(@socket, :edit, context.slug)}
-            data-qa={"context-edit-#{context.id}"}
-          >
-            <%= dgettext("actions", "edit") %>
-          </.link>
-        <% end %>
-        <%= if is_owner_or_admin?(context, @current_user) do %>
-          <.link
-            href="#"
-            phx-click="delete"
-            phx-value-id={context.id}
-            data-confirm={dgettext("prompts", "are you sure?")}
-            data-qa={"delete-context-#{context.id}"}
-          >
-            <%= dgettext("actions", "delete") %>
-          </.link>
-        <% end %>
+        <.link
+          :if={Contexts.is_owner?(context, @current_user)}
+          patch={Routes.context_index_path(@socket, :edit, context.slug)}
+          aria-label={dgettext("actions", "edit %{context_slug}", context_slug: context.slug)}
+        >
+          <%= dgettext("actions", "edit") %>
+        </.link>
+        <.link
+          :if={Contexts.is_owner_or_admin?(context, @current_user)}
+          href="#"
+          phx-click="delete"
+          phx-value-id={context.id}
+          data-confirm={dgettext("prompts", "are you sure?")}
+          aria-label={dgettext("actions", "delete %{context_slug}", context_slug: context.slug)}
+        >
+          <%= dgettext("actions", "delete") %>
+        </.link>
       </:actions>
     </.live_component>
   <% end %>
 
-  <%= if @current_user do %>
-    <.link patch={Routes.context_index_path(@socket, :new)} class="self-end btn btn-primary">
-      <%= dgettext("actions", "new context") %>
-    </.link>
-  <% end %>
+  <.link
+    :if={@current_user}
+    patch={Routes.context_index_path(@socket, :new)}
+    class="self-end btn btn-primary"
+  >
+    <%= dgettext("actions", "new context") %>
+  </.link>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.context_index_path(@socket, :index)}>
-    <.live_component
-      module={MemexWeb.ContextLive.FormComponent}
-      id={@context.id || :new}
-      current_user={@current_user}
-      title={@page_title}
-      action={@live_action}
-      context={@context}
-      return_to={Routes.context_index_path(@socket, :index)}
-    />
-  </.modal>
-<% end %>
+<.modal :if={@live_action in [:new, :edit]} return_to={Routes.context_index_path(@socket, :index)}>
+  <.live_component
+    module={MemexWeb.ContextLive.FormComponent}
+    id={@context.id || :new}
+    current_user={@current_user}
+    title={@page_title}
+    action={@live_action}
+    context={@context}
+    return_to={Routes.context_index_path(@socket, :index)}
+  />
+</.modal>

lib/memex_web/live/context_live/show.ex

@@ -1,7 +1,6 @@
 defmodule MemexWeb.ContextLive.Show do
   use MemexWeb, :live_view
-  import MemexWeb.Components.ContextContent
-  alias Memex.{Accounts.User, Contexts, Contexts.Context}
+  alias Memex.Contexts
 
   @impl true
   def mount(_params, _session, socket) do
@@ -11,7 +10,7 @@ defmodule MemexWeb.ContextLive.Show do
   @impl true
   def handle_params(
         %{"slug" => slug},
-        _,
+        _params,
         %{assigns: %{live_action: live_action, current_user: current_user}} = socket
       ) do
     context =
@@ -46,13 +45,4 @@ defmodule MemexWeb.ContextLive.Show do
 
   defp page_title(:show, %{slug: slug}), do: slug
   defp page_title(:edit, %{slug: slug}), do: gettext("edit %{slug}", slug: slug)
-
-  @spec is_owner_or_admin?(Context.t(), User.t()) :: boolean()
-  defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner_or_admin?(_context, %{role: :admin}), do: true
-  defp is_owner_or_admin?(_context, _other_user), do: false
-
-  @spec is_owner?(Context.t(), User.t()) :: boolean()
-  defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner?(_context, _other_user), do: false
 end

lib/memex_web/live/context_live/show.html.heex

@@ -3,7 +3,15 @@
     <%= @context.slug %>
   </h1>
 
-  <p><%= if @context.tags, do: @context.tags |> Enum.join(", ") %></p>
+  <div class="flex flex-wrap space-x-1">
+    <.link
+      :for={tag <- @context.tags}
+      navigate={Routes.context_index_path(Endpoint, :search, tag)}
+      class="link"
+    >
+      <%= tag %>
+    </.link>
+  </div>
 
   <.context_content context={@context} />
 
@@ -12,41 +20,37 @@
   </p>
 
   <div class="self-end flex space-x-4">
-    <.link class="btn btn-primary" navigate={Routes.context_index_path(@socket, :index)}>
-      <%= dgettext("actions", "back") %>
+    <.link
+      :if={Contexts.is_owner?(@context, @current_user)}
+      class="btn btn-primary"
+      patch={Routes.context_show_path(@socket, :edit, @context.slug)}
+    >
+      <%= dgettext("actions", "edit") %>
     </.link>
-    <%= if is_owner?(@context, @current_user) do %>
-      <.link
-        class="btn btn-primary"
-        patch={Routes.context_show_path(@socket, :edit, @context.slug)}
-      >
-        <%= dgettext("actions", "edit") %>
-      </.link>
-    <% end %>
-    <%= if is_owner_or_admin?(@context, @current_user) do %>
-      <button
-        type="button"
-        class="btn btn-primary"
-        phx-click="delete"
-        data-confirm={dgettext("prompts", "are you sure?")}
-        data-qa={"delete-context-#{@context.id}"}
-      >
-        <%= dgettext("actions", "delete") %>
-      </button>
-    <% end %>
+    <button
+      :if={Contexts.is_owner_or_admin?(@context, @current_user)}
+      type="button"
+      class="btn btn-primary"
+      phx-click="delete"
+      data-confirm={dgettext("prompts", "are you sure?")}
+      aria-label={dgettext("actions", "delete %{context_slug}", context_slug: @context.slug)}
+    >
+      <%= dgettext("actions", "delete") %>
+    </button>
   </div>
 </div>
 
-<%= if @live_action in [:edit] do %>
-  <.modal return_to={Routes.context_show_path(@socket, :show, @context.slug)}>
-    <.live_component
-      module={MemexWeb.ContextLive.FormComponent}
-      id={@context.id}
-      current_user={@current_user}
-      title={@page_title}
-      action={@live_action}
-      context={@context}
-      return_to={Routes.context_show_path(@socket, :show, @context.slug)}
-    />
-  </.modal>
-<% end %>
+<.modal
+  :if={@live_action == :edit}
+  return_to={Routes.context_show_path(@socket, :show, @context.slug)}
+>
+  <.live_component
+    module={MemexWeb.ContextLive.FormComponent}
+    id={@context.id}
+    current_user={@current_user}
+    title={@page_title}
+    action={@live_action}
+    context={@context}
+    return_to={Routes.context_show_path(@socket, :show, @context.slug)}
+  />
+</.modal>

lib/memex_web/live/faq_live.html.heex

@@ -1,5 +1,5 @@
 <div class="mx-auto flex flex-col justify-center items-stretch space-y-8 text-center max-w-3xl">
-  <h1 class="title text-primary-400 text-2xl">
+  <h1 class="title text-primary-400 text-xl text-left">
     <%= gettext("faq") %>
   </h1>
 
@@ -7,16 +7,13 @@
 
   <ul class="flex flex-col justify-center items-stretch space-y-8">
     <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
+      <b class="whitespace-nowrap text-left">
         <%= gettext("what is this?") %>
       </b>
       <p>
         <%= gettext(
           "this is a memex, used to document not just your notes, but also your perspectives and processes."
         ) %>
-      </p>
-
-      <p>
         <%= gettext("some things that this memex is very loosely inspired by:") %>
       </p>
 
@@ -55,20 +52,16 @@
     </li>
 
     <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
+      <b class="whitespace-nowrap text-left">
         <%= gettext("why split up into notes, contexts and pipelines?") %>
       </b>
       <p>
         <%= gettext(
           "i really admired the idea of a zettelkasten, especially with org-mode backlinks, however I felt like my notes would immediately become too messy by just putting everything into a single hierarchy."
         ) %>
-      </p>
-      <p>
         <%= gettext(
           "i wanted to separate between a personal dictionary of concepts and then my thought processes that are built off of my experiences and life lessons. these are notes, and contexts, respectively."
         ) %>
-      </p>
-      <p>
         <%= gettext(
           "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!"
         ) %>
@@ -76,15 +69,13 @@
     </li>
 
     <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
+      <b class="whitespace-nowrap text-left">
         <%= gettext("what should my notes be like?") %>
       </b>
       <p>
         <%= gettext(
           "in my opinion, notes should be written by any of the discrete objects or concepts that are meaningful to you in your life."
         ) %>
-      </p>
-      <p>
         <%= gettext(
           "spoons? probably not. a particular brand of spoons that you really like? why not :)"
         ) %>
@@ -92,13 +83,11 @@
     </li>
 
     <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
+      <b class="whitespace-nowrap text-left">
         <%= gettext("what should my contexts be like?") %>
       </b>
       <p>
         <%= gettext("in my opinion, contexts should be like single-topic blog posts.") %>
-      </p>
-      <p>
         <%= gettext(
           "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could backlink to the spoon note as an example of how it fits nicely into your hand."
         ) %>
@@ -106,15 +95,13 @@
     </li>
 
     <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
+      <b class="whitespace-nowrap text-left">
         <%= gettext("what should my pipelines be like?") %>
       </b>
       <p>
         <%= gettext(
           "in my opinion, pipelines should be pretty lightweight, and just backlink to contexts to provide most of the heavy lifting."
         ) %>
-      </p>
-      <p>
         <%= gettext(
           "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could backlink to the physical designs context, maybe with some notes about how it applies in this case."
         ) %>
@@ -122,20 +109,16 @@
     </li>
 
     <li class="flex flex-col justify-center items-stretch space-y-2">
-      <b class="whitespace-nowrap">
+      <b class="whitespace-nowrap text-left">
         <%= gettext("how many people should i invite?") %>
       </b>
       <p>
         <%= gettext(
           "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document."
         ) %>
-      </p>
-      <p>
         <%= gettext(
           "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you."
         ) %>
-      </p>
-      <p>
         <%= gettext(
           "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)"
         ) %>

lib/memex_web/live/home_live.ex

@@ -3,11 +3,11 @@ defmodule MemexWeb.HomeLive do
   Liveview for the main home page
   """
 
-  @version Mix.Project.config()[:version]
-
   use MemexWeb, :live_view
   alias Memex.Accounts
-  alias MemexWeb.{Endpoint, FaqLive}
+  alias MemexWeb.FaqLive
+
+  @version Mix.Project.config()[:version]
 
   @impl true
   def mount(_params, _session, socket) do

lib/memex_web/live/home_live.html.heex

@@ -1,11 +1,9 @@
-<div class="mx-auto flex flex-col justify-center items-stretch space-y-4 max-w-3xl">
-  <h1 class="title text-primary-400 text-2xl text-center">
+<div class="mx-auto flex flex-col justify-center items-stretch space-y-4 max-w-lg">
+  <h1 class="title text-primary-400 text-xl">
     <%= gettext("memEx") %>
   </h1>
 
-  <hr class="hr" />
-
-  <ul class="flex flex-col space-y-4 text-center">
+  <ul class="flex flex-col space-y-4">
     <li class="flex flex-col justify-center items-center space-y-2">
       <b class="whitespace-nowrap">
         <%= gettext("notes:") %>
@@ -33,19 +31,16 @@
       </p>
     </li>
 
-    <li class="flex flex-col justify-center items-center space-y-2">
-      <.link
-        navigate={Routes.live_path(Endpoint, FaqLive)}
-        class="link title text-primary-400 text-lg"
-      >
-        <%= gettext("read more on how to use %{name}", name: "memEx") %>
+    <li class="flex flex-col justify-center items-center text-right space-y-2">
+      <.link navigate={Routes.live_path(Endpoint, FaqLive)} class="btn btn-primary">
+        <%= gettext("read more on how to use memEx") %>
       </.link>
     </li>
   </ul>
 
   <hr class="hr" />
 
-  <ul class="flex flex-col space-y-4 text-center">
+  <ul class="flex flex-col space-y-4">
     <h2 class="title text-primary-400 text-lg">
       <%= gettext("features") %>
     </h2>
@@ -80,44 +75,39 @@
 
   <hr class="hr" />
 
-  <ul class="flex flex-col space-y-4 text-center">
+  <ul class="flex flex-col justify-center space-y-4">
     <h2 class="title text-primary-400 text-lg">
       <%= gettext("instance information") %>
     </h2>
 
-    <li class="flex flex-col justify-center space-x-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <b>
         <%= gettext("admins:") %>
       </b>
-      <p>
+      <p class="flex flex-col justify-center items-center space-y-2">
         <%= if @admins |> Enum.empty?() do %>
           <.link href={Routes.user_registration_path(Endpoint, :new)} class="link">
-            <%= dgettext("prompts", "register to setup %{name}", name: "memEx") %>
+            <%= dgettext("prompts", "register to setup memEx") %>
           </.link>
         <% else %>
-          <div class="flex flex-wrap justify-center space-x-2">
-            <%= for admin <- @admins do %>
-              <a class="link" href={"mailto:#{admin.email}"}>
-                <%= admin.email %>
-              </a>
-            <% end %>
-          </div>
+          <.link :for={%{email: email} <- @admins} class="link" href={"mailto:#{email}"}>
+            <%= email %>
+          </.link>
         <% end %>
       </p>
     </li>
 
-    <li class="flex flex-row justify-center space-x-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <b><%= gettext("registration:") %></b>
       <p>
-        <%= Application.get_env(:memex, Endpoint)[:registration]
-        |> case do
-          "public" -> gettext("public signups")
-          _ -> gettext("invite only")
+        <%= case Accounts.registration_mode() do
+          :public -> gettext("public signups")
+          :invite_only -> gettext("invite only")
         end %>
       </p>
     </li>
 
-    <li class="flex flex-row justify-center items-center space-x-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <b><%= gettext("version:") %></b>
       <.link
         href="https://gitea.bubbletea.dev/shibao/memEx/src/branch/stable/changelog.md"
@@ -133,12 +123,12 @@
 
   <hr class="hr" />
 
-  <ul class="flex flex-col space-y-2 text-center justify-center">
+  <ul class="flex flex-col space-y-2">
     <h2 class="title text-primary-400 text-lg">
-      <%= gettext("get involved!") %>
+      <%= gettext("get involved") %>
     </h2>
 
-    <li class="flex flex-col justify-center space-x-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <.link
         href="https://gitea.bubbletea.dev/shibao/memEx"
         class="flex flex-row justify-center items-center space-x-2 link"
@@ -149,7 +139,7 @@
         <i class="fas fa-md fa-code"></i>
       </.link>
     </li>
-    <li class="flex flex-col justify-center space-x-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <.link
         href="https://weblate.bubbletea.dev/engage/memEx"
         class="flex flex-row justify-center items-center space-x-2 link"
@@ -160,7 +150,7 @@
         <i class="fas fa-md fa-language"></i>
       </.link>
     </li>
-    <li class="flex flex-col justify-center space-x-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <.link
         href="https://gitea.bubbletea.dev/shibao/memEx/issues/new"
         class="flex flex-row justify-center items-center space-x-2 link"

lib/memex_web/live/invite_live/form_component.ex

@@ -1,11 +1,11 @@
 defmodule MemexWeb.InviteLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create an Memex.Invites.Invite
+  Livecomponent that can update or create an Memex.Accounts.Invite
   """
 
   use MemexWeb, :live_component
   alias Ecto.Changeset
-  alias Memex.{Accounts.User, Invites, Invites.Invite}
+  alias Memex.Accounts.{Invite, Invites, User}
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -13,23 +13,45 @@ defmodule MemexWeb.InviteLive.FormComponent do
           %{:invite => Invite.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{invite: invite} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Invites.change_invite(invite))}
+  def update(%{invite: _invite} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"invite" => invite_params},
-        %{assigns: %{invite: invite}} = socket
-      ) do
-    {:noreply, socket |> assign(:changeset, invite |> Invites.change_invite(invite_params))}
+  def handle_event("validate", %{"invite" => invite_params}, socket) do
+    {:noreply, socket |> assign_changeset(invite_params, :validate)}
   end
 
   def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
     save_invite(socket, action, invite_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, current_user: user, invite: invite}} = socket,
+         invite_params,
+         changeset_action \\ nil
+       ) do
+    default_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case default_action do
+        :insert -> Invite.create_changeset(user, "example_token", invite_params)
+        :update -> invite |> Invite.update_changeset(invite_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action || default_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_invite(
          %{assigns: %{current_user: current_user, invite: invite, return_to: return_to}} = socket,
          :edit,
@@ -38,9 +60,7 @@ defmodule MemexWeb.InviteLive.FormComponent do
     socket =
       case invite |> Invites.update_invite(invite_params, current_user) do
         {:ok, %{name: invite_name}} ->
-          prompt =
-            dgettext("prompts", "%{invite_name} updated successfully", invite_name: invite_name)
-
+          prompt = dgettext("prompts", "%{name} updated successfully", name: invite_name)
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
@@ -58,9 +78,7 @@ defmodule MemexWeb.InviteLive.FormComponent do
     socket =
       case current_user |> Invites.create_invite(invite_params) do
         {:ok, %{name: invite_name}} ->
-          prompt =
-            dgettext("prompts", "%{invite_name} created successfully", invite_name: invite_name)
-
+          prompt = dgettext("prompts", "%{name} created successfully", name: invite_name)
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->

lib/memex_web/live/invite_live/form_component.html.heex

@@ -11,23 +11,27 @@
     phx-change="validate"
     phx-submit="save"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
-        <%= changeset_errors(@changeset) %>
-      </div>
-    <% end %>
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
+      <%= changeset_errors(@changeset) %>
+    </div>
 
-    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-400") %>
+    <%= label(f, :name, gettext("name"), class: "title text-lg text-primary-400") %>
     <%= text_input(f, :name, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :name, "col-span-3") %>
 
-    <%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-400") %>
+    <%= label(f, :uses_left, gettext("uses left"), class: "title text-lg text-primary-400") %>
     <%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :uses_left, "col-span-3") %>
+    <span class="col-span-3 text-primary-500 italic text-center">
+      <%= gettext(~s/leave "uses left" blank to make invite unlimited/) %>
+    </span>
 
-    <%= submit(dgettext("actions", "Save"),
+    <%= submit(dgettext("actions", "save"),
       class: "mx-auto btn btn-primary col-span-3",
-      phx_disable_with: dgettext("prompts", "Saving...")
+      phx_disable_with: dgettext("prompts", "saving...")
     ) %>
   </.form>
 </div>

lib/memex_web/live/invite_live/index.ex

@@ -1,26 +1,16 @@
 defmodule MemexWeb.InviteLive.Index do
   @moduledoc """
-  Liveview to show a Memex.Invites.Invite index
+  Liveview to show a Memex.Accounts.Invite index
   """
 
   use MemexWeb, :live_view
-  import MemexWeb.Components.{InviteCard, UserCard}
-  alias Memex.{Accounts, Invites, Invites.Invite}
-  alias MemexWeb.HomeLive
+  alias Memex.Accounts
+  alias Memex.Accounts.{Invite, Invites}
   alias Phoenix.LiveView.JS
 
   @impl true
-  def mount(_params, _session, %{assigns: %{current_user: current_user}} = socket) do
-    socket =
-      if current_user |> Map.get(:role) == :admin do
-        socket |> display_invites()
-      else
-        prompt = dgettext("errors", "You are not authorized to view this page")
-        return_to = Routes.live_path(Endpoint, HomeLive)
-        socket |> put_flash(:error, prompt) |> push_navigate(to: return_to)
-      end
-
-    {:ok, socket}
+  def mount(_params, _session, socket) do
+    {:ok, socket |> display_invites()}
   end
 
   @impl true
@@ -61,7 +51,7 @@ defmodule MemexWeb.InviteLive.Index do
       ) do
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{"uses_left" => nil}, current_user)
+      |> Invites.update_invite(%{uses_left: nil}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
           prompt =
@@ -83,7 +73,7 @@ defmodule MemexWeb.InviteLive.Index do
       ) do
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{"uses_left" => nil, "disabled_at" => nil}, current_user)
+      |> Invites.update_invite(%{uses_left: nil, disabled_at: nil}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
           prompt =
@@ -107,7 +97,7 @@ defmodule MemexWeb.InviteLive.Index do
 
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{"uses_left" => 0, "disabled_at" => now}, current_user)
+      |> Invites.update_invite(%{uses_left: 0, disabled_at: now}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
           prompt =
@@ -122,22 +112,18 @@ defmodule MemexWeb.InviteLive.Index do
     {:noreply, socket}
   end
 
-  @impl true
-  def handle_event("copy_to_clipboard", _, socket) do
-    prompt = dgettext("prompts", "Copied to clipboard")
+  def handle_event("copy_to_clipboard", _params, socket) do
+    prompt = dgettext("prompts", "copied to clipboard")
     {:noreply, socket |> put_flash(:info, prompt)}
   end
 
-  @impl true
   def handle_event(
         "delete_user",
         %{"id" => id},
         %{assigns: %{current_user: current_user}} = socket
       ) do
     %{email: user_email} = Accounts.get_user!(id) |> Accounts.delete_user!(current_user)
-
     prompt = dgettext("prompts", "%{user_email} deleted succesfully", user_email: user_email)
-
     {:noreply, socket |> put_flash(:info, prompt) |> display_invites()}
   end
 
@@ -150,7 +136,8 @@ defmodule MemexWeb.InviteLive.Index do
       |> Map.get(:admin, [])
       |> Enum.reject(fn %{id: user_id} -> user_id == current_user.id end)
 
+    use_counts = invites |> Invites.get_use_counts(current_user)
     users = all_users |> Map.get(:user, [])
-    socket |> assign(invites: invites, admins: admins, users: users)
+    socket |> assign(invites: invites, use_counts: use_counts, admins: admins, users: users)
   end
 end

lib/memex_web/live/invite_live/index.html.heex

@@ -1,5 +1,5 @@
-<div class="w-full flex flex-col space-y-8 justify-center items-center">
-  <h1 class="title text-2xl title-primary-500">
+<div class="mx-auto flex flex-col justify-center items-stretch space-y-4 max-w-3xl">
+  <h1 class="title text-xl title-primary-500">
     <%= gettext("invites") %>
   </h1>
 
@@ -11,149 +11,155 @@
     <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
       <%= dgettext("actions", "invite someone new!") %>
     </.link>
-  <% else %>
-    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "create invite") %>
-    </.link>
   <% end %>
 
-  <div class="w-full flex flex-row flex-wrap justify-center items-center">
-    <%= for invite <- @invites do %>
-      <.invite_card invite={invite}>
-        <:code_actions>
-          <form phx-submit="copy_to_clipboard">
-            <button
-              type="submit"
-              class="mx-2 my-1 btn btn-primary"
-              phx-click={JS.dispatch("memex:clipcopy", to: "#code-#{invite.id}")}
-            >
-              <%= dgettext("actions", "Copy to clipboard") %>
-            </button>
-          </form>
-        </:code_actions>
-        <.link
-          patch={Routes.invite_index_path(Endpoint, :edit, invite)}
-          class="text-primary-400 link"
-          data-qa={"edit-#{invite.id}"}
-        >
-          <i class="fa-fw fa-lg fas fa-edit"></i>
-        </.link>
-
-        <.link
-          href="#"
-          class="text-primary-400 link"
-          phx-click="delete_invite"
-          phx-value-id={invite.id}
-          data-confirm={
-            dgettext("prompts", "are you sure you want to delete the invite for %{invite_name}?",
-              invite_name: invite.name
-            )
-          }
-          data-qa={"delete-#{invite.id}"}
-        >
-          <i class="fa-fw fa-lg fas fa-trash"></i>
-        </.link>
-
-        <%= if invite.disabled_at |> is_nil() do %>
-          <a href="#" class="btn btn-primary" phx-click="disable_invite" phx-value-id={invite.id}>
-            <%= gettext("disable") %>
-          </a>
-        <% else %>
-          <a href="#" class="btn btn-primary" phx-click="enable_invite" phx-value-id={invite.id}>
-            <%= gettext("enable") %>
-          </a>
-        <% end %>
-
-        <%= if invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil()) do %>
-          <a
-            href="#"
-            class="btn btn-primary"
-            phx-click="set_unlimited"
-            phx-value-id={invite.id}
-            data-confirm={
-              dgettext("prompts", "are you sure you want to make %{invite_name} unlimited?",
-                invite_name: invite.name
-              )
+  <div class="flex flex-col justify-center items-stretch space-y-4">
+    <.invite_card
+      :for={invite <- @invites}
+      invite={invite}
+      current_user={@current_user}
+      use_count={Map.get(@use_counts, invite.id)}
+    >
+      <:code_actions>
+        <form phx-submit="copy_to_clipboard">
+          <button
+            type="submit"
+            class="mx-2 my-1 btn btn-secondary"
+            phx-click={JS.dispatch("memex:clipcopy", to: "#code-#{invite.id}")}
+            aria-label={
+              dgettext("actions", "copy invite link for %{invite_name}", invite_name: invite.name)
             }
           >
-            <%= gettext("set unlimited") %>
-          </a>
-        <% end %>
-      </.invite_card>
-    <% end %>
+            <%= dgettext("actions", "copy") %>
+          </button>
+        </form>
+      </:code_actions>
+      <.link
+        patch={Routes.invite_index_path(Endpoint, :edit, invite)}
+        class="text-primary-400 link"
+        aria-label={
+          dgettext("actions", "edit invite for %{invite_name}", invite_name: invite.name)
+        }
+      >
+        <i class="fa-fw fa-lg fas fa-edit"></i>
+      </.link>
+
+      <.link
+        href="#"
+        class="text-primary-400 link"
+        phx-click="delete_invite"
+        phx-value-id={invite.id}
+        data-confirm={
+          dgettext("prompts", "are you sure you want to delete the invite for %{invite_name}?",
+            invite_name: invite.name
+          )
+        }
+        aria-label={
+          dgettext("actions", "delete invite for %{invite_name}", invite_name: invite.name)
+        }
+      >
+        <i class="fa-fw fa-lg fas fa-trash"></i>
+      </.link>
+
+      <.link
+        href="#"
+        class="btn btn-secondary"
+        phx-click={if invite.disabled_at, do: "enable_invite", else: "disable_invite"}
+        phx-value-id={invite.id}
+      >
+        <%= if invite.disabled_at, do: gettext("enable"), else: gettext("disable") %>
+      </.link>
+
+      <.link
+        :if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())}
+        href="#"
+        class="btn btn-secondary"
+        phx-click="set_unlimited"
+        phx-value-id={invite.id}
+        data-confirm={
+          dgettext("prompts", "are you sure you want to make %{invite_name} unlimited?",
+            invite_name: invite.name
+          )
+        }
+      >
+        <%= gettext("set unlimited") %>
+      </.link>
+    </.invite_card>
+
+    <.link
+      :if={@invites != []}
+      patch={Routes.invite_index_path(Endpoint, :new)}
+      class="btn btn-primary ml-auto"
+    >
+      <%= dgettext("actions", "create invite") %>
+    </.link>
   </div>
 
   <%= unless @admins |> Enum.empty?() do %>
     <hr class="hr" />
 
-    <h1 class="title text-2xl text-primary-400">
-      <%= gettext("Admins") %>
+    <h1 class="title text-xl text-primary-400">
+      <%= gettext("admins") %>
     </h1>
 
-    <div class="w-full flex flex-row flex-wrap justify-center items-center">
-      <%= for admin <- @admins do %>
-        <.user_card user={admin}>
-          <.link
-            href="#"
-            class="text-primary-400 link"
-            phx-click="delete_user"
-            phx-value-id={admin.id}
-            data-confirm={
-              dgettext(
-                "prompts",
-                "are you sure you want to delete %{email}? This action is permanent!",
-                email: admin.email
-              )
-            }
-          >
-            <i class="fa-fw fa-lg fas fa-trash"></i>
-          </.link>
-        </.user_card>
-      <% end %>
+    <div class="flex flex-col justify-center items-stretch space-y-4">
+      <.user_card :for={admin <- @admins} user={admin}>
+        <.link
+          href="#"
+          class="text-primary-400 link"
+          phx-click="delete_user"
+          phx-value-id={admin.id}
+          data-confirm={
+            dgettext(
+              "prompts",
+              "are you sure you want to delete %{email}? this action is permanent!",
+              email: admin.email
+            )
+          }
+        >
+          <i class="fa-fw fa-lg fas fa-trash"></i>
+        </.link>
+      </.user_card>
     </div>
   <% end %>
 
   <%= unless @users |> Enum.empty?() do %>
     <hr class="hr" />
 
-    <h1 class="title text-2xl text-primary-400">
+    <h1 class="title text-xl text-primary-400">
       <%= gettext("users") %>
     </h1>
 
-    <div class="w-full flex flex-row flex-wrap justify-center items-center">
-      <%= for user <- @users do %>
-        <.user_card user={user}>
-          <.link
-            href="#"
-            class="text-primary-400 link"
-            phx-click="delete_user"
-            phx-value-id={user.id}
-            data-confirm={
-              dgettext(
-                "prompts",
-                "are you sure you want to delete %{email}? This action is permanent!",
-                email: user.email
-              )
-            }
-          >
-            <i class="fa-fw fa-lg fas fa-trash"></i>
-          </.link>
-        </.user_card>
-      <% end %>
+    <div class="flex flex-col justify-center items-stretch space-y-4">
+      <.user_card :for={user <- @users} user={user}>
+        <.link
+          href="#"
+          class="text-primary-400 link"
+          phx-click="delete_user"
+          phx-value-id={user.id}
+          data-confirm={
+            dgettext(
+              "prompts",
+              "are you sure you want to delete %{email}? this action is permanent!",
+              email: user.email
+            )
+          }
+        >
+          <i class="fa-fw fa-lg fas fa-trash"></i>
+        </.link>
+      </.user_card>
     </div>
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.invite_index_path(Endpoint, :index)}>
-    <.live_component
-      module={MemexWeb.InviteLive.FormComponent}
-      id={@invite.id || :new}
-      title={@page_title}
-      action={@live_action}
-      invite={@invite}
-      return_to={Routes.invite_index_path(Endpoint, :index)}
-      current_user={@current_user}
-    />
-  </.modal>
-<% end %>
+<.modal :if={@live_action in [:new, :edit]} return_to={Routes.invite_index_path(Endpoint, :index)}>
+  <.live_component
+    module={MemexWeb.InviteLive.FormComponent}
+    id={@invite.id || :new}
+    title={@page_title}
+    action={@live_action}
+    invite={@invite}
+    return_to={Routes.invite_index_path(Endpoint, :index)}
+    current_user={@current_user}
+  />
+</.modal>

lib/memex_web/live/live_helpers.ex

@@ -1,80 +0,0 @@
-defmodule MemexWeb.LiveHelpers do
-  @moduledoc """
-  Contains resuable methods for all liveviews
-  """
-
-  import Phoenix.Component
-  alias Phoenix.LiveView.JS
-
-  @doc """
-  Renders a live component inside a modal.
-
-  The rendered modal receives a `:return_to` option to properly update
-  the URL when the modal is closed.
-
-  ## Examples
-
-      <.modal return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}>
-        <.live_component
-          module={<%= inspect context.web_module %>.<%= inspect Module.concat(schema.web_namespace, schema.alias) %>Live.FormComponent}
-          id={@<%= schema.singular %>.id || :new}
-          title={@page_title}
-          action={@live_action}
-          return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}
-          <%= schema.singular %>: @<%= schema.singular %>
-        />
-      </.modal>
-  """
-  def modal(assigns) do
-    ~H"""
-    <.link
-      patch={@return_to}
-      id="modal-bg"
-      class="fade-in fixed z-10 left-0 top-0
-         w-screen h-screen overflow-hidden
-         p-8 flex flex-col justify-center items-center cursor-auto"
-      style="background-color: rgba(0,0,0,0.4);"
-      phx-remove={hide_modal()}
-    >
-      <span class="hidden"></span>
-    </.link>
-
-    <div
-      id="modal"
-      class="fixed z-10 left-0 top-0 pointer-events-none
-        w-screen h-screen overflow-hidden
-        p-4 sm:p-8 flex flex-col justify-center items-center"
-    >
-      <div
-        id="modal-content"
-        class="fade-in-scale max-w-3xl max-h-3xl relative w-full
-        pointer-events-auto overflow-hidden
-        px-8 py-4 sm:py-8 flex flex-col justify-start items-stretch
-        bg-primary-800 text-primary-400 border-primary-900 border-2 rounded-lg"
-      >
-        <.link
-          patch={@return_to}
-          id="close"
-          class="absolute top-8 right-10
-                      text-gray-500 hover:text-gray-800
-                      transition-all duration-500 ease-in-out"
-          phx-remove={hide_modal()}
-        >
-          <i class="fa-fw fa-lg fas fa-times"></i>
-        </.link>
-
-        <div class="overflow-x-hidden overflow-y-visible p-8 flex flex-col space-y-4 justify-start items-stretch">
-          <%= render_slot(@inner_block) %>
-        </div>
-      </div>
-    </div>
-    """
-  end
-
-  def hide_modal(js \\ %JS{}) do
-    js
-    |> JS.hide(to: "#modal", transition: "fade-out")
-    |> JS.hide(to: "#modal-bg", transition: "fade-out")
-    |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
-  end
-end

lib/memex_web/live/note_live/form_component.ex

@@ -1,16 +1,18 @@
 defmodule MemexWeb.NoteLive.FormComponent do
   use MemexWeb, :live_component
-
+  alias Ecto.Changeset
   alias Memex.Notes
 
   @impl true
   def update(%{note: note, current_user: current_user} = assigns, socket) do
     changeset = Notes.change_note(note, current_user)
 
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign(:changeset, changeset)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(:changeset, changeset)
+
+    {:ok, socket}
   end
 
   @impl true
@@ -19,10 +21,13 @@ defmodule MemexWeb.NoteLive.FormComponent do
         %{"note" => note_params},
         %{assigns: %{note: note, current_user: current_user}} = socket
       ) do
+    changeset = note |> Notes.change_note(note_params, current_user)
+
     changeset =
-      note
-      |> Notes.change_note(note_params, current_user)
-      |> Map.put(:action, :validate)
+      case changeset |> Changeset.apply_action(:validate) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
 
     {:noreply, assign(socket, :changeset, changeset)}
   end
@@ -36,16 +41,18 @@ defmodule MemexWeb.NoteLive.FormComponent do
          :edit,
          note_params
        ) do
-    case Notes.update_note(note, note_params, current_user) do
-      {:ok, %{slug: slug}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{slug} saved", slug: slug))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Notes.update_note(note, note_params, current_user) do
+        {:ok, %{slug: slug}} ->
+          socket
+          |> put_flash(:info, gettext("%{slug} saved", slug: slug))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, :changeset, changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, :changeset, changeset)
+      end
+
+    {:noreply, socket}
   end
 
   defp save_note(
@@ -53,15 +60,17 @@ defmodule MemexWeb.NoteLive.FormComponent do
          :new,
          note_params
        ) do
-    case Notes.create_note(note_params, current_user) do
-      {:ok, %{slug: slug}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{slug} created", slug: slug))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Notes.create_note(note_params, current_user) do
+        {:ok, %{slug: slug}} ->
+          socket
+          |> put_flash(:info, gettext("%{slug} created", slug: slug))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, changeset: changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, changeset: changeset)
+      end
+
+    {:noreply, socket}
   end
 end

lib/memex_web/live/note_live/form_component.html.heex

@@ -11,7 +11,8 @@
   >
     <%= text_input(f, :slug,
       class: "input input-primary",
-      placeholder: gettext("slug")
+      placeholder: gettext("slug"),
+      aria_label: gettext("slug")
     ) %>
     <%= error_tag(f, :slug) %>
 
@@ -20,7 +21,8 @@
       class: "input input-primary h-64 min-h-64",
       phx_hook: "MaintainAttrs",
       phx_update: "ignore",
-      placeholder: gettext("content")
+      placeholder: gettext("content"),
+      aria_label: gettext("content")
     ) %>
     <%= error_tag(f, :content) %>
 
@@ -28,15 +30,15 @@
       id: "tags-input",
       class: "input input-primary",
       placeholder: gettext("tag1,tag2"),
-      phx_update: "ignore",
-      value: Notes.get_tags_string(@changeset)
+      aria_label: gettext("tag1,tag2")
     ) %>
     <%= error_tag(f, :tags_string) %>
 
     <div class="flex justify-center items-stretch space-x-4">
       <%= select(f, :visibility, Ecto.Enum.values(Memex.Notes.Note, :visibility),
         class: "grow input input-primary",
-        prompt: gettext("select privacy")
+        prompt: gettext("select privacy"),
+        aria_label: gettext("select privacy")
       ) %>
 
       <%= submit(dgettext("actions", "save"),

lib/memex_web/live/note_live/index.ex

@@ -1,6 +1,6 @@
 defmodule MemexWeb.NoteLive.Index do
   use MemexWeb, :live_view
-  alias Memex.{Accounts.User, Notes, Notes.Note}
+  alias Memex.{Notes, Notes.Note}
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
@@ -59,7 +59,6 @@ defmodule MemexWeb.NoteLive.Index do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
     {:noreply, socket |> push_patch(to: Routes.note_index_path(Endpoint, :index))}
   end
@@ -76,13 +75,4 @@ defmodule MemexWeb.NoteLive.Index do
   defp display_notes(%{assigns: %{search: search}} = socket) do
     socket |> assign(notes: Notes.list_public_notes(search))
   end
-
-  @spec is_owner_or_admin?(Note.t(), User.t()) :: boolean()
-  defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner_or_admin?(_context, %{role: :admin}), do: true
-  defp is_owner_or_admin?(_context, _other_user), do: false
-
-  @spec is_owner?(Note.t(), User.t()) :: boolean()
-  defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner?(_context, _other_user), do: false
 end

lib/memex_web/live/note_live/index.html.heex

@@ -5,7 +5,8 @@
 
   <.form
     :let={f}
-    for={:search}
+    for={%{}}
+    as={:search}
     phx-change="search"
     phx-submit="search"
     class="self-stretch flex flex-col items-stretch"
@@ -13,6 +14,7 @@
     <%= text_input(f, :search_term,
       class: "input input-primary",
       value: @search,
+      role: "search",
       phx_debounce: 300,
       placeholder: gettext("search")
     ) %>
@@ -30,46 +32,44 @@
       notes={@notes}
     >
       <:actions :let={note}>
-        <%= if is_owner?(note, @current_user) do %>
-          <.link
-            patch={Routes.note_index_path(@socket, :edit, note.slug)}
-            data-qa={"note-edit-#{note.id}"}
-          >
-            <%= dgettext("actions", "edit") %>
-          </.link>
-        <% end %>
-        <%= if is_owner_or_admin?(note, @current_user) do %>
-          <.link
-            href="#"
-            phx-click="delete"
-            phx-value-id={note.id}
-            data-confirm={dgettext("prompts", "are you sure?")}
-            data-qa={"delete-note-#{note.id}"}
-          >
-            <%= dgettext("actions", "delete") %>
-          </.link>
-        <% end %>
+        <.link
+          :if={Notes.is_owner?(note, @current_user)}
+          patch={Routes.note_index_path(@socket, :edit, note.slug)}
+          aria-label={dgettext("actions", "edit %{note_slug}", note_slug: note.slug)}
+        >
+          <%= dgettext("actions", "edit") %>
+        </.link>
+        <.link
+          :if={Notes.is_owner_or_admin?(note, @current_user)}
+          href="#"
+          phx-click="delete"
+          phx-value-id={note.id}
+          data-confirm={dgettext("prompts", "are you sure?")}
+          aria-label={dgettext("actions", "delete %{note_slug}", note_slug: note.slug)}
+        >
+          <%= dgettext("actions", "delete") %>
+        </.link>
       </:actions>
     </.live_component>
   <% end %>
 
-  <%= if @current_user do %>
-    <.link patch={Routes.note_index_path(@socket, :new)} class="self-end btn btn-primary">
-      <%= dgettext("actions", "new note") %>
-    </.link>
-  <% end %>
+  <.link
+    :if={@current_user}
+    patch={Routes.note_index_path(@socket, :new)}
+    class="self-end btn btn-primary"
+  >
+    <%= dgettext("actions", "new note") %>
+  </.link>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.note_index_path(@socket, :index)}>
-    <.live_component
-      module={MemexWeb.NoteLive.FormComponent}
-      id={@note.id || :new}
-      current_user={@current_user}
-      title={@page_title}
-      action={@live_action}
-      note={@note}
-      return_to={Routes.note_index_path(@socket, :index)}
-    />
-  </.modal>
-<% end %>
+<.modal :if={@live_action in [:new, :edit]} return_to={Routes.note_index_path(@socket, :index)}>
+  <.live_component
+    module={MemexWeb.NoteLive.FormComponent}
+    id={@note.id || :new}
+    current_user={@current_user}
+    title={@page_title}
+    action={@live_action}
+    note={@note}
+    return_to={Routes.note_index_path(@socket, :index)}
+  />
+</.modal>

lib/memex_web/live/note_live/show.ex

@@ -1,7 +1,6 @@
 defmodule MemexWeb.NoteLive.Show do
   use MemexWeb, :live_view
-
-  alias Memex.{Accounts.User, Notes, Notes.Note}
+  alias Memex.Notes
 
   @impl true
   def mount(_params, _session, socket) do
@@ -11,7 +10,7 @@ defmodule MemexWeb.NoteLive.Show do
   @impl true
   def handle_params(
         %{"slug" => slug},
-        _,
+        _params,
         %{assigns: %{live_action: live_action, current_user: current_user}} = socket
       ) do
     note =
@@ -46,13 +45,4 @@ defmodule MemexWeb.NoteLive.Show do
 
   defp page_title(:show, %{slug: slug}), do: slug
   defp page_title(:edit, %{slug: slug}), do: gettext("edit %{slug}", slug: slug)
-
-  @spec is_owner_or_admin?(Note.t(), User.t()) :: boolean()
-  defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner_or_admin?(_context, %{role: :admin}), do: true
-  defp is_owner_or_admin?(_context, _other_user), do: false
-
-  @spec is_owner?(Note.t(), User.t()) :: boolean()
-  defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner?(_context, _other_user), do: false
 end

lib/memex_web/live/note_live/show.html.heex

@@ -3,54 +3,51 @@
     <%= @note.slug %>
   </h1>
 
-  <p><%= if @note.tags, do: @note.tags |> Enum.join(", ") %></p>
+  <div class="flex flex-wrap space-x-1">
+    <.link
+      :for={tag <- @note.tags}
+      navigate={Routes.note_index_path(Endpoint, :search, tag)}
+      class="link"
+    >
+      <%= tag %>
+    </.link>
+  </div>
 
-  <textarea
-    id="show-note-content"
-    class="input input-primary h-128 min-h-128"
-    phx-hook="MaintainAttrs"
-    phx-update="ignore"
-    readonly
-    phx-no-format
-  ><%= @note.content %></textarea>
+  <.note_content note={@note} />
 
   <p class="self-end">
     <%= gettext("Visibility: %{visibility}", visibility: @note.visibility) %>
   </p>
 
   <div class="self-end flex space-x-4">
-    <.link class="btn btn-primary" navigate={Routes.note_index_path(@socket, :index)}>
-      <%= dgettext("actions", "back") %>
+    <.link
+      :if={Notes.is_owner?(@note, @current_user)}
+      class="btn btn-primary"
+      patch={Routes.note_show_path(@socket, :edit, @note.slug)}
+    >
+      <%= dgettext("actions", "edit") %>
     </.link>
-    <%= if is_owner?(@note, @current_user) do %>
-      <.link class="btn btn-primary" patch={Routes.note_show_path(@socket, :edit, @note.slug)}>
-        <%= dgettext("actions", "edit") %>
-      </.link>
-    <% end %>
-    <%= if is_owner_or_admin?(@note, @current_user) do %>
-      <button
-        type="button"
-        class="btn btn-primary"
-        phx-click="delete"
-        data-confirm={dgettext("prompts", "are you sure?")}
-        data-qa={"delete-note-#{@note.id}"}
-      >
-        <%= dgettext("actions", "delete") %>
-      </button>
-    <% end %>
+    <button
+      :if={Notes.is_owner_or_admin?(@note, @current_user)}
+      type="button"
+      class="btn btn-primary"
+      phx-click="delete"
+      data-confirm={dgettext("prompts", "are you sure?")}
+      aria-label={dgettext("actions", "delete %{note_slug}", note_slug: @note.slug)}
+    >
+      <%= dgettext("actions", "delete") %>
+    </button>
   </div>
 </div>
 
-<%= if @live_action in [:edit] do %>
-  <.modal return_to={Routes.note_show_path(@socket, :show, @note.slug)}>
-    <.live_component
-      module={MemexWeb.NoteLive.FormComponent}
-      id={@note.id}
-      current_user={@current_user}
-      title={@page_title}
-      action={@live_action}
-      note={@note}
-      return_to={Routes.note_show_path(@socket, :show, @note.slug)}
-    />
-  </.modal>
-<% end %>
+<.modal :if={@live_action == :edit} return_to={Routes.note_show_path(@socket, :show, @note.slug)}>
+  <.live_component
+    module={MemexWeb.NoteLive.FormComponent}
+    id={@note.id}
+    current_user={@current_user}
+    title={@page_title}
+    action={@live_action}
+    note={@note}
+    return_to={Routes.note_show_path(@socket, :show, @note.slug)}
+  />
+</.modal>

lib/memex_web/live/pipeline_live/form_component.ex

@@ -1,16 +1,18 @@
 defmodule MemexWeb.PipelineLive.FormComponent do
   use MemexWeb, :live_component
-
+  alias Ecto.Changeset
   alias Memex.Pipelines
 
   @impl true
   def update(%{pipeline: pipeline, current_user: current_user} = assigns, socket) do
     changeset = Pipelines.change_pipeline(pipeline, current_user)
 
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign(:changeset, changeset)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(:changeset, changeset)
+
+    {:ok, socket}
   end
 
   @impl true
@@ -19,10 +21,13 @@ defmodule MemexWeb.PipelineLive.FormComponent do
         %{"pipeline" => pipeline_params},
         %{assigns: %{pipeline: pipeline, current_user: current_user}} = socket
       ) do
+    changeset = pipeline |> Pipelines.change_pipeline(pipeline_params, current_user)
+
     changeset =
-      pipeline
-      |> Pipelines.change_pipeline(pipeline_params, current_user)
-      |> Map.put(:action, :validate)
+      case changeset |> Changeset.apply_action(:validate) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
 
     {:noreply, assign(socket, :changeset, changeset)}
   end
@@ -41,16 +46,18 @@ defmodule MemexWeb.PipelineLive.FormComponent do
          :edit,
          pipeline_params
        ) do
-    case Pipelines.update_pipeline(pipeline, pipeline_params, current_user) do
-      {:ok, %{slug: slug}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{slug} saved", slug: slug))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Pipelines.update_pipeline(pipeline, pipeline_params, current_user) do
+        {:ok, %{slug: slug}} ->
+          socket
+          |> put_flash(:info, gettext("%{slug} saved", slug: slug))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, :changeset, changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, :changeset, changeset)
+      end
+
+    {:noreply, socket}
   end
 
   defp save_pipeline(
@@ -58,15 +65,17 @@ defmodule MemexWeb.PipelineLive.FormComponent do
          :new,
          pipeline_params
        ) do
-    case Pipelines.create_pipeline(pipeline_params, current_user) do
-      {:ok, %{slug: slug}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{slug} created", slug: slug))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Pipelines.create_pipeline(pipeline_params, current_user) do
+        {:ok, %{slug: slug}} ->
+          socket
+          |> put_flash(:info, gettext("%{slug} created", slug: slug))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, changeset: changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, changeset: changeset)
+      end
+
+    {:noreply, socket}
   end
 end

lib/memex_web/live/pipeline_live/form_component.html.heex

@@ -11,7 +11,8 @@
   >
     <%= text_input(f, :slug,
       class: "input input-primary",
-      placeholder: gettext("slug")
+      placeholder: gettext("slug"),
+      aria_label: gettext("slug")
     ) %>
     <%= error_tag(f, :slug) %>
 
@@ -20,7 +21,8 @@
       class: "input input-primary h-64 min-h-64",
       phx_hook: "MaintainAttrs",
       phx_update: "ignore",
-      placeholder: gettext("description")
+      placeholder: gettext("description"),
+      aria_label: gettext("description")
     ) %>
     <%= error_tag(f, :description) %>
 
@@ -28,15 +30,15 @@
       id: "tags-input",
       class: "input input-primary",
       placeholder: gettext("tag1,tag2"),
-      phx_update: "ignore",
-      value: Pipelines.get_tags_string(@changeset)
+      aria_label: gettext("tag1,tag2")
     ) %>
     <%= error_tag(f, :tags_string) %>
 
     <div class="flex justify-center items-stretch space-x-4">
       <%= select(f, :visibility, Ecto.Enum.values(Memex.Pipelines.Pipeline, :visibility),
         class: "grow input input-primary",
-        prompt: gettext("select privacy")
+        prompt: gettext("select privacy"),
+        aria_label: gettext("select privacy")
       ) %>
 
       <%= submit(dgettext("actions", "save"),

lib/memex_web/live/pipeline_live/index.ex

@@ -1,6 +1,6 @@
 defmodule MemexWeb.PipelineLive.Index do
   use MemexWeb, :live_view
-  alias Memex.{Accounts.User, Pipelines, Pipelines.Pipeline}
+  alias Memex.{Pipelines, Pipelines.Pipeline}
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
@@ -59,14 +59,13 @@ defmodule MemexWeb.PipelineLive.Index do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
     {:noreply, socket |> push_patch(to: Routes.pipeline_index_path(Endpoint, :index))}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    {:noreply,
-     socket |> push_patch(to: Routes.pipeline_index_path(Endpoint, :search, search_term))}
+    redirect_to = Routes.pipeline_index_path(Endpoint, :search, search_term)
+    {:noreply, socket |> push_patch(to: redirect_to)}
   end
 
   defp display_pipelines(%{assigns: %{current_user: current_user, search: search}} = socket)
@@ -77,13 +76,4 @@ defmodule MemexWeb.PipelineLive.Index do
   defp display_pipelines(%{assigns: %{search: search}} = socket) do
     socket |> assign(pipelines: Pipelines.list_public_pipelines(search))
   end
-
-  @spec is_owner_or_admin?(Pipeline.t(), User.t()) :: boolean()
-  defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner_or_admin?(_context, %{role: :admin}), do: true
-  defp is_owner_or_admin?(_context, _other_user), do: false
-
-  @spec is_owner?(Pipeline.t(), User.t()) :: boolean()
-  defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner?(_context, _other_user), do: false
 end

lib/memex_web/live/pipeline_live/index.html.heex

@@ -5,7 +5,8 @@
 
   <.form
     :let={f}
-    for={:search}
+    for={%{}}
+    as={:search}
     phx-change="search"
     phx-submit="search"
     class="self-stretch flex flex-col items-stretch"
@@ -13,6 +14,7 @@
     <%= text_input(f, :search_term,
       class: "input input-primary",
       value: @search,
+      role: "search",
       phx_debounce: 300,
       placeholder: gettext("search")
     ) %>
@@ -30,46 +32,49 @@
       pipelines={@pipelines}
     >
       <:actions :let={pipeline}>
-        <%= if is_owner?(pipeline, @current_user) do %>
-          <.link
-            patch={Routes.pipeline_index_path(@socket, :edit, pipeline.slug)}
-            data-qa={"pipeline-edit-#{pipeline.id}"}
-          >
-            <%= dgettext("actions", "edit") %>
-          </.link>
-        <% end %>
-        <%= if is_owner_or_admin?(pipeline, @current_user) do %>
-          <.link
-            href="#"
-            phx-click="delete"
-            phx-value-id={pipeline.id}
-            data-confirm={dgettext("prompts", "are you sure?")}
-            data-qa={"delete-pipeline-#{pipeline.id}"}
-          >
-            <%= dgettext("actions", "delete") %>
-          </.link>
-        <% end %>
+        <.link
+          :if={Pipelines.is_owner?(pipeline, @current_user)}
+          patch={Routes.pipeline_index_path(@socket, :edit, pipeline.slug)}
+          aria-label={dgettext("actions", "edit %{pipeline_slug}", pipeline_slug: pipeline.slug)}
+        >
+          <%= dgettext("actions", "edit") %>
+        </.link>
+        <.link
+          :if={Pipelines.is_owner_or_admin?(pipeline, @current_user)}
+          href="#"
+          phx-click="delete"
+          phx-value-id={pipeline.id}
+          data-confirm={dgettext("prompts", "are you sure?")}
+          aria-label={
+            dgettext("actions", "delete %{pipeline_slug}", pipeline_slug: pipeline.slug)
+          }
+        >
+          <%= dgettext("actions", "delete") %>
+        </.link>
       </:actions>
     </.live_component>
   <% end %>
 
-  <%= if @current_user do %>
-    <.link patch={Routes.pipeline_index_path(@socket, :new)} class="self-end btn btn-primary">
-      <%= dgettext("actions", "new pipeline") %>
-    </.link>
-  <% end %>
+  <.link
+    :if={@current_user}
+    patch={Routes.pipeline_index_path(@socket, :new)}
+    class="self-end btn btn-primary"
+  >
+    <%= dgettext("actions", "new pipeline") %>
+  </.link>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.pipeline_index_path(@socket, :index)}>
-    <.live_component
-      module={MemexWeb.PipelineLive.FormComponent}
-      id={@pipeline.id || :new}
-      current_user={@current_user}
-      title={@page_title}
-      action={@live_action}
-      pipeline={@pipeline}
-      return_to={Routes.pipeline_index_path(@socket, :index)}
-    />
-  </.modal>
-<% end %>
+<.modal
+  :if={@live_action in [:new, :edit]}
+  return_to={Routes.pipeline_index_path(@socket, :index)}
+>
+  <.live_component
+    module={MemexWeb.PipelineLive.FormComponent}
+    id={@pipeline.id || :new}
+    current_user={@current_user}
+    title={@page_title}
+    action={@live_action}
+    pipeline={@pipeline}
+    return_to={Routes.pipeline_index_path(@socket, :index)}
+  />
+</.modal>

lib/memex_web/live/pipeline_live/show.ex

@@ -1,8 +1,6 @@
 defmodule MemexWeb.PipelineLive.Show do
   use MemexWeb, :live_view
-  import MemexWeb.Components.StepContent
-  alias Memex.{Accounts.User, Pipelines}
-  alias Memex.Pipelines.{Pipeline, Steps, Steps.Step}
+  alias Memex.{Pipelines, Pipelines.Steps, Pipelines.Steps.Step}
 
   @impl true
   def mount(_params, _session, socket) do
@@ -80,7 +78,6 @@ defmodule MemexWeb.PipelineLive.Show do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event(
         "delete_step",
         %{"step-id" => step_id},
@@ -99,7 +96,6 @@ defmodule MemexWeb.PipelineLive.Show do
     {:noreply, socket}
   end
 
-  @impl true
   def handle_event(
         "reorder_step",
         %{"step-id" => step_id, "direction" => direction},
@@ -125,13 +121,4 @@ defmodule MemexWeb.PipelineLive.Show do
     do: gettext("edit %{slug}", slug: slug)
 
   defp page_title(:add_step, %{slug: slug}), do: gettext("add step to %{slug}", slug: slug)
-
-  @spec is_owner_or_admin?(Pipeline.t(), User.t()) :: boolean()
-  defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner_or_admin?(_context, %{role: :admin}), do: true
-  defp is_owner_or_admin?(_context, _other_user), do: false
-
-  @spec is_owner?(Pipeline.t(), User.t()) :: boolean()
-  defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
-  defp is_owner?(_context, _other_user), do: false
 end

lib/memex_web/live/pipeline_live/show.html.heex

@@ -3,46 +3,48 @@
     <%= @pipeline.slug %>
   </h1>
 
-  <p><%= if @pipeline.tags, do: @pipeline.tags |> Enum.join(", ") %></p>
+  <div class="flex flex-wrap space-x-1">
+    <.link
+      :for={tag <- @pipeline.tags}
+      navigate={Routes.pipeline_index_path(Endpoint, :search, tag)}
+      class="link"
+    >
+      <%= tag %>
+    </.link>
+  </div>
 
-  <%= if @pipeline.description do %>
-    <textarea
-      id="show-pipeline-description"
-      class="input input-primary h-32 min-h-32"
-      phx-hook="MaintainAttrs"
-      phx-update="ignore"
-      readonly
-      phx-no-format
-    ><%= @pipeline.description %></textarea>
-  <% end %>
+  <textarea
+    :if={@pipeline.description}
+    id="show-pipeline-description"
+    class="input input-primary h-32 min-h-32"
+    phx-hook="MaintainAttrs"
+    phx-update="ignore"
+    readonly
+    phx-no-format
+  ><%= @pipeline.description %></textarea>
 
   <p class="self-end">
     <%= gettext("Visibility: %{visibility}", visibility: @pipeline.visibility) %>
   </p>
 
   <div class="pb-4 self-end flex space-x-4">
-    <.link class="btn btn-primary" navigate={Routes.pipeline_index_path(@socket, :index)}>
-      <%= dgettext("actions", "back") %>
+    <.link
+      :if={Pipelines.is_owner?(@pipeline, @current_user)}
+      class="btn btn-primary"
+      patch={Routes.pipeline_show_path(@socket, :edit, @pipeline.slug)}
+    >
+      <%= dgettext("actions", "edit") %>
     </.link>
-    <%= if is_owner?(@pipeline, @current_user) do %>
-      <.link
-        class="btn btn-primary"
-        patch={Routes.pipeline_show_path(@socket, :edit, @pipeline.slug)}
-      >
-        <%= dgettext("actions", "edit") %>
-      </.link>
-    <% end %>
-    <%= if is_owner_or_admin?(@pipeline, @current_user) do %>
-      <button
-        type="button"
-        class="btn btn-primary"
-        phx-click="delete"
-        data-confirm={dgettext("prompts", "are you sure?")}
-        data-qa={"delete-pipeline-#{@pipeline.id}"}
-      >
-        <%= dgettext("actions", "delete") %>
-      </button>
-    <% end %>
+    <button
+      :if={Pipelines.is_owner_or_admin?(@pipeline, @current_user)}
+      type="button"
+      class="btn btn-primary"
+      phx-click="delete"
+      data-confirm={dgettext("prompts", "are you sure?")}
+      aria-label={dgettext("actions", "delete %{pipeline_slug}", pipeline_slug: @pipeline.slug)}
+    >
+      <%= dgettext("actions", "delete") %>
+    </button>
   </div>
 
   <hr class="hr" />
@@ -62,7 +64,7 @@
           <%= gettext("%{position}. %{title}", position: position + 1, title: title) %>
         </h3>
 
-        <%= if is_owner?(@pipeline, @current_user) do %>
+        <%= if Pipelines.is_owner?(@pipeline, @current_user) do %>
           <div class="flex justify-between items-center space-x-4">
             <%= if position <= 0 do %>
               <i class="fas text-xl fa-chevron-up cursor-not-allowed opacity-25"></i>
@@ -73,7 +75,7 @@
                 phx-click="reorder_step"
                 phx-value-direction="up"
                 phx-value-step-id={step_id}
-                data-qa={"move-step-up-#{step_id}"}
+                aria-label={dgettext("actions", "move %{step_title} up", step_title: step.title)}
               >
                 <i class="fas text-xl fa-chevron-up"></i>
               </button>
@@ -88,7 +90,9 @@
                 phx-click="reorder_step"
                 phx-value-direction="down"
                 phx-value-step-id={step_id}
-                data-qa={"move-step-down-#{step_id}"}
+                aria-label={
+                  dgettext("actions", "move %{step_title} down", step_title: step.title)
+                }
               >
                 <i class="fas text-xl fa-chevron-down"></i>
               </button>
@@ -97,7 +101,7 @@
             <.link
               class="self-end btn btn-primary"
               patch={Routes.pipeline_show_path(@socket, :edit_step, @pipeline.slug, step_id)}
-              data-qa={"edit-step-#{step_id}"}
+              aria-label={dgettext("actions", "edit %{step_title}", step_title: step.title)}
             >
               <%= dgettext("actions", "edit") %>
             </.link>
@@ -108,7 +112,7 @@
               phx-click="delete_step"
               phx-value-step-id={step_id}
               data-confirm={dgettext("prompts", "are you sure?")}
-              data-qa={"delete-step-#{step_id}"}
+              aria-label={dgettext("actions", "delete %{step_title}", step_title: step.title)}
             >
               <%= dgettext("actions", "delete") %>
             </button>
@@ -120,15 +124,13 @@
     <% end %>
   <% end %>
 
-  <%= if is_owner?(@pipeline, @current_user) do %>
-    <.link
-      class="self-end btn btn-primary"
-      patch={Routes.pipeline_show_path(@socket, :add_step, @pipeline.slug)}
-      data-qa={"add-step-#{@pipeline.id}"}
-    >
-      <%= dgettext("actions", "add step") %>
-    </.link>
-  <% end %>
+  <.link
+    :if={Pipelines.is_owner?(@pipeline, @current_user)}
+    class="self-end btn btn-primary"
+    patch={Routes.pipeline_show_path(@socket, :add_step, @pipeline.slug)}
+  >
+    <%= dgettext("actions", "add step") %>
+  </.link>
 </div>
 
 <%= case @live_action do %>
@@ -144,20 +146,7 @@
         return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}
       />
     </.modal>
-  <% :add_step -> %>
-    <.modal return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}>
-      <.live_component
-        module={MemexWeb.StepLive.FormComponent}
-        id={@pipeline.id || :new}
-        current_user={@current_user}
-        title={@page_title}
-        action={@live_action}
-        pipeline={@pipeline}
-        step={@step}
-        return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}
-      />
-    </.modal>
-  <% :edit_step -> %>
+  <% action when action in [:add_step, :edit_step] -> %>
     <.modal return_to={Routes.pipeline_show_path(@socket, :show, @pipeline.slug)}>
       <.live_component
         module={MemexWeb.StepLive.FormComponent}

lib/memex_web/live/step_live/form_component.ex

@@ -1,16 +1,18 @@
 defmodule MemexWeb.StepLive.FormComponent do
   use MemexWeb, :live_component
-
+  alias Ecto.Changeset
   alias Memex.Pipelines.Steps
 
   @impl true
   def update(%{step: step, current_user: current_user, pipeline: _pipeline} = assigns, socket) do
     changeset = Steps.change_step(step, current_user)
 
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign(:changeset, changeset)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(:changeset, changeset)
+
+    {:ok, socket}
   end
 
   @impl true
@@ -19,10 +21,13 @@ defmodule MemexWeb.StepLive.FormComponent do
         %{"step" => step_params},
         %{assigns: %{step: step, current_user: current_user}} = socket
       ) do
+    changeset = step |> Steps.change_step(step_params, current_user)
+
     changeset =
-      step
-      |> Steps.change_step(step_params, current_user)
-      |> Map.put(:action, :validate)
+      case changeset |> Changeset.apply_action(:validate) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
 
     {:noreply, assign(socket, :changeset, changeset)}
   end
@@ -36,16 +41,18 @@ defmodule MemexWeb.StepLive.FormComponent do
          :edit_step,
          step_params
        ) do
-    case Steps.update_step(step, step_params, current_user) do
-      {:ok, %{title: title}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{title} saved", title: title))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Steps.update_step(step, step_params, current_user) do
+        {:ok, %{title: title}} ->
+          socket
+          |> put_flash(:info, gettext("%{title} saved", title: title))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, :changeset, changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, :changeset, changeset)
+      end
+
+    {:noreply, socket}
   end
 
   defp save_step(
@@ -60,15 +67,17 @@ defmodule MemexWeb.StepLive.FormComponent do
          :add_step,
          step_params
        ) do
-    case Steps.create_step(step_params, position, pipeline, current_user) do
-      {:ok, %{title: title}} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, gettext("%{title} created", title: title))
-         |> push_navigate(to: return_to)}
+    socket =
+      case Steps.create_step(step_params, position, pipeline, current_user) do
+        {:ok, %{title: title}} ->
+          socket
+          |> put_flash(:info, gettext("%{title} created", title: title))
+          |> push_navigate(to: return_to)
 
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, changeset: changeset)}
-    end
+        {:error, %Changeset{} = changeset} ->
+          assign(socket, changeset: changeset)
+      end
+
+    {:noreply, socket}
   end
 end

lib/memex_web/live/step_live/form_component.html.heex

@@ -11,7 +11,8 @@
   >
     <%= text_input(f, :title,
       class: "input input-primary",
-      placeholder: gettext("title")
+      placeholder: gettext("title"),
+      aria_label: gettext("title")
     ) %>
     <%= error_tag(f, :title) %>
 
@@ -20,7 +21,8 @@
       class: "input input-primary h-64 min-h-64",
       phx_hook: "MaintainAttrs",
       phx_update: "ignore",
-      placeholder: gettext("use [[context-slug]] to link to a context")
+      placeholder: gettext("use [[context-slug]] to link to a context"),
+      aria_label: gettext("use [[context-slug]] to link to a context")
     ) %>
     <%= error_tag(f, :content) %>
 

lib/memex_web/router.ex

@@ -11,15 +11,17 @@ defmodule MemexWeb.Router do
     plug :protect_from_forgery
     plug :put_secure_browser_headers
     plug :fetch_current_user
-    plug :put_user_locale, default: Application.compile_env(:gettext, :default_locale, "en_US")
+    plug :put_user_locale
   end
 
-  defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, default: default) do
+  defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, _opts) do
+    default = Application.fetch_env!(:gettext, :default_locale)
     Gettext.put_locale(locale || default)
     conn |> put_session(:locale, locale || default)
   end
 
-  defp put_user_locale(conn, default: default) do
+  defp put_user_locale(conn, _opts) do
+    default = Application.fetch_env!(:gettext, :default_locale)
     Gettext.put_locale(default)
     conn |> put_session(:locale, default)
   end
@@ -76,6 +78,7 @@ defmodule MemexWeb.Router do
       put "/users/settings", UserSettingsController, :update
       delete "/users/settings/:id", UserSettingsController, :delete
       get "/users/settings/confirm_email/:token", UserSettingsController, :confirm_email
+      get "/export/:mode", ExportController, :export
     end
 
     scope "/", MemexWeb do

lib/memex_web/telemetry.ex

@@ -57,6 +57,30 @@ defmodule MemexWeb.Telemetry do
           "The time the connection spent waiting before being checked out for the query"
       ),
 
+      # Oban Metrics
+      counter("oban.job.exception",
+        tags: [:queue, :worker],
+        event_name: [:oban, :job, :exception],
+        measurement: :duration,
+        description: "Number of oban jobs that raised an exception"
+      ),
+      counter("oban.job.start",
+        tags: [:queue, :worker],
+        event_name: [:oban, :job, :start],
+        measurement: :system_time,
+        description: "Number of oban jobs started"
+      ),
+      summary("oban.job.stop.duration",
+        tags: [:queue, :worker],
+        unit: {:native, :millisecond},
+        description: "Length of time spent processing the oban job"
+      ),
+      summary("oban.job.stop.queue_time",
+        tags: [:queue, :worker],
+        unit: {:native, :millisecond},
+        description: "Time the oban job spent waiting in milliseconds"
+      ),
+
       # VM Metrics
       summary("vm.memory.total", unit: {:byte, :kilobyte}),
       summary("vm.total_run_queue_lengths.total"),

lib/memex_web/templates/error/error.html.heex

@@ -5,15 +5,15 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>
-      <%= dgettext("errors", "Error") %>| memEx
+      <%= dgettext("errors", "Error") %> | <%= gettext("memEx") %>
     </title>
     <link rel="stylesheet" href="/css/app.css" />
     <script defer type="text/javascript" src="/js/app.js">
     </script>
   </head>
-  <body class="m-0 p-0 w-full h-full bg-primary-800 text-primary-400 subpixel-antialiased">
+  <body class="pb-8 m-0 p-0 w-full h-full bg-primary-800 text-primary-400 subpixel-antialiased">
     <header>
-      <.topbar current_user={assigns[:current_user]}></.topbar>
+      <.topbar current_user={assigns[:current_user]} />
     </header>
 
     <div class="pb-8 w-full flex flex-col justify-center items-center text-center">
@@ -24,9 +24,12 @@
 
         <hr class="w-full hr" />
 
-        <a href={Routes.live_path(Endpoint, HomeLive)} class="link title text-primary-400 text-lg">
+        <.link
+          href={Routes.live_path(Endpoint, HomeLive)}
+          class="link title text-primary-400 text-lg"
+        >
           <%= dgettext("errors", "go back home") %>
-        </a>
+        </.link>
       </div>
     </div>
   </body>

lib/memex_web/templates/layout/app.html.heex

@@ -1,18 +1,14 @@
 <main role="main" class="min-h-full min-w-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <%= if get_flash(@conn, :info) do %>
-        <p class="alert alert-info" role="alert">
-          <%= get_flash(@conn, :info) %>
-        </p>
-      <% end %>
-      <%= if get_flash(@conn, :error) do %>
-        <p class="alert alert-danger" role="alert">
-          <%= get_flash(@conn, :error) %>
-        </p>
-      <% end %>
+      <p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
+        <%= get_flash(@conn, :info) %>
+      </p>
+      <p :if={get_flash(@conn, :error)} class="alert alert-danger" role="alert">
+        <%= get_flash(@conn, :error) %>
+      </p>
     </div>
   </header>
 

lib/memex_web/templates/layout/live.html.heex

@@ -1,24 +1,27 @@
-<main class="mb-8 min-w-full">
+<main class="pb-8 min-w-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <%= if @flash && @flash |> Map.has_key?("info") do %>
-        <p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info">
-          <%= live_flash(@flash, "info") %>
-        </p>
-      <% end %>
+      <p
+        :if={@flash && @flash |> Map.has_key?("info")}
+        class="alert alert-info"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="info"
+      >
+        <%= live_flash(@flash, "info") %>
+      </p>
 
-      <%= if @flash && @flash |> Map.has_key?("error") do %>
-        <p
-          class="alert alert-danger"
-          role="alert"
-          phx-click="lv:clear-flash"
-          phx-value-key="error"
-        >
-          <%= live_flash(@flash, "error") %>
-        </p>
-      <% end %>
+      <p
+        :if={@flash && @flash |> Map.has_key?("error")}
+        class="alert alert-danger"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="error"
+      >
+        <%= live_flash(@flash, "error") %>
+      </p>
     </div>
   </header>
 
@@ -27,28 +30,16 @@
   </div>
 </main>
 
-<div
-  id="loading"
-  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-primary-900 z-50
-  flex flex-col justify-center items-center space-y-4
-  transition-opacity ease-in-out duration-500"
->
-  <h1 class="title text-2xl title-primary-500 text-primary-400">
-    <%= gettext("Loading...") %>
-  </h1>
-
-  <i class="fas fa-3x fa-spin fa-gear text-primary-400"></i>
-</div>
-
 <div
   id="disconnect"
-  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-primary-900 z-50
-  flex flex-col justify-center items-center space-y-4
-  transition-opacity ease-in-out duration-500"
+  class="z-50 fixed opacity-0 bottom-12 right-12 px-8 py-4 w-max h-max
+  border border-primary-400 shadow-lg rounded-lg bg-primary-900 text-primary-400
+  flex justify-center items-center space-x-4
+  transition-opacity ease-in-out duration-500 delay-[2000ms]"
 >
-  <h1 class="title text-2xl title-primary-500 text-primary-400">
+  <i class="fas fa-fade text-md fa-satellite-dish"></i>
+
+  <h1 class="title text-md">
     <%= gettext("Reconnecting...") %>
   </h1>
-
-  <i class="fas fa-3x fa-fade fa-satellite-dish text-primary-400"></i>
 </div>

lib/memex_web/templates/layout/root.html.heex

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" class="m-0 p-0 w-full h-full">
+<html lang="en" class="m-0 p-0 w-full h-full bg-primary-800">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -18,7 +18,7 @@
     </script>
   </head>
 
-  <body class="m-0 p-0 w-full h-full bg-primary-800 text-primary-400 subpixel-antialiased">
+  <body class="m-0 p-0 w-full h-full text-primary-400 subpixel-antialiased">
     <%= @inner_content %>
   </body>
 </html>

lib/memex_web/templates/user_confirmation/new.html.heex

@@ -1,15 +1,16 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "Resend confirmation instructions") %>
   </h1>
 
   <.form
     :let={f}
-    for={:user}
+    for={%{}}
+    as={:user}
     action={Routes.user_confirmation_path(@conn, :create)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= label(f, :email, class: "title text-lg text-primary-400") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-400") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
     <%= submit(dgettext("actions", "Resend confirmation instructions"),
@@ -20,11 +21,13 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "register") %>
-      </.link>
-    <% end %>
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
+      <%= dgettext("actions", "register") %>
+    </.link>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "log in") %>
     </.link>

lib/memex_web/templates/user_registration/new.html.heex

@@ -1,4 +1,4 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "register") %>
   </h1>
@@ -9,27 +9,23 @@
     action={Routes.user_registration_path(@conn, :create)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
-      </div>
+    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+      <%= dgettext("errors", "oops, something went wrong! please check the errors below.") %>
+    </p>
+
+    <%= if @invite_token do %>
+      <%= hidden_input(f, :invite_token, value: @invite_token) %>
     <% end %>
 
-    <%= if @invite do %>
-      <%= hidden_input(f, :invite_token, value: @invite.token) %>
-    <% end %>
-
-    <%= label(f, :email, class: "title text-lg text-primary-400") %>
+    <%= label(f, :email, gettext("email"), class: "title text-lg text-primary-400") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :email, "col-span-3") %>
 
-    <%= label(f, :password, class: "title text-lg text-primary-400") %>
+    <%= label(f, :password, gettext("password"), class: "title text-lg text-primary-400") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
-    <%= label(f, :locale, gettext("Language"), class: "title text-lg text-primary-400") %>
+    <%= label(f, :locale, gettext("language"), class: "title text-lg text-primary-400") %>
     <%= select(
       f,
       :locale,

lib/memex_web/templates/user_reset_password/edit.html.heex

@@ -1,4 +1,4 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-400 text-xl">
     <%= dgettext("actions", "Reset password") %>
   </h1>
@@ -9,19 +9,15 @@
     action={Routes.user_reset_password_path(@conn, :update, @token)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
-          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
-      </div>
-    <% end %>
+    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+      <%= dgettext("errors", "oops, something went wrong! please check the errors below.") %>
+    </p>
 
-    <%= label(f, :password, "new password", class: "title text-lg text-primary-400") %>
+    <%= label(f, :password, gettext("new password"), class: "title text-lg text-primary-400") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
-    <%= label(f, :password_confirmation, "Confirm new password",
+    <%= label(f, :password_confirmation, gettext("confirm new password"),
       class: "title text-lg text-primary-400"
     ) %>
     <%= password_input(f, :password_confirmation,
@@ -38,11 +34,13 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "register") %>
-      </.link>
-    <% end %>
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
+      <%= dgettext("actions", "register") %>
+    </.link>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "log in") %>
     </.link>