Compare commits

..

No commits in common. '05b33baf9f9b2ee5f93e70b8a6d2d668d1a954bf' and '78f2a113ddb5c9ac9d30309e4cc1b07173cb5cec' have entirely different histories.

Binary file not shown.

@ -1,15 +1,10 @@
from flask import Flask from flask import Flask
from flask_sqlalchemy import SQLAlchemy # type: ignore from flask_sqlalchemy import SQLAlchemy # type: ignore
from flask_bcrypt import Bcrypt # type: ignore
app = Flask(__name__) app = Flask(__name__)
app.config['SECRET_KEY'] = 'db3746b2ffa650b3804e4316d227f853' app.config['SECRET_KEY'] = 'db3746b2ffa650b3804e4316d227f853'
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///blogsite.db' app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///blogsite.db'
db = SQLAlchemy(app) db = SQLAlchemy(app)
bcrypt = Bcrypt(app)
from blogapp import routes from blogapp import routes

@ -1,7 +1,6 @@
from flask_wtf import FlaskForm from flask_wtf import FlaskForm
from wtforms import StringField, PasswordField, SubmitField, BooleanField from wtforms import StringField, PasswordField, SubmitField, BooleanField
from wtforms.validators import DataRequired, Length, Email, EqualTo, ValidationError from wtforms.validators import DataRequired, Length, Email, EqualTo
from blogapp.models import User
class RegistrationForm(FlaskForm): class RegistrationForm(FlaskForm):
@ -15,15 +14,6 @@ class RegistrationForm(FlaskForm):
validators=[DataRequired(), EqualTo('password')]) validators=[DataRequired(), EqualTo('password')])
submit =SubmitField('Sign Up') submit =SubmitField('Sign Up')
def validate_username(self, username):
user = User.query.filter_by(username=username.data).first()
if user:
raise ValidationError('That username is taken. Please choose a different one')
def validate_email(self, email):
user = User.query.filter_by(email=email.data).first()
if user:
raise ValidationError('That email is taken. Please choose a different one')
class LoginForm(FlaskForm): class LoginForm(FlaskForm):
email = StringField('Email', email = StringField('Email',

@ -1,5 +1,5 @@
from flask import render_template, url_for, flash, redirect from flask import render_template, url_for, flash, redirect
from blogapp import app, db, bcrypt from blogapp import app
from blogapp.forms import RegistrationForm, LoginForm from blogapp.forms import RegistrationForm, LoginForm
from blogapp.models import User, Post from blogapp.models import User, Post
@ -28,15 +28,8 @@ def home():
def register(): def register():
form = RegistrationForm() form = RegistrationForm()
if form.validate_on_submit(): if form.validate_on_submit():
hashed_password = bcrypt.generate_password_hash( flash(f'Account created for {form.username.data}!')
form.password.data).decode('utf-8') return redirect(url_for('home'))
user = User(username=form.username.data,
email=form.email.data, password=hashed_password)
db.session.add(user)
db.session.commit()
flash(f'Your account has been created !!')
return redirect(url_for('login'))
return render_template('register.html', title='register', form=form, pagetitle=pagetitle) return render_template('register.html', title='register', form=form, pagetitle=pagetitle)
@ -45,8 +38,8 @@ def login():
form = LoginForm() form = LoginForm()
if form.validate_on_submit(): if form.validate_on_submit():
if form.email.data == 'admin' and form.password.data == 'admin': if form.email.data == 'admin' and form.password.data == 'admin':
flash(f'You have been log in !') flash('You have been log in !')
return redirect(url_for('home')) return redirect(url_for('home'))
else: else:
flash(f'Login Unsuccessful') flash('Login Unsuccessful')
return render_template('login.html', title='login', form=form, pagetitle=pagetitle) return render_template('login.html', title='login', form=form, pagetitle=pagetitle)

@ -1,3 +0,0 @@
.invalid {
color:red;
}

@ -13,7 +13,7 @@
<body> <body>
<header>
{% block navbar %} {% block navbar %}
<ul> <ul>
<li><a href="{{ url_for('home') }}"> home </a></li> <li><a href="{{ url_for('home') }}"> home </a></li>
@ -21,31 +21,27 @@
<li><a href="{{ url_for('register') }}">register</a></li> <li><a href="{{ url_for('register') }}">register</a></li>
</ul> </ul>
{% endblock %} {% endblock %}
</header>
<main>
{% for head in pagetitle %}
{% if title == head.title %}
<h1>{{ head.title }}</h1>
{% endif %}
{% endfor %}
<div>
{% with messages = get_flashed_messages(with_categories=true) %} {% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %} {% if messages %}
{% for caterogy, message in messages %} {% for caterogy, message in messages %}
<div class="alert alert-{{ category }}"> <div>
{{ message }} {{ message }}
</div> </div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
{% for head in pagetitle %}
{% if title == head.title %}
<h1>{{ head.title }}</h1>
{% endif %}
{% endfor %}
<div>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div> </div>
</main>
</body> </body>
</html> </html>

@ -11,8 +11,8 @@
{{ form.email.label() }} {{ form.email.label() }}
{% if form.email.errors %} {% if form.email.errors %}
{{ form.email() }} {{ form.email() }}
<div class="invalid"> <div>
{% for error in form.email.errors %} {% for errors in form.email.errors %}
<span>{{ error }}</span> <span>{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>
@ -27,8 +27,8 @@
{{ form.password.label() }} {{ form.password.label() }}
{% if form.password.errors %} {% if form.password.errors %}
{{ form.password()}} {{ form.password()}}
<div class="invalid"> <div>
{% for error in form.password.errors %} {% for errors in form.password.errors %}
<span>{{ error }}</span> <span>{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>

@ -1,5 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div> <div>
@ -11,8 +13,8 @@
{{ form.username.label() }} {{ form.username.label() }}
{% if form.username.errors %} {% if form.username.errors %}
{{ form.username()}} {{ form.username()}}
<div class="invalid"> <div>
{% for error in form.username.errors %} {% for errors in form.username.errors %}
<span>{{ error }}</span> <span>{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>
@ -25,8 +27,8 @@
{{ form.email.label() }} {{ form.email.label() }}
{% if form.email.errors %} {% if form.email.errors %}
{{ form.email() }} {{ form.email() }}
<div class="invalid"> <div>
{% for error in form.email.errors %} {% for errors in form.email.errors %}
<span>{{ error }}</span> <span>{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>
@ -40,14 +42,14 @@
<div> <div>
{{ form.password.label() }} {{ form.password.label() }}
{% if form.password.errors %} {% if form.password.errors %}
{{ form.password() }} {{ form.password()}}
<div class="invalid"> <div>
{% for error in form.password.errors %} {% for errors in form.password.errors %}
<span>{{ error }}</span> <span>{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
{{ form.password(class="form-control") }} {{ form.password() }}
{% endif %} {% endif %}
</div> </div>
@ -57,8 +59,8 @@
{{ form.confirm_password.label() }} {{ form.confirm_password.label() }}
{% if form.confirm_password.errors %} {% if form.confirm_password.errors %}
{{ form.confirm_password()}} {{ form.confirm_password()}}
<div class="invalid"> <div>
{% for error in form.confirm_password.errors %} {% for errors in form.confirm_password.errors %}
<span>{{ error }}</span> <span>{{ error }}</span>
{% endfor %} {% endfor %}
</div> </div>

Binary file not shown.
Loading…
Cancel
Save