|
|
@@ -4,7 +4,7 @@ from unicodedata import category
|
|
|
from flask import Blueprint, render_template, request, flash, redirect, url_for
|
|
|
from flask_login import login_user, login_required, logout_user, current_user
|
|
|
from werkzeug.security import generate_password_hash, check_password_hash
|
|
|
-from .models import User, Bookmark
|
|
|
+from .models import User, Bookmark, Groups
|
|
|
from . import db
|
|
|
import string, secrets
|
|
|
|
|
|
@@ -51,6 +51,10 @@ def home():
|
|
|
@logic.route('/create', methods=['GET', 'POST'])
|
|
|
@login_required
|
|
|
def create():
|
|
|
+
|
|
|
+ bgroups = Groups.query.filter_by(owner=current_user.id).all()
|
|
|
+ print(bgroups[0].group)##
|
|
|
+
|
|
|
if request.method == 'POST':
|
|
|
wlink = request.form.get('web_link')
|
|
|
wname = request.form.get('web_name')
|
|
|
@@ -60,11 +64,15 @@ def create():
|
|
|
print(wlink, wname, wgroup, wstatus)
|
|
|
if wlink and wname and wgroup and wstatus:
|
|
|
new_link = Bookmark(owner=current_user.id, status=wstatus, name=wname, group=wgroup, link=wlink)
|
|
|
+ group_check = Groups.query.filter_by(group=wgroup).first()
|
|
|
+ if not group_check:
|
|
|
+ new_group = Groups(owner=current_user.id, group=wgroup)
|
|
|
+ db.session.add(new_group)
|
|
|
db.session.add(new_link)
|
|
|
db.session.commit()
|
|
|
flash('New Bookmark added!', category='success')
|
|
|
|
|
|
- return render_template('create_bookmark.html', user=current_user)
|
|
|
+ return render_template('create_bookmark.html', user=current_user, bgroups=bgroups)
|
|
|
|
|
|
@logic.route('/shared', methods=['GET'])
|
|
|
@login_required
|