|
|
@@ -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():
|