Skip to content

Commit

Permalink
feat: 🔖 Version 1.2.1
Browse files Browse the repository at this point in the history
Update Notification // Bump Scrcpy
  • Loading branch information
Frontesque committed Jun 24, 2022
1 parent 93c1fcd commit a575076
Show file tree
Hide file tree
Showing 16 changed files with 164 additions and 10 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scrcpy-plus",
"version": "1.2.0",
"version": "1.2.1",
"description": "A GUI for scrcpy",
"main": "./dist/main/index.js",
"scripts": {
Expand Down Expand Up @@ -35,5 +35,8 @@
"vuetify": "^2.5.10",
"webpack": "^4.46.0",
"webpack-node-externals": "^3.0.0"
},
"dependencies": {
"@nuxtjs/axios": "^5.13.6"
}
}
Binary file modified src/extraResources/scrcpy/SDL2.dll
Binary file not shown.
Binary file modified src/extraResources/scrcpy/avcodec-59.dll
Binary file not shown.
Binary file modified src/extraResources/scrcpy/avformat-59.dll
Binary file not shown.
Binary file modified src/extraResources/scrcpy/avutil-57.dll
Binary file not shown.
Binary file added src/extraResources/scrcpy/msys-usb-1.0.dll
Binary file not shown.
Binary file modified src/extraResources/scrcpy/scrcpy-server
Binary file not shown.
Binary file modified src/extraResources/scrcpy/scrcpy.exe
Binary file not shown.
Binary file modified src/extraResources/scrcpy/swresample-4.dll
Binary file not shown.
Binary file modified src/extraResources/scrcpy/swscale-6.dll
Binary file not shown.
53 changes: 53 additions & 0 deletions src/renderer/components/updateNotice.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<template>
<v-dialog v-model="updateAvailable" width="500">
<v-card>
<v-card-title class="text-h5 grey darken-3">Update Available</v-card-title>
<v-card-text style="margin-top: 2em;">A new version of SCRCPY+ is ready to be downloaded at your next convenience!</v-card-text>
<v-card-text>
<center>
<span>{{ currentVersion }}</span>
<v-icon>mdi-arrow-right</v-icon>
<span>{{ latestVersion }}</span>
</center>
</v-card-text>
<v-card-actions>
<v-spacer />
<v-btn text @click="updateAvailable = false">Later</v-btn>
<v-btn text color="primary" @click="open">Download</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>

<script>
export default {
data() {
return {
updateAvailable: false,
currentVersion: new String(),
latestVersion: new String(),
repo: []
}
},
async mounted() {
this.currentVersion = process.env.version;
this.repo = await this.$axios.$get(process.env.releasesUrl).catch(err => console.log(err));
this.latestVersion = this.repo[0].name;
const latest = this.latestVersion.split(".");
const current = this.currentVersion.split(".");
for (const i in latest) {
if (latest[i] > current[i]) {
console.log("UPDATE AVAILABLE")
return this.updateAvailable = true;
}
}
},
methods: {
open() {
require('electron').shell.openExternal(this.repo[0].html_url)
}
}
}
</script>
5 changes: 5 additions & 0 deletions src/renderer/layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ section {
margin: 2em;
padding: 1em;
}
.highlight {
background: #999;
border-radius: 3px;
}
</style>
8 changes: 5 additions & 3 deletions src/renderer/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@

