Merge pull request #9 from Blankphrase/adiela

Adiela

Author: CliffordKasera

.gitignore

@@ -1 +1,11 @@
+.DS_Store
 virtual/
+*.pyc
+.vscode/
+venv/
+.idea/
+config.py
+migrations/
+start.sh
+
+

app/__init__.py

@@ -0,0 +1,50 @@
+from flask import Flask
+from flask_bootstrap import Bootstrap
+from config import config_options
+from flask_sqlalchemy import SQLAlchemy
+from flask_login import LoginManager
+
+
+
+# Instances of flask extensions
+# Instance of LoginManger and using its methods
+login_manager = LoginManager()
+login_manager.session_protection = 'strong'
+login_manager.login_view = 'auth.login'
+bootstrap = Bootstrap()
+db = SQLAlchemy()
+
+def create_app(config_name):
+    '''
+    Function that takes configuration setting key as an argument
+    
+    Args:
+        config_name : name of the configuration to be used
+    '''
+
+    # Initialising application
+    app = Flask(__name__)
+
+    # Creating the app configurations
+    app.config.from_object(config_options[config_name])
+    config_options[config_name].init_app(app)
+
+
+    # Initialising flask extensions
+    bootstrap.init_app(app)
+    db.init_app(app)
+    login_manager.init_app(app)
+
+    # Regestering the main blueprint
+    from .main import main as main_blueprint
+    app.register_blueprint(main_blueprint)
+
+    # Regestering the auth bluprint
+    from .auth import auth as auth_blueprint
+    app.register_blueprint(auth_blueprint, url_prefix='/auth')
+
+    # # Setting config when using an API
+    # from .requests import configure_request
+    # configure_request(app)
+
+    return app

app/auth/__init__.py

@@ -0,0 +1,3 @@
+from flask import Blueprint
+auth = Blueprint('auth', __name__)
+from . import views,forms

app/auth/forms.py

@@ -0,0 +1,30 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField,PasswordField,SubmitField, BooleanField
+from wtforms.validators import Required,Email,EqualTo
+from ..models import User
+from wtforms import ValidationError
+
+
+class RegistrationForm(FlaskForm):
+
+    email = StringField('Your Email Address',validators=[Required(),Email()])
+    username = StringField('Enter your username',validators = [Required()])
+    password = PasswordField('Password',validators = [Required(),
+    EqualTo('password_confirm',message = 'Passwords must match')])
+    password_confirm = PasswordField('Confirm Passwords',validators = [Required()])
+    submit = SubmitField('Sign Up')
+
+    def validate_email(self,data_field):
+            if User.query.filter_by(email =data_field.data).first():
+                raise ValidationError('There is an account with that email')
+
+    def validate_username(self,data_field):
+        if User.query.filter_by(username = data_field.data).first():
+            raise ValidationError('That username is taken')
+
+
+class LoginForm(FlaskForm):
+    email = StringField('Your Email Address',validators=[Required(),Email()])
+    password = PasswordField('Password',validators =[Required()])
+    remember = BooleanField('Remember me')
+    submit = SubmitField('Sign In')

app/auth/views.py

@@ -0,0 +1,42 @@
+from flask import render_template, redirect, url_for, flash, request
+from . import auth
+from ..models import User
+from .forms import RegistrationForm, LoginForm
+from .. import db
+from flask_login import login_user, login_required, logout_user
+
+#....
+@auth.route('/login',methods=['GET','POST'])
+def login():
+    login_form = LoginForm()
+    if login_form.validate_on_submit():
+        user = User.query.filter_by(email = login_form.email.data).first()
+        if user is not None and user.verify_password(login_form.password.data):
+            login_user(user,login_form.remember.data)
+            return redirect(request.args.get('next') or url_for('main.index'))
+
+        flash('Invalid username or Password')
+
+    title = "Login House Hounting "
+    return render_template('auth/login.html',login_form = login_form,title=title)
+#....
+
+
+
+@auth.route('/register',methods = ["GET","POST"])
+def register():
+    form = RegistrationForm()
+    if form.validate_on_submit():
+        user = User(email = form.email.data, username = form.username.data,password = form.password.data)
+        db.session.add(user)
+        db.session.commit()
+        return redirect(url_for('auth.login'))
+        title = "New Account"
+    return render_template('auth/register.html',registration_form = form)
+
+
+@auth.route('/logout')
+@login_required
+def logout():
+    logout_user()
+    return redirect(url_for("main.index"))

