Picture

app.py

@@ -7,7 +7,7 @@
 
 if __name__ == '__main__':
      # app.run(debug=True, host='0.0.0.0')
-     app.run(debug=True)
+     app.run(debug=True, port=5001)
 
 
      # mvc Model View Controller

application/__init__.py

@@ -11,7 +11,7 @@
 #  Object is Python classes
 #  Relational is MySQL
 # SQLAlchemy is the MAPPING layer between them
-app.config['SQLALCHEMY_DATABASE_URI'] = "mysql+pymysql://root:password@localhost/flask_team_a"
+app.config['SQLALCHEMY_DATABASE_URI'] = "mysql+pymysql://root:password@localhost/team_yellow"
 # app.config['SQLALCHEMY_DATABASE_URI'] = "mysql+pymysql://username:password@host/database_name"
 # app.config['SQLALCHEMY_DATABASE_URI']=('mysql+pymysql://' + getenv('MYSQL_USER') + ':' + getenv('MYSQL_PASSWORD') + '@' + getenv('MYSQL_HOST') + '/' + getenv('MYSQL_DB'))
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False

application/forms.py

@@ -1,10 +1,153 @@
 from flask_wtf import FlaskForm
-from wtforms import StringField, SubmitField
+from wtforms import StringField, SubmitField, PasswordField, BooleanField, DateField, IntegerField, SelectField
+from wtforms.validators import DataRequired, Length, Email, EqualTo, ValidationError
 
+# need form to do email newsletter sign up
 
