diff --git a/eveai_app/extensions.py b/eveai_app/extensions.py index 810f591..bc69930 100644 --- a/eveai_app/extensions.py +++ b/eveai_app/extensions.py @@ -1,12 +1,14 @@ from flask_sqlalchemy import SQLAlchemy -from sqlalchemy.orm import DeclarativeBase from flask_migrate import Migrate from flask_bcrypt import Bcrypt from flask_bootstrap import Bootstrap from flask_jwt_extended import JWTManager + +# Create extensions + db = SQLAlchemy() migrate = Migrate() bcrypt = Bcrypt() bootstrap = Bootstrap() -jwt = JWTManager() +jwt = JWTManager() \ No newline at end of file diff --git a/eveai_app/templates/base.html b/eveai_app/templates/base.html index bc94efd..8352c09 100644 --- a/eveai_app/templates/base.html +++ b/eveai_app/templates/base.html @@ -1,19 +1,29 @@ - + + - - + - - - - - {% block title %}{% endblock %} + + + + {% block title %}{% endblock %} + + + + + + + + + + + + - -
Register
-
Login
-
+ + + {% include 'navbar.html' %} {% with messages = get_flashed_messages()%} {% if messages%} {% for message in messages%} diff --git a/eveai_app/templates/navbar.html b/eveai_app/templates/navbar.html new file mode 100644 index 0000000..5733f81 --- /dev/null +++ b/eveai_app/templates/navbar.html @@ -0,0 +1,59 @@ + + + + + + \ No newline at end of file diff --git a/eveai_app/views/user_forms.py b/eveai_app/views/user_forms.py index 208d9ba..72e4c75 100644 --- a/eveai_app/views/user_forms.py +++ b/eveai_app/views/user_forms.py @@ -6,7 +6,7 @@ from wtforms.validators import DataRequired, Length, Email, NumberRange class TenantForm(FlaskForm): name = StringField('Name', validators=[DataRequired(), Length(max=80)]) website = StringField('Website', validators=[DataRequired(), Length(max=255)]) - license_start_date = DateField('License Start Date', id='datepicker') + license_start_date = DateField('License Start Date', id='form-control datepicker') license_end_date = DateField('License End Date', id='datepicker') allowed_monthly_interactions = IntegerField('Allowed Monthly Interactions', validators=[NumberRange(min=0)]) submit = SubmitField('Submit') @@ -25,3 +25,5 @@ class UserForm(FlaskForm): valid_to = DateField('Valid to', id='datepicker') tenant_id = IntegerField('Tenant ID', validators=[NumberRange(min=0)]) submit = SubmitField('Submit') + +