Merge branch 'master' of github.com:Away0x/gin_bbs

Away0x · Jun 4, 2019 · 24d24d7 · 24d24d7
2 parents 5b9ad36 + 696dc37
commit 24d24d7
Show file tree

Hide file tree

Showing 33 changed files with 391 additions and 811 deletions.
diff --git a/.version b/.version
@@ -1,4 +1,4 @@
-go 12.5
+go 1.12.5
 node 10.13.0
 vue 3.1.3
 taro 1.3.0-beta.3

diff --git a/README.md b/README.md
@@ -131,3 +131,19 @@
 - 站长可以删除分类
 
 ***
+
+![1](readme/1.png)
+
+![2](readme/2.png)
+
+![3](readme/3.png)
+
+![4](readme/4.png)
+
+![5](readme/5.png)
+
+![6](readme/6.png)
+
+![7](readme/7.png)
+
+![8](readme/8.png)
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "private": true,
   "scripts": {
-    "admin:serve": "echo 'open admin-fe serve (development)' && cd admin-fe && yarn serve",
-    "admin:build": "echo 'admin-fe build (production)' && cd admin-fe && yarn build",
+    "admin:serve": "echo 'open vue-admin-app serve (development)' && cd vue-admin-app && yarn serve",
+    "admin:build": "echo 'vue-admin-app build (production)' && cd vue-admin-app && yarn build",
     "dev": "npm run development",
     "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "watch": "npm run development -- --watch",

diff --git a/readme/1.png b/readme/1.png
diff --git a/readme/2.png b/readme/2.png
diff --git a/readme/3.png b/readme/3.png
diff --git a/readme/4.png b/readme/4.png
diff --git a/readme/5.png b/readme/5.png
diff --git a/readme/6.png b/readme/6.png
diff --git a/readme/7.png b/readme/7.png
diff --git a/readme/8.png b/readme/8.png
diff --git a/resources/views/layouts/_header.html b/resources/views/layouts/_header.html
@@ -2,7 +2,7 @@
   <div class="container">
     <!-- Branding Image -->
     <a class="navbar-brand " href="{% route 'root' %}">
-      LaraBBS
+      GinBBS
     </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>

diff --git a/vue-admin-app/.browserslistrc b/vue-admin-app/.browserslistrc
@@ -1,3 +1,2 @@
 > 1%
 last 2 versions
-not ie <= 8
diff --git a/vue-admin-app/README.md b/vue-admin-app/README.md
diff --git a/vue-admin-app/dist/index.html b/vue-admin-app/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/admin/favicon.ico><title>vue-admin-app</title><link href=/admin/js/about.69176fa8.js rel=prefetch><link href=/admin/css/app.94a82374.css rel=preload as=style><link href=/admin/js/app.7ab2abf8.js rel=preload as=script><link href=/admin/js/chunk-vendors.3e0747ef.js rel=preload as=script><link href=/admin/css/app.94a82374.css rel=stylesheet></head><body><noscript><strong>We're sorry but admin-fe doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/admin/js/chunk-vendors.3e0747ef.js></script><script src=/admin/js/app.7ab2abf8.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/admin/favicon.ico><title>vue-admin-app</title><link href=/admin/js/about.f9b219d0.js rel=prefetch><link href=/admin/css/app.94a82374.css rel=preload as=style><link href=/admin/js/app.674b3f5c.js rel=preload as=script><link href=/admin/js/chunk-vendors.3856d5b3.js rel=preload as=script><link href=/admin/css/app.94a82374.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-admin-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/admin/js/chunk-vendors.3856d5b3.js></script><script src=/admin/js/app.674b3f5c.js></script></body></html>
diff --git a/vue-admin-app/dist/js/about.69176fa8.js → vue-admin-app/dist/js/about.f9b219d0.js b/vue-admin-app/dist/js/about.69176fa8.js → vue-admin-app/dist/js/about.f9b219d0.js
diff --git a/vue-admin-app/dist/js/about.69176fa8.js.map → vue-admin-app/dist/js/about.f9b219d0.js.map b/vue-admin-app/dist/js/about.69176fa8.js.map → vue-admin-app/dist/js/about.f9b219d0.js.map
diff --git a/vue-admin-app/dist/js/app.7ab2abf8.js → vue-admin-app/dist/js/app.674b3f5c.js b/vue-admin-app/dist/js/app.7ab2abf8.js → vue-admin-app/dist/js/app.674b3f5c.js
diff --git a/vue-admin-app/dist/js/app.7ab2abf8.js.map → vue-admin-app/dist/js/app.674b3f5c.js.map b/vue-admin-app/dist/js/app.7ab2abf8.js.map → vue-admin-app/dist/js/app.674b3f5c.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/admin/favicon.ico><title>vue-admin-app</title><link href=/admin/js/about.69176fa8.js rel=prefetch><link href=/admin/css/app.94a82374.css rel=preload as=style><link href=/admin/js/app.7ab2abf8.js rel=preload as=script><link href=/admin/js/chunk-vendors.3e0747ef.js rel=preload as=script><link href=/admin/css/app.94a82374.css rel=stylesheet></head><body><noscript><strong>We're sorry but admin-fe doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/admin/js/chunk-vendors.3e0747ef.js></script><script src=/admin/js/app.7ab2abf8.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/admin/favicon.ico><title>vue-admin-app</title><link href=/admin/js/about.f9b219d0.js rel=prefetch><link href=/admin/css/app.94a82374.css rel=preload as=style><link href=/admin/js/app.674b3f5c.js rel=preload as=script><link href=/admin/js/chunk-vendors.3856d5b3.js rel=preload as=script><link href=/admin/css/app.94a82374.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-admin-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/admin/js/chunk-vendors.3856d5b3.js></script><script src=/admin/js/app.674b3f5c.js></script></body></html>