Skip to content

Commit 274d0e0

Browse files
kurtommykurtommy
committed
axiom ui
1 parent 3c62529 commit 274d0e0

File tree

86 files changed

+1528
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1528
-451
lines changed

Diff for: ‎dist.zip

356 KB
Binary file not shown.

Diff for: ‎src/app/volumio.scss renamed to ‎dist/app/volumio-style.scss_

+5-4
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262

6363
$headerHeight: 50px;
6464
$footerHeight: 50px;
65-
button {
66-
@extend .btn, .btn-success;
67-
}
6865

6966
#volumio {
7067
#contentWrapper {
@@ -75,10 +72,14 @@ button {
7572
top: $headerHeight;
7673
bottom: $footerHeight;
7774
overflow: scroll;
78-
border: solid 0px blue;
75+
border: solid 0 blue;
7976
}
8077
}
8178

79+
button {
80+
@extend .btn, .btn-success;
81+
}
82+
8283
@mixin noRowMargin {
8384
margin-left: 0px !important;
8485
margin-right: 0px !important;

Diff for: ‎dist/assets/graphics/axiom-air-logo.png

16.9 KB
Loading

Diff for: ‎dist/assets/graphics/background-bottom.jpg

106 KB
Loading

Diff for: ‎dist/assets/graphics/background-top.jpg

136 KB
Loading

Diff for: ‎dist/assets/graphics/background-top.png

491 KB
Loading

Diff for: ‎dist/assets/graphics/device-icon-1.png

4.09 KB
Loading

Diff for: ‎dist/assets/graphics/device-icon-2.png

1.8 KB
Loading

Diff for: ‎dist/assets/graphics/device-icon-3.png

3.26 KB
Loading

Diff for: ‎dist/assets/graphics/device-icon-4.png

3.32 KB
Loading

Diff for: ‎dist/assets/graphics/device-icon-5.png

6.51 KB
Loading

Diff for: ‎dist/assets/graphics/device-icon-6.png

5.25 KB
Loading

Diff for: ‎dist/assets/graphics/panel-background.png

27.9 KB
Loading

Diff for: ‎dist/assets/graphics/panel-title.jpg

3.17 KB
Loading

Diff for: ‎dist/assets/graphics/table-item-background.png

65.8 KB
Loading

Diff for: ‎dist/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<!doctype html><html ng-app="volumio"><head><meta charset="utf-8"><title>Volumio</title><meta name="description" content=""><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><link rel="stylesheet" href="styles/vendor-cd4f69ac82.css"><link rel="stylesheet" href="styles/app-1e132dccc3.css"></head><body><!--[if lt IE 10]>
1+
<!doctype html><html ng-app="volumio"><head><meta charset="utf-8"><title>Volumio</title><meta name="description" content=""><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"><link rel="stylesheet" href="styles/vendor-cd4f69ac82.css"><link rel="stylesheet" href="styles/app-2fc5dea85d.css"></head><body><!--[if lt IE 10]>
22
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
3-
<![endif]--><div ui-view="layout"></div><script src="scripts/vendor-f1865dec62.js"></script><script src="scripts/app-bad353b7ab.js"></script></body></html>
3+
<![endif]--><div ui-view="layout"></div><script src="scripts/vendor-f1865dec62.js"></script><script src="scripts/app-47a349f7e2.js"></script></body></html>

Diff for: ‎dist/scripts/app-47a349f7e2.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎dist/scripts/app-bad353b7ab.js

-4
This file was deleted.

Diff for: ‎dist/styles/app-1e132dccc3.css

-1
This file was deleted.

Diff for: ‎dist/styles/app-2fc5dea85d.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎gulp/styles.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var path = require('path');
44
var gulp = require('gulp');
55
var conf = require('./conf');
66
var gutil = require('gulp-util');
7+
var filter = require('gulp-filter');
78

89
var browserSync = require('browser-sync');
910

@@ -22,11 +23,15 @@ gulp.task('styles', function () {
2223

2324
var injectFiles = gulp.src([
2425
path.join(conf.paths.src, '/app/**/*.scss'),
25-
path.join('!' + conf.paths.src, '/app/index.scss')
26-
], { read: false });
26+
path.join('!' + conf.paths.src, '/app/index.scss'),
27+
path.join('!' + conf.paths.src, '/app/themes/axiom/axiom-style.scss')
28+
], { read: true });
29+
2730

2831
var injectOptions = {
2932
transform: function(filePath) {
33+
//console.log(filePath);
34+
3035
filePath = filePath.replace(conf.paths.src + '/app/', '');
3136
return '@import "' + filePath + '";';
3237
},

Diff for: ‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"karma-phantomjs-launcher": "~0.2.0",
4747
"lodash": "~3.9.3",
4848
"main-bower-files": "~2.8.0",
49+
"map-stream": "0.0.6",
4950
"merge-stream": "~0.1.7",
5051
"require-dir": "~0.3.0",
5152
"uglify-save-license": "~0.4.1",

Diff for: ‎src/app/browse/browse.controller.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ class BrowseController {
99
// console.log('asd');
1010
// })
1111
this.$modal = $modal;
12-
this.browseService.fetchLibrary({
13-
name: "Music Library",
14-
uri: "music-library"
15-
});
12+
// this.browseService.fetchLibrary({
13+
// name: "Music Library",
14+
// uri: "music-library"
15+
// });
1616
}
1717

1818
fetchLibrary(item) {
@@ -30,12 +30,13 @@ class BrowseController {
3030
}
3131

3232
clickListItem(item, event) {
33-
if (event.target.tagName === 'TD' && item.type !== 'song') {
33+
console.log(event);
34+
if (event.target.tagName !== 'I' && item.type !== 'song') {
3435
this.fetchLibrary(item);
3536
}
3637
}
3738
dblClickListItem(item, event) {
38-
if (event.target.tagName === 'TD' && item.type === 'song') {
39+
if (event.target.tagName !== 'I' && item.type === 'song') {
3940
this.play(item);
4041
}
4142
}

Diff for: ‎src/app/browse/browse.scss

+24-22
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
#browse{
2-
#toolbarRow{
3-
@include make-row();
4-
#browseSources {
5-
@include make-sm-column(8);
6-
}
7-
#searchBox {
8-
@include make-sm-column(4);
1+
#volumio {
2+
#browse{
3+
#toolbarRow{
4+
@include make-row();
5+
#browseSources {
6+
@include make-sm-column(8);
7+
}
8+
#searchBox {
9+
@include make-sm-column(4);
10+
}
911
}
10-
}
11-
#browseList{
12-
//@include make-row();
13-
.browseItemMenu{
14-
position: relative;
15-
.buttonsGroup{
16-
position: absolute;
17-
top: 34px;
18-
right: 0;
19-
left: auto;
20-
z-index: 3;
12+
#browseList{
13+
//@include make-row();
14+
.browseItemMenu{
15+
position: relative;
16+
.buttonsGroup{
17+
position: absolute;
18+
top: 34px;
19+
right: 0;
20+
left: auto;
21+
z-index: 3;
22+
}
2123
}
2224
}
23-
}
2425

