1.0.1 release #15

Merged
williamp merged 35 commits from testing into master 2023-03-21 18:10:14 +00:00
18 changed files with 174 additions and 24 deletions
Showing only changes of commit ddc90da012 - Show all commits

View File

@@ -60,12 +60,13 @@ def login():
if form.validate_on_submit(): if form.validate_on_submit():
userName = form.userName.data userName = form.userName.data
password = form.password.data password = form.password.data
remember = form.rememberMe.data
user = User.query.filter_by(userName=userName).first() user = User.query.filter_by(userName=userName).first()
if not user or not check_password_hash(user.password, password): if not user or not check_password_hash(user.password, password):
flash('Credentials incorrect! Please try again') flash('Credentials incorrect! Please try again')
return redirect(url_for('login')) return redirect(url_for('login'))
login_user(user) login_user(user, remember=remember)
return redirect(url_for('events')) return redirect(url_for('events'))
return render_template('login.html', form=form) return render_template('login.html', form=form)

View File

@@ -35,4 +35,5 @@ class SignupForm(FlaskForm):
class LoginForm(FlaskForm): class LoginForm(FlaskForm):
userName = StringField('Username', validators=[InputRequired()]) userName = StringField('Username', validators=[InputRequired()])
password = PasswordField('Password', validators=[InputRequired()]) password = PasswordField('Password', validators=[InputRequired()])
rememberMe = BooleanField(label='Remember me?')

View File

@@ -19,6 +19,9 @@
{{ form.password.label }} {{ form.password.label }}
{{ form.password }} {{ form.password }}
</p> </p>
<p>
{{ form.rememberMe.label}} {{ form.rememberMe }}
</p>
<p> <p>
<button class="btn btn-primary" type="submit">Submit</button> <button class="btn btn-primary" type="submit">Submit</button>
</p> </p>