Skip to content

Commit 345abfc

Browse files
rgoleargolea
committed
Saved changes [hotfix]
2 parents ea5354e + 4266bc2 commit 345abfc

File tree

7 files changed

+35
-99
lines changed

7 files changed

+35
-99
lines changed

‎public/app/settings/controller/controller.js‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
1-
app.controller('settingsCtrl', ['$scope', 'Settings', '$mdToast', '$mdDialog', '$rootScope', function ($scope, Settings, $mdToast, $mdDialog, $rootScope) {
1+
app.controller('settingsCtrl', ['$scope', 'Settings', '$mdToast', '$mdDialog', '$rootScope', 'PALETTES', function ($scope, Settings, $mdToast, $mdDialog, $rootScope, PALETTES) {
22

3-
$scope.themes = [
4-
{id: 'red_lime', name: 'Primary: Red, Accent: Lime'},
5-
{id: 'red_yellow', name: 'Primary: Red, Accent: Yellow'},
6-
{id: 'red_amber', name: 'Primary: Red, Accent: Amber'},
7-
{id: 'red_orange', name: 'Primary: Red, Accent: Orange'},
8-
{id: 'red_deep-orange', name: 'Primary: Red, Accent: Deep Orange'},
9-
{id: 'red_brown', name: 'Primary: Red, Accent: Brown'},
10-
{id: 'red_grey', name: 'Primary: Red, Accent: Grey'},
11-
{id: 'red_pink', name: 'Primary: Red, Accent: Pink'},
12-
{id: 'red_purple', name: 'Primary: Red, Accent: Purple'},
13-
{id: 'red_deep-purple', name: 'Primary: Red, Accent: Deep Purple'},
14-
{id: 'red_indigo', name: 'Primary: Red, Accent: Indigo'},
15-
{id: 'red_blue', name: 'Primary: Red, Accent: Blue'},
16-
{id: 'red_light-blue', name: 'Primary: Red, Accent: Light Blue'},
17-
{id: 'red_cyan', name: 'Primary: Red, Accent: Cyan'},
18-
{id: 'red_teal', name: 'Primary: Red, Accent: Teal'},
19-
{id: 'red_green', name: 'Primary: Red, Accent: Green'},
20-
{id: 'red_light-green', name: 'Primary: Red, Accent: Light Green'},
21-
{id: 'red_blue-grey', name: 'Primary: Red, Accent: Blue Grey'}
22-
];
3+
$scope.palettes = PALETTES;
234

245
$scope.settings = Settings.query();
256
$scope.newSetting = new Settings();

‎public/app/settings/controller/routes.js‎

Lines changed: 12 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,18 @@
1-
app.config(['$stateProvider', '$mdThemingProvider', function ($stateProvider, $mdThemingProvider) {
1+
//app.constant('PALETTES', ['red', 'purple', 'deep-purple', 'indigo', 'blue', 'light-blue', 'cyan', 'teal', 'green', 'light-green', 'lime', 'yellow', 'amber', 'orange', 'deep-orange', 'brown', 'grey', 'blue-grey']);
22

3-
$mdThemingProvider.theme('red_pink')
4-
.primaryPalette('red')
5-
.accentPalette('pink');
3+
app.constant('PALETTES', ['red', 'blue', 'blue-grey']);
64

7-
$mdThemingProvider.theme('red_purple')
8-
.primaryPalette('red')
9-
.accentPalette('purple');
5+
app.config(['$stateProvider', '$mdThemingProvider', 'PALETTES', function ($stateProvider, $mdThemingProvider, PALETTES) {
106

11-
$mdThemingProvider.theme('red_deep-purple')
12-
.primaryPalette('red')
13-
.accentPalette('deep-purple');
14-
15-
$mdThemingProvider.theme('red_indigo')
16-
.primaryPalette('red')
17-
.accentPalette('indigo');
18-
19-
$mdThemingProvider.theme('red_blue')
20-
.primaryPalette('red')
21-
.accentPalette('blue');
22-
23-
$mdThemingProvider.theme('red_light-blue')
24-
.primaryPalette('red')
25-
.accentPalette('light-blue');
26-
27-
$mdThemingProvider.theme('red_cyan')
28-
.primaryPalette('red')
29-
.accentPalette('cyan');
30-
31-
$mdThemingProvider.theme('red_teal')
32-
.primaryPalette('red')
33-
.accentPalette('teal');
34-
35-
$mdThemingProvider.theme('red_green')
36-
.primaryPalette('red')
37-
.accentPalette('green');
38-
39-
$mdThemingProvider.theme('red_light-green')
40-
.primaryPalette('red')
41-
.accentPalette('light-green');
42-
43-
$mdThemingProvider.theme('red_lime')
44-
.primaryPalette('red')
45-
.accentPalette('lime');
46-
47-
$mdThemingProvider.theme('red_yellow')
48-
.primaryPalette('red')
49-
.accentPalette('yellow');
50-
$mdThemingProvider.theme('red_amber')
51-
.primaryPalette('red')
52-
.accentPalette('amber');
53-
54-
$mdThemingProvider.theme('red_orange')
55-
.primaryPalette('red')
56-
.accentPalette('orange');
57-
58-
$mdThemingProvider.theme('red_deep-orange')
59-
.primaryPalette('red')
60-
.accentPalette('deep-orange');
61-
62-
$mdThemingProvider.theme('red_brown')
63-
.primaryPalette('red')
64-
.accentPalette('brown');
65-
66-
$mdThemingProvider.theme('red_grey')
67-
.primaryPalette('red')
68-
.accentPalette('grey');
69-
70-
$mdThemingProvider.theme('red_blue-grey')
71-
.primaryPalette('red')
72-
.accentPalette('blue-grey');
7+
PALETTES.forEach(function (primary, i) {
8+
PALETTES.forEach(function (accent, j) {
9+
if (i !== j) {
10+
$mdThemingProvider.theme(primary + '_' +accent)
11+
.primaryPalette(primary)
12+
.accentPalette(accent);
13+
}
14+
});
15+
});
7316

7417

7518
$stateProvider

‎public/app/settings/partials/dashboard.settings.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<md-button ng-href="http://www.google.com/design/spec/style/color.html#color-ui-color-palette" target="_blank">View palettes</md-button>
12
<md-content layout="column" layout-padding layout-gt-md="row">
23
<!-- List of Settings -->
34
<md-content flex>
@@ -24,8 +25,11 @@ <h3>{{setting.name | uppercase}}</h3>
2425
<label>App name*</label>
2526
<input type="text" ng-model="newSetting.appName" autocomplete="off">
2627
</md-input-container>
27-
<md-select placeholder="Theme" ng-model="newSetting.theme" style="width:100%;">
28-
<md-option ng-repeat="theme in themes" value="{{theme.id}}">{{theme.name}}</md-option>
28+
<md-select placeholder="Primary palette" ng-model="newSetting.primary" style="width:100%;">
29+
<md-option ng-repeat="palette in palettes" value="{{palette}}">{{palette | uppercase}}</md-option>
30+
</md-select>
31+
<md-select placeholder="Accent palette" ng-model="newSetting.accent" style="width:100%;">
32+
<md-option ng-repeat="palette in palettes" value="{{palette}}">{{palette | uppercase}}</md-option>
2933
</md-select>
3034
<md-switch ng-model="newSetting.active">Active</md-switch>
3135
<md-button type="submit" class="md-raised md-primary">Submit</md-button>

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="dist/style.min.css">
1010
</head>
1111

12-
<body md-theme="{{settings.theme}}">
12+
<body md-theme="{{settings.primary}}_{{settings.accent}}">
1313
<ui-view></ui-view>
1414
<script src="dpd.js"></script>
1515
<script src="dist/script.min.js"></script>

‎resources/settings/config.json‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
"id": "active",
2626
"order": 2
2727
},
28-
"theme": {
29-
"name": "theme",
28+
"primary": {
29+
"name": "primary",
3030
"type": "string",
3131
"typeLabel": "string",
32-
"required": false,
33-
"id": "theme",
32+
"required": true,
33+
"id": "primary",
3434
"order": 3
35+
},
36+
"accent": {
37+
"name": "accent",
38+
"type": "string",
39+
"typeLabel": "string",
40+
"required": true,
41+
"id": "accent",
42+
"order": 4
3543
}
3644
}
3745
}

‎resources/settings/post.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if(this.active){
22
dpd.settings.get().then(function(settings){
33
settings.forEach(function(setting){
4-
if(setting.active){
4+
if(setting.active && setting.id !==this.id){
55
cancel();
66
}
77
});

‎resources/settings/put.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if(this.active){
22
dpd.settings.get().then(function(settings){
33
settings.forEach(function(setting){
4-
if(setting.active){
4+
if(setting.active && setting.id !==this.id){
55
cancel();
66
}
77
});

0 commit comments

Comments
 (0)