Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

Commit

Permalink
correct initial state of message banner #81 #83 #84
Browse files Browse the repository at this point in the history
  • Loading branch information
steffchep committed Mar 19, 2019
1 parent 312724a commit f9f87af
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 15 deletions.
11 changes: 4 additions & 7 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<links></links>
</footer>
<please-login></please-login>
<error-message :message="statusMessage" :is-error="isError" show-for-secs="5"></error-message>
<message-banner show-for-secs="5"></message-banner>
</div>
</template>

Expand All @@ -56,8 +56,7 @@ import Search from './components/navbar/Search.vue'
import Conference from './Conference'
import Timetable from './components/navbar/Timetable.vue'
import PleaseLogin from './components/PleaseLogin.vue'
import ErrorMessage from './components/MessageBanner.vue'
import StatusMessage from './Status.js'
import MessageBanner from './components/MessageBanner.vue'
export default {
components: {
Expand All @@ -73,16 +72,14 @@ export default {
Login,
Language,
Links,
ErrorMessage
MessageBanner
},
name: 'app',
data () {
return {
mobileMenuOpen: false,
conference: Conference.getConference(),
events: Conference.getAllEvents(),
statusMessage: StatusMessage.message,
isError: StatusMessage.error
events: Conference.getAllEvents()
}
},
computed: {
Expand Down
6 changes: 6 additions & 0 deletions src/Conference.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import axios from 'axios'
import Vue from 'vue'
import groupBy from 'lodash-es/groupBy'
import Favorites from './Favourites'
import Status from './components/Status.js'
import moment from 'moment'

const refreshIntervalFavoritesMs = 90 * 1000
Expand Down Expand Up @@ -250,6 +251,9 @@ const init = function () {
axios.get(base + 'rest/init.json')
.then(function (response) {
conference.loadingFailed = false
Status.message = 'initialized'
Status.error = false

for (const key in response.data) {
if (response.data.hasOwnProperty(key)) {
Vue.set(conference, key, response.data[key])
Expand All @@ -270,6 +274,8 @@ const init = function () {
init()
}
console.log(error)
Status.message = 'couldn\'t initialize'
Status.error = true
conference.loadingFailed = true
})
}
Expand Down
21 changes: 14 additions & 7 deletions src/components/MessageBanner.vue
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
<template>
<div class="status-area" :class="errorClass + cssClass">{{message}}</div>
<div class="status-area" :class="errorClass + cssClass">{{status.message}}</div>
</template>
<script>
import Status from './Status.js'
export default {
name: 'MessageBanner',
props: ['message', 'showForSecs', 'isError'],
props: ['showForSecs'],
data () {
return {
errorClass: this.isError ? 'error ' : '',
status: Status,
cssClass: 'nothere'
}
},
mounted () {
this.setHide()
},
computed: {
errorClass () {
return this.status.isError ? 'error ' : ''
}
},
watch: {
message () {
status () {
console.log('trigger')
this.setHide()
}
},
methods: {
clearMessage () {
setTimeout(() => {
this.message = ''
this.isError = false
this.status.message = ''
this.status.isError = false
}, 500)
},
setHide () {
if (this.message && this.message.length > 0) {
if (this.status.message && this.status.message.length > 0) {
this.cssClass = 'here'
setTimeout(() => {
this.cssClass = 'nothere'
Expand Down
2 changes: 1 addition & 1 deletion src/Status.js → src/components/Status.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
message: '',
message: ' ',
error: false
}

0 comments on commit f9f87af

Please sign in to comment.