co-auther - npm Package Compare versions

Comparing version 0.0.5 to 0.0.6

package.json

 {
   "name": "co-auther",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
@@ -8,3 +8,3 @@ "main": "src/co-auther/co-auther.js",
     "start": "node server",
-    "build": "npm run gulp-ts && npm run tsc-e2e && npm run gulp-sass",
+    "build": "npm run typescript && npm run tsc-e2e && npm run gulp-sass",
     "prepublish": "npm run build",
@@ -14,4 +14,4 @@ "afterinstall": "npm run webdriver",
     "test-e2e": "npm run build && gulp test-e2e",
-    "gulp-ts": "gulp typescript",
-    "gulp-ts:watch": "gulp typescript:watch",
+    "typescript": "gulp typescript",
+    "watch": "gulp typescript:watch",
     "gulp-sass": "gulp sass",
@@ -28,3 +28,3 @@ "tsc-e2e": "tsc -p test/e2e"
   "devDependencies": {
-    "angular2": "2.0.0-beta.1",
+    "angular2": "2.0.0-beta.2",
     "bootstrap": "git+https://[e-mail]/twbs/bootstrap.git#v4-dev",
@@ -31,0 +31,0 @@ "es6-promise": "3.0.2",

README.md

@@ -92,1 +92,10 @@ # co-auther
 ```
+
+In order to remember which terminal route you were aiming for when accessing the GUI, you need this 'hack' in the terminal routes:
+
+```javascript
+import {setTerminal} from 'co-auther'
+...
+@CanActivate(setTerminal)
+...
+```

src/co-auther/co-auther.js

 var dontTouchLocalStorage = false;
+var terminalRoute = null;
 var coAuther;
-var routeFunction = function (afterHash) {
+function basicRouting(afterHash) {
     var loc = window.location;
     window.location.href = loc.protocol + "//" + loc.host + loc.pathname + "#/" + afterHash;
+}
+// Basic default route function, should be overridden
+var routeFunction = function (afterHash) {
+    basicRouting(afterHash);
 };
@@ -46,2 +51,5 @@ var getCoAuther = function () {
                 // initialRequest done, move on to logged in
+                if (terminalRoute) {
+                    return goToTerminal();
+                }
                 return routeFunction(config.LOGGED_IN);
@@ -57,2 +65,12 @@ });
 exports.activationHelper = activationHelper;
+// terminal memory
+function setTerminal() {
+    terminalRoute = window.location.hash.substring(2);
+    return true;
+}
+exports.setTerminal = setTerminal;
+function goToTerminal() {
+    basicRouting(terminalRoute);
+}
+exports.goToTerminal = goToTerminal;
 function CoAuther(apiService) {
@@ -59,0 +77,0 @@ var initialDataLoaded = false;

src/co-auther/co-auther.ts

 let dontTouchLocalStorage = false
+let terminalRoute = null
 let coAuther
-let routeFunction = (afterHash) => {
+function basicRouting (afterHash) {
   let loc = window.location
   window.location.href = `${loc.protocol}//${loc.host}${loc.pathname}#/${afterHash}`
 }
+// Basic default route function, should be overridden
+let routeFunction = (afterHash) => {
+  basicRouting(afterHash)
+}
 let getCoAuther = function () {
@@ -41,5 +46,8 @@ if (!coAuther) {
       initialRequestPending = true
-        getCoAuther().makeInitialRequestWrap().then(() => {
-          initialRequestPending = false
+      getCoAuther().makeInitialRequestWrap().then(() => {
+        initialRequestPending = false
         // initialRequest done, move on to logged in
+        if (terminalRoute) {
+          return goToTerminal()
+        }
         return routeFunction(config.LOGGED_IN)
@@ -55,2 +63,11 @@ })
 
+// terminal memory
+function setTerminal () {
+  terminalRoute = window.location.hash.substring(2)
+  return true
+}
+function goToTerminal () {
+  basicRouting(terminalRoute)
+}
+
 function CoAuther (apiService) {
@@ -86,3 +103,3 @@ let initialDataLoaded = false
   function makeInitialRequestWrap () {
-    return new Promise ((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       apiService.makeInitialRequest()
@@ -156,3 +173,5 @@ .then(() => {
   getCoAuther,
-  activationHelper
+  activationHelper,
+  setTerminal,
+  goToTerminal
 }

src/example-themed/components/app-cmp.js

@@ -47,3 +47,3 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
             { path: '/authenticate', as: 'Authenticate', component: authenticate_cmp_1.AuthenticateCmp, useAsDefault: true },
-            { path: '/loggedIn', as: 'LoggedIn', component: logged_in_cmp_1.LoggedInCmp },
+            { path: '/loggedIn/...', as: 'LoggedIn', component: logged_in_cmp_1.LoggedInCmp },
             { path: '/initialRequest', as: 'InitialRequest', component: initial_request_cmp_1.InitialRequestCmp }
@@ -50,0 +50,0 @@ ]),

src/example-themed/components/app-cmp.ts

@@ -21,3 +21,3 @@ // Angular
   {path: '/authenticate',    as: 'Authenticate',     component: AuthenticateCmp,   useAsDefault: true},
-  {path: '/loggedIn',        as: 'LoggedIn',         component: LoggedInCmp},
+  {path: '/loggedIn/...',    as: 'LoggedIn',         component: LoggedInCmp},
   {path: '/initialRequest',  as: 'InitialRequest',   component: InitialRequestCmp}
@@ -24,0 +24,0 @@ ])

src/example-themed/components/logged-in-cmp.js

@@ -12,3 +12,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 var router_1 = require('angular2/router');
+var router_2 = require('angular2/router');
 var co_auther_1 = require('../../co-auther/co-auther');
+var dashboard_cmp_1 = require('./logged-in-pages/dashboard-cmp');
+var settings_cmp_1 = require('./logged-in-pages/settings-cmp');
 var LoggedInCmp = (function () {
@@ -22,7 +25,15 @@ function LoggedInCmp() {
     LoggedInCmp = __decorate([
+        router_2.RouteConfig([
+            { path: '/dashboard', as: 'Dashboard', component: dashboard_cmp_1.DashboardCmp, useAsDefault: true },
+            { path: '/settings', as: 'Settings', component: settings_cmp_1.SettingsCmp }
+        ]),
         core_1.Component({
             selector: 'logged-in-cmp',
-            template: "\n    <nav class=\"navbar navbar-dark navbar-fixed-top bg-inverse\">\n      <button type=\"button\" class=\"navbar-toggler hidden-sm-up\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\n        <span class=\"sr-only\">Toggle navigation</span>\n        <span class=\"icon-bar\"></span>\n        <span class=\"icon-bar\"></span>\n        <span class=\"icon-bar\"></span>\n      </button>\n      <a class=\"navbar-brand\" href=\"#\">Project name</a>\n      <div id=\"navbar\">\n        <nav class=\"nav navbar-nav pull-xs-left\">\n          <a class=\"nav-item nav-link\" href=\"#\">Dashboard</a>\n          <a class=\"nav-item nav-link\" href=\"#\" (click)=\"logOut($event)\">Logout</a>\n        </nav>\n        <form class=\"pull-xs-right\">\n          <input type=\"text\" class=\"form-control\" placeholder=\"Search...\">\n        </form>\n      </div>\n    </nav>\n\n    <div class=\"container-fluid\">\n      <div class=\"row\">\n        <div class=\"col-sm-3 col-md-2 sidebar\">\n          <ul class=\"nav nav-sidebar\">\n            <li class=\"active\"><a href=\"#\">Overview <span class=\"sr-only\">(current)</span></a></li>\n            <li><a href=\"#\">Reports</a></li>\n          </ul>\n          <ul class=\"nav nav-sidebar\">\n            <li><a href=\"\">Nav item again</a></li>\n            <li><a href=\"\">One more nav</a></li>\n          </ul>\n        </div>\n        <div class=\"col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main\">\n          <h1 class=\"page-header\">Dashboard</h1>\n        </div>\n      </div>\n    </div>\n  "
+            directives: [router_2.ROUTER_DIRECTIVES],
+            template: "\n    <nav class=\"navbar navbar-dark navbar-fixed-top bg-inverse\">\n      <button type=\"button\" class=\"navbar-toggler hidden-sm-up\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\n        <span class=\"sr-only\">Toggle navigation</span>\n        <span class=\"icon-bar\"></span>\n        <span class=\"icon-bar\"></span>\n        <span class=\"icon-bar\"></span>\n      </button>\n      <a class=\"navbar-brand\" href=\"#\">Project name</a>\n      <div id=\"navbar\">\n        <nav class=\"nav navbar-nav pull-xs-left\">\n          <a class=\"nav-item nav-link\" href=\"#\" (click)=\"logOut($event)\">Logout</a>\n        </nav>\n        <form class=\"pull-xs-right\">\n          <input type=\"text\" class=\"form-control\" placeholder=\"Search...\">\n        </form>\n      </div>\n    </nav>\n\n    <div class=\"container-fluid\">\n      <div class=\"row\">\n        <div class=\"col-sm-3 col-md-2 sidebar\">\n          <ul class=\"nav nav-sidebar\">\n            <li class=\"active\"><a [routerLink]=\"['/LoggedIn/Dashboard']\">Dashboard<span class=\"sr-only\">(current)</span></a></li>\n            <li><a [routerLink]=\"['/LoggedIn/Settings']\">Settings</a></li>\n          </ul>\n          <ul class=\"nav nav-sidebar\">\n            <li><a href=\"\">Dummy item 1</a></li>\n            <li><a href=\"\">Dummy item 2</a></li>\n          </ul>\n        </div>\n        <div class=\"col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main\">\n          <router-outlet></router-outlet>\n        </div>\n      </div>\n    </div>\n  "
         }),
-        router_1.CanActivate(function () { return co_auther_1.activationHelper('LoggedIn'); }), 
+        router_1.CanActivate(function (next, previous) {
+            console.log('next:', next ? '"' + next.urlPath + '"' : null, 'previous:', previous ? '"' + previous.urlPath + '"' : null);
+            return co_auther_1.activationHelper('LoggedIn');
+        }), 
         __metadata('design:paramtypes', [])
@@ -29,0 +40,0 @@ ], LoggedInCmp);

src/example-themed/components/logged-in-cmp.ts

 import {Component} from 'angular2/core'
 import {CanActivate} from 'angular2/router'
+import {ROUTER_DIRECTIVES, RouteConfig} from 'angular2/router'
 import {activationHelper, getCoAuther} from '../../co-auther/co-auther'
+import {DashboardCmp} from './logged-in-pages/dashboard-cmp'
+import {SettingsCmp} from './logged-in-pages/settings-cmp'
 
+@RouteConfig([
+  {path: '/dashboard',  as: 'Dashboard',  component: DashboardCmp,   useAsDefault: true},
+  {path: '/settings',   as: 'Settings',   component: SettingsCmp}
+])
 @Component({
   selector: 'logged-in-cmp',
+  directives: [ROUTER_DIRECTIVES],
   template: `
@@ -18,3 +26,2 @@ <nav class="navbar navbar-dark navbar-fixed-top bg-inverse">
         <nav class="nav navbar-nav pull-xs-left">
-          <a class="nav-item nav-link" href="#">Dashboard</a>
           <a class="nav-item nav-link" href="#" (click)="logOut($event)">Logout</a>
@@ -32,12 +39,12 @@ </nav>
           <ul class="nav nav-sidebar">
-            <li class="active"><a href="#">Overview <span class="sr-only">(current)</span></a></li>
-            <li><a href="#">Reports</a></li>
+            <li class="active"><a [routerLink]="['/LoggedIn/Dashboard']">Dashboard<span class="sr-only">(current)</span></a></li>
+            <li><a [routerLink]="['/LoggedIn/Settings']">Settings</a></li>
           </ul>
           <ul class="nav nav-sidebar">
-            <li><a href="">Nav item again</a></li>
-            <li><a href="">One more nav</a></li>
+            <li><a href="">Dummy item 1</a></li>
+            <li><a href="">Dummy item 2</a></li>
           </ul>
         </div>
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-          <h1 class="page-header">Dashboard</h1>
+          <router-outlet></router-outlet>
         </div>
@@ -48,3 +55,6 @@ </div>
 })
-@CanActivate(() => activationHelper('LoggedIn'))
+@CanActivate((next, previous) => {
+  console.log('next:', next ? '"' + next.urlPath + '"' : null, 'previous:', previous ? '"' + previous.urlPath + '"' : null)
+  return activationHelper('LoggedIn')
+})
 export class LoggedInCmp {
@@ -51,0 +61,0 @@ logOut ($event) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

202764

increased by4.51%

Number of package files

78

increased by8.33%

Lines of code

5224

increased by2.41%

Number of lines in readme file

100

increased by8.7%

No dependency changes