From ff1df5b4c62223b9a5af1e159ede8e8098b1923e Mon Sep 17 00:00:00 2001
From: ArrayYang <64732862+ArrayYang@users.noreply.github.com>
Date: Fri, 4 Dec 2020 12:07:18 +0800
Subject: [PATCH] lkt

---
 .idea/.gitignore                              |  8 ++++++++
 .idea/OAPS-TreeLib-master.iml                 | 19 +++++++++++++++++++
 .idea/dataSources.xml                         | 11 +++++++++++
 .../inspectionProfiles/profiles_settings.xml  |  6 ++++++
 .idea/misc.xml                                |  7 +++++++
 .idea/modules.xml                             |  8 ++++++++
 service.py                                    |  9 +++++++++
 templates/article.html                        |  6 ++++++
 templates/subject.html                        | 10 ++++++++++
 9 files changed, 84 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/OAPS-TreeLib-master.iml
 create mode 100644 .idea/dataSources.xml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/OAPS-TreeLib-master.iml b/.idea/OAPS-TreeLib-master.iml
new file mode 100644
index 0000000..a4e9024
--- /dev/null
+++ b/.idea/OAPS-TreeLib-master.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="Flask">
+    <option name="enabled" value="true" />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+      </list>
+    </option>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..607000e
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="database" uuid="e9e25521-af24-416d-a4f0-5d04715c533c">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:C:\Users\97622\Desktop\OAPS-TreeLib-master\database.sqlite</jdbc-url>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.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>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..172840b
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (1) (2)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..fa83966
--- /dev/null
+++ b/.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/OAPS-TreeLib-master.iml" filepath="$PROJECT_DIR$/.idea/OAPS-TreeLib-master.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/service.py b/service.py
index af5395e..5d92744 100644
--- a/service.py
+++ b/service.py
@@ -315,9 +315,15 @@ def get_subject(subjectID):
     ).all()
     for x in a:
         hot_article.append(x)
+<<<<<<< HEAD
 
     return render_template('subject.html', url=url, subject_id=subject.id, articles=articles, hot_article=hot_article, Tool=Tool)
 
+=======
+    if not subject.pid  == "None" :
+        return render_template('subject.html', url=url, subject_id=subject.id,lasturl="http://127.0.0.1:5000/subject/"+str(subject.pid) ,articles=articles, hot_article=hot_article, Tool=Tool)
+    else :return render_template('subject.html', url=url, subject_id=subject.id,lasturl="http://127.0.0.1:5000/" ,articles=articles, hot_article=hot_article, Tool=Tool)
+>>>>>>> 4c444f8 (第一次提交)
 # ============================================================================================
 # before request
 # ============================================================================================
@@ -397,8 +403,11 @@ def find_subjects(subject, count):
 # ================================================================================
 @app.route('/edit_subcategory', methods=['GET', 'POST'])
 def add_sub_category():
+<<<<<<< HEAD
     if not session.get('logged_in'):
         return render_template('login.html')
+=======
+>>>>>>> 4c444f8 (第一次提交)
     if request.method == 'POST':
         subject_id = request.form['subject_id']
         subject_name = request.form['subject_name']
diff --git a/templates/article.html b/templates/article.html
index 032959b..f298279 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -135,12 +135,15 @@ <h2 class="card-title">{{ article.title }}</h2><!--title-->
 </div>
 </div><br>
 
+<<<<<<< HEAD
 {% if comments %}
 <div class="alert alert-primary">
     Number of comments :{{ comments|length }}
 </div>
 
 
+=======
+>>>>>>> 4c444f8 (第一次提交)
 {% for comment in comments[::-1] %}
     <div class="card">
         <div class="card-body">
@@ -152,7 +155,10 @@ <h2 class="card-title">{{ article.title }}</h2><!--title-->
         </div>
     </div>
 {% endfor %}
+<<<<<<< HEAD
 {% endif %}
+=======
+>>>>>>> 4c444f8 (第一次提交)
 
 
 {%  endblock %}
diff --git a/templates/subject.html b/templates/subject.html
index a86d00e..ad37b73 100644
--- a/templates/subject.html
+++ b/templates/subject.html
@@ -58,6 +58,7 @@
         <br><div class="card">
     <div class="card-body">
       <p class="card-text">You are in {{ url }}</p>
+<<<<<<< HEAD
         <form name="myform" method="get" onsubmit="return verify();">
             <input type="text" name="subject_id" style="display: none" value={{ subject_id }}><br>
         <button type="submit" class="btn btn-primary" onclick="postArticle()">post article</button>
@@ -65,6 +66,15 @@
         <button type="submit" class="btn btn-primary" onclick="createSubject()">add subcategory</button>
         <input type="checkbox" name="add_father" value="father" /> add main subject
             {% endif %}
+=======
+        <a href="{{lasturl}}">返回上一级</a>
+        <form name="myform" method="get" onsubmit="return verify();">
+            <input type="text" name="subject_id" style="display: none" value={{ subject_id }}>
+            <input type="email" name="email" id="email" placeholder="Enter Email to post or create" required="required"/><br><br>
+        <button type="submit" class="btn btn-primary" onclick="postArticle()">post article</button>
+        <button type="submit" class="btn btn-primary" onclick="createSubject()">add subcategory</button>
+        <input type="checkbox" name="add_father" value="father" /> add main subject
+>>>>>>> 4c444f8 (第一次提交)
         </form>
     </div>
   </div><br>