CSS design and Navbar routing works

.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,23 @@
 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
 app.register_blueprint(users_bp)
-
+app.register_blueprint(post_bp)
 
 # General views
 from . import views

project/add_post.py

@@ -0,0 +1,54 @@
+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('/posts', methods= ['GET', 'POST'])
+@login_required
+def add_post():
+    form = PostForm(request.form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            title = form.title.data
+            text = form.text.data
+            post = Post(current_user.id, title, text)    
+            db.session.add(post)
+            db.session.commit()
+            return redirect(url_for('feed'))   
+        else:
+            return render_template('add_post.html', form=form, error="An error occured")
+    return render_template('add_post.html', form=form)
+
+@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.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,24 @@
 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()])
+
+

project/models.py

@@ -1,19 +1,22 @@
+
 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)
+    profile_pic_url     = db.Column(db.String, nullable=True)
+    password_hash       = db.Column(db.String, nullable=False)
 
-    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 __init__(self, username, password):
+    def __init__(self, username, displayname, password):
         self.username = username
+        self.displayname = displayname
         self.set_password(password)
 
     def set_password(self, password):
@@ -22,15 +25,105 @@ def set_password(self, password):
     def check_password(self, password):
         return check_password_hash(self.password_hash, password)
 
+    def get_follower_count(self):
+        get_followers = Follower.query.filte_by(followedID = self.id)
+        return get_followers.count
+
+    def get_followed_count(self):
+        get_followed = Follower.query.filte_by(followerID = self.id)
+        return get_followed.count
+
     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'))
+    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.ArtURL = ""
+        self.Title = Title
+        self.Text = Text
+        self.Date = self.format_date()
+        self.Rating = 0
+        self.ArtistID = None
+
+    def relate(self, userid):
+        getpostlike = Like.query.filter(and_((postID == self.id), (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()
+
+    def get_rating(self):
+        getlikes = Like.query.filter(postID == self.id).all()
+        self.Rating = len(getlikes)
+
+    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 format_date(self):
+        now = datetime.now()
+        return str(now.month) + " - " + str(now.day) + " - " + str(now.year)
+
+    def get_description1(self):
+        return self.Text[:10] 
+
+
+    def get_description2(self):
+        return self.Text[10:300] + "."
+
+
+    def get_title(self):
+        return self.Title[:100] + "."
+
+
+
+
+
+
+    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/static/css/feeds.css

@@ -0,0 +1,13 @@
+.borders{
+	width: 190px;
+
+}
+
+
+
+#title_story
+{
+	font-size: 27px;
+
+}
+

project/static/css/layoutnavstyle.css

@@ -0,0 +1,35 @@
+.navbar-top {
+    background: #4D5061;
+    border-bottom: 4px solid #60B078;
+    color: #FFF;
+}
+
+.text-white{
+    color:#fff;
+}
+
+.navbar-doublerow > .navbar{
+	display: block;
+	padding: 0px auto;
+	margin: 0px auto;
+	min-height: 25px;
+}
+
+/*Down nav*/
+.navbar-doublerow .navbar-down .navbar-brand {
+    /*navbar brand*/
+	padding: 0px auto;
+	float: left;
+	color: #60B078;
+	font-size: 30px;
+}
+.navbar-doublerow .navbar-down ul>li>a{
+    /*Menu items*/
+	font-size: 15px;
+	color: #000;
+}
+.navbar-doublerow .navbar-down ul>li>a:hover{
+    /*menu hover*/
+	border-bottom: 1px solid #60B078;
+	color: #60B078;
+}