This commit is contained in:
Jon Lambson 2017-08-21 14:28:58 -06:00
parent 198597dc3b
commit 4474e23042
11 changed files with 25 additions and 37 deletions

View File

@ -15,7 +15,6 @@
.login-container {
top: 25vh;
}
/* Common CSS */
.cp {
cursor: pointer;

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html ng-app="launchpad" ng-strict ng-controller="loginCtrl as vm">
<html ng-app="launchpad" ng-strict>
<head>
<meta charset="utf-8">
<title>Launch-pad</title>
@ -9,7 +9,7 @@
<link rel="stylesheet" href="/css/styles.css">
</head>
<body class="{{ vm.currentPath }}">
<body>
<div ui-view class="splash-page"></div>
<div class="search-bar" ui-view="header"></div>
<div class="container main-content">

View File

@ -11,8 +11,6 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
data: { requiresLogin: false },
url: '/splash-page',
templateUrl: '/templates/splash-page.html',
controller: 'loginCtrl',
controllerAs: 'vm'
})
.state('app',{
data: { requiresLogin: true },
@ -20,8 +18,6 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'header': {
templateUrl: '/templates/partials/header.html',
controller: 'loginCtrl',
controllerAs: 'vm'
},
'menu': {
templateUrl: '/templates/partials/menu.html'
@ -36,8 +32,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/home.html',
controller: 'loginCtrl',
controllerAs: 'vm'
controller: 'loginCtrl as vm'
}
}
})
@ -46,8 +41,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/bolt.html',
controller: 'boltCtrl',
controllerAs: 'vm'
controller: 'boltCtrl as vm',
}
}
})
@ -56,8 +50,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/files.html',
controller: 'fileCtrl',
controllerAs: 'vm'
controller: 'fileCtrl as vm',
}
}
})
@ -66,8 +59,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/contacts.html',
controller: 'contactCtrl',
controllerAs: 'vm'
controller: 'contactCtrl as vm',
}
}
})
@ -76,8 +68,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/music.html',
controller: 'musicCtrl',
controllerAs: 'vm'
controller: 'musicCtrl as vm',
}
}
})
@ -86,8 +77,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/email.html',
controller: 'emailCtrl',
controllerAs: 'vm'
controller: 'emailCtrl as vm',
}
}
})
@ -96,8 +86,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/website.html',
controller: 'websiteCtrl',
controllerAs: 'vm'
controller: 'websiteCtrl as vm',
}
}
})
@ -107,7 +96,6 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
'content@': {
templateUrl: 'templates/dns.html',
controller: 'dnsCtrl',
controllerAs: 'vm'
}
}
})
@ -116,8 +104,7 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: {
'content@': {
templateUrl: 'templates/account-settings.html',
controller: 'loginCtrl',
controllerAs: 'vm'
controller: 'loginCtrl as vm',
}
}
});

View File

@ -4,7 +4,6 @@ app.controller('loginCtrl', [
var vm = this;
vm.currentPath = $location.url().substr(1);
vm.independentIssuer = false;
vm.oauth3 = Oauth3.oauth3 = Oauth3.oauth3 || Oauth3.create(location);
vm.timers = {};
@ -124,9 +123,14 @@ app.controller('loginCtrl', [
vm.setIssuer(vm.defaultIssuer);
vm.getSession = function() {
console.log('asdf');
return Auth.select(Auth.session);
};
$scope.$watch('vm.session', function (newValue, oldValue) {
vm.session = newValue;
});
vm.initListLoggedInProfiles = function () {
vm.activeProfiles = Auth.getActiveSessions();
};
@ -153,4 +157,5 @@ app.controller('loginCtrl', [
});
};
}]);

View File

