resolving conflicts

Author: SophiaNM

.gitignore

@@ -2,12 +2,17 @@
 virtual/
 *.pyc
 .vscode/
-<<<<<<< HEAD
 venv/
 .idea/
 config.py
-=======
->>>>>>> Sophia
+venv/
+.idea/
+config.py
 migrations/
 start.sh
 config.py
+migrations/
+* __pycache__/
+config.py
+models.py
+

__pycache__/config.cpython-36.pyc

@@ -1,17 +1,16 @@
 from flask_wtf import FlaskForm
-from wtforms import StringField,PasswordField,SubmitField, BooleanField
-from wtforms.validators import Required,Email,EqualTo
+from wtforms import StringField, PasswordField, SubmitField, BooleanField, FileField, TextAreaField
+from wtforms.validators import DataRequired, 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()])
+    email = StringField('Your Email Address', validators=[Email(), DataRequired()])
+    username = StringField('Enter your username', validators=[DataRequired()])
+    password = PasswordField('Password', validators=[DataRequired(), EqualTo('password_confirm', message='Passwords must match')])
+    password_confirm = PasswordField('Confirm Passwords', validators=[DataRequired()])
     submit = SubmitField('Sign Up')
 
     def validate_email(self,data_field):
@@ -24,7 +23,26 @@ def validate_username(self,data_field):
 
 
 class LoginForm(FlaskForm):
-    email = StringField('Your Email Address',validators=[Required(),Email()])
-    password = PasswordField('Password',validators =[Required()])
+    email = StringField('Your Email Address', validators=[DataRequired(), Email()])
+    password = PasswordField('Password', validators=[DataRequired()])
     remember = BooleanField('Remember me')
-    submit = SubmitField('Sign In')
+    submit = SubmitField('Sign In')
+
+
+class UpdateProfileForm(FlaskForm):
+
+    profile_pic = FileField('Profile Picture', validators=[])
+    bio = TextAreaField('Bio')
+    email = StringField('Your Email Address', validators=[Email(), DataRequired()])
+    username = StringField('Enter your username', validators=[DataRequired()])
+    password = PasswordField('Password', validators=[DataRequired(), EqualTo('password_confirm', message='Passwords must match')])
+    password_confirm = PasswordField('Confirm Passwords', validators=[DataRequired()])
+    submit = SubmitField('Sign Up')
+
+    def validate_email(self, email):
+            if User.query.filter_by(email=email.data).first():
+                raise ValidationError('There is an account with that email')
+
+    def validate_username(self, username):
+        if User.query.filter_by(username=username.data).first():
+            raise ValidationError('That username is taken')

app/__pycache__/models.cpython-36.pyc

@@ -0,0 +1,32 @@
+.listing-container{
+    padding-top: 10vh;
+    color: #555555;
+}
+.listing-header{
+    margin-bottom: 20px;
+    padding: 10px;
+}
+.left-col{
+    margin: 20px;
+}
+table{
+    width: 100%;
+    margin-bottom: 20px;
+}
+td {
+    padding: 12px;
+    font-size: 20px;
+
+    text-align: left;
+    border-bottom: 1px solid #ddd;
+}
+.btn-book{
+    color: #fff;
+    background-color: #008b8b;
+    border-radius: 0;
+    margin: 20px;
+    float: right;
+}
+#booking-form{
+    padding: 20px;
+}