+class EmailSignUpForm(FlaskForm):
+    email = StringField('Email')
+    submit = SubmitField('Sign Up')
+
+
+def validate_username(form, field):
+    excluded_chars = " *?!'^+%&/()=}][{$#"
+    for char in form.username.data:
+        if char in excluded_chars:
+            raise ValidationError(
+                f'Character {char} is not allowed in username. Please do not use any of the following characters: {excluded_chars}')
+
+# new form needs to link to userlogin person and address tables for registering customers (is set in the route to set the
+# persontype to '2' which is customer
+class CustomerRegistrationForm(FlaskForm):
+    # userlogin elements
+    username = StringField('Username', validators=[DataRequired(), Length(min=2, max=30), validate_username])
+    password = PasswordField('Password', validators=[DataRequired(), Length(min=6)])
+    confirm_password = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('password', message="Passwords must match")])
+
+    # person elements
+    first_name = StringField('First Name', validators=[DataRequired(), Length(min=2, max=30)])
+    last_name = StringField('Last Name', validators=[DataRequired(), Length(min=2, max=30)])
+    email = StringField('Email', validators=[DataRequired(), Email(message='Please supply a valid email')])
+
+    # address elements
+    address_line_one = StringField('Address Line 1', validators=[DataRequired()])
+    address_line_two = StringField('Address Line 2')
+    address_line_three = StringField('Address Line 3')
+    postcode = StringField('Postcode', validators=[DataRequired()])
+    phone_number = StringField('Phone Number')
+    # submit
+    submit = SubmitField('Sign Up')
+
+
+
+class LoginForm(FlaskForm):
+    email = StringField('Email', validators=[DataRequired(), Email(message='Please supply a valid email')])
+    password = PasswordField('Password', validators=[DataRequired()])
+    remember = BooleanField('Remember Me')
+    submit = SubmitField('Login')
+
+
+# as staff are now a type of person, this form gets a bit more complicated, needs to link to userlogin, address,
+# person and staff info tables to be functional (can set persontype to '1' which is staff in the routes)
+class StaffRegistrationForm(FlaskForm):
+    # userlogin elements
+    username = StringField('Username', validators=[DataRequired(), Length(min=2, max=30), validate_username])
+    password = PasswordField('Password', validators=[DataRequired(), Length(min=6)])
+    confirm_password = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('confirm_password',
+                                                                                             message="Passwords must match")])
+
+    # person elements
+    first_name = StringField('First Name', validators=[DataRequired(), Length(min=2, max=30)])
+    last_name = StringField('Last Name', validators=[DataRequired(), Length(min=2, max=30)])
+    email = StringField('Email', validators=[DataRequired(), Email(message='Please supply a valid email')])
+
+    # address elements
+    address_line_one = StringField('Address Line 1', validators=[DataRequired()])
+    address_line_two = StringField('Address Line 2')
+    address_line_three = StringField('Address Line 3')
+    postcode = StringField('Postcode', validators=[DataRequired()])
+    phone_number = StringField('Phone Number')
+
+    # staff info elements
+    job_title = StringField('Job title', validators=[DataRequired()])
+    date_of_birth = DateField('Date of birth', validators=[DataRequired()])
+    # submit
+    submit = SubmitField('Register New Staff Member')
+
+
+class PlantForm(FlaskForm):
+    # plant_name = StringField('Plant Name', validators=[DataRequired()])
+    #removed plant_name field as not sure it was necessary, can add again if needed. Had to completely remove from html file as form would not work with it commented out, was still picking up on the website after submitting the form"
+    plant_species = StringField('Plant Species', validators=[DataRequired()])
+    plant_type = SelectField('Type', choices=[('1', 'Cacti/Succulent'), ('2', 'Hanging'), ('3', 'Flowering'), ('4', 'Palms'), ('5', 'Ferns')], validators=[DataRequired()])
+    plant_category = SelectField('Categories', choices=[('1', 'Indoor'), ('2', 'Outdoor')])
+    plant_price = IntegerField('Plant Price', validators=[DataRequired()])
+    plant_stock = IntegerField('Number Being Added To Stock', validators=[DataRequired()])
+    plant_size = SelectField('Size', choices=[('1', 'Tiny'), ('2', 'Small'), ('3', 'Medium'), ('4', 'Tall')], validators=[DataRequired()])
+    plant_nickname = StringField('Plant Nickname', validators=[DataRequired()])
+    plant_info = StringField('General Plant Info', validators=[DataRequired()])
+    care_tip_1 = StringField('First Care Tip', validators=[DataRequired()])
+    care_tip_2 = StringField('Second Care Tip')
+    care_tip_3 = StringField('Third Care Tip')
+    image_1 = StringField('Image Link', validators=[DataRequired()])
+    image_2 = StringField('Image Link')
+    image_3 = StringField('Image Link')
+    tech_description = StringField('Women in tech description', validators=[DataRequired()])
+    submit = SubmitField('Register Plant')
+
+
+# add a new blog post
+class NewBlogPostForm(FlaskForm):
+    title = StringField('Title', validators=[DataRequired()])
+    author = StringField('Author', validators=[DataRequired()])
+    post_content = StringField('Post Content', validators=[DataRequired()])
+
+    submit = SubmitField('Add post')
+
+# delete blog post
+class DeleteBlogPostForm(FlaskForm):
+    id = IntegerField('ID of the post you want to delete', validators=[DataRequired()])
+
+    submit = SubmitField('Delete post')
+
+# log in form
+class LogInForm(FlaskForm):
+    username = StringField('Username', validators=[DataRequired()])
+    password = PasswordField('Password', validators=[DataRequired()])
+    type = SelectField('Type', choices=[('1', 'Staff'), ('2', 'Customer')])
+
+    submit = SubmitField('Log in')
+
+# add to cart
+class AddToCartForm(FlaskForm):
+    product = SelectField('Species', choices=[(1, 'Boston Fern'), (2, 'Aloe Vera'), (3, 'Parlour Palm')])
+    # product = SelectField('Species', choices=['Boston Fern', 'Aloe Vera', 'Parlour Palm'])
+    quantity = IntegerField('Quantity', validators=[DataRequired()])
+    # price =
+    submit = SubmitField('Add to cart')
+
+# create a search form
+class SearchForm(FlaskForm):
+    searched = StringField('Searched', validators=[DataRequired()])
+    submit = SubmitField('Submit')
+
+
+class OrderForm(FlaskForm):
+    # basically as the fields we need to make a new db record are already in the cart values or can be autopopulated,
+    # so think you would just use this form as the confirmation button
+    # submit
+    submit = SubmitField('Place Order')
+
+class UpdateEmailForm(FlaskForm):
+    new_email = StringField('New email address', validators=[DataRequired()])
+    # submit
+    submit = SubmitField('Update Email')
+
+# Victoria's code
 class BasicForm(FlaskForm):
     first_name = StringField('First Name')
     last_name = StringField('Last Name')
     submit = SubmitField('Add Name')
 
 