@ -32,7 +32,7 @@ app.controller('websiteCtrl', [
return $q.all(Auth.sessions.map(function (session) {
return Auth.select(session).then(function (oauth3) {
console.log('asdf');
return oauth3.api(apiname, {}).then(function (collection) {
if (collection.error) {

View File

@ -1,7 +1,5 @@
<h1 class="text-center">Account Settings</h1>
<div class="row">
<!-- left column -->
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="text-center">
<img src="http://s3.amazonaws.com/37assets/svn/765-default-avatar.png" class="avatar img-circle img-thumbnail" alt="avatar">
@ -9,7 +7,6 @@
<input type="file" class="text-center center-block well well-sm">
</div>
</div>
<!-- edit form column -->
<div class="col-md-8 col-sm-6 col-xs-12 personal-info">
<h3>Personal Info</h3>
<form class="form-horizontal" role="form">

View File

@ -44,7 +44,7 @@
</thead>
-->
<tbody>
<tr ng-repeat="shared_artist in vm.shared_artists">
<tr ng-repeat="shared_artist in vm.shared_artists track by $index">
<td class="select-an-artist" ng-click="vm.get_artist(shared_artist)">{{ shared_artist }}</td>
<td>December 23, 2016</td>
<td><i class="fa fa-exchange js-sync-icon" aria-hidden="true"></i></td>
@ -61,7 +61,7 @@
</thead>
-->
<tbody>
<tr ng-repeat="artist in vm.artists">
<tr ng-repeat="artist in vm.artists track by $index">
<td class="select-an-artist" ng-click="vm.get_artist(artist)">{{ artist }}</td>
<td>June 13, 2017</td>
<td><i class="fa fa-exchange js-sync-icon" aria-hidden="true"></i></td>

View File

@ -7,7 +7,7 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="media">
<h5 class="media-heading">System Message > Jane Smith {{ vm.userName() }}</h5>
<h5 class="media-heading">System Message > Jane Smith {{ vm.session }}</h5>
<hr>
<div class="media-left">
<div class="image-thing"><i class="fa fa-bullhorn fa-3x" aria-hidden="true"></i></div>

View File

@ -1,4 +1,4 @@
<nav class="navbar navbar-default navbar-fixed-top">
<nav class="navbar navbar-default navbar-fixed-top" ng-controller="loginCtrl as vm">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
@ -28,7 +28,7 @@
<li role="separator" class="divider"></li>
<li ng-if="vm.sessions.length">Switch User</li>
<li ng-repeat="session in vm.sessions"><a ng-click="vm.selectSession(session)"><span ng-bind="session.subject">me@example.com</span> <i class="fa fa-user" aria-hidden="true"></i>
<li ng-repeat="session in vm.sessions track by $index"><a ng-click="vm.selectSession(session); vm.selectedProfile(session);"><span ng-bind="session.subject">me@example.com</span> <i class="fa fa-user" aria-hidden="true"></i>
<br><small ng-bind="session.issuer">example.com</small></a></li>
<li ng-if="vm.sessions.length" role="separator" class="divider"></li>

View File

@ -1,7 +1,7 @@
<section class="col-md-offset-4 col-md-4 login-container" ng-init="vm.initListLoggedInProfiles()">
<form>
<h4 class="text-center">Sign in</h4>
<a href="#!/home" class="current-user-container" ng-repeat="profile in vm.activeProfiles track by $index">
<a href="#!/home" class="current-user-container" ng-repeat="profile in vm.sessions track by $index" ng-click="vm.selectSession(profile);">
<div class="current-user-split"><i class="fa fa-user"></i></div>
<div class="current-user-text">Resume with {{ profile.email }}</div>
</a>

View File

@ -18,7 +18,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li ng-repeat="record in vm.records"><button class="btn btn-link" ng-bind="record.sub" ng-click="vm.selectRecord(record)">www</button></li>
<li ng-repeat="record in vm.records track by $index"><button class="btn btn-link" ng-bind="record.sub" ng-click="vm.selectRecord(record)">www</button></li>
</ul>
</div>
</div>
@ -31,7 +31,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li ng-repeat="domain in vm.domains"><button class="btn btn-link" ng-bind="domain.domain" ng-click="vm.selectDomain(domain)">example.com</button></li>
<li ng-repeat="domain in vm.domains track by $index"><button class="btn btn-link" ng-bind="domain.domain" ng-click="vm.selectDomain(domain)">example.com</button></li>
</ul>
</div>
</div>