Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/css/themes/dark-purple.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ $tag-category-content-official-color: #b9b541;
$tag-category-content-fanmade-color: #cc8eb5;
$tag-category-species-color: #b16b50;
$tag-category-body-type-color: #b8b8b8;
$tag-category-gender-color: #0b9d88;

$commission-category-color: #e07b27;

Expand Down
1 change: 1 addition & 0 deletions assets/css/themes/dark-red.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ $tag-category-content-official-color: #d1cf84;
$tag-category-content-fanmade-color: #ebb1d6;
$tag-category-species-color: #d2b48c;
$tag-category-body-type-color: #b8b8b8;
$tag-category-gender-color: #0b9d88;

$commission-category-color: #e02727;

Expand Down
2 changes: 1 addition & 1 deletion assets/static/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions assets/static/images/tagblocked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions lib/philomena/commissions/commission.ex
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ defmodule Philomena.Commissions.Commission do
def categories do
[
Anthro: "Anthro",
"Canon Characters": "Canon Characters",
"Cyberchase Characters": "Cyberchase Characters",
Comics: "Comics",
"Fetish Art": "Fetish Art",
"Human and EqG": "Human and EqG",
"Fetish Content": "Fetish Content",
"Human": "Human",
NSFW: "NSFW",
"Original Characters": "Original Characters",
"OCs": "OCs",
"Original Species": "Original Species",
Pony: "Pony",
Requests: "Requests",
Safe: "Safe",
SFW: "SFW",
Shipping: "Shipping",
Transformation: "Transformation",
"Violence and Gore": "Violence and Gore"
]
end
Expand All @@ -85,6 +85,8 @@ defmodule Philomena.Commissions.Commission do
"Crafted Item",
"Sculpture",
"Plushie",
"Trading Card",
"Reference Sheet",
"Other"
]
end
Expand Down
6 changes: 3 additions & 3 deletions lib/philomena_web/controllers/admin/user_ban_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ defmodule PhilomenaWeb.Admin.UserBanController do
case Bans.create_user(conn.assigns.current_user, user_ban_params) do
{:ok, user_ban} ->
conn
|> put_flash(:info, "User was successfully banned.")
|> put_flash(:info, "User Was Successfully Banned.")
|> moderation_log(details: &log_details/2, data: user_ban)
|> redirect(to: ~p"/admin/user_bans")

Expand All @@ -74,7 +74,7 @@ defmodule PhilomenaWeb.Admin.UserBanController do
case Bans.update_user(conn.assigns.user, user_ban_params) do
{:ok, user_ban} ->
conn
|> put_flash(:info, "User ban successfully updated.")
|> put_flash(:info, "User Ban Successfully Updated.")
|> moderation_log(details: &log_details/2, data: user_ban)
|> redirect(to: ~p"/admin/user_bans")

Expand All @@ -87,7 +87,7 @@ defmodule PhilomenaWeb.Admin.UserBanController do
{:ok, user_ban} = Bans.delete_user(conn.assigns.user)

conn
|> put_flash(:info, "User ban successfully deleted.")
|> put_flash(:info, "User Ban Successfully Deleted.")
|> moderation_log(details: &log_details/2, data: user_ban)
|> redirect(to: ~p"/admin/user_bans")
end
Expand Down
2 changes: 1 addition & 1 deletion lib/philomena_web/templates/image/_description.html.slime
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
= if String.length(@image.description) > 0 do
= @body
- else
em No description provided.
em No description set yet.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
=> label f, :will_create, "Content you are particularly interested in drawing or creating (optional):"
= textarea f, :will_create, class: "input input--wide input--text", placeholder: "List specific content you are willing to accept commissions for."
= error_tag f, :will_create
.field
=> label f, :neither_create, "Something that I sometimes draw (optional):"
= textarea f, :neither_create, class: "input input--wide input--text", placeholder: "List specific content you are sometimes willing to accept commissions for."
= error_tag f, :neither_create
.field
=> label f, :will_not_create, "Content you will not draw or create (optional):"
= textarea f, :will_not_create, class: "input input--wide input--text", placeholder: "List specific content you are not willing to accept commissions for."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
br

strong> Status:
= if @commission.open, do: "Open", else: "Closed"
= if @commission.open, do: "Open", else: "No"

br

Expand Down Expand Up @@ -50,11 +50,19 @@
.block__content.commission__block_body
= @rendered.will_create

/ Will neither create block
= if @commission.neither_create not in [nil, ""] do
.block
.block__header
span.block__header__title Will maybe draw/create
.block__content.commission__block_body
= @rendered.will_n_create

/ Will not create block
= if @commission.will_not_create not in [nil, ""] do
.block
.block__header
span.block__header__title Will not draw/create
span.block__header__title Won't draw/create
.block__content.commission__block_body
= @rendered.will_not_create

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
h1
= @commission.user.name
| 's Commissions
| 's Commissions Info!

.column-layout

Expand Down