module.exports = {
env: {
version: "1.2.0",
//scrcpyPath: "src/extraResources/scrcpy/", //Development
scrcpyPath: "resources/scrcpy/", //Production
version: "1.2.1",
scrcpyPath: "src/extraResources/scrcpy/", //Development
//scrcpyPath: "resources/scrcpy/", //Production
os: "windows",

releasesUrl: "https://api.github.com/repos/Frontesque/scrcpy-plus/releases",
devicePollRate: 1250,
},
components: true,
Expand All @@ -27,6 +28,7 @@ module.exports = {
buildModules: [],
modules: [
'@nuxtjs/vuetify',
'@nuxtjs/axios'
],
vuetify: {
theme: {
Expand Down
8 changes: 8 additions & 0 deletions src/renderer/pages/changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
<v-btn style="margin-top: 1em;" rounded color="primary" @click="$router.go(-1)">Back</v-btn>
</section>

<section>
<h3>1.2.1</h3>
<ul>
<li>Added automatic update notification</li>
<li>Bump SCRCPY Version (1.23 -> 1.24)</li>
</ul>
</section>

<section>
<h3>1.2.0</h3>
<ul>
Expand Down
6 changes: 2 additions & 4 deletions src/renderer/pages/index.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<template>
<div>



<!-- Import Modules -->
<scrcpyPlusInfo />
<device :device.sync="deviceConnected" />
<adb v-if="deviceConnected" />
<scrcpy v-if="deviceConnected" />
<!-- End Import Modules -->

<updateNotice />
<!-- End Import Modules -->
</div>
</template>

Expand Down
89 changes: 87 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@
"@babel/types" "^7.4.4"
esutils "^2.0.2"

"@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4":
"@babel/runtime@^7.14.0", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4":
version "7.18.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
Expand Down Expand Up @@ -1403,6 +1403,24 @@
webpack-node-externals "^3.0.0"
webpackbar "^4.0.0"

"@nuxtjs/axios@^5.13.6":
version "5.13.6"
resolved "https://registry.yarnpkg.com/@nuxtjs/axios/-/axios-5.13.6.tgz#6f4bbd98a3a7799a5d2c0726c6ad2a98aa111881"
integrity sha512-XS+pOE0xsDODs1zAIbo95A0LKlilvJi8YW0NoXYuq3/jjxGgWDxizZ6Yx0AIIjZOoGsXJOPc0/BcnSEUQ2mFBA==
dependencies:
"@nuxtjs/proxy" "^2.1.0"
axios "^0.21.1"
axios-retry "^3.1.9"
consola "^2.15.3"
defu "^5.0.0"

"@nuxtjs/proxy@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@nuxtjs/proxy/-/proxy-2.1.0.tgz#fa7715a11d237fa1273503c4e9e137dd1bf5575b"
integrity sha512-/qtoeqXgZ4Mg6LRg/gDUZQrFpOlOdHrol/vQYMnKu3aN3bP90UfOUB3QSDghUUK7OISAJ0xp8Ld78aHyCTcKCQ==
dependencies:
http-proxy-middleware "^1.0.6"

"@nuxtjs/vuetify@^1.12.1":
version "1.12.3"
resolved "https://registry.yarnpkg.com/@nuxtjs/vuetify/-/vuetify-1.12.3.tgz#d4adf84e18fd474044bf971e7cc978e25eb16ba1"
Expand Down Expand Up @@ -1472,6 +1490,13 @@
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==

"@types/http-proxy@^1.17.5":
version "1.17.9"
resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
dependencies:
"@types/node" "*"

"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
version "7.0.11"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
Expand Down Expand Up @@ -2154,6 +2179,21 @@ autoprefixer@^9.6.1:
postcss "^7.0.32"
postcss-value-parser "^4.1.0"

axios-retry@^3.1.9:
version "3.2.5"
resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.2.5.tgz#64952992837c7d9a12eec156a2694a7945f60895"
integrity sha512-a8umkKbfIkTiYJQLx3v3TzKM85TGKB8ZQYz4zwykt2fpO64TsRlUhjaPaAb3fqMWCXFm2YhWcd8V5FHDKO9bSA==
dependencies:
"@babel/runtime" "^7.15.4"
is-retry-allowed "^2.2.0"

axios@^0.21.1:
version "0.21.4"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
dependencies:
follow-redirects "^1.14.0"

babel-loader@^8.2.2:
version "8.2.5"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
Expand Down Expand Up @@ -3990,6 +4030,11 @@ event-stream@=3.3.4:
stream-combiner "~0.0.4"
through "~2.3.1"

eventemitter3@^4.0.0:
version "4.0.7"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==

events@^3.0.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
Expand Down Expand Up @@ -4272,6 +4317,11 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3"
readable-stream "^2.3.6"

follow-redirects@^1.0.0, follow-redirects@^1.14.0:
version "1.15.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==

for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
Expand Down Expand Up @@ -4853,6 +4903,26 @@ http-proxy-agent@^5.0.0:
agent-base "6"
debug "4"

http-proxy-middleware@^1.0.6:
version "1.3.1"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
dependencies:
"@types/http-proxy" "^1.17.5"
http-proxy "^1.18.1"
is-glob "^4.0.1"
is-plain-obj "^3.0.0"
micromatch "^4.0.2"

http-proxy@^1.18.1:
version "1.18.1"
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
dependencies:
eventemitter3 "^4.0.0"
follow-redirects "^1.0.0"
requires-port "^1.0.0"

https-browserify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
Expand Down Expand Up @@ -5276,6 +5346,11 @@ is-plain-obj@^1.0.0:
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==

is-plain-obj@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==

is-plain-object@^2.0.3, is-plain-object@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
Expand All @@ -5296,6 +5371,11 @@ is-resolvable@^1.0.0:
resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==

is-retry-allowed@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==

is-shared-array-buffer@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
Expand Down Expand Up @@ -5858,7 +5938,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"

micromatch@^4.0.4:
micromatch@^4.0.2, micromatch@^4.0.4:
version "4.0.5"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
Expand Down Expand Up @@ -7765,6 +7845,11 @@ require-directory@^2.1.1:
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==

requires-port@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==

resolve-from@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
Expand Down

0 comments on commit a575076

Please sign in to comment.