app/main/__init__.py

@@ -0,0 +1,3 @@
+from flask import Blueprint
+main = Blueprint('main',__name__)
+from . import views,errors

app/main/errors.py

@@ -0,0 +1,11 @@
+from flask import render_template
+from . import main
+
+# Error handler decorator
+@main.app_errorhandler(404)
+def four_Ow_four(error):
+    '''
+    Function to render the 404 error page
+    '''
+    title = '404 page'
+    return render_template('fourOwfour.html', title=title),404

app/main/forms.py

@@ -0,0 +1,27 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, SubmitField, MultipleFileField, SelectField, IntegerField, DateField, TimeField, TextAreaField
+from wtforms.validators import Required
+from ..models import User
+from wtforms import ValidationError
+
+
+class ListingForm(FlaskForm):
+    images = MultipleFileField('Upload a few images',validators=[FileAllowed(['jpg', 'png']), Required])
+    location = SelectField('Neighbourhood', choices=[('eastleigh', 'Eastleigh'), ('karen', 'Karen'),
+                                                     ('kileleshwa', 'Kileleshwa'), ('Langata', 'Langata'),
+                                                     ('lavington', 'Lavington'), ('muthaiga', 'Muthaiga'),
+                                                     ('ngara', 'Ngara'), ('runda', 'Runda'), ('donholm', 'Donholm'),
+                                                     ('south-B', 'South-B'), ('south-C', 'South-C'),
+                                                     ('upperhill', 'Upperhill'), ('westlands', 'Westlands')])
+    category = SelectField('Type', validators=[Required], choices=[('apartment', 'Apartment'),
+                                                                    ('bungalow', 'Bungalow'),
+                                                                    ('maisonette', 'Maisonette')])
+    bedrooms = SelectField('Size', validators=[Required], choices=[('bedsitter', 'Bedsitter'), ('1 Bedroom', '1 Bedroom'),
+                                                                   ('2 Bedroom', '2 Bedroom'), ('3 Bedroom', '3 Bedroom'),
+                                                                   ('4 Bedroom', '4 Bedroom')])
+    pricing = IntegerField('Price', validators=[Required])
+    description = TextAreaField('Description', validators=[Required])
+    view_date = DateField('Date', validators=[Required])
+    view_start_time = TimeField('From', min="9:00", max="18:00", validators=[Required])
+    view_end_time = TimeField('To', validators=[Required])
+    submit = SubmitField('Submit')

app/main/views.py

@@ -0,0 +1,16 @@
+from flask import render_template,request,redirect,url_for,abort
+from . import main
+
+# Views
+@main.route('/')
+def index():
+
+    '''
+    View root page function that returns the index page and its data
+    '''
+
+    title = 'Home'
+
+    return render_template('index.html', title = title )
+   
+

app/models.py

@@ -0,0 +1,43 @@
+# File for models/classes
+from . import db
+from . import login_manager
+from flask_login import UserMixin, current_user
+from werkzeug.security import generate_password_hash,check_password_hash
+
+
+
+@login_manager.user_loader
+def load_user(user_id):
+    return User.query.get(int(user_id))
+
+
+
+class User(UserMixin,db.Model):
+    
+    __tablename__ = 'users'
+    id = db.Column(db.Integer, primary_key = True)
+    username = db.Column(db.String(255))
+    email = db.Column(db.String(255),unique = True,index = True)
+    pass_secure = db.Column(db.String(255))
+
+    @property
+    def password(self):
+        raise AttributeError('You cannot read the password attribute')
+
+    @password.setter
+    def password(self, password):
+        self.pass_secure = generate_password_hash(password)
+
+    def verify_password(self,password):
+        return check_password_hash(self.pass_secure,password)
+
+    def __repr__(self):
+        return f'{self.username}'
+
+
+class House(db.Model):
+
+    __tablename__ = 'houses'
+    id = db.Column(db.Integer, primary_key = True)
+
+