diff --git a/flask/forest/__init__.py b/flask/forest/__init__.py
index 74ccc3b..9fb7d9c 100644
--- a/flask/forest/__init__.py
+++ b/flask/forest/__init__.py
@@ -65,21 +65,6 @@ app.register_blueprint(admin_blueprint, url_prefix='/' + app.config['ADMIN_PREFI
from .settings import settings as settings_blueprint
app.register_blueprint(settings_blueprint, url_prefix='/settings')
-
-class CustomJSONEncoder(JSONEncoder):
- """This class adds support for lazy translation texts to Flask's
- JSON encoder. This is necessary when flashing translated texts."""
- def default(self, obj):
- from speaklater import is_lazy_string
- if is_lazy_string(obj):
- try:
- return unicode(obj) # python 2
- except NameError:
- return str(obj) # python 3
- return super(CustomJSONEncoder, self).default(obj)
-
-#app.json_encoder = CustomJSONEncoder
-
@app.errorhandler(403)
def forbidden(e):
if request.accept_mimetypes.accept_json and \
@@ -120,11 +105,6 @@ def service_unavailable(e):
def handle_csrf_error(e):
return render_template('errors/csrf_error.html', reason=e.description), 400
-#@app.before_request
-#def before_request():
-# g.request_start_time = time.time()
-# g.request_time = lambda: '%.5fs' % (time.time() - g.request_start_time)
-# g.pjax = 'X-PJAX' in request.headers
if not app.config['DEBUG'] == 1 and app.config['MAIL_SERVER'] != '':
import logging
diff --git a/flask/forest/auth/forms.py b/flask/forest/auth/forms.py
index 2bcc6e3..d4bbc4a 100644
--- a/flask/forest/auth/forms.py
+++ b/flask/forest/auth/forms.py
@@ -2,7 +2,7 @@ from flask_wtf import FlaskForm, RecaptchaField
from wtforms import StringField, PasswordField, BooleanField, SubmitField, SelectField, DecimalField
from wtforms import validators, ValidationError
-from wtforms.fields.html5 import EmailField
+from wtforms.fields import EmailField
from ..models import User
diff --git a/flask/forest/models.py b/flask/forest/models.py
index 24af7d0..a93d3c7 100644
--- a/flask/forest/models.py
+++ b/flask/forest/models.py
@@ -1,5 +1,3 @@
-# FAT MODEL
-
from werkzeug.security import generate_password_hash, check_password_hash
from itsdangerous import TimedJSONWebSignatureSerializer as Serializer
@@ -75,9 +73,6 @@ class User(db.Model, UserMixin):
phone = db.Column(db.String)
group = db.Column(db.String, default='User')
- language = db.Column(db.String, default='BG')
- wallet = db.Column(db.Float)
- currency = db.Column(db.String, default='BGN')
inv_items = db.relationship('Item', backref='owner', lazy='dynamic')
@@ -206,6 +201,6 @@ class Item(db.Model):
__tablename__ = 'items'
id = db.Column(db.Integer, primary_key=True) #PK
user_id = db.Column(db.ForeignKey('users.id')) #FK
- date_created = db.Column(db.DateTime, default=datetime.utcnow)
-
+ key = db.Column(db.Integer, defaults=0)
description = db.Column(db.Unicode)
+ date_created = db.Column(db.DateTime, default=datetime.utcnow)
\ No newline at end of file
diff --git a/flask/forest/panel/forms.py b/flask/forest/panel/forms.py
deleted file mode 100644
index ee6f96f..0000000
--- a/flask/forest/panel/forms.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from flask_wtf import FlaskForm
-from wtforms import StringField, PasswordField, BooleanField, SubmitField, SelectField, DecimalField
-from flask_pagedown.fields import PageDownField
-from wtforms import validators, ValidationError
-from wtforms.fields.html5 import EmailField, DecimalRangeField
-
-from .. import db
-
-class OrderForm(FlaskForm):
- region_choices = [(1, 'Plovdiv, Bulgaria'), (2, 'International Space Station')]
- region = SelectField('Region:', choices=region_choices, coerce=int)
-
- recipe_choices = [(1, 'RootVPS')]
- recipe = SelectField('Type:', choices=recipe_choices, coerce=int)
-
- cpu = DecimalRangeField('Processor Cores', default=2)
- memory = DecimalRangeField('Memory', default=2048)
- storage = DecimalRangeField('Storage', default=20)
-
- alias = StringField('Name:', [validators.Regexp(message='ex.: myservice1.com, myservice2.local', regex='^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$'), validators.Length(6,64)])
-
- submit = SubmitField('DEPLOY')
-
-class MessageForm(FlaskForm):
- line = PageDownField('Enter your message...', validators=[validators.DataRequired()])
- submit = SubmitField('Submit')
-
diff --git a/flask/forest/templates/main/domaincheck.html b/flask/forest/templates/main/domaincheck.html
deleted file mode 100644
index 23b7dc4..0000000
--- a/flask/forest/templates/main/domaincheck.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
diff --git a/flask/forest/templates/main/livechat.html b/flask/forest/templates/main/livechat.html
deleted file mode 100644
index f13b480..0000000
--- a/flask/forest/templates/main/livechat.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "base.html" %}
-
-{% block styles %}
-{{ super() }}
-
-{% endblock %}
-
-
-{% block page_content %}
-
-
-{% endblock %}
-
-
-{% block footer %}
-{% endblock %}
diff --git a/flask/forest/templates/main/market.html b/flask/forest/templates/main/market.html
deleted file mode 100644
index c491188..0000000
--- a/flask/forest/templates/main/market.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-
-{% block page_content %}
-App Store
-
-
- {% for key, value in products.items() %}
-
- {% if key|int % 3 == 0 %}
-
-
- {% endif %}
- {% endfor %}
-
-
-{% endblock %}
diff --git a/flask/forest/templates/main/marketgroup.html b/flask/forest/templates/main/marketgroup.html
deleted file mode 100644
index 4a415a0..0000000
--- a/flask/forest/templates/main/marketgroup.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-
-{% block page_content %}
-{{ groupname }}
-
-
- {% for key, value in products.items() %}
-
- {% if key|int % 3 == 0 %}
-
-
- {% endif %}
- {% endfor %}
-
-
-{% endblock %}
diff --git a/flask/forest/templates/main/serverlist.html b/flask/forest/templates/main/serverlist.html
deleted file mode 100644
index 9db1717..0000000
--- a/flask/forest/templates/main/serverlist.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% for server in servers %}
-
-
-
-
-
-
- Alias: {{ server.name }}
- Processor: {{ server.cpu }}
- Memory: {{ server.mem }}
- Storage: {{ server.hdd }}
-
-
-
-
-
-{% endfor %}
-
diff --git a/flask/forest/templates/panel/dashboard.html b/flask/forest/templates/panel/dashboard.html
index 90cf0fe..48c567d 100644
--- a/flask/forest/templates/panel/dashboard.html
+++ b/flask/forest/templates/panel/dashboard.html
@@ -14,139 +14,21 @@ $('a[data-toggle="tooltip"]').tooltip({
});
-
-
-{{ pagedown.include_pagedown() }}
-
{% endblock %}
{% block page_content %}
-{% if current_user.fresh_user == True %}
-
-
-
-
-{% endif %}
-
-
-
- {% if inv_deployments != [] %}
+ {% if inv_items != [] %}
-
-
Datacenter Manager
-
-
- {% for deploy in inv_deployments %}
- {% include "panel/vdc_pool.html" %}
- {% endfor %}
-
-
-
-
- {% endif %}
-
- {% if inv_services != [] %}
-
-
-
Services
+
+
Items
- {% include "panel/services.html" %}
+ {% include "panel/items.html" %}
{% endif %}
-
- {% if inv_domains != [] %}
-
-
-
Domains
-
- {% include "panel/domains.html" %}
-
-
-
- {% endif %}
-
-
- {% if inv_addresses != [] %}
-
-
-
Communications
-
- Public
-
-
-
-
- IP |
- Region |
- Reverse DNS |
-
-
-
- {% for address in inv_addresses %}
-
- {{ address.ip }} |
- {{ regions[address.region_id] }} |
- {{ address.rdns }} |
-
- {% endfor %}
-
-
-
-
-
-
-
-
-
-
-
- {% endif %}
-
-
diff --git a/flask/forest/templates/panel/deploy.html b/flask/forest/templates/panel/deploy.html
deleted file mode 100644
index 7a9938e..0000000
--- a/flask/forest/templates/panel/deploy.html
+++ /dev/null
@@ -1,119 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Deploy a server{% endblock %}
-
-{% block scripts %}
-{{ super() }}
-
-
-{% endblock %}
-
-{% block page_content %}
-
Deploy new Server
-
-{% endblock %}
-
diff --git a/flask/forest/templates/panel/domains.html b/flask/forest/templates/panel/domains.html
deleted file mode 100644
index 7f6ee9c..0000000
--- a/flask/forest/templates/panel/domains.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% block domains %}
-
-
-
-
- Name |
- Expiry Date |
- Time Left |
-
-
- {% for domain in inv_domains %}
-
- {{ domain.fqdn }} |
- {{ domain.date_expire }} |
- {% if domain.enabled == False %}
- EXPIRED |
- {% else %}
- {% if domain.warning == True %}
- |
- {% else %}
- {{ domain.daysleft }} day(s) |
- {% endif %}
- {% endif %}
-
-
- {% endfor %}
-
-
-
-
-
- {% else %}
-
- {% endif %}
-{% endblock %}
diff --git a/flask/forest/templates/panel/email/adm_neworder.html b/flask/forest/templates/panel/email/adm_neworder.html
deleted file mode 100644
index 4c751ff..0000000
--- a/flask/forest/templates/panel/email/adm_neworder.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
{{ user.email }} have ordered a new deployment
-
-
-
Regards,
-Proxadmin
diff --git a/flask/forest/templates/panel/email/adm_neworder.txt b/flask/forest/templates/panel/email/adm_neworder.txt
deleted file mode 100644
index f608587..0000000
--- a/flask/forest/templates/panel/email/adm_neworder.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-User {{ user.email }} have ordered a new deployment.
-
-Regards,
-Proxadmin
diff --git a/flask/forest/templates/panel/items.html b/flask/forest/templates/panel/items.html
new file mode 100644
index 0000000..bd5f873
--- /dev/null
+++ b/flask/forest/templates/panel/items.html
@@ -0,0 +1,20 @@
+{% block services %}
+
+
+
+
+ Key |
+ Description |
+ Date Created |
+
+
+ {% for item in inv_items %}
+ {{ item.key }} |
+ {{ item.description }} |
+ {{ moment(item.date_created).format('lll') }} |
+
+ {% endfor %}
+
+
+
+{% endblock %}
diff --git a/flask/forest/templates/panel/services.html b/flask/forest/templates/panel/services.html
deleted file mode 100644
index a620e60..0000000
--- a/flask/forest/templates/panel/services.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% block services %}
-
-
-
-
- Category |
- Description |
- Last Charged |
- Time Left |
-
-
- {% for service in inv_services %}
- {% if service.enabled == False %}
-
- {% else %}
- {% if service.warning == True %}
-
- {% else %}
-
- {% endif %}
- {% endif %}
- {{ service.category }} |
- {{ service.description }} |
- {{ moment(service.date_last_charge).format('lll') }} ({{ moment(service.date_last_charge).fromNow() }}) |
- {% if service.enabled == False %}
- |
- {% else %}
- {% if service.warning == True %}
- |
- {% else %}
- {{ service.daysleft }} day(s) |
- {% endif %}
- {% endif %}
-
- {% endfor %}
-
-
-
-
-{% endblock %}
diff --git a/flask/forest/templates/panel/support_item.html b/flask/forest/templates/panel/support_item.html
deleted file mode 100644
index f6f9343..0000000
--- a/flask/forest/templates/panel/support_item.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% block support_item %}
-{% if support != None %}
-
-
-
- started at {{ moment(support.timestamp).format('ll') }}
-
-
-
-
- {% for line in support.inv_lines %}
-
{{ line.topic.owner.email }} {{ moment(line.timestamp).format('lll') }}
- {{ line.line }}
- {% endfor %}
- {% endif %}
-
-
-
-{% endblock %}
-
diff --git a/flask/forest/templates/panel/support_list.html b/flask/forest/templates/panel/support_list.html
deleted file mode 100644
index a4ee8b7..0000000
--- a/flask/forest/templates/panel/support_list.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "base.html" %}
-
-{% block styles %}
-{{ super() }}
-{% endblock %}
-
-{% block scripts %}
-{{ super() }}
-
-{% endblock %}
-
-{% block page_content %}
-
-
- {% if inv_topics != [] %}
- {% for support in inv_topics %}
-
-
-
{{ support.hashtag }}
-
-
- {% include "panel/support_item.html" %}
-
-
-
-
- {% endfor %}
-
- {% endif %}
-
-
-
-
-{% endblock %}
-
diff --git a/flask/forest/templates/panel/vdc_pool.html b/flask/forest/templates/panel/vdc_pool.html
deleted file mode 100644
index 4a40bb0..0000000
--- a/flask/forest/templates/panel/vdc_pool.html
+++ /dev/null
@@ -1,122 +0,0 @@
-{% block vdc_pool %}
- {% if deploy.enabled == False %}
-
- {% else %}
- {% if deploy.warning == True %}
-
- {% else %}
-
- {% endif %}
- {% endif %}
-
-
-
- {% if deploy.enabled == False or deploy.warning == True or status[deploy.machine_id] != 'running' %}
-
- {% else %}
-
- {% endif %}
-
-
-
-
-
-
-
- {% if deploy.enabled == False %}
-
- {% else %}
- {% if deploy.warning == True %}
-
- {% else %}
-
{{ deploy.daysleft }} day(s) |
- {% endif %}
- {% endif %}
-
-
- Last Payment Date: {{ moment(deploy.date_last_charge).format('lll') }}
- {% if deploy.period == 1 %}
- {{ deploy.period }} month payment cycle
- {% else %}
- {{ deploy.period }} months payment cycle
- {% endif %}
- State: {{ status[deploy.machine_id] }}
- Protected: {{ deploy.protected }}
-
-
-
-
-
- {% if deploy.enabled == True %}
-
- {% if status[deploy.machine_id] == 'running' %}
-
-
-
-
-
-
- {% else %}
-
- {% endif %}
- {% endif %}
-
-
-
-
-
-
-
-
- Processor {{ deploy.machine_cpu }} {% if deploy.machine_cpu > 1 %}cores{% else %}core{% endif %}
-
-
-
- Allocated memory {{ deploy.machine_mem }} MB
-
-
-
-
-
- Network traffic
-
-
-
- IOPS of {{ deploy.machine_hdd }} GB storage
-
-
-
-
-
-
-
-
-
- {% with support=deploy.topic %}
- {% include "panel/support_item.html" %}
- {% endwith %}
-
-
-
-
-
-
-
-
-
-
-
-
- {% if inv_deployments != [] %}
-
- {% else %}
-
- {% endif %}
-{% endblock %}