+

application/models.py

@@ -1,18 +1,162 @@
-from application import db # import the sqlalchemy object (db) created for our app
+from application import db  # import the sqlalchemy object (db) created for our app
 
+# Blog posts
+class BlogPosts(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    author = db.Column(db.String(50), nullable=False)
+    date_posted = db.Column(db.Date, nullable=False)
+    title = db.Column(db.String(50), nullable=False)
+    post_content = db.Column(db.String(1000), nullable=False)
+
+
+
+# Newsletter signup
+class Newsletter(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    newsletter_email = db.Column(db.String(120), nullable=False)
+
+# PersonType linking to Person
+class PersonType(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    person_type_description = db.Column(db.String(50), nullable=False)
+    # not a field in the table, but PersonType table links back to Person(can use to set permissions
+    # in later iteration)
+    person_type = db.relationship('Person', backref='person_type')
+
+
+# UserLogin linking to Person
+class UserLogin(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    username = db.Column(db.String(50), nullable=False)
+    password = db.Column(db.String(50), nullable=False)
+    # not field in table but relationship between userlogin and person
+    user_login = db.relationship('Person', backref='user_login')
 
+
+# address linking to person
+class Address(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    address_line_one = db.Column(db.String(50), nullable=False)
+    address_line_two = db.Column(db.String(50), nullable=True)
+    address_line_three = db.Column(db.String(50), nullable=True)
+    address_line_four = db.Column(db.String(50), nullable=True)
+    postcode = db.Column(db.String(50), nullable=False)
+    # relationship between address and customer table - several people may have the same address
+    address = db.relationship('Person', backref='address')
+
+
+# Staff Info - allows us to record extra info about staff, but also gives them staff ID number to use to assign
+# to orders for packing etc
+class StaffInfo(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    job_title = db.Column(db.String(50), nullable=False)
+    date_of_birth = db.Column(db.Date, nullable=False)
+    staff_info = db.relationship('Person', backref='staff_info')
+
+
+
+# Person linking to address userlogin and orderheader
 class Person(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     first_name = db.Column(db.String(30), nullable=False)
     last_name = db.Column(db.String(30), nullable=False)
-    cars = db.relationship('Car', backref='person')
+    email = db.Column(db.String(120), nullable=False)
+    # address_id is the Foreign Key linking to the Address table
+    address_id = db.Column(db.Integer, db.ForeignKey('address.id'), nullable=False)
+    phone_number = db.Column(db.String(30), nullable=False)
+    # user_login_id is linking back for username and password purposes
+    user_login_id = db.Column(db.Integer, db.ForeignKey('user_login.id'), nullable=False)
+    person_type_id = db.Column(db.Integer, db.ForeignKey('person_type.id'), nullable=False)
+    staff_info_id = db.Column(db.Integer, db.ForeignKey('staff_info.id'), nullable=True)
+    # not a field in the table, but OrderHeader table links back to PersonID
+    person_id = db.relationship('OrderHeader', backref='person')
 
 
-class Car(db.Model):
+class OrderStatus(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    status_description = db.Column(db.String(50), nullable=False)
+    # not a field in the table, but OrderStatus table links back to OrderHeader
+    order_status = db.relationship('OrderHeader', backref='order_status')
+
+
+class Category(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    category_description = db.Column(db.String(50), nullable=False)
+    # not a field in the table, but Category table links back to Product
+    category = db.relationship('Product', backref='category')
+
+
+class PlantType(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    plant_type_description = db.Column(db.String(50), nullable=False)
+    # not a field in the table, but PlantType table links back to Product
+    plant_type = db.relationship('Product', backref='plant_type')
+
+
+class Size(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    size_description = db.Column(db.String(50), nullable=False)
+    # not a field in the table, but Size table links back to Product
+    size = db.relationship('Product', backref='size')
+
+
+class Product(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    species = db.Column(db.String(50), nullable=False)
+    # is this the right data type to store number to 2 decimal places?
+    price = db.Column(db.Integer, nullable=False)
+    stock = db.Column(db.Integer, nullable=False)
+    category_id = db.Column(db.Integer, db.ForeignKey('category.id'), nullable=False)
+    plant_type_id = db.Column(db.Integer, db.ForeignKey('plant_type.id'), nullable=False)
+    size_id = db.Column(db.Integer, db.ForeignKey('size.id'), nullable=False)
+    plant_nickname = db.Column(db.String(50), nullable=False)
+    general_info = db.Column(db.String(200), nullable=False)
+    care_tip1 = db.Column(db.String(100), nullable=False)
+    care_tip2 = db.Column(db.String(100), nullable=True)
+    care_tip3 = db.Column(db.String(100), nullable=True)
+    img_link1 = db.Column(db.String(200), nullable=False)
+    img_link2 = db.Column(db.String(200), nullable=True)
+    img_link3 = db.Column(db.String(200), nullable=True)
+    tech_description = db.Column(db.String(400), nullable=False)
+    # not a field in the table, but OrderLine table links back to Product
+    product = db.relationship('OrderLine', backref='product')
+
+class OrderHeader(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    number_plate = db.Column(db.String(7), nullable=False)
-    colour = db.Column(db.String(10), nullable=False)
-    make = db.Column(db.String(20), nullable=False)
-    model = db.Column(db.String(20), nullable=False)
     person_id = db.Column(db.Integer, db.ForeignKey('person.id'), nullable=False)
+    # not totally sure how we do dates, check this
+    order_date = db.Column(db.Date, nullable=False)
+    status_id = db.Column(db.Integer, db.ForeignKey('order_status.id'), nullable=False)
+    # also what is best data type for price data?
+    total_cost = db.Column(db.Integer)
+    # staff_id = db.Column(db.Integer, db.ForeignKey('StaffInfo.id'), nullable=False)
+    # staff_id = db.Column(db.Integer, db.ForeignKey('person.staff_info_id'), nullable=False)
+    # not a field in the table, but OrderLine table links back to OrderHeader
+    order_header = db.relationship('OrderLine', backref='order_header')
+
+
+class OrderLine(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    order_header_id = db.Column(db.Integer, db.ForeignKey('order_header.id'), nullable=False)
+    product_id = db.Column(db.Integer, db.ForeignKey('product.id'), nullable=False)
+    quantity = db.Column(db.Integer, nullable=False)
+    # also what is best data type for price data?
+    price_paid = db.Column(db.Integer)
+
+
+# Victoria's code:
 
+# class Person(db.Model):
+#     id = db.Column(db.Integer, primary_key=True)
+#     first_name = db.Column(db.String(30), nullable=False)
+#     last_name = db.Column(db.String(30), nullable=False)
+#     cars = db.relationship('Car', backref='person')
+#
+#
+# class Car(db.Model):
+#     id = db.Column(db.Integer, primary_key=True)
+#     number_plate = db.Column(db.String(7), nullable=False)
+#     colour = db.Column(db.String(10), nullable=False)
+#     make = db.Column(db.String(20), nullable=False)
+#     model = db.Column(db.String(20), nullable=False)
+#     person_id = db.Column(db.Integer, db.ForeignKey('person.id'), nullable=False)