diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c6ce9c9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "modules/helpers"] + path = modules/helpers + url = https://gitlab.gclab.ru/helpers/helpers +[submodule "modules/jsonrpc"] + path = modules/jsonrpc + url = https://gitlab.gclab.ru/helpers/jsonrpc diff --git a/deploy/config/__init__.py b/deploy/config/__init__.py index 50d84cb..a9de4c1 100644 --- a/deploy/config/__init__.py +++ b/deploy/config/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' CONFIG = 'config.demo' diff --git a/deploy/config/demo.py b/deploy/config/demo.py index fa41fea..f4be8e3 100644 --- a/deploy/config/demo.py +++ b/deploy/config/demo.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import os diff --git a/modules/helpers b/modules/helpers new file mode 160000 index 0000000..b7b9f1b --- /dev/null +++ b/modules/helpers @@ -0,0 +1 @@ +Subproject commit b7b9f1b1adf1fc315de0e1f2afbe0ff6b8d9789e diff --git a/modules/jsonrpc b/modules/jsonrpc new file mode 160000 index 0000000..be945dd --- /dev/null +++ b/modules/jsonrpc @@ -0,0 +1 @@ +Subproject commit be945dd7cdd5e6efd95dc6515252e865467237d7 diff --git a/run.py b/run.py index 38dba6e..4e643d5 100755 --- a/run.py +++ b/run.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import sys diff --git a/src/helpers b/src/helpers new file mode 120000 index 0000000..1b41595 --- /dev/null +++ b/src/helpers @@ -0,0 +1 @@ +../modules/helpers/src/helpers \ No newline at end of file diff --git a/src/jsonrpc b/src/jsonrpc new file mode 120000 index 0000000..c241413 --- /dev/null +++ b/src/jsonrpc @@ -0,0 +1 @@ +../modules/jsonrpc/src/jsonrpc \ No newline at end of file diff --git a/src/myapp/__main__.py b/src/myapp/__main__.py index b2a103f..b989a59 100644 --- a/src/myapp/__main__.py +++ b/src/myapp/__main__.py @@ -1,7 +1,4 @@ -#!/usr/bin/env python3 - __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import sys diff --git a/src/myapp/api/__init__.py b/src/myapp/api/__init__.py index d5d2007..2810b00 100644 --- a/src/myapp/api/__init__.py +++ b/src/myapp/api/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from jsonrpc import JSONRPC diff --git a/src/myapp/api/user.py b/src/myapp/api/user.py index 6ce5558..b1d0722 100644 --- a/src/myapp/api/user.py +++ b/src/myapp/api/user.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from . import jsonrpc diff --git a/src/myapp/bin/api.py b/src/myapp/bin/api.py index 9efd091..fd9f503 100755 --- a/src/myapp/bin/api.py +++ b/src/myapp/bin/api.py @@ -1,7 +1,4 @@ -#!/usr/bin/env python3 - __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import sys diff --git a/src/myapp/decorators.py b/src/myapp/decorators.py index 9907c26..f8000f9 100644 --- a/src/myapp/decorators.py +++ b/src/myapp/decorators.py @@ -1,7 +1,4 @@ -#!/usr/bin/env python3 - __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import datetime diff --git a/src/myapp/lib/__init__.py b/src/myapp/lib/__init__.py index dfaa311..0eac6a7 100644 --- a/src/myapp/lib/__init__.py +++ b/src/myapp/lib/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from .pagination import Pagination, getpage # noqa F401 diff --git a/src/myapp/lib/info.py b/src/myapp/lib/info.py index 7bc9200..4007df1 100644 --- a/src/myapp/lib/info.py +++ b/src/myapp/lib/info.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from flask import session diff --git a/src/myapp/lib/pagination.py b/src/myapp/lib/pagination.py index ec9ace3..32b2a3e 100644 --- a/src/myapp/lib/pagination.py +++ b/src/myapp/lib/pagination.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from math import ceil diff --git a/src/myapp/lib/passwd.py b/src/myapp/lib/passwd.py index a5baffe..bb57572 100644 --- a/src/myapp/lib/passwd.py +++ b/src/myapp/lib/passwd.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import uuid diff --git a/src/myapp/lib/storage.py b/src/myapp/lib/storage.py index 24fb5f6..c586385 100644 --- a/src/myapp/lib/storage.py +++ b/src/myapp/lib/storage.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' diff --git a/src/myapp/models/__init__.py b/src/myapp/models/__init__.py index 80b21de..33415a6 100644 --- a/src/myapp/models/__init__.py +++ b/src/myapp/models/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from sqlalchemy import create_engine diff --git a/src/myapp/models/note/common.py b/src/myapp/models/note/common.py index 2739ad7..0e4592b 100644 --- a/src/myapp/models/note/common.py +++ b/src/myapp/models/note/common.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import datetime diff --git a/src/myapp/models/note/tag.py b/src/myapp/models/note/tag.py index 4e5dbfb..ead991e 100644 --- a/src/myapp/models/note/tag.py +++ b/src/myapp/models/note/tag.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import datetime diff --git a/src/myapp/models/page/common.py b/src/myapp/models/page/common.py index b1b33be..f43ca5e 100644 --- a/src/myapp/models/page/common.py +++ b/src/myapp/models/page/common.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import datetime diff --git a/src/myapp/models/page/tag.py b/src/myapp/models/page/tag.py index 19a0dc1..4fde522 100644 --- a/src/myapp/models/page/tag.py +++ b/src/myapp/models/page/tag.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import datetime diff --git a/src/myapp/models/tag.py b/src/myapp/models/tag.py index 9685e55..bb36244 100644 --- a/src/myapp/models/tag.py +++ b/src/myapp/models/tag.py @@ -5,7 +5,6 @@ """ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from sqlalchemy import Column, Integer, String diff --git a/src/myapp/models/users.py b/src/myapp/models/users.py index ba259d3..d25e0c2 100644 --- a/src/myapp/models/users.py +++ b/src/myapp/models/users.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import datetime diff --git a/src/myapp/ns_api/__init__.py b/src/myapp/ns_api/__init__.py index 447b02d..f587be9 100644 --- a/src/myapp/ns_api/__init__.py +++ b/src/myapp/ns_api/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from functools import wraps diff --git a/src/myapp/ns_api/page/__init__.py b/src/myapp/ns_api/page/__init__.py index 257bb69..4024d93 100644 --- a/src/myapp/ns_api/page/__init__.py +++ b/src/myapp/ns_api/page/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' diff --git a/src/myapp/ns_api/profile/__init__.py b/src/myapp/ns_api/profile/__init__.py index 320eeab..977362c 100644 --- a/src/myapp/ns_api/profile/__init__.py +++ b/src/myapp/ns_api/profile/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' diff --git a/src/myapp/ns_api/profile/common.py b/src/myapp/ns_api/profile/common.py index c738f20..1664284 100644 --- a/src/myapp/ns_api/profile/common.py +++ b/src/myapp/ns_api/profile/common.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from .. import jsonrpc, login_required diff --git a/src/myapp/ns_api/tag/__init__.py b/src/myapp/ns_api/tag/__init__.py index 085e295..dedc85e 100644 --- a/src/myapp/ns_api/tag/__init__.py +++ b/src/myapp/ns_api/tag/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' diff --git a/src/myapp/ns_api/tag/common.py b/src/myapp/ns_api/tag/common.py index 0d7fc32..fee5ba5 100644 --- a/src/myapp/ns_api/tag/common.py +++ b/src/myapp/ns_api/tag/common.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from .. import jsonrpc, login_required diff --git a/src/myapp/ns_api/tag/note.py b/src/myapp/ns_api/tag/note.py index e884bd1..dda62a5 100644 --- a/src/myapp/ns_api/tag/note.py +++ b/src/myapp/ns_api/tag/note.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from .. import jsonrpc, login_required diff --git a/src/myapp/ns_api/tag/page.py b/src/myapp/ns_api/tag/page.py index c089d37..43d92eb 100644 --- a/src/myapp/ns_api/tag/page.py +++ b/src/myapp/ns_api/tag/page.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from .. import jsonrpc, login_required diff --git a/src/myapp/ns_api/user.py b/src/myapp/ns_api/user.py index c5f7449..855ca67 100644 --- a/src/myapp/ns_api/user.py +++ b/src/myapp/ns_api/user.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from . import jsonrpc diff --git a/src/myapp/ns_common/__init__.py b/src/myapp/ns_common/__init__.py index 5d4cbc8..3c1cfbe 100644 --- a/src/myapp/ns_common/__init__.py +++ b/src/myapp/ns_common/__init__.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' import os diff --git a/src/myapp/ns_common/views.py b/src/myapp/ns_common/views.py index 8f14be7..40ce3c8 100644 --- a/src/myapp/ns_common/views.py +++ b/src/myapp/ns_common/views.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from flask import render_template diff --git a/src/myapp/views.py b/src/myapp/views.py index 0dc0b17..d562498 100644 --- a/src/myapp/views.py +++ b/src/myapp/views.py @@ -1,5 +1,4 @@ __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from flask import render_template, Response diff --git a/wsgi.py b/wsgi.py index ca14eec..4e5b9d2 100755 --- a/wsgi.py +++ b/wsgi.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 __author__ = 'RemiZOffAlex' -__copyright__ = '(c) RemiZOffAlex' __email__ = 'remizoffalex@mail.ru' from myapp import app as application # noqa F401