Merge pull request #33 from luaChina/develop

Develop

Author: AmazingMoon

components/app-header.vue

@@ -53,7 +53,7 @@
                             >
                         </li>
                     </ul>
-                    <no-ssr>
+                    <client-only>
                         <div>
                             <div v-if="user.id == 0">
                                 <router-link to="/login" rel="nofollow">
@@ -176,7 +176,7 @@
                                 </div>
                             </div>
                         </div>
-                    </no-ssr>
+                    </client-only>
                 </div>
             </div>
         </nav>

layouts/default.vue

@@ -1,57 +1,94 @@
 <template>
-  <div>
-    <nuxt />
-  </div>
+    <div class="bg-light d-flex flex-column main" id="app">
+        <app-header></app-header>
+        <div class="container pt-4 main-content">
+            <nuxt />
+        </div>
+        <app-foot></app-foot>
+    </div>
 </template>
 <script>
-export default { name: "layout" };
+import header from "~/components/app-header.vue";
+import footer from "~/components/app-footer.vue";
+import * as Sentry from "@sentry/browser";
+import { Integrations } from "@sentry/tracing";
+export default {
+  name: "layout",
+  components: {
+        "app-header": header,
+        "app-foot": footer
+    },
+     mounted() {
+        this.$nextTick(() => {
+            this.$nuxt.$loading.start();
+            setTimeout(() => this.$nuxt.$loading.finish(), 500);
+        });
+        // init sentry
+        Sentry.init({
+            dsn: "https://[email protected]/1329324",
+            integrations: [new Integrations.BrowserTracing()],
+            tracesSampleRate: 1.0,
+        });
+        // init baidu seo
+        var bp = document.createElement("script");
+        bp.src = "https://zz.bdstatic.com/linksubmit/push.js";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(bp, s);
+    }
+    };
 </script>
 <style>
+.main {
+    min-height: 100vh;
+}
+.main-content {
+    flex: 1;
+}
 html {
-  font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI",
-    Roboto, "Helvetica Neue", Arial, sans-serif;
-  font-size: 16px;
-  word-spacing: 1px;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  box-sizing: border-box;
+    font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont,
+        "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+    font-size: 16px;
+    word-spacing: 1px;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-font-smoothing: antialiased;
+    box-sizing: border-box;
 }
 
 *,
 *:before,
 *:after {
-  box-sizing: border-box;
-  margin: 0;
+    box-sizing: border-box;
+    margin: 0;
 }
 
 .button--green {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #3b8070;
-  color: #3b8070;
-  text-decoration: none;
-  padding: 10px 30px;
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #3b8070;
+    color: #3b8070;
+    text-decoration: none;
+    padding: 10px 30px;
 }
 
 .button--green:hover {
-  color: #fff;
-  background-color: #3b8070;
+    color: #fff;
+    background-color: #3b8070;
 }
 
 .button--grey {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #35495e;
-  color: #35495e;
-  text-decoration: none;
-  padding: 10px 30px;
-  margin-left: 15px;
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #35495e;
+    color: #35495e;
+    text-decoration: none;
+    padding: 10px 30px;
+    margin-left: 15px;
 }
 
 .button--grey:hover {
-  color: #fff;
-  background-color: #35495e;
+    color: #fff;
+    background-color: #35495e;
 }
 </style>

nuxt.config.js

@@ -25,24 +25,6 @@ module.exports = {
                     "Lua 中国，这里是 Lua 论坛，为开发者提供学习交流的平台，Lua 中国需要你的力量！"
             }
         ],
-        link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.ico" }],
-        script: [
-            {
-                src:
-                    "https://lua-china-1256147061.file.myqcloud.com/static/js/sentry.min.js",
-                crossorigin: "anonymous"
-            },
-            {
-                src:
-                    "https://lua-china-1256147061.file.myqcloud.com/static/js/highlight.min.js",
-                crossorigin: "anonymous"
-            },
-            {
-                src:
-                    "https://lua-china-1256147061.file.myqcloud.com/static/js/lua.min.js",
-                crossorigin: "anonymous"
-            }
-        ]
     },
 
     /*