diff --git a/assets/css/components.scss b/assets/css/components.scss index f46cc75..b5c3a21 100644 --- a/assets/css/components.scss +++ b/assets/css/components.scss @@ -39,9 +39,9 @@ } .btn-alert { - @apply bg-red-600 focus:bg-red-700 active:bg-red-800; - @apply border-red-600 focus:border-red-700 active:border-red-800; - @apply text-primary-400; + @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 text-primary-300; } .hr { diff --git a/lib/memex_web/components/topbar.ex b/lib/memex_web/components/topbar.ex index bafacd8..0e2253a 100644 --- a/lib/memex_web/components/topbar.ex +++ b/lib/memex_web/components/topbar.ex @@ -35,8 +35,8 @@ defmodule MemexWeb.Components.Topbar do text-lg text-primary-400 text-ellipsis"> <%= if @current_user do %>
  • - <%= live_redirect(gettext("Pipelines"), - to: Routes.pipeline_index_path(Endpoint, :index), + <%= live_redirect(gettext("Notes"), + to: Routes.note_index_path(Endpoint, :index), class: "text-primary-400 text-primary-400 hover:underline truncate" ) %>
  • @@ -49,29 +49,13 @@ defmodule MemexWeb.Components.Topbar do
  • - <%= live_redirect(gettext("Notes"), - to: Routes.note_index_path(Endpoint, :index), + <%= live_redirect(gettext("Pipelines"), + to: Routes.pipeline_index_path(Endpoint, :index), class: "text-primary-400 text-primary-400 hover:underline truncate" ) %>
  • -
    - - - <%= for {app, _vsn} <- @results do %> - - <% end %> - -
    +
  • <%= if @current_user.role == :admin do %>
  • diff --git a/lib/memex_web/live/context_live/show.html.heex b/lib/memex_web/live/context_live/show.html.heex index 652ef45..cef69e4 100644 --- a/lib/memex_web/live/context_live/show.html.heex +++ b/lib/memex_web/live/context_live/show.html.heex @@ -37,5 +37,5 @@ <%= live_patch("Edit", to: Routes.context_show_path(@socket, :edit, @context), class: "button") %> - | -<%= live_redirect("Back", to: Routes.context_index_path(@socket, :index)) %> + +| <%= live_redirect("Back", to: Routes.context_index_path(@socket, :index)) %> diff --git a/lib/memex_web/live/home_live.html.heex b/lib/memex_web/live/home_live.html.heex index 8e1f6e9..7dc56cd 100644 --- a/lib/memex_web/live/home_live.html.heex +++ b/lib/memex_web/live/home_live.html.heex @@ -114,5 +114,52 @@ end %>

  • + +
  • + Version: + <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline", + to: "https://gitea.bubbletea.dev/shibao/memex/src/branch/stable/CHANGELOG.md", + target: "_blank", + rel: "noopener noreferrer" do %> +

    0.1.0

    + + <% end %> +
  • + + +
    + + diff --git a/lib/memex_web/live/note_live/show.html.heex b/lib/memex_web/live/note_live/show.html.heex index d55faee..cd4e698 100644 --- a/lib/memex_web/live/note_live/show.html.heex +++ b/lib/memex_web/live/note_live/show.html.heex @@ -37,4 +37,5 @@ <%= live_patch("Edit", to: Routes.note_show_path(@socket, :edit, @note), class: "button") %> - | <%= live_redirect("Back", to: Routes.note_index_path(@socket, :index)) %> + +| <%= live_redirect("Back", to: Routes.note_index_path(@socket, :index)) %> diff --git a/lib/memex_web/live/pipeline_live/show.html.heex b/lib/memex_web/live/pipeline_live/show.html.heex index 4e63c63..0b43e69 100644 --- a/lib/memex_web/live/pipeline_live/show.html.heex +++ b/lib/memex_web/live/pipeline_live/show.html.heex @@ -32,5 +32,5 @@ <%= live_patch("Edit", to: Routes.pipeline_show_path(@socket, :edit, @pipeline), class: "button") %> - | -<%= live_redirect("Back", to: Routes.pipeline_index_path(@socket, :index)) %> + +| <%= live_redirect("Back", to: Routes.pipeline_index_path(@socket, :index)) %> diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 4318887..e30f34e 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -36,7 +36,7 @@ msgid "Confirm your account" msgstr "" #, elixir-autogen, elixir-format -#: lib/memex_web/components/topbar.ex:45 +#: lib/memex_web/components/topbar.ex:63 msgid "Contexts" msgstr "" @@ -98,7 +98,7 @@ msgid "Forgot your password?" msgstr "" #, elixir-autogen, elixir-format -#: lib/memex_web/live/home_live.ex:10 +#: lib/memex_web/live/home_live.ex:12 msgid "Home" msgstr "" @@ -160,7 +160,7 @@ msgid "No invites 😔" msgstr "" #, elixir-autogen, elixir-format -#: lib/memex_web/components/topbar.ex:52 +#: lib/memex_web/components/topbar.ex:70 msgid "Notes" msgstr "" @@ -170,7 +170,7 @@ msgid "Notes:" msgstr "" #, elixir-autogen, elixir-format -#: lib/memex_web/components/topbar.ex:38 +#: lib/memex_web/components/topbar.ex:56 msgid "Pipelines" msgstr "" @@ -244,3 +244,63 @@ msgstr "" #: lib/memex_web/live/home_live.html.heex:3 msgid "memex" msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:87 +msgid "Admins:" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/note_live/form_component.html.heex:20 +msgid "Content" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:134 +msgid "Get involved!" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:151 +msgid "Help translate" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:82 +msgid "Instance Information" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:113 +msgid "Invite Only" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:112 +msgid "Public Signups" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:160 +msgid "Report bugs or request features" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/note_live/form_component.html.heex:35 +msgid "Save" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/note_live/form_component.html.heex:36 +msgid "Saving..." +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/note_live/form_component.html.heex:13 +msgid "Title" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:142 +msgid "View the source code" +msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index 143b800..3df080b 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -140,3 +140,8 @@ msgstr "" #: lib/memex_web/controllers/user_settings_controller.ex:95 msgid "Your account has been deleted" msgstr "" + +#, elixir-autogen, elixir-format +#: lib/memex_web/live/home_live.html.heex:91 +msgid "Register to setup %{name}" +msgstr ""