diff --git a/README b/README index 6f329ea..571dcbb 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ # flask-bootstrap -> allows me to format that wtf form with boostrap markup - yet to test if it also means I don't need to include it exlicitly in head, etc. # install needed binaries (maybe I could have done this instead of pip below too -- when I docker this shit, sort it out?) -sudo apt install python3-pip python3-psycopg2 libpq-dev +sudo apt install python3-pip python3-psycopg2 libpq-dev python3-flask ### LEARN: supposedly could use virtualenv instead of pip3 install --user? OR even apt to install direct? # --user sticks python libs in ~/.local/[bin|lib|share] @@ -16,7 +16,7 @@ pip3 install --user flask sqlalchemy flask-sqlalchemy flask-marshmallow SQLAlche ########################################################### FOR local RUN: # run a DEV version by: -python3 main.py +FLASK_APP=main FLASK_ENV=development flask run --host=192.168.0.2 ### to make a new PROD copy.. sudo docker-compose -f /srv/docker/config/docker-compose.yml stop bookdb_web @@ -43,5 +43,3 @@ Maybe: TODO-20: ORM all books load is slow - should I lazy load all books (ajax the 2nd->last pages in, or not use ORM, and do a quick db.execute()....) TODO-21: allow a way to add a book as a child of another existing book (opposite of rem_sub_book) - -TODO-26: gunicorn and/or more modern non-flask??? diff --git a/author.py b/author.py index 85e7f2b..2a1b8ae 100644 --- a/author.py +++ b/author.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, validators, Form from flask_wtf import FlaskForm from flask import request, render_template, redirect -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/condition.py b/condition.py index a5b29ad..6668317 100644 --- a/condition.py +++ b/condition.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validators from flask import request, render_template, redirect from flask_wtf import FlaskForm -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/covertype.py b/covertype.py index cab3f62..9e54807 100644 --- a/covertype.py +++ b/covertype.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validators from flask import request, render_template, redirect from flask_wtf import FlaskForm -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/genre.py b/genre.py index 45ee4b7..83cf304 100644 --- a/genre.py +++ b/genre.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validators from flask import request, render_template, redirect from flask_wtf import FlaskForm -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import func, Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/loan.py b/loan.py index d054cc8..505d14d 100644 --- a/loan.py +++ b/loan.py @@ -2,7 +2,7 @@ from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaF from flask_wtf import FlaskForm from flask import request, render_template, redirect from wtforms.fields.html5 import DateField -from __main__ import db, app, ma +from main import db, app, ma from datetime import date from sqlalchemy import Sequence from sqlalchemy.exc import SQLAlchemyError diff --git a/owned.py b/owned.py index 1e09093..2d5884f 100644 --- a/owned.py +++ b/owned.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validators from flask import request, render_template, redirect from flask_wtf import FlaskForm -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import func, Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/publisher.py b/publisher.py index 372b162..c285144 100644 --- a/publisher.py +++ b/publisher.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validators from flask import request, render_template, redirect from flask_wtf import FlaskForm -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/rating.py b/rating.py index 474ea0d..be60771 100644 --- a/rating.py +++ b/rating.py @@ -1,7 +1,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validators from flask import request, render_template, redirect from flask_wtf import FlaskForm -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy import Sequence from sqlalchemy.exc import SQLAlchemyError from status import st, Status diff --git a/series.py b/series.py index 582251b..71cf7cb 100644 --- a/series.py +++ b/series.py @@ -2,7 +2,7 @@ from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaF from flask_wtf import FlaskForm from flask import request, render_template, redirect from wtforms.fields.html5 import DateField -from __main__ import db, app, ma +from main import db, app, ma from sqlalchemy.exc import SQLAlchemyError from status import st, Status