Эх сурвалжийг харах

public/shared bookmarks page backend done

control 3 жил өмнө
parent
commit
cf13bb10ac
2 өөрчлөгдсөн 30 нэмэгдсэн , 10 устгасан
  1. 21 6
      app/logic.py
  2. 9 4
      app/templates/shared.html

+ 21 - 6
app/logic.py

@@ -62,6 +62,27 @@ def home():
 
     return render_template('home.html', user=current_user, bdic=bb_dic)
 
+@logic.route('/shared', methods=['GET', 'POST'])
+@login_required
+def shared():
+
+    # owned groups
+    bgroups = Groups.query.filter_by(owner=current_user.id).all()
+    # owned bookmarks
+    bmarks = Bookmark.query.filter_by(owner=current_user.id).all()
+
+    bb_dic = dict() # dict of lists
+    for bg in bgroups:
+        inter_list = list()
+        for bm in bmarks:
+            if bm.group == bg.group and bm.status == 'public':
+                inter_list.append(bm)
+        if len(inter_list) != 0:
+            bb_dic[bg.group] = inter_list
+
+    return render_template('shared.html', user=current_user, bdic=bb_dic)
+
+
 @logic.route('/create', methods=['GET', 'POST'])
 @login_required
 def create():
@@ -89,12 +110,6 @@ def create():
 
     return render_template('create_bookmark.html', user=current_user, bgroups=bgroups)
 
-@logic.route('/shared', methods=['GET'])
-@login_required
-def shared():
-    pass
-
-    return render_template('shared.html', user=current_user)
 
 @logic.route('/login', methods=['GET', 'POST'])
 def login():

+ 9 - 4
app/templates/shared.html

@@ -39,28 +39,33 @@
             </div>
         </div>
         <!-- Code: Each Group of Box-->
+        {% for bg, bml in bdic.items(): %}
         <div class="col-lg-4 col-md-4 col-sm-4">
             <div class="inner_box">
-                <h3>(Group1)</h3>
+                <h3>{{ bg }}</h3>
                 <hr>
                 <!-- Code: Each Link in the Box-->
+                {% for bm in bml: %}
                 <ul class="list">
-                    <li><span class="bull">(ICON) (NAME)</span></li>
+                    <li><span class="bull">ICON {{ bm.name }} {{ bm.status }}</span></li>
                     <li class="href_link_button">
-                        <a href="(Web_link)">
+                        <a href="{{ bm.link }}">
                             <img src="static/logo/link_logo.png"width="25" height="25">
                         </a>
+                        <button type="submit">Edit</button>
                     </li>
                 </ul>
+                {% endfor %}
                 <!-- (End) Code: Each Link in the Box (End)-->
                 <br>
             </div>
         </div>
         <!--(End) Code: Each Group of Box (End)-->
+        {% endfor %}
         <div class="clearfix"></div>
     </div>
     <div class="clearfix"></div>
 </div>
 <div class="clearfix"></div>
 {% endblock %}
-</div>
+</div>