adjustments

Author: jgauffin

src/Server/Coderr.Server.Web/ClientApp/components/home/home.vue.html

@@ -48,7 +48,7 @@ <h3>Application configuration (admin only)</h3>
                             </p>
                         </div>
                         <div class="card-footer">
-                            <a class="btn btn-primary" :href="`/manage/application/${appId}`">
+                            <a class="btn btn-primary" :href="`manage/application/${appId}`">
                                 Application settings
                             </a>
                         </div>
@@ -62,7 +62,7 @@ <h3>Invite co-workers (admin only)</h3>
                             <p>To invite co-workers, use the Cog wheel (<i class="fa fa-cog text-primary"></i>) found in top right menu, select one of your applications and then use the "Security" tab.</p>
                         </div>
                         <div class="card-footer">
-                            <a class="btn btn-primary" :href="`/manage/application/${appId}/security`">
+                            <a class="btn btn-primary" :href="`manage/application/${appId}/security`">
                                 Invite co-workers
                             </a>
                         </div>

src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.ts

@@ -79,6 +79,7 @@ export default class NavMenuComponent extends Vue {
             }
         });
         PubSubService.Instance.subscribe(MenuApi.MessagingTopics.SetApplication, ctx => {
+            console.log('SET', ctx.message)
             var msg = <MenuApi.SetApplication>ctx.message.body;
             this.changeApplication(msg.applicationId);
         });
@@ -110,7 +111,15 @@ export default class NavMenuComponent extends Vue {
             }
         }
 
-        if (paramCount === 1 && currentRoute.params.hasOwnProperty('applicationId')) {
+        if (currentRoute.path.indexOf('/manage/') !== -1) {
+            if (applicationId) {
+                const route = { name: 'manageAppSettings', params: { applicationId: applicationId.toString() } };
+                this.$router.push(route);
+            } else {
+                const route = { name: 'manageHome' };
+                this.$router.push(route);
+            }
+        } else if (paramCount === 1 && currentRoute.params.hasOwnProperty('applicationId')) {
             if (applicationId == null) {
                 this.$router.push({ name: currentRoute.name });
                 this.publishApplicationChanged(null);
@@ -119,21 +128,11 @@ export default class NavMenuComponent extends Vue {
                 this.publishApplicationChanged(applicationId);
             }
             return;
-        }
-
-        if (currentRoute.path.indexOf('/discover') === 0) {
+        } else if (currentRoute.path.indexOf('/discover') === 0) {
             this.$router.push({ name: 'discover', params: { applicationId: applicationId.toString() } });
         } else if (currentRoute.path.indexOf('/analyze') === 0) {
             this.$router.push({ name: 'analyzeHome', params: { applicationId: applicationId.toString() } });
-        } else if (currentRoute.path.indexOf('/manage/') !== -1) {
-            if (applicationId) {
-                const route = { name: 'manageAppSettings', params: { applicationId: applicationId.toString() } };
-                this.$router.push(route);
-            } else {
-                const route = { name: 'manageHome' };
-                this.$router.push(route);
-            }
-        } else {
+        } else  {
             const route = { name: currentRoute.name, params: { applicationId: applicationId.toString() } };
             this.$router.push(route);
         }

src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.vue.html

@@ -64,7 +64,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item">
-                            <a href="/account/logout" class="nav-link" title="Log out">
+                            <a href="account/logout/" class="nav-link" title="Log out">
                                 <i class="fa fa-power-off"></i>
                             </a>
                         </li>

src/Server/Coderr.Server.Web/Controllers/AccountController.cs

@@ -112,7 +112,8 @@ public async Task<ActionResult> Accept(AcceptViewModel model)
 
 
             await SignInAsync(identity);
-            return RedirectToAction("UpdateSession", new { returnUrl = "/#/account/accepted" });
+            var url = Url.Content("~/");
+            return RedirectToAction("UpdateSession", new {returnUrl = url});
         }
 
         [HttpGet("account/activate/{id}")]