fix url

APP/.idea/.gitignore

@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml

APP/.idea/APP.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

APP/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,12 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N801" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

APP/.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

APP/.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+  <component name="PyCharmProfessionalAdvertiser">
+    <option name="shown" value="true" />
+  </component>
+</project>

APP/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/APP.iml" filepath="$PROJECT_DIR$/.idea/APP.iml" />
+    </modules>
+  </component>
+</project>

APP/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

APP/server.py

@@ -1,16 +1,24 @@
 from flask import request, Flask, jsonify
-import json
-from flask_sqlalchemy import SQLAlchemy
-from APP.view import collection, block
 from APP.view.auth import bp_auth
 from APP.view.block import bp_block
+from APP.view.start import bp_start
 from APP.view.collection import bp_collection
 from APP.view.database import init_db
+from flask_cors import *
 
-app = Flask(__name__)
 
+class CustomFlask(Flask):
+
+    jinja_options = Flask.jinja_options.copy()
+    jinja_options.update(dict(
+        variable_start_string='%%',  # Default is '{{', I'm changing this because Vue.js uses '{{' / '}}'
+        variable_end_string='%%',
+    ))
+app = CustomFlask(__name__)
+CORS(app, supports_credentials=True)
 app.register_blueprint(bp_auth)
+app.register_blueprint(bp_start)
 app.register_blueprint(bp_block)
 app.register_blueprint(bp_collection)
-init_db()
+#init_db()
 app.run(debug=True)

APP/static/js/wsy.js

@@ -1,5 +1,26 @@
 
 var url_prefix = "http://127.0.0.1:5000/";
