From 05480097c45592f85b2ce4b1d7ab4ab83e02b04d Mon Sep 17 00:00:00 2001 From: deflax Date: Thu, 9 Mar 2017 03:09:49 +0200 Subject: [PATCH] messing up --- {proxadmin => app}/__init__.py | 19 +++++++++--------- {proxadmin => app}/auth/__init__.py | 0 {proxadmin => app}/auth/forms.py | 0 {proxadmin => app}/auth/routes.py | 0 {proxadmin => app}/decorators.py | 0 {proxadmin => app}/email.py | 0 {proxadmin => app}/exceptions.py | 0 {proxadmin => app}/models.py | 3 +-- .../static/css/bootstrap-slider.css | 0 {proxadmin => app}/static/css/navbar.css | 0 {proxadmin => app}/static/css/nouislider.css | 0 .../static/css/rangeslider.scss | 0 {proxadmin => app}/static/css/style.css | 0 {proxadmin => app}/static/css/style.css.old | 0 {proxadmin => app}/static/images/1.jpg | Bin {proxadmin => app}/static/images/2.jpg | Bin {proxadmin => app}/static/images/220x180.png | Bin {proxadmin => app}/static/images/3.jpg | Bin {proxadmin => app}/static/images/4.jpg | Bin {proxadmin => app}/static/images/5.jpg | Bin {proxadmin => app}/static/images/6.jpg | Bin {proxadmin => app}/static/images/Hosting2.png | Bin .../static/images/VPS-Mission.png | Bin .../static/images/VPS-Security.png | Bin .../static/images/VPS-Support.png | Bin .../static/images/VPS-equipment.png | Bin {proxadmin => app}/static/images/_bg.jpg | Bin .../static/images/bg-linear.jpg | Bin {proxadmin => app}/static/images/bg.jpg | Bin .../static/images/datapoint.png | Bin .../static/images/header-layer.jpg | Bin {proxadmin => app}/static/images/hex24.png | Bin {proxadmin => app}/static/images/hex32.png | Bin {proxadmin => app}/static/images/hex512.png | Bin {proxadmin => app}/static/images/purplebg.jpg | Bin .../static/images/purplebg1.jpg | Bin .../static/images/purplebg2.jpg | Bin {proxadmin => app}/static/images/robot.png | Bin .../static/images/texture-diagonal.png | Bin .../static/js/bootstrap-slider.js | 0 {proxadmin => app}/static/js/jquery.js | 0 {proxadmin => app}/static/js/mgui.js | 0 .../static/js/nouislider.min.js | 0 {proxadmin => app}/static/js/rangeslider.js | 0 .../templates/_formhelpers.html | 0 {proxadmin => app}/templates/_slide.html | 0 {proxadmin => app}/templates/auth/2fa.html | 0 .../templates/auth/already_confirmed.html | 0 .../templates/auth/change_password.html | 0 .../templates/auth/email/adm_loginnotify.html | 0 .../templates/auth/email/adm_loginnotify.txt | 0 .../templates/auth/email/adm_regnotify.html | 0 .../templates/auth/email/adm_regnotify.txt | 0 .../templates/auth/email/confirm.html | 0 .../templates/auth/email/confirm.txt | 0 .../templates/auth/email/reset_password.html | 0 .../templates/auth/email/reset_password.txt | 0 {proxadmin => app}/templates/auth/login.html | 0 .../templates/auth/register.html | 0 .../templates/auth/reset_password.html | 0 .../templates/auth/unconfirmed.html | 0 {proxadmin => app}/templates/base.html | 0 {proxadmin => app}/templates/errors/403.html | 0 {proxadmin => app}/templates/errors/404.html | 0 {proxadmin => app}/templates/errors/500.html | 0 .../templates/errors/csrf_error.html | 0 {proxadmin => app}/templates/footer.html | 0 {proxadmin => app}/templates/nav-full.html | 0 {proxadmin => app}/templates/nav.html | 0 .../templates/uinvoice/_sidebar.html | 0 .../templates/uinvoice/charge.html | 0 .../templates/uinvoice/documents.html | 0 .../templates/uinvoice/email/adm_payment.html | 0 .../templates/uinvoice/email/adm_payment.txt | 0 .../templates/uinvoice/invoice.html | 0 .../templates/uinvoice/profile.html | 0 .../templates/vmanager/_misc.html | 0 .../templates/vmanager/aboutus.html | 0 .../templates/vmanager/dashboard.html | 0 .../templates/vmanager/deploy.html | 0 .../vmanager/email/adm_unreachable.html | 0 .../vmanager/email/adm_unreachable.txt | 0 .../templates/vmanager/empty_dashboard.html | 0 .../templates/vmanager/index.html | 0 .../templates/vmanager/livechat.html | 0 .../templates/vmanager/market.html | 0 .../templates/vmanager/marketgroup.html | 0 .../templates/vmanager/terms.html | 0 {proxadmin => app}/uinvoice/__init__.py | 0 {proxadmin => app}/uinvoice/forms.py | 0 {proxadmin => app}/uinvoice/routes.py | 0 {proxadmin => app}/vmanager/__init__.py | 0 {proxadmin => app}/vmanager/errors.py | 0 {proxadmin => app}/vmanager/forms.py | 0 {proxadmin => app}/vmanager/routes.py | 1 - 95 files changed, 10 insertions(+), 13 deletions(-) rename {proxadmin => app}/__init__.py (88%) rename {proxadmin => app}/auth/__init__.py (100%) rename {proxadmin => app}/auth/forms.py (100%) rename {proxadmin => app}/auth/routes.py (100%) rename {proxadmin => app}/decorators.py (100%) rename {proxadmin => app}/email.py (100%) rename {proxadmin => app}/exceptions.py (100%) rename {proxadmin => app}/models.py (99%) rename {proxadmin => app}/static/css/bootstrap-slider.css (100%) rename {proxadmin => app}/static/css/navbar.css (100%) rename {proxadmin => app}/static/css/nouislider.css (100%) rename {proxadmin => app}/static/css/rangeslider.scss (100%) rename {proxadmin => app}/static/css/style.css (100%) rename {proxadmin => app}/static/css/style.css.old (100%) rename {proxadmin => app}/static/images/1.jpg (100%) rename {proxadmin => app}/static/images/2.jpg (100%) rename {proxadmin => app}/static/images/220x180.png (100%) rename {proxadmin => app}/static/images/3.jpg (100%) rename {proxadmin => app}/static/images/4.jpg (100%) rename {proxadmin => app}/static/images/5.jpg (100%) rename {proxadmin => app}/static/images/6.jpg (100%) rename {proxadmin => app}/static/images/Hosting2.png (100%) rename {proxadmin => app}/static/images/VPS-Mission.png (100%) rename {proxadmin => app}/static/images/VPS-Security.png (100%) rename {proxadmin => app}/static/images/VPS-Support.png (100%) rename {proxadmin => app}/static/images/VPS-equipment.png (100%) rename {proxadmin => app}/static/images/_bg.jpg (100%) rename {proxadmin => app}/static/images/bg-linear.jpg (100%) rename {proxadmin => app}/static/images/bg.jpg (100%) rename {proxadmin => app}/static/images/datapoint.png (100%) rename {proxadmin => app}/static/images/header-layer.jpg (100%) rename {proxadmin => app}/static/images/hex24.png (100%) rename {proxadmin => app}/static/images/hex32.png (100%) rename {proxadmin => app}/static/images/hex512.png (100%) rename {proxadmin => app}/static/images/purplebg.jpg (100%) rename {proxadmin => app}/static/images/purplebg1.jpg (100%) rename {proxadmin => app}/static/images/purplebg2.jpg (100%) rename {proxadmin => app}/static/images/robot.png (100%) rename {proxadmin => app}/static/images/texture-diagonal.png (100%) rename {proxadmin => app}/static/js/bootstrap-slider.js (100%) rename {proxadmin => app}/static/js/jquery.js (100%) rename {proxadmin => app}/static/js/mgui.js (100%) rename {proxadmin => app}/static/js/nouislider.min.js (100%) rename {proxadmin => app}/static/js/rangeslider.js (100%) rename {proxadmin => app}/templates/_formhelpers.html (100%) rename {proxadmin => app}/templates/_slide.html (100%) rename {proxadmin => app}/templates/auth/2fa.html (100%) rename {proxadmin => app}/templates/auth/already_confirmed.html (100%) rename {proxadmin => app}/templates/auth/change_password.html (100%) rename {proxadmin => app}/templates/auth/email/adm_loginnotify.html (100%) rename {proxadmin => app}/templates/auth/email/adm_loginnotify.txt (100%) rename {proxadmin => app}/templates/auth/email/adm_regnotify.html (100%) rename {proxadmin => app}/templates/auth/email/adm_regnotify.txt (100%) rename {proxadmin => app}/templates/auth/email/confirm.html (100%) rename {proxadmin => app}/templates/auth/email/confirm.txt (100%) rename {proxadmin => app}/templates/auth/email/reset_password.html (100%) rename {proxadmin => app}/templates/auth/email/reset_password.txt (100%) rename {proxadmin => app}/templates/auth/login.html (100%) rename {proxadmin => app}/templates/auth/register.html (100%) rename {proxadmin => app}/templates/auth/reset_password.html (100%) rename {proxadmin => app}/templates/auth/unconfirmed.html (100%) rename {proxadmin => app}/templates/base.html (100%) rename {proxadmin => app}/templates/errors/403.html (100%) rename {proxadmin => app}/templates/errors/404.html (100%) rename {proxadmin => app}/templates/errors/500.html (100%) rename {proxadmin => app}/templates/errors/csrf_error.html (100%) rename {proxadmin => app}/templates/footer.html (100%) rename {proxadmin => app}/templates/nav-full.html (100%) rename {proxadmin => app}/templates/nav.html (100%) rename {proxadmin => app}/templates/uinvoice/_sidebar.html (100%) rename {proxadmin => app}/templates/uinvoice/charge.html (100%) rename {proxadmin => app}/templates/uinvoice/documents.html (100%) rename {proxadmin => app}/templates/uinvoice/email/adm_payment.html (100%) rename {proxadmin => app}/templates/uinvoice/email/adm_payment.txt (100%) rename {proxadmin => app}/templates/uinvoice/invoice.html (100%) rename {proxadmin => app}/templates/uinvoice/profile.html (100%) rename {proxadmin => app}/templates/vmanager/_misc.html (100%) rename {proxadmin => app}/templates/vmanager/aboutus.html (100%) rename {proxadmin => app}/templates/vmanager/dashboard.html (100%) rename {proxadmin => app}/templates/vmanager/deploy.html (100%) rename {proxadmin => app}/templates/vmanager/email/adm_unreachable.html (100%) rename {proxadmin => app}/templates/vmanager/email/adm_unreachable.txt (100%) rename {proxadmin => app}/templates/vmanager/empty_dashboard.html (100%) rename {proxadmin => app}/templates/vmanager/index.html (100%) rename {proxadmin => app}/templates/vmanager/livechat.html (100%) rename {proxadmin => app}/templates/vmanager/market.html (100%) rename {proxadmin => app}/templates/vmanager/marketgroup.html (100%) rename {proxadmin => app}/templates/vmanager/terms.html (100%) rename {proxadmin => app}/uinvoice/__init__.py (100%) rename {proxadmin => app}/uinvoice/forms.py (100%) rename {proxadmin => app}/uinvoice/routes.py (100%) rename {proxadmin => app}/vmanager/__init__.py (100%) rename {proxadmin => app}/vmanager/errors.py (100%) rename {proxadmin => app}/vmanager/forms.py (100%) rename {proxadmin => app}/vmanager/routes.py (99%) diff --git a/proxadmin/__init__.py b/app/__init__.py similarity index 88% rename from proxadmin/__init__.py rename to app/__init__.py index 5c7d728..a218925 100644 --- a/proxadmin/__init__.py +++ b/app/__init__.py @@ -6,7 +6,6 @@ from flask_login import LoginManager from flask_wtf.csrf import CSRFProtect, CSRFError from flask_babel import Babel, lazy_gettext from werkzeug.contrib.fixers import ProxyFix -from .config import basedir, MAIL_SERVER, MAIL_PORT, MAIL_USERNAME, MAIL_PASSWORD app = Flask(__name__) app.config.from_object('config') @@ -106,20 +105,20 @@ def get_locale(): # g.request_time = lambda: '%.5fs' % (time.time() - g.request_start_time) # g.pjax = 'X-PJAX' in request.headers -if not app.debug and MAIL_SERVER != '': +if not app.debug and app.config['MAIL_SERVER'] != '': import logging from logging.handlers import SMTPHandler credentials = None - secure = None - if MAIL_USERNAME or MAIL_PASSWORD: - credentials = (MAIL_USERNAME, MAIL_PASSWORD) - if MAIL_USE_TLS is None: + secure = Nonep + if app.config['MAIL_USERNAME'] or app.config['MAIL_PASSWORD']: + credentials = (app.config['MAIL_USERNAME'], app.config['MAIL_PASSWORD']) + if app.config['MAIL_USE_TLS'] is None: secure = () mail_handler = SMTPHandler( - mailhost=(MAIL_SERVER, MAIL_PORT), - fromaddr=MAIL_SENDER, - toaddrs=[MAIL_ADMIN], - subject=MAIL_SUBJECT_PREFIX + ' Application Error', + mailhost=(app.config['MAIL_SERVER'], app.config['MAIL_PORT']), + fromaddr=app.config['MAIL_SENDER'], + toaddrs=[app.config['MAIL_ADMIN']], + subject=app.config['MAIL_SUBJECT_PREFIX'] + ' Application Error', credentials=credentials, secure=secure) mail_handler.setLevel(logging.ERROR) diff --git a/proxadmin/auth/__init__.py b/app/auth/__init__.py similarity index 100% rename from proxadmin/auth/__init__.py rename to app/auth/__init__.py diff --git a/proxadmin/auth/forms.py b/app/auth/forms.py similarity index 100% rename from proxadmin/auth/forms.py rename to app/auth/forms.py diff --git a/proxadmin/auth/routes.py b/app/auth/routes.py similarity index 100% rename from proxadmin/auth/routes.py rename to app/auth/routes.py diff --git a/proxadmin/decorators.py b/app/decorators.py similarity index 100% rename from proxadmin/decorators.py rename to app/decorators.py diff --git a/proxadmin/email.py b/app/email.py similarity index 100% rename from proxadmin/email.py rename to app/email.py diff --git a/proxadmin/exceptions.py b/app/exceptions.py similarity index 100% rename from proxadmin/exceptions.py rename to app/exceptions.py diff --git a/proxadmin/models.py b/app/models.py similarity index 99% rename from proxadmin/models.py rename to app/models.py index 21d8bfc..84784b2 100644 --- a/proxadmin/models.py +++ b/app/models.py @@ -2,10 +2,9 @@ import hashlib from werkzeug.security import generate_password_hash, check_password_hash from itsdangerous import TimedJSONWebSignatureSerializer as Serializer -from config import Config from flask import current_app, request, url_for from flask_login import UserMixin, AnonymousUserMixin -from app.exceptions import ValidationError +from proxadmin.exceptions import ValidationError from . import db, lm import os diff --git a/proxadmin/static/css/bootstrap-slider.css b/app/static/css/bootstrap-slider.css similarity index 100% rename from proxadmin/static/css/bootstrap-slider.css rename to app/static/css/bootstrap-slider.css diff --git a/proxadmin/static/css/navbar.css b/app/static/css/navbar.css similarity index 100% rename from proxadmin/static/css/navbar.css rename to app/static/css/navbar.css diff --git a/proxadmin/static/css/nouislider.css b/app/static/css/nouislider.css similarity index 100% rename from proxadmin/static/css/nouislider.css rename to app/static/css/nouislider.css diff --git a/proxadmin/static/css/rangeslider.scss b/app/static/css/rangeslider.scss similarity index 100% rename from proxadmin/static/css/rangeslider.scss rename to app/static/css/rangeslider.scss diff --git a/proxadmin/static/css/style.css b/app/static/css/style.css similarity index 100% rename from proxadmin/static/css/style.css rename to app/static/css/style.css diff --git a/proxadmin/static/css/style.css.old b/app/static/css/style.css.old similarity index 100% rename from proxadmin/static/css/style.css.old rename to app/static/css/style.css.old diff --git a/proxadmin/static/images/1.jpg b/app/static/images/1.jpg similarity index 100% rename from proxadmin/static/images/1.jpg rename to app/static/images/1.jpg diff --git a/proxadmin/static/images/2.jpg b/app/static/images/2.jpg similarity index 100% rename from proxadmin/static/images/2.jpg rename to app/static/images/2.jpg diff --git a/proxadmin/static/images/220x180.png b/app/static/images/220x180.png similarity index 100% rename from proxadmin/static/images/220x180.png rename to app/static/images/220x180.png diff --git a/proxadmin/static/images/3.jpg b/app/static/images/3.jpg similarity index 100% rename from proxadmin/static/images/3.jpg rename to app/static/images/3.jpg diff --git a/proxadmin/static/images/4.jpg b/app/static/images/4.jpg similarity index 100% rename from proxadmin/static/images/4.jpg rename to app/static/images/4.jpg diff --git a/proxadmin/static/images/5.jpg b/app/static/images/5.jpg similarity index 100% rename from proxadmin/static/images/5.jpg rename to app/static/images/5.jpg diff --git a/proxadmin/static/images/6.jpg b/app/static/images/6.jpg similarity index 100% rename from proxadmin/static/images/6.jpg rename to app/static/images/6.jpg diff --git a/proxadmin/static/images/Hosting2.png b/app/static/images/Hosting2.png similarity index 100% rename from proxadmin/static/images/Hosting2.png rename to app/static/images/Hosting2.png diff --git a/proxadmin/static/images/VPS-Mission.png b/app/static/images/VPS-Mission.png similarity index 100% rename from proxadmin/static/images/VPS-Mission.png rename to app/static/images/VPS-Mission.png diff --git a/proxadmin/static/images/VPS-Security.png b/app/static/images/VPS-Security.png similarity index 100% rename from proxadmin/static/images/VPS-Security.png rename to app/static/images/VPS-Security.png diff --git a/proxadmin/static/images/VPS-Support.png b/app/static/images/VPS-Support.png similarity index 100% rename from proxadmin/static/images/VPS-Support.png rename to app/static/images/VPS-Support.png diff --git a/proxadmin/static/images/VPS-equipment.png b/app/static/images/VPS-equipment.png similarity index 100% rename from proxadmin/static/images/VPS-equipment.png rename to app/static/images/VPS-equipment.png diff --git a/proxadmin/static/images/_bg.jpg b/app/static/images/_bg.jpg similarity index 100% rename from proxadmin/static/images/_bg.jpg rename to app/static/images/_bg.jpg diff --git a/proxadmin/static/images/bg-linear.jpg b/app/static/images/bg-linear.jpg similarity index 100% rename from proxadmin/static/images/bg-linear.jpg rename to app/static/images/bg-linear.jpg diff --git a/proxadmin/static/images/bg.jpg b/app/static/images/bg.jpg similarity index 100% rename from proxadmin/static/images/bg.jpg rename to app/static/images/bg.jpg diff --git a/proxadmin/static/images/datapoint.png b/app/static/images/datapoint.png similarity index 100% rename from proxadmin/static/images/datapoint.png rename to app/static/images/datapoint.png diff --git a/proxadmin/static/images/header-layer.jpg b/app/static/images/header-layer.jpg similarity index 100% rename from proxadmin/static/images/header-layer.jpg rename to app/static/images/header-layer.jpg diff --git a/proxadmin/static/images/hex24.png b/app/static/images/hex24.png similarity index 100% rename from proxadmin/static/images/hex24.png rename to app/static/images/hex24.png diff --git a/proxadmin/static/images/hex32.png b/app/static/images/hex32.png similarity index 100% rename from proxadmin/static/images/hex32.png rename to app/static/images/hex32.png diff --git a/proxadmin/static/images/hex512.png b/app/static/images/hex512.png similarity index 100% rename from proxadmin/static/images/hex512.png rename to app/static/images/hex512.png diff --git a/proxadmin/static/images/purplebg.jpg b/app/static/images/purplebg.jpg similarity index 100% rename from proxadmin/static/images/purplebg.jpg rename to app/static/images/purplebg.jpg diff --git a/proxadmin/static/images/purplebg1.jpg b/app/static/images/purplebg1.jpg similarity index 100% rename from proxadmin/static/images/purplebg1.jpg rename to app/static/images/purplebg1.jpg diff --git a/proxadmin/static/images/purplebg2.jpg b/app/static/images/purplebg2.jpg similarity index 100% rename from proxadmin/static/images/purplebg2.jpg rename to app/static/images/purplebg2.jpg diff --git a/proxadmin/static/images/robot.png b/app/static/images/robot.png similarity index 100% rename from proxadmin/static/images/robot.png rename to app/static/images/robot.png diff --git a/proxadmin/static/images/texture-diagonal.png b/app/static/images/texture-diagonal.png similarity index 100% rename from proxadmin/static/images/texture-diagonal.png rename to app/static/images/texture-diagonal.png diff --git a/proxadmin/static/js/bootstrap-slider.js b/app/static/js/bootstrap-slider.js similarity index 100% rename from proxadmin/static/js/bootstrap-slider.js rename to app/static/js/bootstrap-slider.js diff --git a/proxadmin/static/js/jquery.js b/app/static/js/jquery.js similarity index 100% rename from proxadmin/static/js/jquery.js rename to app/static/js/jquery.js diff --git a/proxadmin/static/js/mgui.js b/app/static/js/mgui.js similarity index 100% rename from proxadmin/static/js/mgui.js rename to app/static/js/mgui.js diff --git a/proxadmin/static/js/nouislider.min.js b/app/static/js/nouislider.min.js similarity index 100% rename from proxadmin/static/js/nouislider.min.js rename to app/static/js/nouislider.min.js diff --git a/proxadmin/static/js/rangeslider.js b/app/static/js/rangeslider.js similarity index 100% rename from proxadmin/static/js/rangeslider.js rename to app/static/js/rangeslider.js diff --git a/proxadmin/templates/_formhelpers.html b/app/templates/_formhelpers.html similarity index 100% rename from proxadmin/templates/_formhelpers.html rename to app/templates/_formhelpers.html diff --git a/proxadmin/templates/_slide.html b/app/templates/_slide.html similarity index 100% rename from proxadmin/templates/_slide.html rename to app/templates/_slide.html diff --git a/proxadmin/templates/auth/2fa.html b/app/templates/auth/2fa.html similarity index 100% rename from proxadmin/templates/auth/2fa.html rename to app/templates/auth/2fa.html diff --git a/proxadmin/templates/auth/already_confirmed.html b/app/templates/auth/already_confirmed.html similarity index 100% rename from proxadmin/templates/auth/already_confirmed.html rename to app/templates/auth/already_confirmed.html diff --git a/proxadmin/templates/auth/change_password.html b/app/templates/auth/change_password.html similarity index 100% rename from proxadmin/templates/auth/change_password.html rename to app/templates/auth/change_password.html diff --git a/proxadmin/templates/auth/email/adm_loginnotify.html b/app/templates/auth/email/adm_loginnotify.html similarity index 100% rename from proxadmin/templates/auth/email/adm_loginnotify.html rename to app/templates/auth/email/adm_loginnotify.html diff --git a/proxadmin/templates/auth/email/adm_loginnotify.txt b/app/templates/auth/email/adm_loginnotify.txt similarity index 100% rename from proxadmin/templates/auth/email/adm_loginnotify.txt rename to app/templates/auth/email/adm_loginnotify.txt diff --git a/proxadmin/templates/auth/email/adm_regnotify.html b/app/templates/auth/email/adm_regnotify.html similarity index 100% rename from proxadmin/templates/auth/email/adm_regnotify.html rename to app/templates/auth/email/adm_regnotify.html diff --git a/proxadmin/templates/auth/email/adm_regnotify.txt b/app/templates/auth/email/adm_regnotify.txt similarity index 100% rename from proxadmin/templates/auth/email/adm_regnotify.txt rename to app/templates/auth/email/adm_regnotify.txt diff --git a/proxadmin/templates/auth/email/confirm.html b/app/templates/auth/email/confirm.html similarity index 100% rename from proxadmin/templates/auth/email/confirm.html rename to app/templates/auth/email/confirm.html diff --git a/proxadmin/templates/auth/email/confirm.txt b/app/templates/auth/email/confirm.txt similarity index 100% rename from proxadmin/templates/auth/email/confirm.txt rename to app/templates/auth/email/confirm.txt diff --git a/proxadmin/templates/auth/email/reset_password.html b/app/templates/auth/email/reset_password.html similarity index 100% rename from proxadmin/templates/auth/email/reset_password.html rename to app/templates/auth/email/reset_password.html diff --git a/proxadmin/templates/auth/email/reset_password.txt b/app/templates/auth/email/reset_password.txt similarity index 100% rename from proxadmin/templates/auth/email/reset_password.txt rename to app/templates/auth/email/reset_password.txt diff --git a/proxadmin/templates/auth/login.html b/app/templates/auth/login.html similarity index 100% rename from proxadmin/templates/auth/login.html rename to app/templates/auth/login.html diff --git a/proxadmin/templates/auth/register.html b/app/templates/auth/register.html similarity index 100% rename from proxadmin/templates/auth/register.html rename to app/templates/auth/register.html diff --git a/proxadmin/templates/auth/reset_password.html b/app/templates/auth/reset_password.html similarity index 100% rename from proxadmin/templates/auth/reset_password.html rename to app/templates/auth/reset_password.html diff --git a/proxadmin/templates/auth/unconfirmed.html b/app/templates/auth/unconfirmed.html similarity index 100% rename from proxadmin/templates/auth/unconfirmed.html rename to app/templates/auth/unconfirmed.html diff --git a/proxadmin/templates/base.html b/app/templates/base.html similarity index 100% rename from proxadmin/templates/base.html rename to app/templates/base.html diff --git a/proxadmin/templates/errors/403.html b/app/templates/errors/403.html similarity index 100% rename from proxadmin/templates/errors/403.html rename to app/templates/errors/403.html diff --git a/proxadmin/templates/errors/404.html b/app/templates/errors/404.html similarity index 100% rename from proxadmin/templates/errors/404.html rename to app/templates/errors/404.html diff --git a/proxadmin/templates/errors/500.html b/app/templates/errors/500.html similarity index 100% rename from proxadmin/templates/errors/500.html rename to app/templates/errors/500.html diff --git a/proxadmin/templates/errors/csrf_error.html b/app/templates/errors/csrf_error.html similarity index 100% rename from proxadmin/templates/errors/csrf_error.html rename to app/templates/errors/csrf_error.html diff --git a/proxadmin/templates/footer.html b/app/templates/footer.html similarity index 100% rename from proxadmin/templates/footer.html rename to app/templates/footer.html diff --git a/proxadmin/templates/nav-full.html b/app/templates/nav-full.html similarity index 100% rename from proxadmin/templates/nav-full.html rename to app/templates/nav-full.html diff --git a/proxadmin/templates/nav.html b/app/templates/nav.html similarity index 100% rename from proxadmin/templates/nav.html rename to app/templates/nav.html diff --git a/proxadmin/templates/uinvoice/_sidebar.html b/app/templates/uinvoice/_sidebar.html similarity index 100% rename from proxadmin/templates/uinvoice/_sidebar.html rename to app/templates/uinvoice/_sidebar.html diff --git a/proxadmin/templates/uinvoice/charge.html b/app/templates/uinvoice/charge.html similarity index 100% rename from proxadmin/templates/uinvoice/charge.html rename to app/templates/uinvoice/charge.html diff --git a/proxadmin/templates/uinvoice/documents.html b/app/templates/uinvoice/documents.html similarity index 100% rename from proxadmin/templates/uinvoice/documents.html rename to app/templates/uinvoice/documents.html diff --git a/proxadmin/templates/uinvoice/email/adm_payment.html b/app/templates/uinvoice/email/adm_payment.html similarity index 100% rename from proxadmin/templates/uinvoice/email/adm_payment.html rename to app/templates/uinvoice/email/adm_payment.html diff --git a/proxadmin/templates/uinvoice/email/adm_payment.txt b/app/templates/uinvoice/email/adm_payment.txt similarity index 100% rename from proxadmin/templates/uinvoice/email/adm_payment.txt rename to app/templates/uinvoice/email/adm_payment.txt diff --git a/proxadmin/templates/uinvoice/invoice.html b/app/templates/uinvoice/invoice.html similarity index 100% rename from proxadmin/templates/uinvoice/invoice.html rename to app/templates/uinvoice/invoice.html diff --git a/proxadmin/templates/uinvoice/profile.html b/app/templates/uinvoice/profile.html similarity index 100% rename from proxadmin/templates/uinvoice/profile.html rename to app/templates/uinvoice/profile.html diff --git a/proxadmin/templates/vmanager/_misc.html b/app/templates/vmanager/_misc.html similarity index 100% rename from proxadmin/templates/vmanager/_misc.html rename to app/templates/vmanager/_misc.html diff --git a/proxadmin/templates/vmanager/aboutus.html b/app/templates/vmanager/aboutus.html similarity index 100% rename from proxadmin/templates/vmanager/aboutus.html rename to app/templates/vmanager/aboutus.html diff --git a/proxadmin/templates/vmanager/dashboard.html b/app/templates/vmanager/dashboard.html similarity index 100% rename from proxadmin/templates/vmanager/dashboard.html rename to app/templates/vmanager/dashboard.html diff --git a/proxadmin/templates/vmanager/deploy.html b/app/templates/vmanager/deploy.html similarity index 100% rename from proxadmin/templates/vmanager/deploy.html rename to app/templates/vmanager/deploy.html diff --git a/proxadmin/templates/vmanager/email/adm_unreachable.html b/app/templates/vmanager/email/adm_unreachable.html similarity index 100% rename from proxadmin/templates/vmanager/email/adm_unreachable.html rename to app/templates/vmanager/email/adm_unreachable.html diff --git a/proxadmin/templates/vmanager/email/adm_unreachable.txt b/app/templates/vmanager/email/adm_unreachable.txt similarity index 100% rename from proxadmin/templates/vmanager/email/adm_unreachable.txt rename to app/templates/vmanager/email/adm_unreachable.txt diff --git a/proxadmin/templates/vmanager/empty_dashboard.html b/app/templates/vmanager/empty_dashboard.html similarity index 100% rename from proxadmin/templates/vmanager/empty_dashboard.html rename to app/templates/vmanager/empty_dashboard.html diff --git a/proxadmin/templates/vmanager/index.html b/app/templates/vmanager/index.html similarity index 100% rename from proxadmin/templates/vmanager/index.html rename to app/templates/vmanager/index.html diff --git a/proxadmin/templates/vmanager/livechat.html b/app/templates/vmanager/livechat.html similarity index 100% rename from proxadmin/templates/vmanager/livechat.html rename to app/templates/vmanager/livechat.html diff --git a/proxadmin/templates/vmanager/market.html b/app/templates/vmanager/market.html similarity index 100% rename from proxadmin/templates/vmanager/market.html rename to app/templates/vmanager/market.html diff --git a/proxadmin/templates/vmanager/marketgroup.html b/app/templates/vmanager/marketgroup.html similarity index 100% rename from proxadmin/templates/vmanager/marketgroup.html rename to app/templates/vmanager/marketgroup.html diff --git a/proxadmin/templates/vmanager/terms.html b/app/templates/vmanager/terms.html similarity index 100% rename from proxadmin/templates/vmanager/terms.html rename to app/templates/vmanager/terms.html diff --git a/proxadmin/uinvoice/__init__.py b/app/uinvoice/__init__.py similarity index 100% rename from proxadmin/uinvoice/__init__.py rename to app/uinvoice/__init__.py diff --git a/proxadmin/uinvoice/forms.py b/app/uinvoice/forms.py similarity index 100% rename from proxadmin/uinvoice/forms.py rename to app/uinvoice/forms.py diff --git a/proxadmin/uinvoice/routes.py b/app/uinvoice/routes.py similarity index 100% rename from proxadmin/uinvoice/routes.py rename to app/uinvoice/routes.py diff --git a/proxadmin/vmanager/__init__.py b/app/vmanager/__init__.py similarity index 100% rename from proxadmin/vmanager/__init__.py rename to app/vmanager/__init__.py diff --git a/proxadmin/vmanager/errors.py b/app/vmanager/errors.py similarity index 100% rename from proxadmin/vmanager/errors.py rename to app/vmanager/errors.py diff --git a/proxadmin/vmanager/forms.py b/app/vmanager/forms.py similarity index 100% rename from proxadmin/vmanager/forms.py rename to app/vmanager/forms.py diff --git a/proxadmin/vmanager/routes.py b/app/vmanager/routes.py similarity index 99% rename from proxadmin/vmanager/routes.py rename to app/vmanager/routes.py index 307dded..34df56a 100644 --- a/proxadmin/vmanager/routes.py +++ b/app/vmanager/routes.py @@ -1,4 +1,3 @@ -from config import Config from flask import render_template, abort, redirect, url_for, abort, flash, request, current_app, make_response, g from flask_login import login_required, login_user, logout_user, current_user from flask_sqlalchemy import get_debug_queries