diff --git a/api/helpers.php b/api/helpers.php index d332420..fc84972 100644 --- a/api/helpers.php +++ b/api/helpers.php @@ -374,6 +374,13 @@ function createInitialUser() { $admin->password = password_hash('admin', PASSWORD_BCRYPT, array('salt' => $admin->salt)); $admin->email = ''; + $options = R::dispense('option'); + $options->tasksOrder = 0; + $options->showAnimations = true; + $options->showAssignee = true; + + $admin->ownOptions = $options; + R::store($admin); } } diff --git a/api/userRoutes.php b/api/userRoutes.php index 9adcfac..cf6e0b8 100644 --- a/api/userRoutes.php +++ b/api/userRoutes.php @@ -137,12 +137,17 @@ $app->get('/users/current', function() use($app, $jsonResponse) { if (validateToken()) { $user = getUser(); if (null != $user) { + $options = []; + foreach($user->ownOptions as $option) { + $options[] = $option; + } $jsonResponse->data = [ 'userId' => $user->id, 'username' => $user->username, 'isAdmin' => $user->isAdmin, 'email' => $user->email, - 'defaultBoard' => $user->defaultBoard + 'defaultBoard' => $user->defaultBoard, + 'options' => $options ]; } } @@ -175,9 +180,9 @@ $app->post('/users', function() use($app, $jsonResponse) { $user->salt = password_hash($data->username . time(), PASSWORD_BCRYPT); $user->password = password_hash($data->password, PASSWORD_BCRYPT, array('salt' => $user->salt)); $options = R::dispense('option'); - $options->newTaskPosition = 1; // Bottom of column (0 == top of column) + $options->newTaskPosition = 0; // Bottom of column (1 == top of column) $options->animate = true; - $user->ownOptions[] = $options; + $user->ownOptions = $options; R::store($user); addUserToBoard($data->defaultBoard, $user); diff --git a/js/controllers/boards.js b/js/controllers/boards.js index e424bef..4808653 100644 --- a/js/controllers/boards.js +++ b/js/controllers/boards.js @@ -21,7 +21,7 @@ function ($scope, $routeParams, $location, $interval, $window, if (text) { return $window.marked(text); } else { - return "
No Description
"; + return ''; } }; diff --git a/js/controllers/settings.js b/js/controllers/settings.js index 7b03543..258d601 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -22,6 +22,7 @@ function ($scope, UserService, AlertService) { .success(function(data) { $scope.currentUser = data.data; $scope.loadingCurrentUser = false; + console.log($scope.currentUser.options[0]); }); }; $scope.loadCurrentUser(); diff --git a/js/controllers/settingsBoard.js b/js/controllers/settingsBoard.js index c01f5a9..fd91d57 100644 --- a/js/controllers/settingsBoard.js +++ b/js/controllers/settingsBoard.js @@ -29,6 +29,16 @@ function ($scope, $interval, BoardService) { $scope.interval = $interval(loadBoards, 5000); $scope.$on('$destroy', function () { $interval.cancel($scope.interval); }); + $scope.userOptions = { + tasksAt: [ + { id: 0, text: 'bottom of column'}, + { id: 1, text: 'top of column'} + ], + taskOrder: 0, + showAnimations: true, + showAssignee: true + }; + $scope.boardSort = { options: [ { sort: 'id', name: 'Creation Date' }, diff --git a/partials/settingsBoardUserOptions.html b/partials/settingsBoardUserOptions.html index 82b2f20..6c81904 100644 --- a/partials/settingsBoardUserOptions.html +++ b/partials/settingsBoardUserOptions.html @@ -1,11 +1,15 @@