etc
/
VueTube
mirror of https://github.com/VueTubeApp/VueTube
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'VueTubeApp:main' into main

This commit is contained in:
gayolGate | Dev Studio 2022-08-07 16:00:39 +02:00 committed by GitHub
parent 4d3bf138a9 116d23a1de
commit db9b88184b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NUXT/components/updateChecker.vue
View File

@ -1,10 +1,6 @@
<template>
<div>
<v-snackbar
v-model="updateSnackbar"
class="updateBar"
:timeout="updateSnackbarTimeout"
>
<v-snackbar v-model="updateSnackbar" class="updateBar" :timeout="updateSnackbarTimeout" rounded>
{{ updateSnackbarText }}
<template #action="{ attrs }">
@ -12,8 +8,8 @@
color="primary"
text
v-bind="attrs"
@click="updateSnackbar = false"
>Close</v-btn
to="/mods/updates?nowait=true"
>Update</v-btn
>
</template>
</v-snackbar>

10
NUXT/pages/activities/install.vue
View File

@ -16,23 +16,25 @@
<language style="width: 80%" />
</center>
<!--
<center class="container hidden" ref="stage2">
<v-autocomplete
label="API"
:items="items"
:items="apis"
style="border-top-right-radius: 1rem !important; border-top-left-radius: 1rem !important; box-shadow: none !important"
solo
filled
class="mx-8"
></v-autocomplete>
</center>
-->
<center class="container hidden" ref="stage3">
<center class="container hidden" ref="stage2">
<h1>{{ lang.featuresetup }}</h1>
<v-checkbox disabled v-model="ryd" :label="lang.enableryd" />
<v-checkbox disabled v-model="sponsorBlock" :label="lang.enablespb" />
</center>
<center class="container hidden" ref="stage4">
<center class="container hidden" ref="stage3">
<h1>{{ lang.thanks }}</h1>
<h3>{{ lang.enjoy }}</h3>
</center>
@ -78,7 +80,7 @@ export default {
ryd: true,
sponsorBlock: true,
items: ["youtube.com", "twitch.tv", "odysee.com"]
apis: ["youtube.com", "twitch.tv", "odysee.com"]
};
},
mounted() {

47
NUXT/pages/activities/update.vue
View File

@ -1,43 +1,24 @@
<template>
<div>
<center class="container">
<v-img
src="/icon.svg"
width="10rem"
height="10rem"
:class="$vuetify.theme.dark ? '' : 'invert'"
/>
<h1>{{ lang.updated }}</h1>
<p>
<span class="version">{{ oldVer }}</span>
<v-icon>mdi-arrow-right</v-icon>
<span class="version">{{ newVer }}</span>
</p>
</center>
<div style="padding: 2em;">
<v-icon x-large color="primary" style="padding-bottom: 0.25em;">mdi-cellphone-arrow-down</v-icon>
<h1>{{ lang.updated }}</h1>
<p>{{ oldVer }} <v-icon>mdi-arrow-right</v-icon> {{ newVer }}</p>
<div class="bottom">
<v-btn rounded color="primary" @click="okay()">{{ lang.awesome }}</v-btn>
</div>
<v-btn @click="okay()" class="rounded-xl primary nextButton"
>{{ lang.awesome }}
<v-icon style="margin-left: 0.5em">mdi-arrow-right</v-icon></v-btn
>
</div>
</template>
<style scoped>
.nextButton {
.bottom {
position: absolute;
bottom: 1em;
left: 50%;
transform: translate(-50%, 0);
}
.container {
width: 100%;
}
.version {
background: rgba(100, 100, 100, 0.5);
border-radius: 3px;
padding: 3px;
bottom: 0;
right: 0;
padding: 2em;
}
</style>

2
NUXT/pages/mods/updates.vue
View File

@ -65,7 +65,7 @@ export default {
this.latestVersion = releases[0];
//--- Wait like 2 seconds because if people don't see loading, they think it didn't refresh properly ---//
await require("~/plugins/utils").delay(2000);
if (!this.$route.query.nowait) await require("~/plugins/utils").delay(2000);
//--- Kick Off Update Notice ---//
if (this.latestVersion.tag_name != this.installedVersion) {

7
NUXT/plugins/languages/english.js
View File

@ -7,7 +7,8 @@ module.exports = {
library: "Library",
restart: "Restart",
later: "Later",
settingRestart: "Modifying this setting requires the app to restart for the changes to be applied."
settingRestart: "Modifying this setting requires the app to restart for the changes to be applied.",
okay: "Okay"
},
index: {
@ -87,8 +88,8 @@ module.exports = {
welcome: "Welcome to VueTube",
tagline: "The future of video streaming",
next: "Next",
updated: "VueTube Was Updated!",
awesome: "Awesome!",
updated: "VueTube was updated",
awesome: "Awesome",
langsetup: "Let's Pick a Language!",
featuresetup: "Let's Pick Some Features!",
enableryd: "Enable Return YouTube Dislike",

2
android/app/build.gradle
View File

@ -7,7 +7,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "0.4"
versionName "0.4.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

2
android/app/release/output-metadata.json
View File

@ -12,7 +12,7 @@
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "0.4",
"versionName": "0.4.2",
"outputFile": "app-release.apk"
}
],

2
readme.md
View File

@ -66,7 +66,7 @@ To install the app, please visit [vuetube.app/install](https://www.vuetube.app/i
### Android
| <a href=https://nightly.link/VueTubeApp/VueTube/workflows/ci/main/android.zip><img id="im" width="200" src=./resources/getunstable.png></a> | <a href=https://github.com/VueTubeApp/VueTube/releases/download/0.4/VueTube-0.4-Canary.apk><img id="im" width="200" src=./resources/getcanary.png></a> | <a href=https://vuetube.app/install><img id="im" width="200" src=./resources/getstable.png></a> |
| <a href=https://nightly.link/VueTubeApp/VueTube/workflows/ci/main/android.zip><img id="im" width="200" src=./resources/getunstable.png></a> | <a href=https://github.com/VueTubeApp/VueTube/releases/tag/0.4.2><img id="im" width="200" src=./resources/getcanary.png></a> | <a href=https://vuetube.app/install><img id="im" width="200" src=./resources/getstable.png></a> |
| ------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
| Pretty unstable, but you get early access to new features. | Less bugs than unstable while having more features than stable. | Not available yet. |