Skip to content

Commit 2b1b2bc

Browse files
committed
Merge pull request flatlogic#34 from gaykov/ui-improvements
UX issues
2 parents 08b7a04 + 7322e3a commit 2b1b2bc

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
lines changed

src/app/controllers/MainController.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,18 @@
1616
vm.showActions = showActions;
1717
vm.title = $state.current.data.title;
1818
vm.showSimpleToast = showSimpleToast;
19+
vm.toggleRightSidebar = toggleRightSidebar;
1920

2021
navService
2122
.loadAllItems()
2223
.then(function(menuItems) {
2324
vm.menuItems = [].concat(menuItems);
2425
});
2526

27+
function toggleRightSidebar() {
28+
$mdSidenav('right').toggle();
29+
}
30+
2631
function toggleItemsList() {
2732
var pending = $mdBottomSheet.hide() || $q.when(true);
2833

@@ -68,7 +73,7 @@
6873
$mdToast.simple()
6974
.content(title)
7075
.hideDelay(2000)
71-
.position('top right')
76+
.position('bottom right')
7277
);
7378
}
7479
}

src/app/controllers/TodoController.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
});
2323

2424
function addTodo() {
25+
if (!vm.todoText) return;
2526
vm.todos.push({text: vm.todoText, done: false});
2627
vm.todoText = '';
2728
}

src/app/views/main.html

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ <h1>AMD</h1>
1717
</div>
1818
</md-button>
1919
<md-divider ng-repeat-end></md-divider>
20-
<md-button hide-gt-md flex ng-click="vm.showActions($event)">
21-
<div layout="row" class="md-tile-content">
20+
<md-button ng-click="vm.showActions($event)" layout-align="center center">
21+
<div class="md-tile-content">
2222
Actions
2323
</div>
2424
</md-button>
@@ -33,8 +33,8 @@ <h1>AMD</h1>
3333
<i class="material-icons">notifications</i>
3434
<span class="notifications-label">7</span>
3535
</md-button>
36-
<md-button hide-sm class="toolbar-button" aria-label="Settings">
37-
<i class="material-icons">settings</i>
36+
<md-button hide-sm class="toolbar-button" aria-label="Settings" ng-click="vm.toggleRightSidebar()">
37+
<i class="material-icons">menu</i>
3838
</md-button>
3939
<md-button hide-gt-sm ng-click="vm.toggleItemsList()" aria-label="Menu">
4040
<i class="material-icons">menu</i>
@@ -46,27 +46,22 @@ <h1>AMD</h1>
4646
</md-content>
4747
</div>
4848

49-
<md-sidenav md-is-locked-open="$mdMedia('gt-sm')" md-component-id="right"
49+
<md-sidenav md-component-id="right"
5050
class="md-whiteframe-z2 md-sidenav-right">
51-
<md-toolbar layout="row">
52-
<md-toolbar flex="80" class="md-warn" layout="row" layout-align="center center">
51+
<md-toolbar>
52+
<md-toolbar class="md-warn" layout="row" layout-align="center center">
5353
<img class="img-circle" ng-src="assets/images/feynman.jpg">
54-
<md-menu>
54+
<md-menu md-offset="0 20">
5555
<md-button class="capitalize" ng-click="$mdOpenMenu()" aria-label="Open menu">
5656
<span>Richard Feynman</span>
5757
<i class="material-icons">keyboard_arrow_down</i>
5858
</md-button>
59-
<md-menu-content>
59+
<md-menu-content width="3">
6060
<md-menu-item><md-button ng-click="$mdCloseMenu()" ui-sref="home.profile">Profile</md-button></md-menu-item>
6161
<md-menu-item><md-button ng-click="$mdCloseMenu()" ui-sref="home.dashboard">Log out</md-button></md-menu-item>
6262
</md-menu-content>
6363
</md-menu>
6464
</md-toolbar>
65-
<md-toolbar flex="20" layout="row" layout-align="center center">
66-
<md-button ng-click="vm.showActions($event)" class="toolbar-button">
67-
<i class="material-icons">more_vert</i>
68-
</md-button>
69-
</md-toolbar>
7065
</md-toolbar>
7166

7267
<section>

src/app/views/partials/checkboxes.html

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ <h4 flex="82">{{vm.remaining()}} of {{vm.todos.length}} remaining</h4>
99
{{todo.text}}
1010
</md-checkbox>
1111

12-
<form ng-submit="vm.addTodo($event)">
13-
<md-input-container>
14-
<label>Write some todo task here...</label>
15-
<input ng-model="vm.todoText">
16-
</md-input-container>
17-
<md-button class="md-fab md-warn" aria-label="Eat cake">
18-
<i class="material-icons">add</i>
19-
</md-button>
12+
<form ng-submit="vm.addTodo($event)" novalidate name="tasksForm">
13+
<div layout="row" flex>
14+
<md-input-container flex ng-class="{'md-input-invalid':tasksForm.taskText.$error.required && tasksForm.$submitted}">
15+
<label>Write some todo task here...</label>
16+
<input ng-model="vm.todoText" name="taskText" required>
17+
</md-input-container>
18+
<md-button class="md-fab md-wayrn md-mini">
19+
<i class="material-icons">add</i>
20+
</md-button>
21+
</div>
2022
<md-button class="md-primary" ng-click="vm.archive($event)">
2123
Remove completed
2224
</md-button>
2325
</form>
24-
</md-content>
26+
</md-content>

0 commit comments

Comments
 (0)