diff --git a/package.json b/package.json
index 6c6fc7c..85514ab 100644
--- a/package.json
+++ b/package.json
@@ -8,30 +8,30 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
- "@mdi/font": "7.0.96",
- "axios": "^1.1.3",
- "core-js": "^3.26.0",
+ "@mdi/font": "7.1.96",
+ "axios": "^1.2.1",
+ "core-js": "^3.27.0",
"crypto-js": "^4.1.1",
"roboto-fontface": "^0.10.0",
- "vue": "^3.2.41",
- "vue-axios": "^3.5.1",
+ "vue": "^3.2.45",
+ "vue-axios": "^3.5.2",
"vue-i18n": "^9.2.2",
"vue-router": "^4.1.6",
- "vuetify": "npm:@vuetify/nightly@next",
+ "vuetify": "^3.0.6",
"vuex": "^4.1.0",
"webfontloader": "^1.6.28",
"webpack-plugin-vuetify": "^2.0.0"
},
"devDependencies": {
- "@babel/core": "^7.19.6",
+ "@babel/core": "^7.20.7",
"@babel/eslint-parser": "^7.19.1",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-service": "~5.0.8",
- "eslint": "^8.26.0",
- "eslint-plugin-vue": "^9.6.0",
- "sass": "^1.55.0",
- "sass-loader": "^13.1.0",
+ "eslint": "^8.30.0",
+ "eslint-plugin-vue": "^9.8.0",
+ "sass": "^1.57.1",
+ "sass-loader": "^13.2.0",
"vue-cli-plugin-vuetify": "~2.5.8",
"vuetify-loader": "^2.0.0-alpha.9"
},
diff --git a/src/App.vue b/src/App.vue
index 6a61558..87e1d5a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,9 +3,8 @@
@@ -29,10 +28,29 @@
@click="toggleTheme"
>
-->
-
+
+
+
+
+
+
+
+
+
+ {{ $t("settings") }}
+
+
+
+
+
+
+ {{ $t("about") }}
+
+
+
-
-
+
+
-
- {{ $store.getters.book.author }}
- {{ $store.getters.book.title }} - {{ $store.getters.chapters[currentChapter].title }}
-
+ {{ $store.getters.book.author }}
+ {{ $store.getters.book.title }} - {{ $store.getters.chapters[currentChapter].title }}
@@ -178,7 +197,8 @@
-->
-
+
+
@@ -187,12 +207,15 @@
//import { ref, onMounted } from "vue";
import { ref } from "vue";
import { useDisplay } from "vuetify";
+ import AboutDialog from "./components/AboutDialog";
import MessageBox from "./components/MessageBox";
import SettingsDialog from "./components/SettingsDialog";
export default {
name: "App",
+
components: {
+ AboutDialog,
MessageBox,
SettingsDialog,
},
@@ -240,6 +263,7 @@
currentChapter: null,
currentProgress: 0,
currentTime: "00:00",
+ duration: "00:00",
playbackRate: 1,
status: 0,
volume: 5,
@@ -689,6 +713,10 @@
if (!silent) { this.alertMessage = this.$t("bookmarkSaved"); }
},
+ showAbout () {
+ this.$refs.AboutDialog.dialog = true;
+ },
+
showMessage (title, text) {
this.$refs.MessageBox.title = title;
this.$refs.MessageBox.text = text;
@@ -766,7 +794,9 @@
background: rgba(15, 15, 15, .5)
.content-container
- height: calc(100vh - 160px)
+ /* height: calc(100vh - 160px) */
+ /* height: calc(100% - 160px) */
+ max-height: 100%
overflow-y: auto
overflow-x: hidden
diff --git a/src/components/AboutDialog.vue b/src/components/AboutDialog.vue
new file mode 100644
index 0000000..62d1c75
--- /dev/null
+++ b/src/components/AboutDialog.vue
@@ -0,0 +1,61 @@
+
+
+
+
+ {{ $t("about") }}
+
+
+ Аудиотека
+ © Александр Чебыкин, 2019-2022
+ Опубликовано под лицензией MIT license
+ Git: https://home.cainet.info/git/cai/AudioLib
+
+
+ Audiobooks library
+ © Alexander I Chebykin, 2019-2022
+ Published under MIT license
+ Git: https://www.cainet.info/git/cai/AudioLib
+
+
+
+
+ Ok
+
+
+
+
+
+
+
diff --git a/src/components/AuthorsLib.vue b/src/components/AuthorsLib.vue
index c09a2fc..bfb8c9d 100644
--- a/src/components/AuthorsLib.vue
+++ b/src/components/AuthorsLib.vue
@@ -3,7 +3,7 @@
flat
tile
color="rgba(0, 0, 0, 0)"
- class="d-flex align-content-start flex-wrap content-container mx-0 pt-2 px-2"
+ class="d-flex align-content-start flex-wrap mx-0 pt-2 px-2"
>
2
diff --git a/src/components/BooksLib.vue b/src/components/BooksLib.vue
index 88398b2..cd245b4 100644
--- a/src/components/BooksLib.vue
+++ b/src/components/BooksLib.vue
@@ -2,7 +2,7 @@
export default {
+ name: "MessageDialog",
+
data () {
return {
dialog: false,
diff --git a/src/components/SettingsDialog.vue b/src/components/SettingsDialog.vue
index 57d21de..f6c6621 100644
--- a/src/components/SettingsDialog.vue
+++ b/src/components/SettingsDialog.vue
@@ -3,66 +3,41 @@
{{ $t("settings") }}
-
- {{ $t("settings") }}
- {{ $t("about") }}
-
-
-
-
-
-
- {{ $t("playbackRate") }}
-
-
-
-
-
- Аудиотека
- © Александр Чебыкин, 2019-2022
- Опубликовано под лицензией MIT license
- Git: https://home.cainet.info/git/cai/AudioLib
-
-
- Audiobooks library
- © Alexander I Chebykin, 2019-2022
- Published under MIT license
- Git: https://www.cainet.info/git/cai/AudioLib
-
-
-
+
+
+
+ {{ $t("playbackRate") }}
+
@@ -75,10 +50,11 @@