From 5731edc82e36715f7e2844808f0b952b44db0e52 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Sun, 13 Mar 2022 12:44:35 -0500 Subject: [PATCH] v2 ui tweaks (#702) * fix m3u and xml urls (kind of) * use svg logos * tweak theme colors --- .../src/assets/images/ersatztv-500.png | Bin 4721 -> 0 bytes .../src/assets/images/ersatztv-logo.svg | 88 ++++++++++++++++++ .../client-app/src/assets/images/ersatztv.png | Bin 4843 -> 0 bytes .../client-app/src/assets/images/ersatztv.svg | 77 +++++++++++++++ .../src/components/Navigation/SideBarLogo.vue | 4 +- ErsatzTV/client-app/src/plugins/vuetify.js | 4 +- .../client-app/src/stores/applicationState.js | 6 +- ErsatzTV/client-app/vue.config.js | 2 +- artwork/ersatztv.svg | 77 +++++++++++++++ 9 files changed, 250 insertions(+), 8 deletions(-) delete mode 100644 ErsatzTV/client-app/src/assets/images/ersatztv-500.png create mode 100644 ErsatzTV/client-app/src/assets/images/ersatztv-logo.svg delete mode 100644 ErsatzTV/client-app/src/assets/images/ersatztv.png create mode 100644 ErsatzTV/client-app/src/assets/images/ersatztv.svg create mode 100644 artwork/ersatztv.svg diff --git a/ErsatzTV/client-app/src/assets/images/ersatztv-500.png b/ErsatzTV/client-app/src/assets/images/ersatztv-500.png deleted file mode 100644 index 9e0a8b4e2c7dc521c3b60a4ddd2e94706dfe55ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4721 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 xV$LGhUABMZbK_MvgsGKDv607ve*sCV*l7R& diff --git a/ErsatzTV/client-app/src/assets/images/ersatztv-logo.svg b/ErsatzTV/client-app/src/assets/images/ersatztv-logo.svg new file mode 100644 index 000000000..3cc6156d0 --- /dev/null +++ b/ErsatzTV/client-app/src/assets/images/ersatztv-logo.svg @@ -0,0 +1,88 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ErsatzTV/client-app/src/assets/images/ersatztv.png b/ErsatzTV/client-app/src/assets/images/ersatztv.png deleted file mode 100644 index c8e54c76e1d69901ebf52262b6a0fad99abe06dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4843 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 RYr6md002ovPDHLkV1nr8_1*vg diff --git a/ErsatzTV/client-app/src/assets/images/ersatztv.svg b/ErsatzTV/client-app/src/assets/images/ersatztv.svg new file mode 100644 index 000000000..e37b70b14 --- /dev/null +++ b/ErsatzTV/client-app/src/assets/images/ersatztv.svg @@ -0,0 +1,77 @@ + + + + + + + + image/svg+xml + + + + + + + ErsatzTV + + diff --git a/ErsatzTV/client-app/src/components/Navigation/SideBarLogo.vue b/ErsatzTV/client-app/src/components/Navigation/SideBarLogo.vue index 5b874d320..a80fbae5f 100644 --- a/ErsatzTV/client-app/src/components/Navigation/SideBarLogo.vue +++ b/ErsatzTV/client-app/src/components/Navigation/SideBarLogo.vue @@ -2,12 +2,12 @@ diff --git a/ErsatzTV/client-app/src/plugins/vuetify.js b/ErsatzTV/client-app/src/plugins/vuetify.js index f03ffa336..9597f01d0 100644 --- a/ErsatzTV/client-app/src/plugins/vuetify.js +++ b/ErsatzTV/client-app/src/plugins/vuetify.js @@ -11,8 +11,8 @@ export default new Vuetify({ theme: { themes: { dark: { - primary: colors.yellow, - secondary: colors.teal.accent3, + primary: "#c0c000", + secondary: "#00c0c0", accent: colors.yellow.accent2, error: colors.red, warning: colors.orange, diff --git a/ErsatzTV/client-app/src/stores/applicationState.js b/ErsatzTV/client-app/src/stores/applicationState.js index b397dbb14..15b2ff248 100644 --- a/ErsatzTV/client-app/src/stores/applicationState.js +++ b/ErsatzTV/client-app/src/stores/applicationState.js @@ -1,14 +1,14 @@ import { defineStore } from "pinia"; -const pageURL = `${window.location}`; +const originURL = `${window.location.origin}`; export const applicationState = defineStore("appState", { state: () => { return { miniMenu: false, currentVersion: "0.4.3-7cd2f9a-docker-nvidia", // Needs to be pulled from API with an action when ready - m3uURL: pageURL + "iptv/channels.m3u", - xmlURL: pageURL + "iptv/xmltv.xml", + m3uURL: originURL + "/iptv/channels.m3u", // this will need to be fixed for reverse proxies + xmlURL: originURL + "/iptv/xmltv.xml", // this will need to be fixed for reverse proxies documentationURL: "https://ersatztv.org/", githubURL: "https://github.com/jasongdove/ErsatzTV", discordURL: "https://discord.gg/hHaJm3yGy6", diff --git a/ErsatzTV/client-app/vue.config.js b/ErsatzTV/client-app/vue.config.js index 621839a69..33dd35e60 100644 --- a/ErsatzTV/client-app/vue.config.js +++ b/ErsatzTV/client-app/vue.config.js @@ -9,5 +9,5 @@ module.exports = defineConfig({ }, publicPath: "/v2/", outputDir: "../wwwroot/v2", - filenameHashing: false + filenameHashing: false, }); diff --git a/artwork/ersatztv.svg b/artwork/ersatztv.svg new file mode 100644 index 000000000..e37b70b14 --- /dev/null +++ b/artwork/ersatztv.svg @@ -0,0 +1,77 @@ + + + + + + + + image/svg+xml + + + + + + + ErsatzTV + +