Skip to content

Commit 411c3ad

Browse files
committed
fix route order
1 parent 0a0745b commit 411c3ad

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

lib/algora_web/controllers/repo_controller.ex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ defmodule AlgoraWeb.RepoController do
99

1010
case user do
1111
%{handle: handle} when is_binary(handle) ->
12-
dbg("redirecting to #{~p"/#{handle}"}")
1312
redirect(conn, to: ~p"/#{handle}")
1413

1514
_ ->
16-
dbg("redirecting to #{~p"/go/#{repo_owner}/#{repo_name}"}")
1715
redirect(conn, to: ~p"/go/#{repo_owner}/#{repo_name}")
1816
end
1917
end

lib/algora_web/router.ex

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,6 @@ defmodule AlgoraWeb.Router do
144144
live "/auth/signup", SignInLive, :signup
145145
end
146146

147-
scope "/:repo_owner/:repo_name" do
148-
get "/", RepoController, :index
149-
150-
live_session :repo,
151-
layout: {AlgoraWeb.Layouts, :user},
152-
on_mount: [{AlgoraWeb.UserAuth, :current_user}, AlgoraWeb.Org.RepoNav] do
153-
live "/issues/:number", BountyLive
154-
live "/pull/:number", BountyLive
155-
end
156-
end
157-
158147
scope "/:user_handle" do
159148
live_session :user,
160149
layout: {AlgoraWeb.Layouts, :user},
@@ -191,6 +180,17 @@ defmodule AlgoraWeb.Router do
191180
end
192181
end
193182

183+
scope "/:repo_owner/:repo_name" do
184+
get "/", RepoController, :index
185+
186+
live_session :repo,
187+
layout: {AlgoraWeb.Layouts, :user},
188+
on_mount: [{AlgoraWeb.UserAuth, :current_user}, AlgoraWeb.Org.RepoNav] do
189+
live "/issues/:number", BountyLive
190+
live "/pull/:number", BountyLive
191+
end
192+
end
193+
194194
live "/0/bounties/:id", OG.BountyLive, :show
195195
get "/og/*path", OGImageController, :generate
196196

0 commit comments

Comments
 (0)