chore(deps): update dependency gettext to ~> 0.24

2023-12-04 16:53:51 +00:00
13 changed files with 54 additions and 116 deletions
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@ -16,15 +16,14 @@
        "fs-extra": "^10.0.0",
        "postcss": "^8.3.6",
        "postcss-import": "^15.0.0",
-        "tailwindcss": "^3.4.3"
+        "tailwindcss": "^3.0.0"
      }
    },
    "../deps/phoenix": {
-      "version": "1.6.16",
-      "license": "MIT"
+      "version": "0.0.1"
    },
    "../deps/phoenix_html": {
-      "version": "3.3.1"
+      "version": "0.0.1"
    },
    "node_modules/@alloc/quick-lru": {
      "version": "5.2.0",
@ -282,9 +281,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001617",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001617.tgz",
-      "integrity": "sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==",
+      "version": "1.0.30001338",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz",
+      "integrity": "sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ==",
      "dev": true,
      "funding": [
        {
@ -294,10 +293,6 @@
        {
          "type": "tidelift",
          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
        }
      ]
    },
@ -514,9 +509,9 @@
      }
    },
    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
      "dev": true,
      "dependencies": {
        "@nodelib/fs.stat": "^2.0.2",
@ -530,9 +525,9 @@
      }
    },
    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
      "dev": true,
      "dependencies": {
        "reusify": "^1.0.4"
@ -899,9 +894,9 @@
      "dev": true
    },
    "node_modules/jiti": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
      "dev": true,
      "bin": {
        "jiti": "bin/jiti.js"
@ -1837,9 +1832,9 @@
      }
    },
    "node_modules/tailwindcss": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
-      "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
      "dev": true,
      "dependencies": {
        "@alloc/quick-lru": "^5.2.0",
@ -1847,10 +1842,10 @@
        "chokidar": "^3.5.3",
        "didyoumean": "^1.2.2",
        "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.2.12",
        "glob-parent": "^6.0.2",
        "is-glob": "^4.0.3",
-        "jiti": "^1.21.0",
+        "jiti": "^1.18.2",
        "lilconfig": "^2.1.0",
        "micromatch": "^4.0.5",
        "normalize-path": "^3.0.0",
@ -1862,6 +1857,7 @@
        "postcss-load-config": "^4.0.1",
        "postcss-nested": "^6.0.1",
        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0",
        "resolve": "^1.22.2",
        "sucrase": "^3.32.0"
      },
@ -2167,9 +2163,9 @@
      "dev": true
    },
    "caniuse-lite": {
-      "version": "1.0.30001617",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001617.tgz",
-      "integrity": "sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==",
+      "version": "1.0.30001338",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz",
+      "integrity": "sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ==",
      "dev": true
    },
    "chokidar": {
@ -2336,9 +2332,9 @@
      }
    },
    "fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
      "dev": true,
      "requires": {
        "@nodelib/fs.stat": "^2.0.2",
@ -2349,9 +2345,9 @@
      }
    },
    "fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
      "dev": true,
      "requires": {
        "reusify": "^1.0.4"
@ -2633,9 +2629,9 @@
      "dev": true
    },
    "jiti": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
      "dev": true
    },
    "jsonfile": {
@ -3271,9 +3267,9 @@
      "dev": true
    },
    "tailwindcss": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
-      "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
      "dev": true,
      "requires": {
        "@alloc/quick-lru": "^5.2.0",
@ -3281,10 +3277,10 @@
        "chokidar": "^3.5.3",
        "didyoumean": "^1.2.2",
        "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.2.12",
        "glob-parent": "^6.0.2",
        "is-glob": "^4.0.3",
-        "jiti": "^1.21.0",
+        "jiti": "^1.18.2",
        "lilconfig": "^2.1.0",
        "micromatch": "^4.0.5",
        "normalize-path": "^3.0.0",
@ -3296,6 +3292,7 @@
        "postcss-load-config": "^4.0.1",
        "postcss-nested": "^6.0.1",
        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0",
        "resolve": "^1.22.2",
        "sucrase": "^3.32.0"
      },
--- a/assets/package.json
+++ b/assets/package.json
@ -17,6 +17,6 @@
    "fs-extra": "^10.0.0",
    "postcss": "^8.3.6",
    "postcss-import": "^15.0.0",
-    "tailwindcss": "^3.4.3"
+    "tailwindcss": "^3.0.0"
  }
 }
