@@ -29,6 +29,19 @@ function loggedInRedirectBrowse(to, from, next) {
2929 }
3030}
3131
32+ function loggedInAndProfileCompleted ( to , from , next ) {
33+ const loggedInUser = store . getters . getLoggedInUser ;
34+ if ( loggedInUser ) {
35+ if ( loggedInUser . is_profile_completed ) {
36+ next ( ) ;
37+ } else {
38+ next ( '/onboarding' ) ;
39+ }
40+ } else {
41+ next ( '/accounts/signin' ) ;
42+ }
43+ }
44+
3245function notLoggedInRedirectLogin ( to , from , next ) {
3346 if ( store . getters . getLoggedInUser ) {
3447 next ( ) ;
@@ -106,38 +119,38 @@ const routes = [
106119 path : '/browse' ,
107120 name : 'Browse' ,
108121 component : Browse ,
109- beforeEnter : notLoggedInRedirectLogin ,
122+ beforeEnter : loggedInAndProfileCompleted ,
110123 props : true ,
111124 } ,
112125 {
113126 path : '/search' ,
114127 component : Search ,
115128 name : 'Search' ,
116- beforeEnter : notLoggedInRedirectLogin ,
129+ beforeEnter : loggedInAndProfileCompleted ,
117130 } ,
118131 {
119132 path : '/settings' ,
120133 component : Settings ,
121134 name : 'Settings' ,
122- beforeEnter : notLoggedInRedirectLogin ,
135+ beforeEnter : loggedInAndProfileCompleted ,
123136 } ,
124137 {
125138 path : '/users/:id' ,
126139 component : User ,
127140 name : 'Users' ,
128- beforeEnter : notLoggedInRedirectLogin ,
141+ beforeEnter : loggedInAndProfileCompleted ,
129142 } ,
130143 {
131144 path : '/history' ,
132145 component : History ,
133146 name : 'History' ,
134- beforeEnter : notLoggedInRedirectLogin ,
147+ beforeEnter : loggedInAndProfileCompleted ,
135148 } ,
136149 {
137150 path : '/matches' ,
138151 component : Matches ,
139152 name : 'Matches' ,
140- beforeEnter : notLoggedInRedirectLogin ,
153+ beforeEnter : loggedInAndProfileCompleted ,
141154 } ,
142155 {
143156 path : '/accounts/signout' ,
0 commit comments