From 874f97d118d50b61354af96dbdb6ec033e49b410 Mon Sep 17 00:00:00 2001 From: Atrian Wagner <411004+skullbunnygalaxy@users.noreply.github.com> Date: Thu, 10 Aug 2023 16:15:31 -0400 Subject: [PATCH 01/11] Updating wording and adding Github links. --- lib/banchan_web/components/layout.ex | 6 ++++++ lib/banchan_web/live/report_bug_live/new.ex | 5 +++-- .../live/static_live/about_us_live.ex | 20 ++++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/banchan_web/components/layout.ex b/lib/banchan_web/components/layout.ex index 8d312f5ee..088589f8a 100644 --- a/lib/banchan_web/components/layout.ex +++ b/lib/banchan_web/components/layout.ex @@ -130,6 +130,12 @@ defmodule BanchanWeb.Components.Layout do target="_blank" rel="noopener noreferrer" > + diff --git a/lib/banchan_web/live/report_bug_live/new.ex b/lib/banchan_web/live/report_bug_live/new.ex index f73ceca37..6e6c8f218 100644 --- a/lib/banchan_web/live/report_bug_live/new.ex +++ b/lib/banchan_web/live/report_bug_live/new.ex @@ -53,8 +53,9 @@ defmodule BanchanWeb.ReportBugLive.New do {#else}

Submit a bug report

-

Use this form to submit bug reports for Banchan Art. Please include as much context as you can.

-

NOTE: This report will be publicly visible on GitHub. Do NOT include anything personal or confidential

+

To submit a bug report for Banchan Art, you may use this form or Github. Please include as much context as you can.

+

You may view existing bugs using our Github issues page.

+

NOTE: This report will be publicly visible on GitHub. Do NOT include anything personal or confidential.

If you need support for something that shouldn't be public, please contact us at support@banchan.art.

# About Banchan Art - We are a [Platform Co-operative](https://en.wikipedia.org/wiki/Platform_cooperative) - of workers and artists coming together to create a new kind of art community. + Banchan Art is a website focused on providing a user-friendly space for artists for managing their clients, commissions, and invoices, and for patrons to discover new and existing artists to follow and to commission art. ## Our Mission - Our mission is to build an alternative space to the traditional, often funded by - [venture capitalist](https://en.wikipedia.org/wiki/Venture_capital), which are built + Our mission is to become a [Platform Co-operative](https://en.wikipedia.org/wiki/Platform_cooperative) + of workers and artists coming together to create a new kind of art community. You can read more about that on our [membership page](/membership). + + The platform co-operative model provides an alternative to the typical media sites that are often funded by + [venture capitalists](https://en.wikipedia.org/wiki/Venture_capital), which are built to extract value from artists and their work, at their expense, while doing their best to crush any alternative they might otherwise have. - We work in solidarity with organizations like [Artisans.Coop](https://artisans.coop/), + This platform is created, owned, and maintained with love and solidarity by Banchan Art LLC. We work in solidarity with organizations like [Artisans.Coop](https://artisans.coop/), [Comradery](https://comradery.co/), and [Ampled](https://www.ampled.com/) to imagine a different economy for the future. + ## Behind the Name + + Banchan Art is named for the Korean culinary tradition of shared side dishes known as banchan. + + Banchan includes a variety of dishes with different flavors and meanings. Each meal is a unique experience due to the constantly rotating selection of dishes and your ability to cater your meal by how much of each dish you select for yourself. You are able to satiate your palate for different tastes as you please. + + The idea behind Banchan Art is to build a platform that provides a meeting point for artists and their supporters. This is a place where both artists and their patrons can customize their experience in a mutually beneficial and harmonious way. Our ideal for the platform is to make it easy and enjoyable to commission a custom piece of art for both sides. Similar to choosing different amounts of banchan to cater a meal to your taste, supporters can choose from different options set up by artists to commission the art piece that they will treasure. + """ From 0bb0c8e1727071d4d2dd7eb411d8b4d6e94de726 Mon Sep 17 00:00:00 2001 From: Atrian Wagner <411004+skullbunnygalaxy@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:53:42 -0400 Subject: [PATCH 02/11] wip feedback for #585 --- lib/banchan/reports/reports.ex | 4 ++-- lib/banchan_web/components/layout.ex | 4 ++-- lib/banchan_web/live/report_bug_live/new.ex | 17 ++++++++++------- .../live/static_live/contact_live.ex | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/banchan/reports/reports.ex b/lib/banchan/reports/reports.ex index 8804734df..9033603f6 100644 --- a/lib/banchan/reports/reports.ex +++ b/lib/banchan/reports/reports.ex @@ -250,13 +250,13 @@ defmodule Banchan.Reports do @doc """ File a bug on GitHub """ - def report_bug(%User{} = actor, title, body, actor_url_fn) do + def report_bug(%User{} = actor, title, body, bug, actor_url_fn) do %{access_token: Application.fetch_env!(:banchan, :github_access_token)} |> Tentacat.Client.new() |> Tentacat.Issues.create("BanchanArt", "banchan", %{ title: title, body: "reported by [@#{actor.handle}](#{actor_url_fn.(actor)}):\n\n#{body}", - labels: ["bug", "from-site"] + labels: ["feedback", "from-site" | if(bug, do: ["bug"], else: [])] }) |> case do {201, %{"html_url" => url}, _} -> diff --git a/lib/banchan_web/components/layout.ex b/lib/banchan_web/components/layout.ex index 088589f8a..5bab95212 100644 --- a/lib/banchan_web/components/layout.ex +++ b/lib/banchan_web/components/layout.ex @@ -95,9 +95,9 @@ defmodule BanchanWeb.Components.Layout do
Co-op About Us - Contact Membership - Report Bug + Contact + Feedback
Legal diff --git a/lib/banchan_web/live/report_bug_live/new.ex b/lib/banchan_web/live/report_bug_live/new.ex index 6e6c8f218..cc307ed57 100644 --- a/lib/banchan_web/live/report_bug_live/new.ex +++ b/lib/banchan_web/live/report_bug_live/new.ex @@ -9,7 +9,7 @@ defmodule BanchanWeb.ReportBugLive.New do alias Surface.Components.Form alias BanchanWeb.Components.{Button, Layout} - alias BanchanWeb.Components.Form.{QuillInput, Submit, TextInput} + alias BanchanWeb.Components.Form.{QuillInput, Checkbox, Submit, TextInput} @impl true def handle_params(_params, _uri, socket) do @@ -17,11 +17,12 @@ defmodule BanchanWeb.ReportBugLive.New do end @impl true - def handle_event("submit", %{"bug_report" => %{"title" => title, "body" => body}}, socket) do + def handle_event("submit", %{"bug_report" => %{"title" => title, "body" => body, "bug"=> bug}}, socket) do case Reports.report_bug( socket.assigns.current_user, title, body, + bug, &Routes.denizen_show_url(Endpoint, :show, &1.handle) ) do {:ok, url} -> @@ -48,14 +49,14 @@ defmodule BanchanWeb.ReportBugLive.New do
{#if @report_url} -

Thanks for your bug report! You can view the issue and sign up for updates here.

+

Thanks for your feedback! You can view the issue and sign up for updates here.

{#if @open} -
+
{#if !@notifications || Enum.empty?(@notifications.entries)}
No notifications
{#else} diff --git a/lib/banchan_web/components/user_handle.ex b/lib/banchan_web/components/user_handle.ex index 471462e0b..4191eb8d0 100644 --- a/lib/banchan_web/components/user_handle.ex +++ b/lib/banchan_web/components/user_handle.ex @@ -21,17 +21,17 @@ defmodule BanchanWeb.Components.UserHandle do {@user.handle} {#if :admin in @user.roles} -
+
{#elseif :mod in @user.roles} -
+
{#elseif :system in @user.roles} -
+
@@ -44,17 +44,17 @@ defmodule BanchanWeb.Components.UserHandle do {@user.handle} {#if :admin in @user.roles} -
+
{#elseif :mod in @user.roles} -
+
{#elseif :system in @user.roles} -
+
@@ -62,7 +62,7 @@ defmodule BanchanWeb.Components.UserHandle do {#else} -
+