25-
#browseTable{
26-
@include make-sm-column(12);
26+
#browseTable{
27+
@include make-sm-column(12);
28+
}
2729
}
2830
}

Diff for: ‎src/app/components/multi-room-dock/multi-room-dock.directive.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ class MultiRoomDockController {
2323
}
2424

2525
changeDevice(device) {
26-
this.socketService.changeHost(device.host);
26+
if (!device.isChild) {
27+
this.socketService.changeHost(device.host);
28+
}
2729
}
28-
2930
}
3031

3132
export default MultiRoomDockDirective;

Diff for: ‎src/app/components/multi-room-dock/multi-room-dock.html

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<div id="multiRoomDockWrapper">
2-
<div ng-repeat="device in multiRoomDock.multiRoomService.devices.list"
2+
<div ng-repeat="device in multiRoomDock.multiRoomService.devices"
33
class="device"
4-
ng-class="{selected: device.host === multiRoomDock.socketService.host}">
5-
<div class="deviceName"><strong>{{device.name}}</strong> ({{device.state.status}}) </div>
6-
<div>{{device.state.artist}}</div>
7-
<div>{{device.state.track}}</div>
8-
<div ng-if="device.host !== multiRoomDock.socketService.host">
9-
<button ng-click="multiRoomDock.changeDevice(device)">
10-
Change device
11-
</button>
12-
<button ng-if="device.state.status === 'stop' || device.state.status === 'pause'"
13-
ng-click="multiRoomDock.changeDevice(device)">
14-
Play
15-
</button>
16-
<button ng-if="device.state.status === 'play'" ng-click="multiRoomDock.changeDevice(device)">
17-
Stop
18-
</button>
4+
ng-class="{'child': device.isChild}"
5+
ng-if="{selected: device.host !== multiRoomDock.socketService.host}"
6+
ng-dblclick="multiRoomDock.changeDevice(device)"
7+
ng-if="device.host !== multiRoomDock.socketService.host">
8+
<div class="deviceIcon">
9+
<img ng-src="{{'assets/graphics/device-icon-' + (device.child.length || 1) + '.png'}}"/>
10+
</div>
11+
<div class="deviceDetails">
12+
<div class="deviceName">
13+
{{device.name}}
14+
</div>
15+
<div class="artist">
16+
{{device.state.artist}}
17+
</div>
18+
<div class="track">
19+
{{device.state.track}}
20+
</div>
1921
</div>
2022
</div>
2123
</div>

