merging new navbar into master

.gitignore

@@ -17,6 +17,8 @@ _mailinglist
 docs/_build/
 .vscode/
 
+*.cfg
+
 # Coverage reports
 htmlcov/
 .coverage

Procfile

@@ -0,0 +1 @@
+web: gunicorn project:app

instance/flask.cfg

@@ -5,7 +5,8 @@ BASEDIR = os.path.abspath(os.path.dirname(__file__))
 TOP_LEVEL_DIR = os.path.abspath(os.curdir)
 PROJECT_DIR = os.path.join(TOP_LEVEL_DIR, 'project')
 
-SQLALCHEMY_DATABASE_URI = "sqlite:///%s" % os.path.join(PROJECT_DIR, 'project.db')
+SQLALCHEMY_DATABASE_URI = 'sqlite:///%s' % os.path.join(PROJECT_DIR, 'project.db')
+
 
 # Update later by using a random number generator and moving
 # the actual key outside of the source code under version control

project/__init__.py

@@ -8,23 +8,25 @@
 app = Flask(__name__, instance_relative_config=True)
 app.config.from_pyfile('flask.cfg')
 
+
 db = SQLAlchemy(app)
 
 login_manager = LoginManager(app)
 login_manager.login_view = 'users.login'
 
-from project.models import User
+from project.models import User, Post
 
 @login_manager.user_loader
 def load_user(user_id):
-    return User.query.filter(User.id == int(user_id)).first()
-
+	return User.query.filter(User.id == int(user_id)).first()
 
 # Blueprints
 from project.users import users_bp
-
+from project.add_post import post_bp
+from project.profile import profile_bp
 app.register_blueprint(users_bp)
-
+app.register_blueprint(post_bp)
+app.register_blueprint(profile_bp)
 
 # General views
 from . import views

project/add_post.py

@@ -0,0 +1,71 @@
+from flask import (
+		Blueprint, redirect, render_template,
+		Response, request, url_for , session
+		)
+from flask_login import login_user, login_required, logout_user, current_user
+from project import db
+from project.forms import PostForm, AddArtForm
+from project.models import Post, User
+
+
+post_bp =  Blueprint('add_post', __name__)
+
+@post_bp.route('/create_post', methods= ['GET', 'POST'])
+@login_required
+def add_post():
+	form = PostForm(request.form)
+	if request.method == 'POST':
+
+		title = form.title.data
+		text = form.text.data
+
+		test_result = test_add_post(form)
+
+		if test_result == "success":
+			post = Post(current_user.id, title, text)
+			db.session.add(post)
+			db.session.commit()
+			return redirect(url_for("feed"))
+		else:
+			data = {'err_msg':test_result}
+			return render_template('add_post.html',form = form, data = data)
+
+	else:
+		return render_template('add_post.html', form=form)
+
+def test_add_post(form):
+	title = form.title.data
+	text = form.text.data
+	if not title or title == "":
+		return "post has to have a title"
+	if not text or text == "":
+		return "post has to have text"
+	return "success"
+
+@post_bp.route('/add_art/<int:post_id>', methods= ['POST'])
+@login_required
+def add_art(post_id):
+	form = AddArtForm(request.form)
+	if request.method == 'POST':
+		if form.validate_on_submit():
+			post = Post.query.filter_by(id = post_id).first()
+			art_url = form.art_url.data
+			post.ArtURL = art_url
+			post.ArtistNotes = form.artist_notes.data
+			post.ArtistID = current_user.id
+			db.session.commit()
+			return redirect(url_for('feed'))   
+		else:
+			return Response("<p>invalid form</p>")
+
+
+
+
+
+
+
+
+
+
+
+

project/forms.py

@@ -1,15 +1,31 @@
 from flask_wtf import Form
-from wtforms import StringField, PasswordField
+from wtforms import StringField, PasswordField, TextAreaField
 from wtforms.validators import DataRequired, Length, EqualTo
 
 
 class RegisterForm(Form):
-    username = StringField('Username', validators=[DataRequired(), Length(max=40)])
-    password = PasswordField('Password', validators=[DataRequired(), Length(max=40)])
-    confirm = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('password')])
+	displayname = StringField('Display Name', validators=[DataRequired(), Length(max=40)])
+	username = StringField('Username', validators=[DataRequired(), Length(max=16)])
+	password = PasswordField('Password', validators=[DataRequired(), Length(max=40)])
+	confirm_pass = PasswordField('Confirm Password', validators=[DataRequired(), Length(max=40)])
 
 
 class LoginForm(Form):
-    username = StringField('Username', validators=[DataRequired(), Length(max=40)])
+    username = StringField('Username', validators=[DataRequired(), Length(max=16)])
     password = PasswordField('Password', validators=[DataRequired(), Length(max=40)])
 
+class PostForm(Form):
+	title = StringField('Title', validators=[DataRequired()])
+	text = TextAreaField('Text', validators=[DataRequired()])
+
+class AddArtForm(Form):
+    art_url = StringField('ArtUrl', validators = [DataRequired()])
+    artist_notes = TextAreaField('Notes', validators = [DataRequired()])
+
+class ProfilePicForm(Form):
+	profile_pic_url = StringField('URL', validators = [DataRequired()])
+
+class ProfileBioForm(Form):
+	profile_bio = StringField('Change Bio', validators = [DataRequired()])	    
+
+

project/models.py

@@ -1,36 +1,117 @@
 from project import db
+from datetime import datetime
 
+from sqlalchemy import and_, or_
 from flask_login import UserMixin
 from werkzeug.security import check_password_hash, generate_password_hash
 
-
 class User(UserMixin, db.Model):
