Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
from config import Config
from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate

from flask_login import LoginManager

# Construct core Flask application with embedded Dash app.
app = Flask(__name__, instance_relative_config=False)
Bootstrap(app)
app.config.from_object(Config)
db = SQLAlchemy(app)
migrate = Migrate(app, db)
login = LoginManager(app)
login.login_view='login'

from app import routes,models


with app.app_context():
Expand Down
20 changes: 19 additions & 1 deletion app/forms.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
from flask_wtf import FlaskForm
from wtforms import StringField, PasswordField, BooleanField, SubmitField
from wtforms.validators import DataRequired
from wtforms.validators import DataRequired, ValidationError, Email, EqualTo
from app.models import User


class LoginForm(FlaskForm):
username = StringField("Username", validators=[DataRequired()])
password = PasswordField("Password", validators=[DataRequired()])
remember_me = BooleanField("Remember Me")
submit = SubmitField("Log In")

class RegistrationForm(FlaskForm):
username = StringField('Username', validators=[DataRequired()])
email = StringField('Email',validators=[DataRequired(), Email()])
password = PasswordField('Password', validators=[DataRequired()])
password2 = PasswordField('Repeat Password', validators=[DataRequired(), EqualTo('password')])
submit = SubmitField('Register')

def validate_usernames(self, username):
user = User.query.filter_by(username=username.data).first()
if user is not None:
raise ValidationError('This username is already in use.')

def validate_email(self, email):
user = User.query.filter_by(email=email.data).first()
if user is not None:
raise ValidationError('This email address is already active.')
15 changes: 13 additions & 2 deletions app/models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
from datetime import datetime
from app import db
from app import db, login
from werkzeug.security import generate_password_hash, check_password_hash
from flask_login import UserMixin
from hashlib import md5


user_coins = db.Table(
Expand All @@ -13,7 +16,7 @@
)


class User(db.Model):
class User(db.Model, UserMixin):
__tablename__ = "user"
id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(64), index=True, unique=True)
Expand All @@ -26,7 +29,15 @@ class User(db.Model):
def __repr__(self):
return "<User {}>".format(self.username)

def set_password(self, password):
self.password_hash = generate_password_hash(password)

def check_password(self, password):
return check_password_hash(self.password_hash, password)

@login.user_loader
def load_user(id):
return User.query.get(int(id))
class Coin(db.Model):
__tablename__ = "coin"
id = db.Column(db.Integer, primary_key=True)
Expand Down
46 changes: 35 additions & 11 deletions app/routes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from flask import render_template, flash, redirect, url_for
from app import app
from app.forms import LoginForm

from flask import render_template, flash, redirect, url_for, request
from app import app, db
from app.forms import LoginForm, RegistrationForm
from flask_login import current_user, login_user, logout_user, login_required
from app.models import User
from werkzeug.urls import url_parse

@app.route("/")
@app.route("/index")
Expand All @@ -11,22 +13,44 @@ def index():
{"author": {"username": "Sal"}, "body": "Beautiful day in Portland!"},
{"author": {"username": "Michael"}, "body": "Pyrates are so cool!"},
{"author": {"username": "Scott"}, "body": "Ooh, Bootstrap!"},
{"author": {"username": "Allyson"}, "body": "Hello, World!"},
]
return render_template("index.html", title="Home", user=user, posts=posts)


@app.route("/login", methods=["GET", "POST"])
def login():
if current_user.is_authenticated:
return redirect(url_for('index'))
form = LoginForm()
if form.validate_on_submit():
flash(
f"Login requested for user {form.username.data}, "
f"remember_me={form.remember_me.data}"
)
return redirect(url_for("index"))
user = User.query.filter_by(username=form.username.data).first()
if user is None or not user.check_password(form.password.data):
flash('Invalid username or password')
return redirect(url_for('login'))
login_user(user, remember=form.remember_me.data)
next_page = request.args.get('next')
if not next_page or url_parse(next_page).netloc !='':
next_page = url_for('index')
return redirect(next_page)
return render_template("login.html", title="Log In", form=form)

@app.route("/logout")
def logout():
logout_user
return redirect(url_for('index'))


