Skip to content

Commit

Permalink
Merge pull request #318 from StanczakDominik/followup-309
Browse files Browse the repository at this point in the history
apply forgotten mix format
  • Loading branch information
StanczakDominik authored Jun 9, 2024
2 parents 1d4c102 + b19da2a commit 7022b43
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# see docs/local_setup.md for usage
9bb669ea86949ceba75d95d05578f67e8ace5351
40157923b1241c63ca5be17696415a500e64dbdd
3 changes: 2 additions & 1 deletion lib/teiserver/account/error_handler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ defmodule Teiserver.Account.ErrorHandler do

def auth_error(conn, {:unauthenticated, _reason}, _opts) do
redirect_to = "#{conn.request_path}?#{conn.query_string}"

conn
|> put_resp_cookie("_redirect_to", redirect_to, sign: true, max_age: 60*5)
|> put_resp_cookie("_redirect_to", redirect_to, sign: true, max_age: 60 * 5)
|> Phoenix.Controller.redirect(
to: TeiserverWeb.Router.Helpers.account_session_path(conn, :login)
)
Expand Down
7 changes: 1 addition & 6 deletions lib/teiserver_web/components/nav_components.ex
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,7 @@ defmodule TeiserverWeb.NavComponents do
~H"""
<div class="col sub-menu-icon">
<a href={@url} class={"block-link #{@active_class}"}>
<Fontawesome.icon
:if={@icon}
icon={@icon}
style="solid"
size="2x"
/><br />
<Fontawesome.icon :if={@icon} icon={@icon} style="solid" size="2x" /><br />
<%= render_slot(@inner_block) %>
</a>
</div>
Expand Down

0 comments on commit 7022b43

Please sign in to comment.