krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved UI stuff into the settings area, moved authWithSession to the Auth controller

Browse Source
This commit is contained in:
Nick Gordon
2013-11-15 16:25:09 -08:00
parent e2e7ba15b2
commit 5116a99dce
6 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/js/app.js
View File

@@ -31,6 +31,7 @@ window.habitrpg = angular.module('habitrpg',
.when('/options/groups/guilds', '/options/groups/guilds/public')
.when('/options/inventory', '/options/inventory/inventory')
.when('/options/inventory/stable', '/options/inventory/stable/pets')
.when('/options/settings', '/options/settings/settings')
// redirect states that don't match
.otherwise("/tasks");
@@ -68,10 +69,6 @@ window.habitrpg = angular.module('habitrpg',
url: "/profile",
templateUrl: "partials/options.profile.profile.html"
})
.state('options.profile.data', {
url: "/profile/data",
templateUrl: "partials/options.profile.data.html"
})
// Options > Groups
.state('options.social', {
@@ -165,6 +162,18 @@ window.habitrpg = angular.module('habitrpg',
controller: 'SettingsCtrl',
templateUrl: "partials/options.settings.html"
})
.state('options.settings.settings', {
url: "/settings",
templateUrl: "partials/options.settings.settings.html"
})
.state('options.settings.api', {
url: "/api",
templateUrl: "partials/options.settings.api.html"
})
.state('options.settings.export', {
url: "/export",
templateUrl: "partials/options.settings.export.html"
})
// Options > Settings
.state('options.admin', {