Skip to content

Commit d62840d

Browse files
committed
Enforce user name on initial setup (required field)
1 parent 22a92f6 commit d62840d

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

src/app/services/dialog/initialsetup.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h4 class="section-title dialog-title">Initial Setup</h4>
66

77
<div class="field text large">
88
<input name="username" placeholder="Your name" ng-model="name" />
9-
<span class="note">This can be changed later in Settings</span>
9+
<span class="note"><span class="red-text" ng-if="error">Please enter your name &nbsp;</span>This can be changed later in Settings</span>
1010
</div>
1111

1212
<div class="field switch">

src/app/services/dialog/service.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,14 +274,18 @@ angular.module('spotmop.services.dialog', [])
274274
templateUrl: 'app/services/dialog/initialsetup.template.html',
275275
controller: function( $scope, $element, $rootScope, $filter, DialogService, SettingsService ){
276276
$scope.saving = false;
277-
$scope.save = function(){
278-
279-
// set state to saving (this swaps save button for spinner)
280-
$scope.saving = true;
281-
282-
// perform the creation
283-
SettingsService.setSetting('pushername', $scope.name);
284-
DialogService.remove();
277+
$scope.save = function(){
278+
if( $scope.name && $scope.name != '' ){
279+
280+
// set state to saving (this swaps save button for spinner)
281+
$scope.saving = true;
282+
283+
// perform the creation
284+
SettingsService.setSetting('pushername', $scope.name);
285+
DialogService.remove();
286+
}else{
287+
$scope.error = true;
288+
}
285289
}
286290
}
287291
};

src/assets/css/forms.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
}
2020

2121
.field .note {
22-
opacity: 0.35;
2322
display: block;
2423
padding: 4px 0 5px 0;
2524
font-family: "Roboto";
2625
font-size: 12px;
2726
font-weight: 300;
27+
color: #777777;
2828
}
2929

3030
.field .input {

0 commit comments

Comments
 (0)