Merge pull request #1 from wuyu8512/master

merge
LightNovelShelf · Dec 19, 2020 · 25f889b · 25f889b
2 parents ced7955 + a4e9d63
commit 25f889b
Show file tree

Hide file tree

Showing 22 changed files with 736 additions and 244 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,11 @@
+{
+  "singleQuote": true,
+  "useTabs": false,
+  "tabWidth": 2,
+  "endOfLine": "lf",
+  "printWidth": 120,
+  "trailingComma": "none",
+  "semi": false,
+  "htmlWhitespaceSensitivity": "strict",
+  "vueIndentScriptAndStyle": true
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,13 +9,17 @@
   },
   "dependencies": {
     "core-js": "^3.8.1",
+    "epubjs": "^0.3.88",
     "epubjs-myh": "^0.3.111",
+    "prettier": "^2.2.1",
+    "v-viewer": "^1.5.1",
     "vue": "^2.6.12",
     "vue-router": "^3.2.0",
     "vuetify": "^2.3.21",
     "vuex": "^3.4.0"
   },
   "devDependencies": {
+    "@mdi/js": "^5.8.55",
     "@vue/cli-plugin-babel": "~4.5.9",
     "@vue/cli-plugin-eslint": "~4.5.9",
     "@vue/cli-plugin-router": "^4.5.9",
@@ -42,7 +46,9 @@
     "parserOptions": {
       "parser": "babel-eslint"
     },
-    "rules": {}
+    "rules": {
+      "no-unused-vars": "off"
+    }
   },
   "browserslist": [
     "> 1%",

diff --git a/public/Test1.epub b/public/Test1.epub
diff --git a/public/Test2.epub b/public/Test2.epub
diff --git a/public/index.html b/public/index.html
@@ -1,13 +1,12 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>
   <body>
     <noscript>

diff --git a/src/App.vue b/src/App.vue
@@ -1,32 +1,7 @@
 <template>
-  <div id="app">
-    <div id="nav">
-      <router-link to="/">Home</router-link> |
-      <router-link to="/about">About</router-link>
-    </div>
-    <router-view/>
-  </div>
+  <v-app><router-view /></v-app>
 </template>
 
 <style lang="scss">
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-}
-
-#nav {
-  padding: 30px;
-
-  a {
-    font-weight: bold;
-    color: #2c3e50;
-
-    &.router-link-exact-active {
-      color: #42b983;
-    }
-  }
-}
+@import "assets/styles/default";
 </style>
diff --git a/src/assets/styles/default.scss b/src/assets/styles/default.scss
@@ -0,0 +1,11 @@
+body {
+  padding: 0 !important;
+}
+
+body::-webkit-scrollbar {
+  display: none;
+}
+
+html {
+  scrollbar-width: none;
+}
diff --git a/src/assets/styles/read.scss b/src/assets/styles/read.scss
@@ -0,0 +1,3 @@
+.duokan-image-single img{
+  margin: 5px 0;
+}