From f5e77a3eaac7c85a3223d44081d48f67e3f1677a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 13 Sep 2022 15:26:28 -0500 Subject: [PATCH] soapbox-fe --> soapbox --- config/config.exs | 8 ++++---- docs/administration/CLI_tasks/frontend.md | 2 +- lib/pleroma/web/utils/colors.ex | 2 +- priv/static/index.html | 6 +++--- test/mix/tasks/pleroma/frontend_test.exs | 10 +++++----- test/pleroma/web/o_status/o_status_controller_test.exs | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/config.exs b/config/config.exs index 0abc9dca9c..05c40c6d73 100644 --- a/config/config.exs +++ b/config/config.exs @@ -775,11 +775,11 @@ "https://git.pleroma.social/pleroma/admin-fe/-/jobs/artifacts/${ref}/download?job=build", "ref" => "develop" }, - "soapbox-fe" => %{ - "name" => "soapbox-fe", - "git" => "https://gitlab.com/soapbox-pub/soapbox-fe", + "soapbox" => %{ + "name" => "soapbox", + "git" => "https://gitlab.com/soapbox-pub/soapbox", "build_url" => - "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production", + "https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/${ref}/download?job=build-production", "ref" => "develop", "build_dir" => "static" }, diff --git a/docs/administration/CLI_tasks/frontend.md b/docs/administration/CLI_tasks/frontend.md index 6a330975d3..0f0bff2a62 100644 --- a/docs/administration/CLI_tasks/frontend.md +++ b/docs/administration/CLI_tasks/frontend.md @@ -24,7 +24,7 @@ Currently, known `` values are: - [kenoma](http://git.pleroma.social/lambadalambda/kenoma) - [pleroma-fe](http://git.pleroma.social/pleroma/pleroma-fe) - [fedi-fe](https://git.pleroma.social/pleroma/fedi-fe) -- [soapbox-fe](https://gitlab.com/soapbox-pub/soapbox-fe) +- [soapbox](https://gitlab.com/soapbox-pub/soapbox) You can still install frontends that are not configured, see below. diff --git a/lib/pleroma/web/utils/colors.ex b/lib/pleroma/web/utils/colors.ex index 6e386df803..efa86f0e9a 100644 --- a/lib/pleroma/web/utils/colors.ex +++ b/lib/pleroma/web/utils/colors.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.Utils.Colors do alias Pleroma.Web.Utils.Colors.RGB # Adapted from: - # https://gitlab.com/soapbox-pub/soapbox-fe/-/blob/develop/app/soapbox/utils/colors.ts + # https://gitlab.com/soapbox-pub/soapbox/-/blob/develop/app/soapbox/utils/colors.ts @intensity_map %{ 50 => 0.95, 100 => 0.9, diff --git a/priv/static/index.html b/priv/static/index.html index a888b895a9..ae0cd9a5d9 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -65,10 +65,10 @@

Almost done...

Congrats! 🎉 You've installed Rebased. Now you just need to install a frontend.

Installing Soapbox

-

To install Soapbox, SSH into the server and download a .zip of the latest build:

- curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/develop/download?job=build-production -o soapbox-fe.zip +

To install Soapbox, SSH into the server and download a .zip of the latest build:

+ curl -L https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/develop/download?job=build-production -o soapbox.zip

Then unpack it into the instance directory:

- busybox unzip soapbox-fe.zip -o -d /opt/pleroma/instance + busybox unzip soapbox.zip -o -d /opt/pleroma/instance

That's it! Just refresh this page.

diff --git a/test/mix/tasks/pleroma/frontend_test.exs b/test/mix/tasks/pleroma/frontend_test.exs index ebb9d921c3..b2658aa819 100644 --- a/test/mix/tasks/pleroma/frontend_test.exs +++ b/test/mix/tasks/pleroma/frontend_test.exs @@ -111,24 +111,24 @@ test "it downloads and unzips unknown frontends" do end test "enabling a primary frontend" do - capture_io(fn -> Frontend.run(["enable", "soapbox-fe"]) end) + capture_io(fn -> Frontend.run(["enable", "soapbox"]) end) primary = Pleroma.Config.get([:frontends, :primary]) - assert primary["name"] == "soapbox-fe" + assert primary["name"] == "soapbox" end test "enabling an admin frontend" do - capture_io(fn -> Frontend.run(["enable", "soapbox-fe", "--admin"]) end) + capture_io(fn -> Frontend.run(["enable", "soapbox", "--admin"]) end) primary = Pleroma.Config.get([:frontends, :admin]) - assert primary["name"] == "soapbox-fe" + assert primary["name"] == "soapbox" end test "raise if configurable_from_database is disabled" do clear_config(:configurable_from_database, false) assert_raise(RuntimeError, fn -> - capture_io(fn -> Frontend.run(["enable", "soapbox-fe"]) end) + capture_io(fn -> Frontend.run(["enable", "soapbox"]) end) end) end end diff --git a/test/pleroma/web/o_status/o_status_controller_test.exs b/test/pleroma/web/o_status/o_status_controller_test.exs index 5abbcfbdcf..6417bd0c70 100644 --- a/test/pleroma/web/o_status/o_status_controller_test.exs +++ b/test/pleroma/web/o_status/o_status_controller_test.exs @@ -345,7 +345,7 @@ test "does not require authentication on non-federating instances", %{ end describe "notice compatibility routes" do - test "Soapbox FE", %{conn: conn} do + test "Soapbox", %{conn: conn} do user = insert(:user) note_activity = insert(:note_activity, user: user)