+ 
-
openHAB is offline
-
Sorry, nothing here...(404)
+
{{this.message}}
+
+
+
+
+
+
{{ $route.meta.reason === 'offline' ? 'Try again' : 'Go back' }}
+ @click="login"
+ >{{ initialLogin ? 'Login' : $route.meta.reason === 'offline' ? 'Try again' : 'Go back' }}
+
+
diff --git a/web/src/store/actions.js b/web/src/store/actions.js
index f42815a..582d159 100644
--- a/web/src/store/actions.js
+++ b/web/src/store/actions.js
@@ -1,4 +1,5 @@
import axios from 'axios'
+import { Platform, LocalStorage } from 'quasar'
export const initialLoad = (context, credential) => {
let initialRequests = () => {
@@ -12,6 +13,24 @@ export const initialLoad = (context, credential) => {
})
}
+ if (Platform.is.cordova) {
+ const baseURL = LocalStorage.get.item('habot.baseURL')
+ if (!baseURL) {
+ return Promise.reject(new Error('Base URL not configured'))
+ }
+ axios.defaults.baseURL = baseURL
+ context.commit('setBaseURL', baseURL)
+
+ let userId = LocalStorage.get.item('habot.credentialUserId')
+ let password = LocalStorage.get.item('habot.credentialPassword')
+ if (userId && password) {
+ credential = {
+ id: userId,
+ password: password
+ }
+ }
+ }
+
if (credential) {
axios.defaults.headers.common['Authorization'] = 'Basic ' + btoa(credential.id + ':' + credential.password)
context.commit('setUsingStoredCredentials')
diff --git a/web/src/store/items/actions.js b/web/src/store/items/actions.js
index edf42f7..d1c1e94 100644
--- a/web/src/store/items/actions.js
+++ b/web/src/store/items/actions.js
@@ -4,7 +4,7 @@ export const someAction = (state) => {}
import axios from 'axios'
import 'event-source-polyfill'
-import { Notify } from 'quasar'
+import { Notify, Platform, LocalStorage } from 'quasar'
let eventSource
let authorizationHeader
@@ -28,14 +28,20 @@ export const initialLoad = (context) => {
}
export const watchEvents = async (context, credential) => {
+ let baseURL = ''
+ if (Platform.is.cordova) {
+ baseURL = LocalStorage.get.item('habot.baseURL') // context.rootState.baseURL
+ }
if (credential || authorizationHeader) {
if (!authorizationHeader) {
authorizationHeader = 'Basic ' + btoa(credential.id + ':' + credential.password)
}
- eventSource = new EventSourcePolyfill('/rest/events', // eslint-disable-line no-undef
+ eventSource = new EventSourcePolyfill(baseURL + '/rest/events', // eslint-disable-line no-undef
{ headers: { 'Authorization': authorizationHeader } })
+ } else if (Platform.is.cordova) {
+ eventSource = new EventSourcePolyfill(baseURL + '/rest/events') // eslint-disable-line no-undef
} else {
- eventSource = new EventSource('/rest/events')
+ eventSource = new EventSource(baseURL + '/rest/events') // eslint-disable-line no-undef
}
eventSource.onopen = (event) => {
diff --git a/web/src/store/mutations.js b/web/src/store/mutations.js
index 829206c..63cd4ed 100644
--- a/web/src/store/mutations.js
+++ b/web/src/store/mutations.js
@@ -6,6 +6,10 @@ export const setUsingStoredCredentials = (state) => {
state.usingStoredCredentials = true
}
+export const setBaseURL = (state, payload) => {
+ state.baseURL = payload
+}
+
export const setLang = (state, payload) => {
state.lang = payload
}
diff --git a/web/src/store/state.js b/web/src/store/state.js
index 378ec9a..2a7edee 100644
--- a/web/src/store/state.js
+++ b/web/src/store/state.js
@@ -1,5 +1,6 @@
export default {
ready: false,
lang: 'en',
- usingStoredCredentials: false
+ usingStoredCredentials: false,
+ baseURL: '' // for cordova
}