From 7673e1b84ce459ad3bd83557c6132c68ae3006b0 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Tue, 14 Jun 2016 08:05:05 +0300 Subject: [PATCH] Up Version with API --- SWSCloudAdministrator/application.py | 34 ++------ .../templates/administrator/users/index.html | 6 +- SWSCloudCore/controllers/users/__init__.py | 13 +++- SWSCloudCore/controllers/users/manage.py | 19 ++++- SWSCloudWeb/application.py | 4 + .../static/js/foundation/foundation.js | 2 +- SWSCloudWeb/templates/default/_footer.html | 23 ++---- SWSCloudWeb/templates/default/_header.html | 6 +- SWSCloudWeb/templates/default/_layout.html | 10 ++- .../templates/default/homepage/index.html | 77 ++++++++++++++----- SWSCloudWeb/views/account/__init__.py | 10 +-- SWSCloudWeb/views/vms/__init__.py | 6 +- extra/uwsgi_admin.ini | 19 +++++ extra/{uwsgi-api.ini => uwsgi_api.ini} | 0 extra/{uwsgi-web.ini => uwsgi_web.ini} | 2 +- setup.py | 46 +++++++---- 16 files changed, 172 insertions(+), 105 deletions(-) create mode 100644 extra/uwsgi_admin.ini rename extra/{uwsgi-api.ini => uwsgi_api.ini} (100%) rename extra/{uwsgi-web.ini => uwsgi_web.ini} (84%) diff --git a/SWSCloudAdministrator/application.py b/SWSCloudAdministrator/application.py index f95ed2b..8f84378 100644 --- a/SWSCloudAdministrator/application.py +++ b/SWSCloudAdministrator/application.py @@ -7,17 +7,7 @@ from flaskext.markdown import Markdown from SWSCloudCore import models from SWSCloudCore.config import config from SWSCloudCore.models import database -from SWSCloudServerAPI.ServerAPI import viewServerAPI -from SWSCloudWeb.views import viewHomepage -from SWSCloudWeb.views.account import viewAccount -from SWSCloudWeb.views.administrator import viewAdministrator -from SWSCloudWeb.views.containers import viewContainers -from SWSCloudWeb.views.documents import viewDocuments -from SWSCloudWeb.views.kb import viewKB -from SWSCloudWeb.views.payments import viewPayments -from SWSCloudWeb.views.support import viewSupport -from SWSCloudWeb.views.tasks import viewTasks -from SWSCloudWeb.views.vms import viewVMs +from SWSCloudAdministrator.Administrator import viewAdministrator app = Flask(__name__, static_folder='static', static_url_path='') # app.config['SERVER_NAME'] = settings.get('Application', 'SERVER_NAME') @@ -26,24 +16,6 @@ app.config['SECRET_KEY'] = config.get("Application", "SECRET_KEY") Markdown(app) babel = Babel(app) - -# / -app.register_blueprint(viewHomepage) -app.register_blueprint(viewSupport) -app.register_blueprint(viewKB) -app.register_blueprint(viewDocuments) -# /tasks -app.register_blueprint(viewTasks) -# /containers -app.register_blueprint(viewContainers) -app.register_blueprint(viewVMs) -# /id -app.register_blueprint(viewAccount) -# /payments -app.register_blueprint(viewPayments) -# /api -app.register_blueprint(viewServerAPI) -# /administrator app.register_blueprint(viewAdministrator) @@ -97,3 +69,7 @@ def after_request(response): # TODO: code to email alert # pass return response + + +if __name__ == '__main__': + app.run(host='0.0.0.0', port=5000, debug=True) diff --git a/SWSCloudAdministrator/templates/administrator/users/index.html b/SWSCloudAdministrator/templates/administrator/users/index.html index e33e6ff..48a06e8 100644 --- a/SWSCloudAdministrator/templates/administrator/users/index.html +++ b/SWSCloudAdministrator/templates/administrator/users/index.html @@ -11,20 +11,22 @@ ID Email + Balance Status Action - {% if users.total == 0 %} + {% if users['total'] == 0 %} - No one users. + No one users. {% else %} {% for user in users['items'] %} {{ user.id }} {{ user.email }} + {{ user.usersbalance.balance }} {% if user.status == 0 %} Inactive diff --git a/SWSCloudCore/controllers/users/__init__.py b/SWSCloudCore/controllers/users/__init__.py index a601cb0..afcde30 100644 --- a/SWSCloudCore/controllers/users/__init__.py +++ b/SWSCloudCore/controllers/users/__init__.py @@ -118,10 +118,15 @@ class ControllerUsersRecoveryCodes(): return True def check(self, user_id, code): - print user_id - if models.UsersRecoveryCodes.select().\ - where(models.UsersRecoveryCodes.user == user_id, models.UsersRecoveryCodes.recovery_code == code).\ - count() == 0: + """ + Проверка существования кода + :param user_id: + :param code: + :return: bool + """ + if models.UsersRecoveryCodes.select().where( + models.UsersRecoveryCodes.user == user_id, models.UsersRecoveryCodes.recovery_code == code + ).count() == 0: return False return True diff --git a/SWSCloudCore/controllers/users/manage.py b/SWSCloudCore/controllers/users/manage.py index 694e8b6..4b1ce82 100644 --- a/SWSCloudCore/controllers/users/manage.py +++ b/SWSCloudCore/controllers/users/manage.py @@ -23,13 +23,26 @@ class ControllerManageUsers: формируем массив со списком пользователей :return: """ + from peewee import JOIN_LEFT_OUTER, JOIN_INNER, JOIN_FULL + + jj = models.Users.select( + models.UsersBalance.balance.alias('balance'), + models.Users.id, + models.Users.email, + models.Users.created, + models.Users.status, + ).join( + models.UsersBalance + ) + for j in jj: + print j.usersbalance.balance return { - 'total': models.Users.select().count(), - 'items': models.Users.select() + 'total': len(jj), + 'items': jj } def item_get(self, user_id): - return models.Users.select().where(models.Users.id == user_id)[0] + return models.Users.select().where(models.Users.id == user_id).get() class ControllerManageUsersDetails: diff --git a/SWSCloudWeb/application.py b/SWSCloudWeb/application.py index 1161e59..aea97e8 100644 --- a/SWSCloudWeb/application.py +++ b/SWSCloudWeb/application.py @@ -97,3 +97,7 @@ def after_request(response): # TODO: code to email alert # pass return response + + +if __name__ == '__main__': + app.run(host='0.0.0.0', port=5000, debug=True) diff --git a/SWSCloudWeb/static/js/foundation/foundation.js b/SWSCloudWeb/static/js/foundation/foundation.js index 65e6304..ebddff0 100644 --- a/SWSCloudWeb/static/js/foundation/foundation.js +++ b/SWSCloudWeb/static/js/foundation/foundation.js @@ -587,7 +587,7 @@ } } }, - + // Description: // Performs a callback function when an image is fully loaded // diff --git a/SWSCloudWeb/templates/default/_footer.html b/SWSCloudWeb/templates/default/_footer.html index 14bd789..83d2a96 100644 --- a/SWSCloudWeb/templates/default/_footer.html +++ b/SWSCloudWeb/templates/default/_footer.html @@ -1,28 +1,19 @@ {% if g.settings['footer_code'] %} {{ g.settings['footer_code']|safe }} {% endif %} + diff --git a/SWSCloudWeb/templates/default/_header.html b/SWSCloudWeb/templates/default/_header.html index 7275dd0..3f9f38c 100644 --- a/SWSCloudWeb/templates/default/_header.html +++ b/SWSCloudWeb/templates/default/_header.html @@ -17,12 +17,12 @@
  • Выход
    • {% else %}