Diff for: ‎src/app/components/multi-room-dock/multi-room-dock.scss

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
#multiRoomDockWrapper {
2-
@include make-row();
3-
@include noRowMargin;
4-
margin-top:10px;
5-
.device {
6-
@include make-sm-column(3);
7-
height:110px;
8-
border: solid 1px #0A0;
9-
background-color: #CCC;
10-
button {
11-
@extend .btn, .btn-success, .btn-xs;
12-
}
13-
&.selected {
14-
.deviceName{
15-
color: #0C0;
1+
#volumio {
2+
#multiRoomDockWrapper {
3+
@include make-row();
4+
@include noRowMargin;
5+
margin-top:10px;
6+
.device {
7+
@include make-sm-column(3);
8+
height:110px;
9+
border: solid 1px #0A0;
10+
background-color: #CCC;
11+
button {
12+
@extend .btn, .btn-success, .btn-xs;
13+
}
14+
&.selected {
15+
.deviceName{
16+
color: #0C0;
17+
}
1618
}
1719
}
1820
}

Diff for: ‎src/app/components/player-buttons/player-buttons.html

+20-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
<div id="playerButtonsDirective">
2-
<button ng-if="playerButtons.playerService.state.status !== 'play'" ng-click="playerButtons.playerService.play()">Play</button>
3-
<button ng-if="playerButtons.playerService.state.status === 'play'" ng-click="playerButtons.playerService.pause()">Pause</button>
4-
<button ng-click="playerButtons.playerService.stop()">Stop</button>
5-
<button ng-click="playerButtons.playerService.prev()">Prev</button>
6-
<button ng-click="playerButtons.playerService.next()">Next</button>
1+
<div id="playerButtons">
2+
<button ng-click="playerButtons.playerService.prev()">
3+
<i class="fa fa-fast-backward"></i>
4+
</button>
5+
<button
6+
ng-if="playerButtons.playerService.state.status !== 'play'"
7+
ng-click="playerButtons.playerService.play()">
8+
<i class="fa fa-play"></i>
9+
</button>
10+
<button
11+
ng-if="playerButtons.playerService.state.status === 'play'"
12+
ng-click="playerButtons.playerService.pause()">
13+
<i class="fa fa-pause"></i>
14+
</button>
15+
<!-- <button ng-click="playerButtons.playerService.stop()">
16+
<i class="fa fa-stop"></i>
17+
</button> -->
18+
<button ng-click="playerButtons.playerService.next()">
19+
<i class="fa fa-fast-forward"></i>
20+
</button>
721
</div>

Diff for: ‎src/app/components/player-buttons/player-buttons.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#playerButtonsDirective {
2-
border: solid 0px red;
3-
4-
1+
#volumio {
2+
#playerButtonsDirective {
3+
border: solid 0px red;
4+
}
55
}

