
company presentations
products and services
educational programs
conferences & events



on January 25, 2021, 10 AM — 6 PM
No.505 Wulumuqi North Road, Jing'an District, Shanghai

diff --git a/data/__all_models.py b/data/__all_models.py index 9b10751..d36c8c6 100644 --- a/data/__all_models.py +++ b/data/__all_models.py @@ -1 +1 @@ -# from . import user +from . import users, roles, files diff --git a/data/files.py b/data/files.py new file mode 100644 index 0000000..e22e444 --- /dev/null +++ b/data/files.py @@ -0,0 +1,18 @@ +from datetime import date + +import sqlalchemy +from flask_login import UserMixin +from werkzeug.security import check_password_hash, generate_password_hash + +from .db_session import SqlAlchemyBase + + +class Files(SqlAlchemyBase, UserMixin): + __tablename__ = 'files' + + id = sqlalchemy.Column(sqlalchemy.Integer, + primary_key=True, autoincrement=True) + path = sqlalchemy.Column(sqlalchemy.String, nullable=False) + user = sqlalchemy.Column(sqlalchemy.Integer, + sqlalchemy.ForeignKey("users.id"), nullable=True, default=None) + up_date = sqlalchemy.Column(sqlalchemy.DateTime, nullable=False) diff --git a/data/roles.py b/data/roles.py new file mode 100644 index 0000000..1edaebf --- /dev/null +++ b/data/roles.py @@ -0,0 +1,13 @@ +import sqlalchemy +from flask_login import UserMixin + +from .db_session import SqlAlchemyBase + + +class Roles(SqlAlchemyBase, UserMixin): + __tablename__ = 'roles' + + id = sqlalchemy.Column(sqlalchemy.Integer, + primary_key=True, autoincrement=True) + name = sqlalchemy.Column(sqlalchemy.String, nullable=False) + rights = sqlalchemy.Column(sqlalchemy.Integer) diff --git a/data/users.py b/data/users.py new file mode 100644 index 0000000..ebb0173 --- /dev/null +++ b/data/users.py @@ -0,0 +1,33 @@ +from datetime import date + +import sqlalchemy +from flask_login import UserMixin +from werkzeug.security import check_password_hash, generate_password_hash + +from .db_session import SqlAlchemyBase + + +class User(SqlAlchemyBase, UserMixin): + __tablename__ = 'users' + + id = sqlalchemy.Column(sqlalchemy.Integer, + primary_key=True, autoincrement=True) + name = sqlalchemy.Column(sqlalchemy.String, nullable=False) + surname = sqlalchemy.Column(sqlalchemy.String, nullable=True) + login = sqlalchemy.Column(sqlalchemy.String, nullable=False, unique=True) + email = sqlalchemy.Column(sqlalchemy.String, + index=True, nullable=False) + about = sqlalchemy.Column(sqlalchemy.String, nullable=True) + photo = sqlalchemy.Column(sqlalchemy.Text) + password = sqlalchemy.Column(sqlalchemy.String, nullable=True) + data_reg = sqlalchemy.Column(sqlalchemy.Date, + default=date.today()) + role = sqlalchemy.Column(sqlalchemy.String, nullable=True) + activity = sqlalchemy.Column(sqlalchemy.Date, nullable=True) + birthday = sqlalchemy.Column(sqlalchemy.Date, nullable=True) + + def check_password(self, password): + return check_password_hash(self.password, password) + + def set_password(self, password): + self.password = generate_password_hash(password) diff --git a/db/заглушка b/db/заглушка deleted file mode 100644 index e69de29..0000000 diff --git a/docs/заглушка b/docs/заглушка deleted file mode 100644 index e69de29..0000000 diff --git a/main.py b/main.py index 18e0182..41f476a 100644 --- a/main.py +++ b/main.py @@ -1,4 +1,5 @@ -from flask import Flask +from flask import Flask, render_template +from data.users import User from waitress import serve from data import db_session @@ -8,11 +9,11 @@ app.config['SECRET_KEY'] = 'test_secret_key' @app.route('/') def base(): - return '' + return render_template('main.html') def main(): - db_session.global_init("db/conventus.db") + db_session.global_init("db/incepted.db") serve(app, host='0.0.0.0', port=5000) diff --git a/static/css/base.css b/static/css/base.css index e69de29..1a4fd9a 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -0,0 +1,4 @@ +.navbar { + display: flex; + justify-content: flex-end; +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 1ea566b..27d6322 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,9 +3,16 @@
+