secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixing broadcast vs info vs default notifications

Browse Source
This commit is contained in:
James Barnsley
2018-07-23 21:14:43 +12:00
parent 0ca1aa76ad
commit a43d5036d2
9 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mopidy_iris/static/app.css
View File

@ -5517,7 +5517,7 @@ main header {
animation-iteration-count: 1; animation-iteration-count: 1;
display: block; display: block;
position: relative; position: relative;
background: #32b5f2; background: #383734;
padding: 16px 40px 16px 22px; padding: 16px 40px 16px 22px;
margin: 10px 0 0 0; margin: 10px 0 0 0;
color: #FFFFFF; color: #FFFFFF;
@ -5555,11 +5555,11 @@ main header {
opacity: 1; } opacity: 1; }
.notifications .notification--good { .notifications .notification--good {
background: #47af2a; } background: #47af2a; }
.notifications .notification--info { .notifications .notification--broadcast {
background: #FFF39C; background: #FFF39C;
color: #000000; } color: #000000; }
.notifications .notification--subtle { .notifications .notification--info {
background: #383734; } background: #32b5f2; }
.notifications .notification--warning { .notifications .notification--warning {
background: #f16f19; } background: #f16f19; }
.notifications .notification--bad { .notifications .notification--bad {
@ -5581,7 +5581,8 @@ main header {
.notifications .notification--process { .notifications .notification--process {
position: relative; position: relative;
padding-right: 18px; padding-right: 18px;
padding-left: 50px; } padding-left: 50px;
background: #32b5f2; }
.notifications .notification--process.cancelling { .notifications .notification--process.cancelling {
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.notifications .notification--process .loader { .notifications .notification--process .loader {

17
mopidy_iris/static/app.js
View File

@ -50903,11 +50903,16 @@ var CoreMiddleware = function () {
}); });
// Log with Raven Sentry // Log with Raven Sentry
if (store.getState().ui.allow_reporting) { /*
Raven.captureException(new Error(message), { if (store.getState().ui.allow_reporting){
extra: data Raven.captureException(
}); new Error(message),
} {
extra: data
}
);
}
*/
// Log with Analytics // Log with Analytics
if (store.getState().ui.allow_reporting) { if (store.getState().ui.allow_reporting) {
@ -51655,7 +51660,7 @@ var UIMiddleware = function () {
key: broadcast.key ? broadcast.key : null, key: broadcast.key ? broadcast.key : null,
title: broadcast.title ? broadcast.title : null, title: broadcast.title ? broadcast.title : null,
content: broadcast.message, content: broadcast.message,
type: 'info', type: 'broadcast',
sticky: true sticky: true
}; };
store.dispatch(uiActions.createNotification(data)); store.dispatch(uiActions.createNotification(data));

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

11
mopidy_iris/static/app.min.css vendored
View File

@ -5517,7 +5517,7 @@ main header {
animation-iteration-count: 1; animation-iteration-count: 1;
display: block; display: block;
position: relative; position: relative;
background: #32b5f2; background: #383734;
padding: 16px 40px 16px 22px; padding: 16px 40px 16px 22px;
margin: 10px 0 0 0; margin: 10px 0 0 0;
color: #FFFFFF; color: #FFFFFF;
@ -5555,11 +5555,11 @@ main header {
opacity: 1; } opacity: 1; }
.notifications .notification--good { .notifications .notification--good {
background: #47af2a; } background: #47af2a; }
.notifications .notification--info { .notifications .notification--broadcast {
background: #FFF39C; background: #FFF39C;
color: #000000; } color: #000000; }
.notifications .notification--subtle { .notifications .notification--info {
background: #383734; } background: #32b5f2; }
.notifications .notification--warning { .notifications .notification--warning {
background: #f16f19; } background: #f16f19; }
.notifications .notification--bad { .notifications .notification--bad {
@ -5581,7 +5581,8 @@ main header {
.notifications .notification--process { .notifications .notification--process {
position: relative; position: relative;
padding-right: 18px; padding-right: 18px;
padding-left: 50px; } padding-left: 50px;
background: #32b5f2; }
.notifications .notification--process.cancelling { .notifications .notification--process.cancelling {
color: rgba(255, 255, 255, 0.5); } color: rgba(255, 255, 255, 0.5); }
.notifications .notification--process .loader { .notifications .notification--process .loader {

2
mopidy_iris/static/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/app.min.js.map
View File

File diff suppressed because one or more lines are too long

2
src/js/services/core/middleware.js
View File

@ -72,6 +72,7 @@ const CoreMiddleware = (function(){
); );
// Log with Raven Sentry // Log with Raven Sentry
/*
if (store.getState().ui.allow_reporting){ if (store.getState().ui.allow_reporting){
Raven.captureException( Raven.captureException(
new Error(message), new Error(message),
@ -80,6 +81,7 @@ const CoreMiddleware = (function(){
} }
); );
} }
*/
// Log with Analytics // Log with Analytics
if (store.getState().ui.allow_reporting){ if (store.getState().ui.allow_reporting){

2
src/js/services/ui/middleware.js
View File

@ -160,7 +160,7 @@ const UIMiddleware = (function(){
key: (broadcast.key ? broadcast.key : null), key: (broadcast.key ? broadcast.key : null),
title: (broadcast.title ? broadcast.title : null), title: (broadcast.title ? broadcast.title : null),
content: broadcast.message, content: broadcast.message,
type: 'info', type: 'broadcast',
sticky: true sticky: true
} }
store.dispatch(uiActions.createNotification(data)); store.dispatch(uiActions.createNotification(data));

9
src/scss/components/_notifications.scss
View File

@ -12,7 +12,7 @@
@include fadein(); @include fadein();
display: block; display: block;
position: relative; position: relative;
background: $blue; background: $grey;
padding: 16px 40px 16px 22px; padding: 16px 40px 16px 22px;
margin: 10px 0 0 0; margin: 10px 0 0 0;
color: $white; color: $white;
@ -57,13 +57,13 @@
background: $green; background: $green;
} }
&--info { &--broadcast {
background: $yellow; background: $yellow;
color: $black; color: $black;
} }
&--subtle { &--info {
background: $grey; background: $blue;
} }
&--warning { &--warning {
@ -96,6 +96,7 @@
position: relative; position: relative;
padding-right: 18px; padding-right: 18px;
padding-left: 50px; padding-left: 50px;
background: $blue;
&.cancelling { &.cancelling {
color: rgba(255,255,255,0.5); color: rgba(255,255,255,0.5);