Show icons in build and remove unused items.
This commit is contained in:
parent
0b5bf7e6b0
commit
6c3539943b
|
@ -17,14 +17,14 @@ if (platform == 'darwin') {
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
appId: `io.freetubeapp.${name}`,
|
appId: `io.freetubeapp.${name}`,
|
||||||
copyright: 'Copyleft ©2020 freetubeapp@protonmail.com',
|
copyright: 'Copyleft © 2020 freetubeapp@protonmail.com',
|
||||||
// asar: false,
|
// asar: false,
|
||||||
// compression: 'store',
|
// compression: 'store',
|
||||||
productName,
|
productName,
|
||||||
directories: {
|
directories: {
|
||||||
output: './build/',
|
output: './build/',
|
||||||
},
|
},
|
||||||
files: ['_icons/icon.*', './dist/**/*', '!./dist/web/**/*'],
|
files: ['_icons/**/*', './dist/**/*', '!./dist/web/**/*'],
|
||||||
dmg: {
|
dmg: {
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
|
@ -46,7 +46,7 @@ const config = {
|
||||||
},
|
},
|
||||||
linux: {
|
linux: {
|
||||||
icon: '_icons/iconColor.png',
|
icon: '_icons/iconColor.png',
|
||||||
target: ['deb', 'rpm', 'zip', 'AppImage'],
|
target: ['deb'],
|
||||||
},
|
},
|
||||||
mac: {
|
mac: {
|
||||||
category: 'public.app-category.utilities',
|
category: 'public.app-category.utilities',
|
||||||
|
|
|
@ -80,7 +80,7 @@ if (isDevMode) {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
from: path.join(__dirname, '../_icons'),
|
from: path.join(__dirname, '../_icons'),
|
||||||
to: path.join(__dirname, '../dist/web/_icons'),
|
to: path.join(__dirname, '../dist/_icons'),
|
||||||
globOptions: {
|
globOptions: {
|
||||||
ignore: ['.*'],
|
ignore: ['.*'],
|
||||||
},
|
},
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
"productName": "FreeTube-Vue",
|
"productName": "FreeTube-Vue",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git+https://github.com/mubaidr/vue-electron-template.git"
|
"url": "git+https://github.com/FreeTubeApp/FreeTube-Vue.git"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "run-s rebuild:electron pack build-release",
|
"build": "run-s rebuild:electron pack build-release",
|
||||||
|
|
|
@ -220,9 +220,9 @@ export default Vue.extend({
|
||||||
this.player.volume(this.volume)
|
this.player.volume(this.volume)
|
||||||
this.player.playbackRate(this.defaultPlayback)
|
this.player.playbackRate(this.defaultPlayback)
|
||||||
|
|
||||||
this.player.vttThumbnails({
|
// this.player.vttThumbnails({
|
||||||
src: this.storyboardSrc
|
// src: this.storyboardSrc
|
||||||
})
|
// })
|
||||||
|
|
||||||
if (this.useDash) {
|
if (this.useDash) {
|
||||||
this.dataSetup.plugins.httpSourceSelector = {
|
this.dataSetup.plugins.httpSourceSelector = {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
|
import $ from 'jquery'
|
||||||
import { mapActions } from 'vuex'
|
import { mapActions } from 'vuex'
|
||||||
import FtCard from '../ft-card/ft-card.vue'
|
import FtCard from '../ft-card/ft-card.vue'
|
||||||
import FtSelect from '../ft-select/ft-select.vue'
|
import FtSelect from '../ft-select/ft-select.vue'
|
||||||
|
@ -16,6 +17,9 @@ export default Vue.extend({
|
||||||
data: function () {
|
data: function () {
|
||||||
return {
|
return {
|
||||||
title: 'General Settings',
|
title: 'General Settings',
|
||||||
|
showInvidiousInstances: false,
|
||||||
|
instanceNames: [],
|
||||||
|
instanceValues: [],
|
||||||
backendNames: [
|
backendNames: [
|
||||||
'Invidious API',
|
'Invidious API',
|
||||||
'Local API'
|
'Local API'
|
||||||
|
@ -541,6 +545,9 @@ export default Vue.extend({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
invidiousInstance: function () {
|
||||||
|
return this.$store.getters.getInvidiousInstance
|
||||||
|
},
|
||||||
backendFallback: function () {
|
backendFallback: function () {
|
||||||
return this.$store.getters.getBackendFallback
|
return this.$store.getters.getBackendFallback
|
||||||
},
|
},
|
||||||
|
@ -563,6 +570,34 @@ export default Vue.extend({
|
||||||
return this.$store.getters.getThumbnailPreference
|
return this.$store.getters.getThumbnailPreference
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
mounted: function () {
|
||||||
|
const requestUrl = 'https://instances.invidio.us/instances.json'
|
||||||
|
$.getJSON(requestUrl, (response) => {
|
||||||
|
console.log(response)
|
||||||
|
const instances = response.filter((instance) => {
|
||||||
|
if (instance[0].includes('.onion') || instance[0].includes('.i2p')) {
|
||||||
|
return false
|
||||||
|
} else {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
this.instanceNames = instances.map((instance) => {
|
||||||
|
return instance[0]
|
||||||
|
})
|
||||||
|
|
||||||
|
this.instanceValues = instances.map((instance) => {
|
||||||
|
return instance[1].uri.replace(/\/$/, '')
|
||||||
|
})
|
||||||
|
|
||||||
|
this.showInvidiousInstances = true
|
||||||
|
}).fail((xhr, textStatus, error) => {
|
||||||
|
console.log(xhr)
|
||||||
|
console.log(textStatus)
|
||||||
|
console.log(requestUrl)
|
||||||
|
console.log(error)
|
||||||
|
})
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions([
|
...mapActions([
|
||||||
'updateBackendFallback',
|
'updateBackendFallback',
|
||||||
|
@ -572,7 +607,8 @@ export default Vue.extend({
|
||||||
'updateLandingPage',
|
'updateLandingPage',
|
||||||
'updateRegion',
|
'updateRegion',
|
||||||
'updateListType',
|
'updateListType',
|
||||||
'updateThumbnailPreference'
|
'updateThumbnailPreference',
|
||||||
|
'updateInvidiousInstance'
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
@change="updateBackendFallback"
|
@change="updateBackendFallback"
|
||||||
/>
|
/>
|
||||||
<ft-toggle-switch
|
<ft-toggle-switch
|
||||||
|
v-if="false"
|
||||||
label="Check for Updates"
|
label="Check for Updates"
|
||||||
:default-value="checkForUpdates"
|
:default-value="checkForUpdates"
|
||||||
@change="updateCheckForUpdates"
|
@change="updateCheckForUpdates"
|
||||||
|
@ -27,6 +28,7 @@
|
||||||
@change="updateBackendPreference"
|
@change="updateBackendPreference"
|
||||||
/>
|
/>
|
||||||
<ft-select
|
<ft-select
|
||||||
|
v-if="false"
|
||||||
placeholder="Default Landing Page"
|
placeholder="Default Landing Page"
|
||||||
:value="landingPage"
|
:value="landingPage"
|
||||||
:select-names="defaultPageNames"
|
:select-names="defaultPageNames"
|
||||||
|
@ -34,6 +36,7 @@
|
||||||
@change="updateLandingPage"
|
@change="updateLandingPage"
|
||||||
/>
|
/>
|
||||||
<ft-select
|
<ft-select
|
||||||
|
v-if="false"
|
||||||
placeholder="Region for Trending"
|
placeholder="Region for Trending"
|
||||||
:value="region"
|
:value="region"
|
||||||
:select-names="regionNames"
|
:select-names="regionNames"
|
||||||
|
@ -54,6 +57,14 @@
|
||||||
:select-values="thumbnailTypeValues"
|
:select-values="thumbnailTypeValues"
|
||||||
@change="updateThumbnailPreference"
|
@change="updateThumbnailPreference"
|
||||||
/>
|
/>
|
||||||
|
<ft-select
|
||||||
|
v-if="showInvidiousInstances"
|
||||||
|
placeholder="Invidious Instance"
|
||||||
|
:value="invidiousInstance"
|
||||||
|
:select-names="instanceNames"
|
||||||
|
:select-values="instanceValues"
|
||||||
|
@change="updateInvidiousInstance"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</ft-card>
|
</ft-card>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -9,12 +9,14 @@
|
||||||
<div class="switchColumnGrid">
|
<div class="switchColumnGrid">
|
||||||
<div class="switchColumn">
|
<div class="switchColumn">
|
||||||
<ft-toggle-switch
|
<ft-toggle-switch
|
||||||
|
v-if="false"
|
||||||
label="Remember History"
|
label="Remember History"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:default-value="rememberHistory"
|
:default-value="rememberHistory"
|
||||||
@change="updateRememberHistory"
|
@change="updateRememberHistory"
|
||||||
/>
|
/>
|
||||||
<ft-toggle-switch
|
<ft-toggle-switch
|
||||||
|
v-if="false"
|
||||||
label="Enable Subtitles by Default"
|
label="Enable Subtitles by Default"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:default-value="enableSubtitles"
|
:default-value="enableSubtitles"
|
||||||
|
@ -47,6 +49,7 @@
|
||||||
@change="updateAutoplayPlaylists"
|
@change="updateAutoplayPlaylists"
|
||||||
/>
|
/>
|
||||||
<ft-toggle-switch
|
<ft-toggle-switch
|
||||||
|
v-if="false"
|
||||||
label="Play Next Video"
|
label="Play Next Video"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:default-value="playNextVideo"
|
:default-value="playNextVideo"
|
||||||
|
|
|
@ -41,6 +41,10 @@ export default Vue.extend({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
invidiousInstance: function () {
|
||||||
|
return this.$store.getters.getInvidiousInstance
|
||||||
|
},
|
||||||
|
|
||||||
listType: function () {
|
listType: function () {
|
||||||
return this.$store.getters.getListType
|
return this.$store.getters.getListType
|
||||||
},
|
},
|
||||||
|
@ -87,7 +91,7 @@ export default Vue.extend({
|
||||||
methods: {
|
methods: {
|
||||||
sharePlaylist: function (method) {
|
sharePlaylist: function (method) {
|
||||||
const youtubeUrl = `https://youtube.com/playlist?list=${this.id}`
|
const youtubeUrl = `https://youtube.com/playlist?list=${this.id}`
|
||||||
const invidiousUrl = `https://invidio.us/playlist?list=${this.id}`
|
const invidiousUrl = `${this.invidiousInstance}/playlist?list=${this.id}`
|
||||||
|
|
||||||
switch (method) {
|
switch (method) {
|
||||||
case 'copyYoutube':
|
case 'copyYoutube':
|
||||||
|
|
|
@ -21,13 +21,11 @@ export default Vue.extend({
|
||||||
currentSecColor: '',
|
currentSecColor: '',
|
||||||
baseThemeNames: [
|
baseThemeNames: [
|
||||||
'Light',
|
'Light',
|
||||||
'Dark',
|
'Dark'
|
||||||
'Gray'
|
|
||||||
],
|
],
|
||||||
baseThemeValues: [
|
baseThemeValues: [
|
||||||
'light',
|
'light',
|
||||||
'dark',
|
'dark'
|
||||||
'gray'
|
|
||||||
],
|
],
|
||||||
colorNames: [
|
colorNames: [
|
||||||
'Red',
|
'Red',
|
||||||
|
|
|
@ -56,8 +56,7 @@ export default Vue.extend({
|
||||||
formatTypeLabel: 'VIDEO FORMATS',
|
formatTypeLabel: 'VIDEO FORMATS',
|
||||||
formatTypeNames: [
|
formatTypeNames: [
|
||||||
'USE DASH FORMATS',
|
'USE DASH FORMATS',
|
||||||
'USE LEGACY FORMATS',
|
'USE LEGACY FORMATS'
|
||||||
'USE YOUTUBE PLAYER'
|
|
||||||
],
|
],
|
||||||
formatTypeValues: [
|
formatTypeValues: [
|
||||||
'dash',
|
'dash',
|
||||||
|
@ -69,17 +68,13 @@ export default Vue.extend({
|
||||||
'COPY INVIDIOUS LINK',
|
'COPY INVIDIOUS LINK',
|
||||||
'OPEN INVIDIOUS LINK',
|
'OPEN INVIDIOUS LINK',
|
||||||
'COPY YOUTUBE LINK',
|
'COPY YOUTUBE LINK',
|
||||||
'OPEN YOUTUBE LINK',
|
'OPEN YOUTUBE LINK'
|
||||||
'COPY YOUTUBE EMBED LINK',
|
|
||||||
'OPEN YOUTUBE EMBED LINK'
|
|
||||||
],
|
],
|
||||||
shareValues: [
|
shareValues: [
|
||||||
'copyInvidious',
|
'copyInvidious',
|
||||||
'openInvidious',
|
'openInvidious',
|
||||||
'copyYoutube',
|
'copyYoutube',
|
||||||
'openYoutube',
|
'openYoutube'
|
||||||
'copyYoutubeEmbed',
|
|
||||||
'openYoutubeEmbed'
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -134,6 +134,8 @@ export default Vue.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
parseLiveChatComment: function (comment) {
|
parseLiveChatComment: function (comment) {
|
||||||
|
console.log(comment)
|
||||||
|
|
||||||
if (this.hasEnded) {
|
if (this.hasEnded) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -141,14 +143,28 @@ export default Vue.extend({
|
||||||
comment.messageHtml = ''
|
comment.messageHtml = ''
|
||||||
|
|
||||||
comment.message.forEach((text) => {
|
comment.message.forEach((text) => {
|
||||||
comment.messageHtml = comment.messageHtml + text.text
|
if (typeof (text.navigationEndpoint) !== 'undefined') {
|
||||||
|
if (typeof (text.navigationEndpoint.watchEndpoint) !== 'undefined') {
|
||||||
|
const htmlRef = `<router-link to="/watch/${text.navigationEndpoint.watchEndpoint.videoId}">${text.text}</router-link>`
|
||||||
|
comment.messageHtml = comment.messageHtml + htmlRef
|
||||||
|
} else {
|
||||||
|
comment.messageHtml = comment.messageHtml + text.text
|
||||||
|
}
|
||||||
|
} else if (typeof (text.alt) !== 'undefined') {
|
||||||
|
const htmlImg = `<img src="${text.url}" alt="${text.alt}" />`
|
||||||
|
comment.messageHtml = comment.messageHtml + htmlImg
|
||||||
|
} else {
|
||||||
|
comment.messageHtml = comment.messageHtml + text.text
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
comment.messageHtml = autolinker.link(comment.messageHtml)
|
comment.messageHtml = autolinker.link(comment.messageHtml)
|
||||||
|
|
||||||
const liveChatComments = $('.liveChatComments')
|
const liveChatComments = $('.liveChatComments')
|
||||||
|
const liveChatMessage = $('.liveChatMessage')
|
||||||
|
|
||||||
if (typeof (liveChatComments.get(0)) === 'undefined' && this.comments.length !== 0) {
|
if (typeof (liveChatComments.get(0)) === 'undefined' && typeof (liveChatMessage.get(0)) === 'undefined') {
|
||||||
|
console.log("Can't find chat object. Stopping chat connection")
|
||||||
this.liveChat.stop()
|
this.liveChat.stop()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-else-if="comments.length === 0"
|
v-else-if="comments.length === 0"
|
||||||
class="messageContainer"
|
class="messageContainer liveChatMessage"
|
||||||
>
|
>
|
||||||
<p
|
<p
|
||||||
class="message"
|
class="message"
|
||||||
|
@ -96,7 +96,7 @@
|
||||||
<p
|
<p
|
||||||
class="chatMessage"
|
class="chatMessage"
|
||||||
v-if="superChat.message.length > 0"
|
v-if="superChat.message.length > 0"
|
||||||
v-html="comment.messageHtml"
|
v-html="superChat.messageHtml"
|
||||||
>
|
>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3,6 +3,7 @@ import Vue from 'vue'
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import router from './router/index'
|
import router from './router/index'
|
||||||
import store from './store/index'
|
import store from './store/index'
|
||||||
|
import 'material-design-icons/iconfont/material-icons.css'
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
import { fas } from '@fortawesome/free-solid-svg-icons'
|
import { fas } from '@fortawesome/free-solid-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
||||||
|
|
|
@ -48,7 +48,7 @@ const state = {
|
||||||
defaultVolume: 1,
|
defaultVolume: 1,
|
||||||
defaultPlayback: 1,
|
defaultPlayback: 1,
|
||||||
defaultVideoFormat: 'dash',
|
defaultVideoFormat: 'dash',
|
||||||
defaultQuality: 'auto',
|
defaultQuality: '720',
|
||||||
useTor: false,
|
useTor: false,
|
||||||
proxy: 'SOCKS5://127.0.0.1:9050',
|
proxy: 'SOCKS5://127.0.0.1:9050',
|
||||||
debugMode: false,
|
debugMode: false,
|
||||||
|
@ -156,6 +156,9 @@ const actions = {
|
||||||
console.log(results)
|
console.log(results)
|
||||||
results.forEach((result) => {
|
results.forEach((result) => {
|
||||||
switch (result._id) {
|
switch (result._id) {
|
||||||
|
case 'invidiousInstance':
|
||||||
|
commit('setInvidiousInstance', result.value)
|
||||||
|
break
|
||||||
case 'backendFallback':
|
case 'backendFallback':
|
||||||
commit('setBackendFallback', result.value)
|
commit('setBackendFallback', result.value)
|
||||||
break
|
break
|
||||||
|
@ -223,6 +226,15 @@ const actions = {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
updateInvidiousInstance ({ commit }, invidiousInstance) {
|
||||||
|
console.log(invidiousInstance)
|
||||||
|
settingsDb.update({ _id: 'invidiousInstance' }, { _id: 'invidiousInstance', value: invidiousInstance }, { upsert: true }, (err, numReplaced) => {
|
||||||
|
if (!err) {
|
||||||
|
commit('setInvidiousInstance', invidiousInstance)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
updateBackendFallback ({ commit }, backendFallback) {
|
updateBackendFallback ({ commit }, backendFallback) {
|
||||||
settingsDb.update({ _id: 'backendFallback' }, { _id: 'backendFallback', value: backendFallback }, { upsert: true }, (err, numReplaced) => {
|
settingsDb.update({ _id: 'backendFallback' }, { _id: 'backendFallback', value: backendFallback }, { upsert: true }, (err, numReplaced) => {
|
||||||
if (!err) {
|
if (!err) {
|
||||||
|
@ -394,6 +406,9 @@ const actions = {
|
||||||
}
|
}
|
||||||
|
|
||||||
const mutations = {
|
const mutations = {
|
||||||
|
setInvidiousInstance (state, invidiousInstance) {
|
||||||
|
state.invidiousInstance = invidiousInstance
|
||||||
|
},
|
||||||
setCurrentTheme (state, currentTheme) {
|
setCurrentTheme (state, currentTheme) {
|
||||||
state.barColor = currentTheme
|
state.barColor = currentTheme
|
||||||
},
|
},
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
--side-nav-hover-color: #e0e0e0;
|
--side-nav-hover-color: #e0e0e0;
|
||||||
--side-nav-active-color: #757575;
|
--side-nav-active-color: #757575;
|
||||||
--search-bar-color: #f5f5f5;
|
--search-bar-color: #f5f5f5;
|
||||||
--logo-icon: url("/_icons/iconColorSmall.png");
|
--logo-icon: url("~../../_icons/iconColorSmall.png");
|
||||||
--logo-text: url("/_icons/textColorSmall.png");
|
--logo-text: url("~../../_icons/textColorSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,8 +31,8 @@
|
||||||
--side-nav-hover-color: #212121;
|
--side-nav-hover-color: #212121;
|
||||||
--side-nav-active-color: #303030;
|
--side-nav-active-color: #303030;
|
||||||
--search-bar-color: #262626;
|
--search-bar-color: #262626;
|
||||||
--logo-icon: url("/_icons/iconColorSmall.png");
|
--logo-icon: url("~../../_icons/iconColorSmall.png");
|
||||||
--logo-text: url("/_icons/textColorSmall.png");
|
--logo-text: url("~../../_icons/textColorSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,8 +50,8 @@
|
||||||
--side-nav-hover-color: #212121;
|
--side-nav-hover-color: #212121;
|
||||||
--side-nav-active-color: #303030;
|
--side-nav-active-color: #303030;
|
||||||
--search-bar-color: #212121;
|
--search-bar-color: #212121;
|
||||||
--logo-icon: url("/_icons/iconColorSmall.png");
|
--logo-icon: url("~../../_icons/iconColorSmall.png");
|
||||||
--logo-text: url("/_icons/textColorSmall.png");
|
--logo-text: url("~../../_icons/textColorSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainRed {
|
.mainRed {
|
||||||
|
@ -59,8 +59,8 @@
|
||||||
--primary-color-hover: #e53935;
|
--primary-color-hover: #e53935;
|
||||||
--primary-color-active: #c62828;
|
--primary-color-active: #c62828;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainPink {
|
.mainPink {
|
||||||
|
@ -68,8 +68,8 @@
|
||||||
--primary-color-hover: #D81B60;
|
--primary-color-hover: #D81B60;
|
||||||
--primary-color-active: #AD1457;
|
--primary-color-active: #AD1457;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainPurple {
|
.mainPurple {
|
||||||
|
@ -77,8 +77,8 @@
|
||||||
--primary-color-hover: #8E24AA;
|
--primary-color-hover: #8E24AA;
|
||||||
--primary-color-active: #6A1B9A;
|
--primary-color-active: #6A1B9A;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainDeepPurple {
|
.mainDeepPurple {
|
||||||
|
@ -86,8 +86,8 @@
|
||||||
--primary-color-hover: #5E35B1;
|
--primary-color-hover: #5E35B1;
|
||||||
--primary-color-active: #4527A0;
|
--primary-color-active: #4527A0;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainIndigo {
|
.mainIndigo {
|
||||||
|
@ -95,8 +95,8 @@
|
||||||
--primary-color-hover: #3949AB;
|
--primary-color-hover: #3949AB;
|
||||||
--primary-color-active: #283593;
|
--primary-color-active: #283593;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainBlue {
|
.mainBlue {
|
||||||
|
@ -104,8 +104,8 @@
|
||||||
--primary-color-hover: #1E88E5;
|
--primary-color-hover: #1E88E5;
|
||||||
--primary-color-active: #1565C0;
|
--primary-color-active: #1565C0;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainLightBlue {
|
.mainLightBlue {
|
||||||
|
@ -113,8 +113,8 @@
|
||||||
--primary-color-hover: #039BE5;
|
--primary-color-hover: #039BE5;
|
||||||
--primary-color-active: #0277BD;
|
--primary-color-active: #0277BD;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainCyan {
|
.mainCyan {
|
||||||
|
@ -122,8 +122,8 @@
|
||||||
--primary-color-hover: #00ACC1;
|
--primary-color-hover: #00ACC1;
|
||||||
--primary-color-active: #00838F;
|
--primary-color-active: #00838F;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainTeal {
|
.mainTeal {
|
||||||
|
@ -131,8 +131,8 @@
|
||||||
--primary-color-hover: #00897B;
|
--primary-color-hover: #00897B;
|
||||||
--primary-color-active: #00695C;
|
--primary-color-active: #00695C;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainGreen {
|
.mainGreen {
|
||||||
|
@ -140,8 +140,8 @@
|
||||||
--primary-color-hover: #43A047;
|
--primary-color-hover: #43A047;
|
||||||
--primary-color-active: #2E7D32;
|
--primary-color-active: #2E7D32;
|
||||||
--text-with-main-color: #FFFFFF;
|
--text-with-main-color: #FFFFFF;
|
||||||
--logo-icon-bar-color: url("/_icons/iconWhite.png");
|
--logo-icon-bar-color: url("~../../_icons/iconWhite.png");
|
||||||
--logo-text-bar-color: url("/_icons/textWhite.png");
|
--logo-text-bar-color: url("~../../_icons/textWhite.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainLightGreen {
|
.mainLightGreen {
|
||||||
|
@ -149,8 +149,8 @@
|
||||||
--primary-color-hover: #7CB342;
|
--primary-color-hover: #7CB342;
|
||||||
--primary-color-active: #558B2F;
|
--primary-color-active: #558B2F;
|
||||||
--text-with-main-color: #000000;
|
--text-with-main-color: #000000;
|
||||||
--logo-icon-bar-color: url("/_icons/iconBlackSmall.png");
|
--logo-icon-bar-color: url("~../../_icons/iconBlackSmall.png");
|
||||||
--logo-text-bar-color: url("/_icons/textBlackSmall.png");
|
--logo-text-bar-color: url("~../../_icons/textBlackSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainLime {
|
.mainLime {
|
||||||
|
@ -158,8 +158,8 @@
|
||||||
--primary-color-hover: #C0CA33;
|
--primary-color-hover: #C0CA33;
|
||||||
--primary-color-active: #9E9D24;
|
--primary-color-active: #9E9D24;
|
||||||
--text-with-main-color: #000000;
|
--text-with-main-color: #000000;
|
||||||
--logo-icon-bar-color: url("/_icons/iconBlackSmall.png");
|
--logo-icon-bar-color: url("~../../_icons/iconBlackSmall.png");
|
||||||
--logo-text-bar-color: url("/_icons/textBlackSmall.png");
|
--logo-text-bar-color: url("~../../_icons/textBlackSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainYellow {
|
.mainYellow {
|
||||||
|
@ -167,8 +167,8 @@
|
||||||
--primary-color-hover: #FDD835;
|
--primary-color-hover: #FDD835;
|
||||||
--primary-color-active: #F9A825;
|
--primary-color-active: #F9A825;
|
||||||
--text-with-main-color: #000000;
|
--text-with-main-color: #000000;
|
||||||
--logo-icon-bar-color: url("/_icons/iconBlackSmall.png");
|
--logo-icon-bar-color: url("~../../_icons/iconBlackSmall.png");
|
||||||
--logo-text-bar-color: url("/_icons/textBlackSmall.png");
|
--logo-text-bar-color: url("~../../_icons/textBlackSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainAmber {
|
.mainAmber {
|
||||||
|
@ -176,8 +176,8 @@
|
||||||
--primary-color-hover: #FFB300;
|
--primary-color-hover: #FFB300;
|
||||||
--primary-color-active: #FF8F00;
|
--primary-color-active: #FF8F00;
|
||||||
--text-with-main-color: #000000;
|
--text-with-main-color: #000000;
|
||||||
--logo-icon-bar-color: url("/_icons/iconBlackSmall.png");
|
--logo-icon-bar-color: url("~../../_icons/iconBlackSmall.png");
|
||||||
--logo-text-bar-color: url("/_icons/textBlackSmall.png");
|
--logo-text-bar-color: url("~../../_icons/textBlackSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainOrange {
|
.mainOrange {
|
||||||
|
@ -185,8 +185,8 @@
|
||||||
--primary-color-hover: #FB8C00;
|
--primary-color-hover: #FB8C00;
|
||||||
--primary-color-active: #EF6C00;
|
--primary-color-active: #EF6C00;
|
||||||
--text-with-main-color: #000000;
|
--text-with-main-color: #000000;
|
||||||
--logo-icon-bar-color: url("/_icons/iconBlackSmall.png");
|
--logo-icon-bar-color: url("~../../_icons/iconBlackSmall.png");
|
||||||
--logo-text-bar-color: url("/_icons/textBlackSmall.png");
|
--logo-text-bar-color: url("~../../_icons/textBlackSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.mainDeepOrange {
|
.mainDeepOrange {
|
||||||
|
@ -194,8 +194,8 @@
|
||||||
--primary-color-hover: #F4511E;
|
--primary-color-hover: #F4511E;
|
||||||
--primary-color-active: #D84315;
|
--primary-color-active: #D84315;
|
||||||
--text-with-main-color: #000000;
|
--text-with-main-color: #000000;
|
||||||
--logo-icon-bar-color: url("/_icons/iconBlackSmall.png");
|
--logo-icon-bar-color: url("~../../_icons/iconBlackSmall.png");
|
||||||
--logo-text-bar-color: url("/_icons/textBlackSmall.png");
|
--logo-text-bar-color: url("~../../_icons/textBlackSmall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
.secRed {
|
.secRed {
|
||||||
|
|
|
@ -1944,7 +1944,9 @@ video::-webkit-media-text-track-display {
|
||||||
background: rgba(255,255,255,0.3);
|
background: rgba(255,255,255,0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.vjs-quality-selector .vjs-menu-button {
|
.vjs-quality-selector .vjs-menu-button{margin:0;padding:0;height:100%;width:100%}.vjs-quality-selector .vjs-icon-placeholder{font-family:'VideoJS';font-weight:normal;font-style:normal}.vjs-quality-selector .vjs-icon-placeholder:before{content:'\f110'}.vjs-quality-changing .vjs-big-play-button{display:none}.vjs-quality-changing .vjs-control-bar{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;visibility:visible;opacity:1}
|
||||||
|
|
||||||
|
/* .vjs-quality-selector .vjs-menu-button {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
@ -1969,7 +1971,7 @@ video::-webkit-media-text-track-display {
|
||||||
display: flex;
|
display: flex;
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
} */
|
||||||
|
|
||||||
.video-js .vjs-vtt-thumbnails {
|
.video-js .vjs-vtt-thumbnails {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
class="logo"
|
class="logo"
|
||||||
>
|
>
|
||||||
<h1>
|
<h1>
|
||||||
{{ versionNumber }} Beta
|
{{ versionNumber }} Alpha
|
||||||
</h1>
|
</h1>
|
||||||
<h3>
|
<h3>
|
||||||
<font-awesome-icon
|
<font-awesome-icon
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
margin-bottom: 60px;
|
margin-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message {
|
||||||
|
color: var(--tertiary-text-color);
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 680px) {
|
@media only screen and (max-width: 680px) {
|
||||||
.card {
|
.card {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import FtCard from '../../components/ft-card/ft-card.vue'
|
import FtCard from '../../components/ft-card/ft-card.vue'
|
||||||
|
import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
|
||||||
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
name: 'History',
|
name: 'History',
|
||||||
components: {
|
components: {
|
||||||
'ft-card': FtCard,
|
'ft-card': FtCard,
|
||||||
|
'ft-flex-box': FtFlexBox,
|
||||||
'ft-element-list': FtElementList
|
'ft-element-list': FtElementList
|
||||||
},
|
},
|
||||||
mounted: function () {
|
mounted: function () {
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
<div>
|
<div>
|
||||||
<ft-card class="card">
|
<ft-card class="card">
|
||||||
<h3>History</h3>
|
<h3>History</h3>
|
||||||
|
<ft-flex-box>
|
||||||
|
<p class="message">
|
||||||
|
This part of the app is not ready yet. Come back later when progress has been made.
|
||||||
|
</p>
|
||||||
|
</ft-flex-box>
|
||||||
</ft-card>
|
</ft-card>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
<general-settings />
|
<general-settings />
|
||||||
<theme-settings />
|
<theme-settings />
|
||||||
<player-settings />
|
<player-settings />
|
||||||
<subscription-settings />
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
margin-bottom: 60px;
|
margin-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message {
|
||||||
|
color: var(--tertiary-text-color);
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 680px) {
|
@media only screen and (max-width: 680px) {
|
||||||
.card {
|
.card {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import FtCard from '../../components/ft-card/ft-card.vue'
|
import FtCard from '../../components/ft-card/ft-card.vue'
|
||||||
|
import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
|
||||||
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
name: 'Subscriptions',
|
name: 'Subscriptions',
|
||||||
components: {
|
components: {
|
||||||
'ft-card': FtCard,
|
'ft-card': FtCard,
|
||||||
|
'ft-flex-box': FtFlexBox,
|
||||||
'ft-element-list': FtElementList
|
'ft-element-list': FtElementList
|
||||||
},
|
},
|
||||||
mounted: function () {
|
mounted: function () {
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
<div>
|
<div>
|
||||||
<ft-card class="card">
|
<ft-card class="card">
|
||||||
<h3>Subscriptions</h3>
|
<h3>Subscriptions</h3>
|
||||||
|
<ft-flex-box>
|
||||||
|
<p class="message">
|
||||||
|
This part of the app is not ready yet. Come back later when progress has been made.
|
||||||
|
</p>
|
||||||
|
</ft-flex-box>
|
||||||
</ft-card>
|
</ft-card>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
margin-bottom: 60px;
|
margin-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message {
|
||||||
|
color: var(--tertiary-text-color);
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 680px) {
|
@media only screen and (max-width: 680px) {
|
||||||
.card {
|
.card {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import FtCard from '../../components/ft-card/ft-card.vue'
|
import FtCard from '../../components/ft-card/ft-card.vue'
|
||||||
|
import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
|
||||||
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
name: 'UserPlaylists',
|
name: 'UserPlaylists',
|
||||||
components: {
|
components: {
|
||||||
'ft-card': FtCard,
|
'ft-card': FtCard,
|
||||||
|
'ft-flex-box': FtFlexBox,
|
||||||
'ft-element-list': FtElementList
|
'ft-element-list': FtElementList
|
||||||
},
|
},
|
||||||
mounted: function () {
|
mounted: function () {
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
<div>
|
<div>
|
||||||
<ft-card class="card">
|
<ft-card class="card">
|
||||||
<h3>Your Playlists</h3>
|
<h3>Your Playlists</h3>
|
||||||
|
<ft-flex-box>
|
||||||
|
<p class="message">
|
||||||
|
This part of the app is not ready yet. Come back later when progress has been made.
|
||||||
|
</p>
|
||||||
|
</ft-flex-box>
|
||||||
</ft-card>
|
</ft-card>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -202,7 +202,7 @@ export default Vue.extend({
|
||||||
label: 'Dash',
|
label: 'Dash',
|
||||||
qualityLabel: format.qualityLabel
|
qualityLabel: format.qualityLabel
|
||||||
}
|
}
|
||||||
})
|
}).reverse()
|
||||||
} else {
|
} else {
|
||||||
this.videoSourceList = result.player_response.streamingData.formats
|
this.videoSourceList = result.player_response.streamingData.formats
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue