diff --git a/backend/src/appenlight/templates/layout.jinja2 b/backend/src/appenlight/templates/layout.jinja2 index b463419..f55dafb 100644 --- a/backend/src/appenlight/templates/layout.jinja2 +++ b/backend/src/appenlight/templates/layout.jinja2 @@ -3,13 +3,6 @@ {% block outer_content %}
-
-
- {% raw %} - {{message.msg}} - {% endraw %} -
-
{% block content %}{% endblock %}
diff --git a/frontend/src/app.js b/frontend/src/app.js index 631cb77..567f93f 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -45,7 +45,10 @@ angular.module('appenlight.components', [ 'appenlight.components.appenlightHeader', 'appenlight.components.indexDashboardView', 'appenlight.components.logsBrowserView', - 'appenlight.components.eventBrowserView' + 'appenlight.components.eventBrowserView', + 'appenlight.components.userProfileView', + 'appenlight.components.userIdentitiesView', + 'appenlight.components.settingsView' ]); angular.module('appenlight.directives', [ 'appenlight.directives.c3chart', diff --git a/frontend/src/components/appenlight-app/appenlight-app.html b/frontend/src/components/appenlight-app/appenlight-app.html index c8c1d23..0d0d1e6 100644 --- a/frontend/src/components/appenlight-app/appenlight-app.html +++ b/frontend/src/components/appenlight-app/appenlight-app.html @@ -1,5 +1,16 @@ +
+
+
+ + {{ message.msg }} +
+
+
+
diff --git a/frontend/src/controllers/index.js b/frontend/src/controllers/index.js deleted file mode 100644 index 03bcd8f..0000000 --- a/frontend/src/controllers/index.js +++ /dev/null @@ -1,27 +0,0 @@ -// # Copyright (C) 2010-2016 RhodeCode GmbH -// # -// # This program is free software: you can redistribute it and/or modify -// # it under the terms of the GNU Affero General Public License, version 3 -// # (only), as published by the Free Software Foundation. -// # -// # This program is distributed in the hope that it will be useful, -// # but WITHOUT ANY WARRANTY; without even the implied warranty of -// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// # GNU General Public License for more details. -// # -// # You should have received a copy of the GNU Affero General Public License -// # along with this program. If not, see . -// # -// # This program is dual-licensed. If you wish to learn more about the -// # AppEnlight Enterprise Edition, including its added features, Support -// # services, and proprietary license terms, please see -// # https://rhodecode.com/licenses/ - -angular.module('appenlight.controllers').controller('IndexCtrl', IndexCtrl); - -IndexCtrl.$inject = [IndexCtrl]; - -function IndexCtrl() { - var vm = this; - vm.selected_section = 'errors'; -} diff --git a/frontend/src/controllers/register.js b/frontend/src/controllers/register.js deleted file mode 100644 index 7f55b69..0000000 --- a/frontend/src/controllers/register.js +++ /dev/null @@ -1,31 +0,0 @@ -// # Copyright (C) 2010-2016 RhodeCode GmbH -// # -// # This program is free software: you can redistribute it and/or modify -// # it under the terms of the GNU Affero General Public License, version 3 -// # (only), as published by the Free Software Foundation. -// # -// # This program is distributed in the hope that it will be useful, -// # but WITHOUT ANY WARRANTY; without even the implied warranty of -// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// # GNU General Public License for more details. -// # -// # You should have received a copy of the GNU Affero General Public License -// # along with this program. If not, see . -// # -// # This program is dual-licensed. If you wish to learn more about the -// # AppEnlight Enterprise Edition, including its added features, Support -// # services, and proprietary license terms, please see -// # https://rhodecode.com/licenses/ - -angular.module('appenlight.controllers') - .controller('RegisterController', RegisterController); - -RegisterController.$inject = ['$scope', '$location']; - -function RegisterController() { - var vm = this; - vm.selected_form = 'sign-up'; - if (window.location.search.indexOf('sign_in') != -1 || window.location.search.indexOf('came_from') != -1) { - vm.selected_form = 'sign-in'; - } -} diff --git a/frontend/src/routes.js b/frontend/src/routes.js index 89dad5d..500b0fb 100644 --- a/frontend/src/routes.js +++ b/frontend/src/routes.js @@ -140,25 +140,23 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun }); $stateProvider.state('admin.configs.list', { - url: '', + url: '/list', templateUrl: 'templates/admin/configs/edit.html', controller: 'ConfigsListController as configs' }); $stateProvider.state('user', { url: '/ui/user', - templateUrl: 'templates/user/parent_view.html' + component: 'settingsView' }); $stateProvider.state('user.profile', { abstract: true, - url: '/profile', - templateUrl: 'templates/user/profile.html' + template: '' }); $stateProvider.state('user.profile.edit', { - url: '', - templateUrl: 'templates/user/profile_edit.html', - controller: 'UserProfileController as profile' + url: '/profile', + component: 'userProfileView' }); @@ -170,8 +168,7 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun $stateProvider.state('user.profile.identities', { url: '/identities', - templateUrl: 'templates/user/profile_identities.html', - controller: 'UserIdentitiesController as identities' + component: 'userIdentitiesView' }); $stateProvider.state('user.profile.auth_tokens', { @@ -187,7 +184,7 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun }); $stateProvider.state('user.alert_channels.list', { - url: '', + url: '/list', templateUrl: 'templates/user/alert_channels_list.html', controller: 'AlertChannelsController as channels' }); @@ -205,7 +202,7 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun }); $stateProvider.state('applications.list', { - url: '', + url: '/list', templateUrl: 'templates/applications/list.html', controller: 'ApplicationsListController as applications' }); diff --git a/frontend/src/templates/user/menu.html b/frontend/src/templates/user/menu.html deleted file mode 100644 index aac76b7..0000000 --- a/frontend/src/templates/user/menu.html +++ /dev/null @@ -1,27 +0,0 @@ -
-
Applications
- -
- - -
-
Settings
- -
- -
-
Notifications
- -
\ No newline at end of file diff --git a/frontend/src/templates/user/profile_edit.html b/frontend/src/templates/user/profile_edit.html deleted file mode 100644 index f037147..0000000 --- a/frontend/src/templates/user/profile_edit.html +++ /dev/null @@ -1,92 +0,0 @@ - - -
-
-
-
-
-
- - -
- -
-
- -
- - -
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
- - -
- -
-
-
- -
- -
-
-
-
-
-