@app.route("/register")
@app.route("/register", methods=['GET', 'POST'])
def register():
return render_template("wip.html")
if current_user.is_authenticated:
return redirect(url_for('index'))
form = RegistrationForm()
if form.validate_on_submit():
user = User(username=form.username.data, email=form.email.data)
user.set_password(form.password.data)
db.session.add(user)
db.session.commit()
flash('CONGRATS! Welcome to the Crypto Sea! X marks the spot!')
return redirect(url_for('login'))
return render_template('register.html', title='Register', form=form)
2 changes: 1 addition & 1 deletion app/templates/404.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block content %}
<div class="container">
<h1>Page Not Found</h1>
<h1>Page Has Been Eaten by a Gru</h1>
Comment thread
CloudF1sh marked this conversation as resolved.
<p><a href="{{ url_for('index') }}">Back to home</a></p>
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion app/templates/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% block content %}
<div class="container">
<h1>An unexpected error has occurred</h1>
<p>The administrator has been notified. Sorry for the inconvenience!</p>
<p>An administrator has been bribed with coffee and will fix it soon.</p>
<p><a href="{{ url_for('index') }}">Back</a></p>
</div>
{% endblock %}
8 changes: 5 additions & 3 deletions app/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
<li><a href="{{ url_for('index') }}">Home</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ url_for('register') }}"><span class="glyphicon glyphicon-user"></span> Register</a></li>
<li><a href="{{ url_for('login') }}"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
<li><a href="{{ url_for('/dash/') }}"><span class="glyphicon glyphicon-signal"></span> Dash Testing</a></li>
<li><a href="{{ url_for('register') }}"><span class="glyphicon glyphicon-globe"></span> Register </a></li>
<li><a href="{{ url_for('login') }}"><span class="glyphicon glyphicon-log-in"></span> Login </a></li>
<li><a href="{{ url_for('user', username=current_user.username) }}"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
<li><a href="{{ url_for('/dash/') }}"><span class="glyphicon glyphicon-signal"></span> Dash Testing </a></li>
<li><a href="{{ url_for('logout') }}"><span class="glyphicon glyphicon-log-out"></span> Logout </a></li>
</ul>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions app/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}

{% block content %}
<div class="container">
<h1>Hi, {{ user.username }}!</h1>
</div>
{% for post in posts %}
<div class="container">
<p>{{ post.author.username }} says: <b>{{ post.body }}</b></p>
</div>
{% endfor %}
<div class="container">
<h1>Hi, {{ user.username }}!</h1>
</div>
{% for post in posts %}
<div class="container">
<p>{{ post.author.username }} says: <b>{{ post.body }}</b></p>
</div>
{% endfor %}
{% endblock %}
6 changes: 3 additions & 3 deletions app/templates/login.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}

{% block content %}
<div class="container">
<div class="container">

<h1>Log In</h1>

Expand All @@ -24,6 +24,6 @@ <h1>Log In</h1>
<p>{{ form.remember_me() }} {{ form.remember_me.label }}</p>
<p>{{ form.submit() }}</p>
</form>

</div>
<p>New User? <a href="{{ url_for('register')}}">Click to Register!</a></p>
</div>
{% endblock %}
39 changes: 39 additions & 0 deletions app/templates/register.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{% extends 'base.html' %}

Comment thread
SalMireles marked this conversation as resolved.
{% block content %}
<div class="container">
<h1>Register</h1>
<form action ="" method="post">
{{ form.hidden_tag() }}
<p>
{{ form.username.label }}<br>
{{ form.username(size=32) }}<br>
{% for error in form.username.errors %}
<span style="color:red;">[{{ error }}]</span>
{% endfor %}
</p>
<p>
{{ form.email.label }}<br>
{{ form.email(size=32) }}<br>
{% for error in form.email.errors %}
<span style="color:red;">[{{ error }}]</span>
{% endfor %}
</p>
<p>
{{ form.password.label }}<br>
{{ form.password(size=32) }}<br>
{% for error in form.password.errors %}
<span style="color:red;">[{{ error }}]</span>
{% endfor %}
</p>
<p>
{{ form.password2.label }}<br>
{{ form.password2(size=32) }}<br>
{% for error in form.password2.errors %}
<span style="color:red;">[{{ error }}]</span>
{% endfor %}
</p>
<p>{{ form.submit() }}</p>
</form>
</div>
{% endblock %}
21 changes: 21 additions & 0 deletions app/templates/user.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% extends "base.html" %}

{% block content %}
<table>
<tr valign="top">
<td><img src="{{ user.avatar(128) }}"></td>
<td><h1>User: {{ user.username }}</h1></td>
</tr>
</table>
<div class="container">
<hr>
{% for post in posts %}
<table>
<tr valign="top">
<td><img src="{{ post.avatar(36) }}"></td>
<td>{{ post.author.username }} says:<br>{{ post.body }}</td>
</tr>
</table>
{%endfor %}
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ services:
MYSQL_ROOT_HOST: '%'
ports:
# <Port exposed> : < MySQL Port running inside container>
# Where our data will be persisted
- '33060:3306'
# Where our data will be persisted
volumes:
# pass volume named mysql-data to mysql container
- mysql-data:/var/lib/mysql
Expand Down
Loading