+
+var cookie = {
+                setCookie: function (name, value) {
+                    document.cookie = name + '=' + value + ';';
+                },
+                getCookie: function (name) {
+                    var arr = document.cookie.split('; ');
+                    for (var i = 0; i < arr.length; i++) {
+                        var arr2 = arr[i].split('=');
+                        if (arr2[0] == name) {
+                            return arr2[1];
+                        }
+                    }
+
+                    return '';
+                },
+                removeCookie: function (name) {
+                    cookie.setCookie(name, '', -1)
+                }
+            };
+
 function sendRequest(url_suffix, data, func) {
     var url = url_prefix + url_suffix;
     $.ajax({
@@ -218,7 +239,9 @@ var page = new Vue({
             }
         },
         jump_to: function (url, block_name, collection_id) {
-            window.location.href = url + "?name=" + block_name + "&id=" + collection_id;
+            cookie.setCookie('name',block_name);
+            cookie.setCookie('id',collection_id);
+            window.location.href = "/add";
         },
         edit: function (order, type) {
             var obj = this.textList[order]
@@ -306,7 +329,9 @@ var recommend = new Vue({
     },
     methods: {
         jump_to: function (url, block_name) {
-            window.location.href = url + "?name=" + block_name + "&id=null";
+            cookie.setCookie('name',block_name);
+            cookie.setCookie('id',null);
+            window.location.href = "%%url_for('"+url+"')%%";
         },
         like: function (order) {
             var obj = this.textList[order];

APP/templates/add.html

@@ -572,7 +572,8 @@
                     name: null
                 },
                 created() {
-                    this.name = GetRequest()['name'];
+                    this.name = cookie.getCookie('name');
+                    page.id = cookie.getCookie('id');
                     console.log(this.name);
                 },
             }

APP/templates/forget.html

@@ -27,6 +27,9 @@
                 if(data.code == 1){
                     window.location = "login.html";
                 }
+                else{
+                    window.location = "forget.html";
+                }
     		},
 			error: function(XMLHttpRequest, textStatus, errorThrown) {
                 alert(XMLHttpRequest.status);

APP/templates/login.html

@@ -47,16 +47,16 @@
                     cookie.setCookie('phonenum', phonenum, 30);
                     alert(data.msg);
                     if(data.code != 1){
-                        window.location = "login.html";
+                        window.location = "%%url_for('start.login')%%";
                     }else{
-                        window.location = "personal.html";
+                        window.location = "%%url_for('start.personal')%%";
                     }
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
                     alert(XMLHttpRequest.status);
                     alert(XMLHttpRequest.readyState);
                     alert(textStatus);
-                    window.location = "login.html";
+                    window.location = "%%url_for('start.login')%%";
                 }
             });
         }
@@ -83,8 +83,8 @@
             </p>
         </div>
         <div class="reg-bar">
-            <a class="reg" href="register.html">立即注册</a>
-            <a class="forget" href="forget.html">忘记密码</a>
+            <a class="reg" href="%%url_for('start.register')%%">立即注册</a>
+            <a class="forget" href="%%url_for('start.forget')%%">忘记密码</a>
         </div>
     </div>
 </body>

APP/templates/personal.html

@@ -423,14 +423,14 @@
                         <ul class="vertical-nav-menu">
                             <li class="app-sidebar__heading">个人中心</li>
                             <li>
-                                <a href="personal.html" class="mm-active">
+                                <a href="%%url_for('start.personal')%%" class="mm-active">
                                     <i class="metismenu-icon pe-7s-browser">
                                     </i>我的集锦
                                 </a>
                             </li>
                             <li class="app-sidebar__heading">广场</li>
                             <li>
-                                <a href="square.html">
+                                <a href="%%url_for('start.square')%%">
                                     <i class="metismenu-icon pe-7s-display2">
                                     </i>用户集锦
                                 </a>
@@ -505,7 +505,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="widget-numbers" v-on:click="jump_to('add.html',item.name,id);">
+                                <div class="widget-numbers" v-on:click="jump_to('start.add',item.name,id);">
                                     <span>{{item.name}}</span></div><br>
                                 <div class="widget-subheading"><i
                                         class="fa fa-tags"></i>&nbsp;&nbsp;<span>{{item.tag}}</span></div>
@@ -552,29 +552,12 @@
         <script src="../static/js/wsy.js"></script>
         <script type="text/javascript" src="../static/assets/scripts/main.js"></script>
         <script>
-            var cookie = {
-                setCookie: function (name, value) {
-                    document.cookie = name + '=' + value + ';';
-                },
-                getCookie: function (name) {
-                    var arr = document.cookie.split('; ');
-                    for (var i = 0; i < arr.length; i++) {
-                        var arr2 = arr[i].split('=');
-                        if (arr2[0] == name) {
-                            return arr2[1];
-                        }
-                    }
 
-                    return '';
-                },
-                removeCookie: function (name) {
-                    cookie.setCookie(name, '', -1)
-                }
-            };
             // wsy:这个phonenum可能需要用什么传参的方式得到
             var phonenum = cookie.getCookie("phonenum");
+            page.id = phonenum;
             if(phonenum == ""){
-                window.location.href = "login.html";
+                window.location.href = "%%url_for('start.login')%%";
                 //phonenum = "1";
             }
 

APP/templates/register.html

@@ -25,8 +25,12 @@
             success: function(data){
     			alert(data.msg);
                 if(data.code == 1){
-                    window.location = "login.html";
+                    window.location = "%%url_for('start.login')%%";
                 }
+                else{
+                    window.location = "%%url_for('start.register')%%";
+                }
+
     		},
 			error: function(XMLHttpRequest, textStatus, errorThrown) {
                 alert(XMLHttpRequest.status);

APP/templates/square.html

@@ -42,6 +42,8 @@
                 window.location.href = "login.html";
                 //phonenum = "1";
             }
+
+
         $(document).ready(function () { getContent('collection'); }); 
     </script>
 
@@ -411,7 +413,7 @@
                             <!-- 集锦样例 -->
                             <div class="col-md-4" v-for="item in textList":key="item.id" v-bind:item='item'>
                                 <div class="card mb-3 bg-arielle-smile widget-chart text-white card-border">
-                                    <div class="widget-numbers" v-on:click="jump_to('add.html',item.name,id);"><span>{{item.name}}</span></div><br>
+                                    <div class="widget-numbers" v-on:click="jump_to('start.add',item.name,id);"><span>{{item.name}}</span></div><br>
                                     <div class="widget-subheading"><i class="fa fa-tags"></i>&nbsp;&nbsp;<span>{{item.tag}}</span></div>
                                     <!-- 未点赞时的状态：点击超链接以增加赞 -->
                                     <div class="widget-description text-danger" v-if="item.isLike!=true"><i class="pe-7s-like" v-on:click="like(item.order)"></i>&nbsp;<span class="pr-1">{{item.like}}</span></div>

APP/view/collection.py

@@ -36,7 +36,7 @@ def add_collection():
 @bp_collection.route("/select", methods=["POST"])
 def get_collection():
     # 搜索的关键词
-    name = request.form.get('name', None)
+    name = request.form.get('name', "")
     # 搜索对象
     phonenum = request.form.get('phonenum', None)
     collections = []

APP/view/start.py

@@ -0,0 +1,36 @@
+from flask import Flask, render_template, request, jsonify, session, Blueprint
+from bson import json_util
+import uuid
+
+from APP.view.database import db_session
+from APP.view.model import Block, CollectionBlock
+
+bp_start = Blueprint("start", __name__)
+
+@bp_start.route("/", methods=["POST",'GET'])
+def hello():
+    return render_template('login.html')
+
+@bp_start.route("/login", methods=["POST",'GET'])
+def login():
+    return render_template('login.html')
+
+@bp_start.route("/register", methods=["POST",'GET'])
+def register():
+    return render_template('register.html')
+
+@bp_start.route("/forget", methods=["POST",'GET'])
+def forget():
+    return render_template('forget.html')
+
+@bp_start.route("/personal", methods=["POST",'GET'])
+def personal():
+    return render_template('personal.html')
+
+@bp_start.route("/square", methods=["POST",'GET'])
+def square():
+    return render_template('square.html')
+
+@bp_start.route("/add", methods=["POST",'GET'])
+def add():
+    return render_template('add.html')