[merge] Merge pull request #120 from segment-oj/refactory-code-tom

[refactory*] drop mess code and fix legency bugs

Author: ZTL-UwU

deploy.sh

@@ -16,7 +16,7 @@ cp -r dist /tmp/
 cd /tmp/dist
 
 # 404 跳转
-echo "<script>fetch('index.html').then(d=>document.write(d.text()))</script>" > 404.html
+echo "<script>fetch('index.html').then(r=>r.text()).then(d=>document.write(d))</script>" > 404.html
 
 # 部署到自定义域域名
 # echo 'www.example.com' > CNAME

package.json

@@ -21,7 +21,10 @@
     "vue": "^2.6.11",
     "vue-router": "^3.3.4",
     "vue-unique-id": "^3.1.0",
-    "vuex": "^3.5.1"
+    "vuex": "^3.5.1",
+    "vue-katex": "^0.4.0",
+    "katex": "^0.11.1",
+    "vue-template-compiler": "^2.6.11"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.4.0",
@@ -30,12 +33,9 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
-    "katex": "^0.11.1",
     "stylelint": "^13.6.1",
     "stylelint-config-standard": "^20.0.0",
-    "stylelint-scss": "^3.18.0",
-    "vue-katex": "^0.4.0",
-    "vue-template-compiler": "^2.6.11"
+    "stylelint-scss": "^3.18.0"
   },
   "eslintConfig": {
     "root": true,

src/App.vue

@@ -15,8 +15,8 @@
 <script>
 import NavBar from './components/page/navbar.vue';
 import Footer from './components/page/footer.vue';
-import UserLogin from './components/user/login.vue';
-import UserRegister from './components/user/register.vue';
+import UserLogin from './components/account/login.vue';
+import UserRegister from './components/account/register.vue';
 
 export default {
   name: 'App',

src/components/user/changePassword.vue renamed to src/components/account/ChangePassword.vue

@@ -99,15 +99,15 @@ export default {
         })
         .then(() => {
           this.buttonLoading = false;
-          this.$SegmentMessage.success(this, 'Changed successfully');
+          this.$info.success('Changed successfully');
         })
         .catch(err => {
           if (err.request.status === 401) {
-            this.$SegmentMessage.error(this, 'Please login first');
+            this.$info.error('Please login first');
             this.$store.state.user.showlogin = true;
           }
           if (err.request.status === 403) {
-            this.$SegmentMessage.error(this, 'Please enter your old password');
+            this.$info.error('Please enter your old password');
             this.old_password_required = true;
           }
           this.buttonLoading = false;

src/components/user/UserNameLink.vue renamed to src/components/account/UserNameLink.vue

@@ -57,9 +57,9 @@ export default {
         })
         .catch(err => {
           if(err.request.status === 404) {
-            this.$SegmentMessage.error(this, 'User does not exist');
+            this.$info.error('User does not exist');
           } else {
-            this.$SegmentMessage.error(this, 'Unknown error');
+            this.$info.error('Unknown error');
           }
           this.userLoading = false;
         });

src/components/user/avatar.vue renamed to src/components/account/avatar.vue

@@ -100,11 +100,11 @@ export default {
         })
         .catch(err => {
           if (err.request.status === 404) {
-            this.$SegmentMessage.error(this, 'User not found');
+            this.$info.error('User not found');
           } else if (err.request.status === 403) {
-            this.$SegmentMessage.error(this, 'Permission denied');
+            this.$info.error('Permission denied');
           } else {
-            this.$SegmentMessage.error(this, 'Unknown error');
+            this.$info.error('Unknown error');
           }
         });
       this.$axios
@@ -115,9 +115,9 @@ export default {
         })
         .catch(err => {
           if(err.request.status === 404) {
-            this.$SegmentMessage.error(this, 'User does not exist');
+            this.$info.error('User does not exist');
           } else {
-            this.$SegmentMessage.error(this, 'Unknown error');
+            this.$info.error('Unknown error');
           }
           this.userLoading = false;
         });
@@ -134,7 +134,7 @@ export default {
         })
         .then(() => {
           this.buttonLoading = false;
-          this.$SegmentMessage.success(this, 'Your changes have been submitted');
+          this.$info.success('Your changes have been submitted');
           if (this.isMine) {
             this.$store.commit('userStaffChange', {
               isStaff: this.isStaff,
@@ -153,21 +153,21 @@ export default {
             })
             .catch(err => {
               if(err.request.status === 404) {
-                this.$SegmentMessage.error(this, 'User does not exist');
+                this.$info.error('User does not exist');
               } else {
-                this.$SegmentMessage.error(this, 'Unknown error');
+                this.$info.error('Unknown error');
               }
               this.userLoading = false;
             });
         })
         .catch(err => {
           this.buttonLoading = false;
           if (err.request.status === 404) {
-            this.$SegmentMessage.error(this, 'User not found');
+            this.$info.error('User not found');
           } else if (err.request.status === 403) {
-            this.$SegmentMessage.error(this, 'Permission denied');
+            this.$info.error('Permission denied');
           } else {
-            this.$SegmentMessage.error(this, 'Unknown error');
+            this.$info.error('Unknown error');
           }
         });
     }

src/components/user/content.vue renamed to src/components/account/content.vue

@@ -179,18 +179,18 @@ export default {
             })
             .catch(err => {
               if(err.request.status === 404) {
-                this.$SegmentMessage.error(this, 'User does not exist');
+                this.$info.error('User does not exist');
               } else {
-                this.$SegmentMessage.error(this, 'Unknown error');
+                this.$info.error('Unknown error');
               }
             });
           this.userLoading = false;
         })
         .catch(err => {
           if(err.request.status === 404) {
-            this.$SegmentMessage.error(this, 'User does not exist');
+            this.$info.error('User does not exist');
           } else {
-            this.$SegmentMessage.error(this, 'Unknown error');
+            this.$info.error('Unknown error');
           }
           this.userLoading = false;
         });

src/components/user/edit.vue renamed to src/components/account/edit.vue

@@ -99,19 +99,19 @@ export default {
             username: this.ldata.username,
             userid: res.data.res.id
           });
-          this.$SegmentMessage.success(this, 'Logged in');
+          this.$info.success('Logged in');
           this.$store.state.user.showlogin = false;
           this.buttonLoading = false;
         })
         .catch(err => {
           if (err.request.status === 403) {
-            this.$SegmentMessage.error(this, 'Username or password incorrect');
+            this.$info.error('Username or password incorrect');
           } else if (err.request.status === 429) {
             // HTTP 429 Too Many Requests
-            this.$SegmentMessage.error(this, 'Requesting too frequently');
+            this.$info.error('Requesting too frequently');
           } else {
             // Unknown error
-            this.$SegmentMessage.error(this, 'Unknown error');
+            this.$info.error('Unknown error');
           }
           this.buttonLoading = false;
         });