coolaj86/walnut_launchpad.html
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing ctrl

Browse Source
This commit is contained in:
Jon Lambson 2017-08-18 16:14:51 -06:00
parent 68607255a3
commit 0a63695869
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -10,7 +10,7 @@
</head> </head>
<body> <body>
<div ui-view class="splash-page" ng-controller="loginCtrl as vm"></div> <div ui-view class="splash-page"></div>
<div class="search-bar" ui-view="header"></div> <div class="search-bar" ui-view="header"></div>
<div class="container main-content"> <div class="container main-content">
<div class="menu-container" ui-view="menu"></div> <div class="menu-container" ui-view="menu"></div>

6
js/app.js
View File

@ -11,6 +11,8 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
data: { requiresLogin: false }, data: { requiresLogin: false },
url: '/splash-page', url: '/splash-page',
templateUrl: '/templates/splash-page.html', templateUrl: '/templates/splash-page.html',
controller: 'loginCtrl',
controllerAs: 'vm'
}) })
.state('app',{ .state('app',{
data: { requiresLogin: true }, data: { requiresLogin: true },
@ -18,8 +20,8 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
views: { views: {
'header': { 'header': {
templateUrl: '/templates/partials/header.html', templateUrl: '/templates/partials/header.html',
controller: 'loginCtrl', // controller: 'loginCtrl',
controllerAs: 'vm' // controllerAs: 'vm'
}, },
'menu': { 'menu': {
templateUrl: '/templates/partials/menu.html' templateUrl: '/templates/partials/menu.html'