Diff for: ‎src/app/components/side-menu/elements/modal-power-off.html

+15-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@
22
<h3 class="modal-title">{{modalPowerOff.params.title}}</h3>
33
</div>
44
<div class="modal-footer">
5-
<button class="btn btn-primary" ng-click="modalPowerOff.powerOff()">Power off</button>
6-
<button class="btn btn-primary" ng-click="modalPowerOff.reboot()">Reboot</button>
7-
<button class="btn btn-warning" ng-click="modalPowerOff.cancel()">Cancel</button>
5+
<button
6+
class="btn-info"
7+
ng-click="modalPowerOff.powerOff()">
8+
Power off
9+
</button>
10+
<button
11+
class="btn-info"
12+
ng-click="modalPowerOff.reboot()">
13+
Reboot
14+
</button>
15+
<button
16+
class="cancelBtn"
17+
ng-click="modalPowerOff.cancel()">
18+
Cancel
19+
</button>
820
</div>

Diff for: ‎src/app/components/side-menu/side-menu.directive.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class PlayerButtonsDirective {
88
scope: false,
99
controller: SideMenuController,
1010
controllerAs: 'sideMenu',
11-
bindToController: true
11+
bindToController: true,
1212
};
1313

1414
return directive;
@@ -23,7 +23,7 @@ class SideMenuController {
2323
this.$modal = $modal;
2424

2525
this.visible = false;
26-
this.menuItems = mockService.get('getMenuItems');
26+
//this.menuItems = mockService.get('getMenuItems');
2727

2828
this.init();
2929
$rootScope.$on('socket:init', () => {
@@ -57,9 +57,9 @@ class SideMenuController {
5757
modalInstance.result.then(() => {}, () => {});
5858
} else if (item.params) {
5959
for (let param in item.params) {
60-
console.log(param);
6160
item.params[param] = String(item.params[param]).replace('/','-');
6261
}
62+
console.log(item.state, item.params);
6363
this.$state.go(item.state, item.params);
6464
} else {
6565
this.$state.go(item.state);
@@ -74,7 +74,7 @@ class SideMenuController {
7474
registerListner() {
7575
this.socketService.on('pushMenuItems', (data) => {
7676
console.log('pushMenuItems', data);
77-
//this.menuItems = data;
77+
this.menuItems = data;
7878
});
7979
}
8080

Diff for: ‎src/app/components/side-menu/side-menu.html

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
<button id="menuBtn" ng-click="sideMenu.toggleMenu()">Menu</button>
2-
<div id="menuList" class="btn-group-vertical" role="group" ng-if="sideMenu.visible" class="">
3-
<button ng-repeat="item in sideMenu.menuItems" type="button" name="button" ng-click="sideMenu.itemClick(item)">
4-
{{item.name}}
1+
<div id="sideMenu">
2+
<button id="openMenuBtn" ng-click="sideMenu.toggleMenu()">
3+
<i class="fa fa-bars"></i>
54
</button>
6-
</div>
5+
<div id="menuList" class="" role="group" ng-if="sideMenu.visible">
6+
<button id="closeMenuBtn" ng-click="sideMenu.toggleMenu()">
7+
<i class="fa fa-times"></i>
8+
</button>
9+
<button
10+
ng-repeat="item in sideMenu.menuItems"
11+
ng-click="sideMenu.itemClick(item)">
12+
{{item.name}}
13+
</button>
14+
</div>
715
</div>

0 commit comments

Comments
 (0)