Compare commits

...

3 commits

Author SHA1 Message Date
445abccd73 wrong import 2022-09-19 09:25:26 +00:00
889fae5a37 OVDashboardPlugin.api_version 2022-09-19 09:24:20 +00:00
a565125245 use Template strings 2022-09-19 09:17:53 +00:00
6 changed files with 18 additions and 19 deletions

View file

@ -108,7 +108,7 @@ export default class App extends Vue {
// Update Images // Update Images
this.$ovdashboard.api_get_list("image/list", (names) => { this.$ovdashboard.api_get_list("image/list", (names) => {
this.image_urls = names.map((name: string) => this.image_urls = names.map((name: string) =>
this.$ovdashboard.api_url("image/get/" + name) this.$ovdashboard.api_url(`image/get/${name}`)
); );
}); });
@ -134,7 +134,7 @@ export default class App extends Vue {
// Update Calendar Aggregates // Update Calendar Aggregates
this.$ovdashboard.api_get_list("aggregate/list", (names) => { this.$ovdashboard.api_get_list("aggregate/list", (names) => {
this.$ovdashboard.api_get_object_multi<EventData[]>( this.$ovdashboard.api_get_object_multi<EventData[]>(
names.map((name) => "aggregate/get/" + name), names.map((name) => `aggregate/get/${name}`),
(calendars) => { (calendars) => {
this.calendar_data = []; this.calendar_data = [];

View file

@ -50,7 +50,7 @@ export default class TickerBar extends Vue {
// 10 seconds + another second per 40px // 10 seconds + another second per 40px
const duration = 10 + Math.round(width / 40); const duration = 10 + Math.round(width / 40);
this._marquee.style.setProperty("animation-duration", duration + "s"); this._marquee.style.setProperty("animation-duration", `${duration}s`);
}); });
} }
} }

View file

@ -8,7 +8,7 @@
<v-divider <v-divider
v-if="index < events.length - 1" v-if="index < events.length - 1"
class="mx-5" class="mx-5"
:key="event.hash + '-div'" :key="`${event.hash}-div`"
/> />
</template> </template>
</v-list> </v-list>
@ -16,7 +16,7 @@
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator"; import { Component, Prop, Vue } from "vue-property-decorator";
import { EventData } from "./model"; import { EventData } from "./EventModel";
import EventItem from "./EventItem.vue"; import EventItem from "./EventItem.vue";
@Component({ @Component({

View file

@ -52,7 +52,7 @@ export default class CalendarCarousel extends Vue {
.getPropertyValue("height"); .getPropertyValue("height");
const maxHeight = parseFloat(divHeightPX) - diff; const maxHeight = parseFloat(divHeightPX) - diff;
divElement.style.setProperty("max-height", maxHeight + "px"); divElement.style.setProperty("max-height", `${maxHeight}px`);
} }
public mounted(): void { public mounted(): void {

View file

@ -67,7 +67,7 @@ export default class EventItem extends Vue {
.mapUnits((x) => Math.round(x)) .mapUnits((x) => Math.round(x))
.toHuman(); .toHuman();
return locale_string + " (" + duration_string + ")"; return `${locale_string} (${duration_string})`;
} }
} }
</script> </script>

View file

@ -3,8 +3,9 @@ import Vue from 'vue';
export class OVDashboardPlugin { export class OVDashboardPlugin {
private axios: AxiosInstance; private axios: AxiosInstance;
private api_version: string;
public constructor() { public constructor(api_version: string) {
// Full config: https://github.com/axios/axios#request-config // Full config: https://github.com/axios/axios#request-config
// axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || ''; // axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
// axios.defaults.headers.common['Authorization'] = AUTH_TOKEN; // axios.defaults.headers.common['Authorization'] = AUTH_TOKEN;
@ -17,6 +18,7 @@ export class OVDashboardPlugin {
}; };
this.axios = axios.create(config); this.axios = axios.create(config);
this.api_version = api_version;
} }
public install(vue: typeof Vue) { public install(vue: typeof Vue) {
@ -25,23 +27,20 @@ export class OVDashboardPlugin {
private get api_baseurl(): string { private get api_baseurl(): string {
if (process.env.NODE_ENV === "production") { if (process.env.NODE_ENV === "production") {
return "//" + window.location.host + "/api/v1"; return `//${window.location.host}/api`;
} else { } else if (process.env.NODE_ENV !== "development") {
if (process.env.NODE_ENV !== "development") { console.warn("Unexpected NODE_ENV value");
console.warn("Unexpected NODE_ENV value");
}
return "//" + window.location.hostname + ":8000/api/v1";
} }
return `//${window.location.hostname}:8000/api`;
} }
public api_url(endpoint?: string): string { public api_url(endpoint?: string): string {
if (endpoint === undefined) if (endpoint === undefined)
return this.api_baseurl; return `${this.api_baseurl}/${this.api_version}`;
else return `${this.api_baseurl}/${this.api_version}/${endpoint}`;
return this.api_baseurl + "/" + endpoint;
} }
private fail(name: string): (reason: unknown) => void { private fail(name: string): (reason: unknown) => void {
@ -141,4 +140,4 @@ export class OVDashboardPlugin {
} }
} }
export default new OVDashboardPlugin(); export default new OVDashboardPlugin("v1");