3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-17 23:26:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2054 from penpot/superalex-update-auth-urls-navigation

Browse source 
✨ Update auth urls navigation
This commit is contained in:
Andrey Antukh 2022-06-29 08:35:41 +02:00 • committed by GitHub
commit b68407a6c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
frontend/src/app/main/ui/routes.cljs
View file

@ -92,17 +92,23 @@
(defn on-navigate (defn on-navigate
[router path] [router path]
(let [match (match-path router path) (let [match (match-path router path)
profile (:profile @storage) profile (:profile @storage)
nopath? (or (= path "") (= path "/")) nopath? (or (= path "") (= path "/"))
authed? (and (not (nil? profile)) path-name (-> match :data :name)
(not= (:id profile) uuid/zero))] authpath? (some #(= path-name %) '(:auth-login
:auth-register
:auth-register-validate
:auth-register-success
:auth-recovery-request
:auth-recovery))
authed? (and (not (nil? profile))
(not= (:id profile) uuid/zero))]
(cond (cond
(and nopath? authed? (nil? match)) (or (and nopath? authed? (nil? match))
(if (not= uuid/zero profile) (and authpath? authed?))
(st/emit! (rt/nav :dashboard-projects {:team-id (du/get-current-team-id profile)})) (st/emit! (rt/nav :dashboard-projects {:team-id (du/get-current-team-id profile)}))
(st/emit! (rt/nav :auth-login)))
(and (not authed?) (nil? match)) (and (not authed?) (nil? match))
(st/emit! (rt/nav :auth-login)) (st/emit! (rt/nav :auth-login))