+	__tablename__ = "users"
+	id                  = db.Column(db.Integer, primary_key=True, autoincrement=True)
+	username            = db.Column(db.String, unique=True, nullable=False)
+	displayname         = db.Column(db.String)
+	#email               = db.Column(db.String, unique=True, nullable=False)
+	bio                 = db.Column(db.String, default = "Hi, i'm using Artflict!")
+	profile_pic_url     = db.Column(db.String, nullable=True)
+	password_hash       = db.Column(db.String, nullable=False)
+
+	def __init__(self, username, displayname, password):
+		self.username = username
+		self.displayname = displayname
+		self.set_password(password)
+
+	def set_password(self, password):
+		self.password_hash = generate_password_hash(password)
+
+	def check_password(self, password):
+		return check_password_hash(self.password_hash, password)
+
+	def get_followers(self):
+		get_followers = Follower.query.filte_by(followedID = self.id)
+		return get_followers
+
+	def get_followed(self):
+		get_followed = Follower.query.filte_by(followerID = self.id)
+		return get_followed
+
+	def __repr__(self):
+		return 'User %d %s' % (self.id, self.username)
+
+class Post(db.Model):
+	__tablename__='posts'
+	id             = db.Column(db.Integer, primary_key=True, autoincrement=True)
+	AuthorID       = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
+	ArtURL         = db.Column(db.String)
+	ArtistID       = db.Column(db.Integer, db.ForeignKey('users.id'))
+	ArtistNotes    = db.Column(db.String)
+	Title          = db.Column(db.String(20), nullable=False)
+	Text           = db.Column(db.String, nullable=False)
+	Rating         = db.Column(db.Integer)
+	Date           = db.Column(db.String, nullable=False)
+
+	def __init__(self, AuthorID, Title, Text):
+		self.AuthorID = AuthorID
+		self.Title = Title
+		self.Text = Text
+		self.Date = self.format_date()
+		self.Rating = 0
+
+	def relate(self):
+		userid = current_user.id
+		getpostlike = Like.query.filter_by(postID = self.id).filter_by(UserID = userid).first()
+		if getpostlike is None:
+			add_like = Like(userid. self.id)
+			db.session.add(add_like)
+		else:
+			db.session.delete(getpostlike)
+
+		self.get_rating()
+		db.session.commit()
 
-    __tablename__ = "users"
+	def get_rating(self):
+		getlikes = Like.query.filter(postID == self.id).all()
+		self.Rating = len(getlikes)
 
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    username = db.Column(db.String, unique=True, nullable=False)
-    password_hash = db.Column(db.String, nullable=False)
+	def format_rating(self):
+		rating = float(self.Rating)
+		if rating < 1000:
+			return str(rating)
+		elif rating < 1000000:
+			new_rating = round(rating / 1000, 1)
+			return  new_rating + "K"
+		elif rating < 1000000000:
+			new_rating = round(rating / 1000000, 1)
+			return new_rating + "M"
+		else:
+			return "LOTS"
 
-    def __init__(self, username, password):
-        self.username = username
-        self.set_password(password)
+	def format_date(self):
+		now = datetime.now()
+		return str(now.month) + " - " + str(now.day) + " - " + str(now.year)
 
-    def set_password(self, password):
-        self.password_hash = generate_password_hash(password)
+	def get_description(self):
+		return self.Text[:200] + "..."
 
-    def check_password(self, password):
-        return check_password_hash(self.password_hash, password)
 
-    def __repr__(self):
-        return 'User %d %s' % (self.id, self.username)
+	def __repr__(self):
+		return "post " + str(self.id) + " " + str(self.Title) + " " + str(self.Text)
 
+class Like(db.Model):
+	__tablename__='likes'
+	id             = db.Column(db.Integer, primary_key=True, autoincrement=True)
+	userID         = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
+	postID         = db.Column(db.Integer, db.ForeignKey('posts.id'), nullable=False)
 
-# TODO: Create your other models here
-class YourModel(db.Model):
-
-    __tablename__ = "yourmodel"
+	def __init__(self, userID, postID):
+		self.userID = userID
+		self.postID = postID
 
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+class Follower(db.Model):
+	__tablename__ = 'followers'
+	id             = db.Column(db.Integer, primary_key=True, autoincrement=True)
+	followerID     = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
+	followedID     = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
 
-    # fill in the rest of your fields and methods!
+	def __init__(self, followerID, followedID):
+		 self.followerID = followerID
+		 self.followedID = followedID

project/profile.py

@@ -0,0 +1,38 @@
+from flask import (
+        Blueprint, redirect, render_template,
+        Response, request, url_for , session,
+        abort
+)
+from flask_login import login_required, current_user
+from project import db
+from project.models import User, Post, Like
+from . import app
+from project.forms import ProfilePicForm, ProfileBioForm
+
+profile_bp =  Blueprint('profile', __name__)
+
+@profile_bp.route('/change_pic', methods= ['POST'])
+@login_required
+def change_pic():
+    form = ProfilePicForm(request.form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            user = User.query.filter_by(id = current_user.id).first()
+            user.profile_pic_url = form.profile_pic_url.data
+            db.session.commit()
+            return redirect(url_for('profile', username = current_user.username))   
+        else:
+            return Response("<p>invalid form</p>")
+
+@profile_bp.route('/change_bio', methods= ['POST'])
+@login_required
+def change_bio():
+    form = ProfileBioForm(request.form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            user = User.query.filter_by(id = current_user.id).first()
+            user.bio = form.profile_bio.data
+            db.session.commit()
+            return redirect(url_for('profile', username = current_user.username))   
+        else:
+            return Response("<p>invalid form</p>")