--- a/assets/tailwind.config.js
+++ b/assets/tailwind.config.js
@ -1,19 +1,19 @@
 module.exports = {
-  content: [
+  purge: [
    "../lib/**/*.ex",
    "../lib/**/*.leex",
    "../lib/**/*.eex",
    "../lib/**/*.heex",
    "./js/**/*.js",
  ],
-  darkMode: 'media', // or 'media' or 'class'
+  darkMode: false, // or 'media' or 'class'
  theme: {
    extend: {
-      colors: {
-        amber: "#ff9800",
-        "light-grey": "#212121",
+			colors: {
+        amber: '#ff9800',
+				'light-grey': '#212121',
      },
-    },
+		},
  },
  variants: {
    extend: {},
--- a/config/test.exs
+++ b/config/test.exs
@ -1,4 +1,4 @@
-import Config
+use Mix.Config

 # Only in tests, remove the complexity from the password hashing algorithm
 config :bcrypt_elixir, :log_rounds, 1
--- a/fly.toml
+++ b/fly.toml
@ -25,8 +25,8 @@ processes = []
  script_checks = []

  [services.concurrency]
-    hard_limit = 10000
-    soft_limit = 6000
+    hard_limit = 25
+    soft_limit = 20
    type = "connections"

  [[services.ports]]
--- a/lib/ketbin/pastes.ex
+++ b/lib/ketbin/pastes.ex
@ -21,10 +21,6 @@ defmodule Ketbin.Pastes do
    Repo.all(Paste)
  end

-  def list_pastes_by_user(user_id) do
-    Repo.all(from(p in Paste, where: p.belongs_to == ^user_id))
-  end
-
  @doc """
  Gets a single paste.

--- a/lib/ketbin/pastes/paste.ex
+++ b/lib/ketbin/pastes/paste.ex
@ -9,8 +9,6 @@ defmodule Ketbin.Pastes.Paste do
    field :content, :string
    field :is_url, :boolean, default: false
    field :belongs_to, :id
-
-    timestamps()
  end

  @doc false
--- a/lib/ketbin_web/controllers/page_controller.ex
+++ b/lib/ketbin_web/controllers/page_controller.ex
@ -134,9 +134,4 @@ defmodule KetbinWeb.PageController do
        render(conn, "edit.html", paste: paste, changeset: changeset)
    end
  end
-
-  def pastes(%{assigns: %{current_user: current_user}} = conn, _params) do
-    pastes = Pastes.list_pastes_by_user(current_user.id)
-    render(conn, "pastes.html", pastes: pastes)
-  end
 end
--- a/lib/ketbin_web/router.ex
+++ b/lib/ketbin_web/router.ex
@ -18,13 +18,6 @@ defmodule KetbinWeb.Router do
    plug :fetch_current_user
  end

-  # scope to ensure user is authenticated
-  scope "/", KetbinWeb do
-    pipe_through [:browser, :require_authenticated_user]
-
-    get "/pastes", PageController, :pastes
-  end
-
  scope "/", KetbinWeb do
    pipe_through :browser

--- a/lib/ketbin_web/templates/layout/_user_menu.html.heex
+++ b/lib/ketbin_web/templates/layout/_user_menu.html.heex
@ -1,28 +1,8 @@
-<script>
-function toggleDropdown() {
-    const dropdown = document.querySelector('#dropdown');
-    const dropdownLabel = document.querySelector('#dropdown-label');
-    if (dropdown.classList.contains('hidden')) {
-        dropdown.classList.remove('hidden');
-        dropdown.classList.add('absolute');
-        dropdownLabel.innerHTML = dropdownLabel.innerHTML.replace('▼', '▲');
-    } else {
-        dropdown.classList.add('hidden');
-        dropdown.classList.remove('absolute');
-        dropdownLabel.innerHTML = dropdownLabel.innerHTML.replace('▲', '▼');
-    }
-}
-</script>
 <ul>
 	<%= if @current_user do %>
-		<div class="relative">
-            <li id="dropdown-label" onclick="toggleDropdown()" class="text-[#ff9800] cursor-pointer select-none"><%= @current_user.email %> ▼</li>
-            <div id="dropdown" class="hidden right-0 z-50 bg-[#313131] px-4 py-2">
-                <li><%= link "Settings", to: Routes.user_settings_path(@conn, :edit) %></li>
-                <li><%= link "Log out", to: Routes.user_session_path(@conn, :delete), method: :delete %></li>
-                <li><%= link "My Pastes", to: Routes.page_path(@conn, :pastes) %></li>
-            </div>
-        </div>
+		<li><%= @current_user.email %></li>
+		<li><%= link "Settings", to: Routes.user_settings_path(@conn, :edit) %></li>
+		<li><%= link "Log out", to: Routes.user_session_path(@conn, :delete), method: :delete %></li>
 	<% else %>
 		<li><%= link "Register", to: Routes.user_registration_path(@conn, :new) %></li>
 		<li><%= link "Log in", to: Routes.user_session_path(@conn, :new) %></li>
--- a/lib/ketbin_web/templates/page/pastes.html.heex
+++ b/lib/ketbin_web/templates/page/pastes.html.heex
@ -1,11 +0,0 @@
-<div class="flex relative flex-col w-full h-full">
-    <ul class="break-word py-4 h-full w-full overflow-y-auto">
-        <%= for paste <- @pastes do %>
-            <li class="flex flex-row items-center justify-between">
-                <a href={ Routes.page_path(@conn, :show, paste) } class="">
-https://katb.in/v/<%= paste.id %>
-                </a>
-            </li>    
-        <% end %>
-    </ul>
-</div>
--- a/mix.exs
+++ b/mix.exs
@ -7,7 +7,7 @@ defmodule Ketbin.MixProject do
      version: "0.1.0",
      elixir: "~> 1.12",
      elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: [:phoenix] ++ Mix.compilers(),
+      compilers: [:phoenix, :gettext] ++ Mix.compilers(),
      start_permanent: Mix.env() == :prod,
      aliases: aliases(),
      deps: deps()
@ -44,7 +44,7 @@ defmodule Ketbin.MixProject do
      {:phoenix_live_dashboard, "~> 0.5"},
      {:telemetry_metrics, "~> 0.6"},
      {:telemetry_poller, "~> 0.5"},
-      {:gettext, "~> 0.18"},
+      {:gettext, "~> 0.24"},
      {:jason, "~> 1.2"},
      {:plug_cowboy, "~> 2.5"},
      {:cors_plug, "~> 3.0"},
--- a/priv/repo/migrations/20240507005300_add_timestamps_pastes.exs
+++ b/priv/repo/migrations/20240507005300_add_timestamps_pastes.exs
@ -1,10 +0,0 @@
-defmodule Ketbin.Repo.Migrations.AddTimestampsPastes do
-  use Ecto.Migration
-
-  def change do
-    alter table(:pastes) do
-      add :inserted_at, :naive_datetime, null: false, default: fragment("CURRENT_TIMESTAMP")
-      add :updated_at, :naive_datetime, null: false, default: fragment("CURRENT_TIMESTAMP")
-    end
-  end
-end