diff --git a/lib/central/general_test_lib.ex b/lib/central/general_test_lib.ex index b087951ad..5794acc18 100644 --- a/lib/central/general_test_lib.ex +++ b/lib/central/general_test_lib.ex @@ -32,7 +32,7 @@ defmodule Central.Helpers.GeneralTestLib do "name" => params["name"] || "Test", "email" => params["email"] || "email@email#{:rand.uniform(999_999_999_999)}", "colour" => params["colour"] || "#00AA00", - "icon" => params["icon"] || "fa-regular fa-user", + "icon" => params["icon"] || "fa-solid fa-user", "permissions" => permissions, "password" => params["password"] || "password", "password_confirmation" => params["password"] || "password", diff --git a/lib/teiserver/account/libs/auth_lib.ex b/lib/teiserver/account/libs/auth_lib.ex index 15285b033..4c79dcf20 100644 --- a/lib/teiserver/account/libs/auth_lib.ex +++ b/lib/teiserver/account/libs/auth_lib.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.AuthLib do require Logger @spec icon :: String.t() - def icon(), do: "fa-regular fa-address-card" + def icon(), do: "fa-solid fa-address-card" @spec get_all_permission_sets() :: Map.t() def get_all_permission_sets do diff --git a/lib/teiserver/account/libs/smurf_key_type_lib.ex b/lib/teiserver/account/libs/smurf_key_type_lib.ex index 01626858d..0044c9012 100644 --- a/lib/teiserver/account/libs/smurf_key_type_lib.ex +++ b/lib/teiserver/account/libs/smurf_key_type_lib.ex @@ -4,7 +4,7 @@ defmodule Teiserver.Account.SmurfKeyTypeLib do # Functions @spec icon :: String.t() - def icon, do: "fa-regular fa-???" + def icon, do: "fa-regular fa-question" @spec colours :: atom def colours, do: :default diff --git a/lib/teiserver/account/reports/mapping_report.ex b/lib/teiserver/account/reports/mapping_report.ex index 8ff8c2b0c..3e6a473b1 100644 --- a/lib/teiserver/account/reports/mapping_report.ex +++ b/lib/teiserver/account/reports/mapping_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Game.MappingReport do alias Teiserver.{Battle} @spec icon() :: String.t() - def icon(), do: "fa-regular fa-map" + def icon(), do: "fa-solid fa-map" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/account/reports/week_on_week_report.ex b/lib/teiserver/account/reports/week_on_week_report.ex index 43fd8bf4f..f57b70e76 100644 --- a/lib/teiserver/account/reports/week_on_week_report.ex +++ b/lib/teiserver/account/reports/week_on_week_report.ex @@ -3,7 +3,7 @@ defmodule Teiserver.Account.WeekOnWeekReport do alias Teiserver.Helper.{TimexHelper, NumberHelper} @spec icon() :: String.t() - def icon(), do: "fa-regular fa-calendar" + def icon(), do: "fa-solid fa-calendar" @spec permissions() :: String.t() def permissions(), do: "Admin" diff --git a/lib/teiserver/helpers/fontawesome.ex b/lib/teiserver/helpers/fontawesome.ex index 56cc8ae2c..242477c26 100644 --- a/lib/teiserver/helpers/fontawesome.ex +++ b/lib/teiserver/helpers/fontawesome.ex @@ -72,11 +72,11 @@ defmodule Fontawesome do def icon_lookup(:chart), do: "fa-chart-line" - def icon_lookup(:day), do: "fa-calendar-day" - def icon_lookup(:week), do: "fa-calendar-week" - def icon_lookup(:month), do: "fa-calendar-range" - def icon_lookup(:quarter), do: "fa-calendar" - def icon_lookup(:year), do: "fa-circle-calendar" + def icon_lookup(:day), do: "" + def icon_lookup(:week), do: "" + def icon_lookup(:month), do: "" + def icon_lookup(:quarter), do: "" + def icon_lookup(:year), do: "" def brand_icons do ~w(42-group 500px accessible-icon accusoft adn adversal affiliatetheme airbnb algolia alipay amazon-pay amazon amilia android angellist angrycreative angular apper apple-pay apple app-store-ios app-store artstation asymmetrik atlassian audible autoprefixer avianex aviato aws bandcamp battle-net behance bilibili bimobject bitbucket bitcoin bity blackberry black-tie blogger-b blogger bluetooth-b bluetooth bootstrap bots btc buffer buromobelexperte buy-n-large buysellads canadian-maple-leaf cc-amazon-pay cc-amex cc-apple-pay cc-diners-club cc-discover cc-jcb cc-mastercard cc-paypal cc-stripe cc-visa centercode centos chromecast chrome cloudflare cloudscale cloudsmith cloudversify cmplid codepen codiepie confluence connectdevelop contao cotton-bureau cpanel creative-commons-by creative-commons-nc-eu creative-commons-nc-jp creative-commons-nc creative-commons-nd creative-commons-pd-alt creative-commons-pd creative-commons-remix creative-commons-sampling-plus creative-commons-sampling creative-commons-sa creative-commons-share creative-commons creative-commons-zero critical-role css3-alt css3 cuttlefish dailymotion d-and-d-beyond d-and-d dashcube deezer delicious deploydog deskpro deviantart dev dhl diaspora digg digital-ocean discord discourse dochub docker draft2digital dribbble dropbox drupal dyalog earlybirds ebay edge-legacy edge elementor ello ember empire envira erlang ethereum etsy evernote expeditedssl facebook-f facebook-messenger facebook fantasy-flight-games fedex fedora figma firefox-browser firefox firstdraft first-order-alt first-order flickr flipboard fly font-awesome fonticons-fi fonticons fort-awesome-alt fort-awesome forumbee foursquare freebsd free-code-camp fulcrum galactic-republic galactic-senate get-pocket gg-circle gg git-alt github-alt github gitkraken gitlab git gitter glide-g glide gofore golang goodreads-g goodreads google-drive google-pay google-play google-plus-g google-plus google google-wallet gratipay grav gripfire grunt guilded gulp hacker-news hackerrank hashnode hips hire-a-helper hive hooli hornbill hotjar houzz html5 hubspot ideal imdb instagram instalod intercom internet-explorer invision ioxhost itch-io itunes-note itunes java jedi-order jenkins jira joget joomla jsfiddle js kaggle keybase keycdn kickstarter-k kickstarter korvue laravel lastfm leanpub less line linkedin-in linkedin linode linux lyft magento mailchimp mandalorian markdown mastodon maxcdn mdb medapps medium medrt meetup megaport mendeley meta microblog microsoft mixcloud mixer mix mizuni modx monero napster neos nfc-directional nfc-symbol nimblr node-js node npm ns8 nutritionix octopus-deploy odnoklassniki odysee old-republic opencart openid opera optin-monster orcid osi padlet page4 pagelines palfed patreon paypal perbyte periscope phabricator phoenix-framework phoenix-squadron php pied-piper-alt pied-piper-hat pied-piper-pp pied-piper pinterest-p pinterest pix playstation product-hunt pushed python qq quinscape quora raspberry-pi ravelry reacteurope react readme rebel reddit-alien reddit redhat red-river renren replyd researchgate resolving rev rocketchat rockrms r-project rust safari salesforce sass schlix screenpal scribd searchengin sellcast sellsy servicestack shirtsinbulk shopify shopware simplybuilt sistrix sith sitrox sketch skyatlas skype slack slideshare snapchat soundcloud sourcetree space-awesome speakap speaker-deck spotify square-behance square-dribbble square-facebook square-font-awesome-stroke square-font-awesome square-github square-gitlab square-git square-google-plus square-hacker-news square-instagram square-js square-lastfm square-odnoklassniki square-pied-piper square-pinterest square-reddit square-snapchat squarespace square-steam square-tumblr square-twitter square-viadeo square-vimeo square-whatsapp square-xing square-youtube stack-exchange stack-overflow stackpath staylinked steam steam-symbol sticker-mule strava stripe-s stripe stubber studiovinari stumbleupon-circle stumbleupon superpowers supple suse swift symfony teamspeak telegram tencent-weibo themeco themeisle the-red-yeti think-peaks tiktok trade-federation trello tumblr twitch twitter typo3 uber ubuntu uikit umbraco uncharted uniregistry unity unsplash untappd ups usb usps ussunnah vaadin viacoin viadeo viber vimeo vimeo-v vine vk vnv vuejs watchman-monitoring waze weebly weibo weixin whatsapp whmcs wikipedia-w windows wirsindhandwerk wix wizards-of-the-coast wodu wolf-pack-battalion wordpress-simple wordpress wpbeginner wpexplorer wpforms wpressr xbox xing yahoo yammer yandex-international yandex yarn y-combinator yelp yoast youtube zhihu) diff --git a/lib/teiserver/helpers/styling_helpers.ex b/lib/teiserver/helpers/styling_helpers.ex index 798c121ca..b501ed93a 100644 --- a/lib/teiserver/helpers/styling_helpers.ex +++ b/lib/teiserver/helpers/styling_helpers.ex @@ -52,6 +52,8 @@ defmodule Teiserver.Helper.StylingHelper do def get_bsname(colour), do: elem(colours(colour), 2) @spec icon(atom) :: String.t() + def icon(nil), do: nil + def icon(nil, _), do: nil def icon(atom), do: icon(atom, "solid") @spec icon(atom, String.t()) :: String.t() @@ -82,13 +84,13 @@ defmodule Teiserver.Helper.StylingHelper do def icon(:summary, fa_type), do: "fa-#{fa_type} fa-clipboard-list" - def icon(:chart, fa_type), do: "fa-#{fa_type} fa-chart-line" + def icon(:chart, _fa_type), do: "fa-solid fa-chart-line" - def icon(:day, fa_type), do: "fa-#{fa_type} fa-calendar-day" - def icon(:week, fa_type), do: "fa-#{fa_type} fa-calendar-week" - def icon(:month, fa_type), do: "fa-#{fa_type} fa-calendar-range" - def icon(:quarter, fa_type), do: "fa-#{fa_type} fa-calendar" - def icon(:year, fa_type), do: "fa-#{fa_type} fa-circle-calendar" + def icon(:day, _fa_type), do: "" + def icon(:week, _fa_type), do: "" + def icon(:month, _fa_type), do: "" + def icon(:quarter, _fa_type), do: "" + def icon(:year, _fa_type), do: "" # defp split_colour(c) do # {r, _} = c |> String.slice(1, 2) |> Integer.parse(16) @@ -224,7 +226,7 @@ defmodule Teiserver.Helper.StylingHelper do @spec random_styling() :: Map.t() def random_styling() do %{ - "icon" => "fa-regular fa-" <> random_icon(), + "icon" => "fa-solid fa-" <> random_icon(), "colour" => random_colour() } end diff --git a/lib/teiserver/logging/lib/aggregate_view_log_lib.ex b/lib/teiserver/logging/lib/aggregate_view_log_lib.ex index a8968bda2..db445f0b2 100644 --- a/lib/teiserver/logging/lib/aggregate_view_log_lib.ex +++ b/lib/teiserver/logging/lib/aggregate_view_log_lib.ex @@ -9,7 +9,7 @@ defmodule Teiserver.Logging.AggregateViewLogLib do def colours(), do: :info2 @spec icon() :: String.t() - def icon(), do: "fa-regular fa-chart-area" + def icon(), do: "fa-solid fa-chart-area" def get_logs() do from(logs in AggregateViewLog) diff --git a/lib/teiserver/logging/lib/audit_log_lib.ex b/lib/teiserver/logging/lib/audit_log_lib.ex index 25284e465..38cb849a6 100644 --- a/lib/teiserver/logging/lib/audit_log_lib.ex +++ b/lib/teiserver/logging/lib/audit_log_lib.ex @@ -8,7 +8,7 @@ defmodule Teiserver.Logging.AuditLogLib do def colours(), do: :danger2 @spec icon() :: String.t() - def icon(), do: "fa-regular fa-archive" + def icon(), do: "fa-solid fa-archive" @spec add_audit_types([String.t()]) :: :ok def add_audit_types(types) do diff --git a/lib/teiserver/logging/lib/logging_lib.ex b/lib/teiserver/logging/lib/logging_lib.ex index 34b3f8b6a..95779197a 100644 --- a/lib/teiserver/logging/lib/logging_lib.ex +++ b/lib/teiserver/logging/lib/logging_lib.ex @@ -6,7 +6,7 @@ defmodule Teiserver.Logging.LoggingLib do def colours(), do: :default @spec icon() :: String.t() - def icon(), do: "fa-regular fa-bars" + def icon(), do: "fa-solid fa-bars" @spec do_not_log(Plug.Conn.t()) :: Plug.Conn.t() def do_not_log(conn) do diff --git a/lib/teiserver/logging/lib/page_view_log_lib.ex b/lib/teiserver/logging/lib/page_view_log_lib.ex index baffa0fd6..43335f800 100644 --- a/lib/teiserver/logging/lib/page_view_log_lib.ex +++ b/lib/teiserver/logging/lib/page_view_log_lib.ex @@ -6,7 +6,7 @@ defmodule Teiserver.Logging.PageViewLogLib do def colours(), do: :info @spec icon() :: String.t() - def icon(), do: "fa-regular fa-chart-line" + def icon(), do: "fa-solid fa-chart-line" alias Teiserver.Logging.PageViewLog diff --git a/lib/teiserver/logging/lib/server_day_log_lib.ex b/lib/teiserver/logging/lib/server_day_log_lib.ex index e9b05b6cd..f4f053719 100644 --- a/lib/teiserver/logging/lib/server_day_log_lib.ex +++ b/lib/teiserver/logging/lib/server_day_log_lib.ex @@ -8,7 +8,7 @@ defmodule Teiserver.Logging.ServerDayLogLib do def colours(), do: :warning @spec icon() :: String.t() - def icon(), do: "fa-regular fa-monitor-heart-rate" + def icon(), do: "fa-solid fa-heart-pulse" @spec get_server_day_logs :: Ecto.Query.t() def get_server_day_logs() do diff --git a/lib/teiserver_web/live/account/party/index.html.heex b/lib/teiserver_web/live/account/party/index.html.heex index 59db05934..cf73cae50 100644 --- a/lib/teiserver_web/live/account/party/index.html.heex +++ b/lib/teiserver_web/live/account/party/index.html.heex @@ -13,12 +13,12 @@ moderator = allow?(@current_user, "Moderator") %>