fix: don't show count of 1 on items

fix: tooltips on lazy loaded items

app/__init__.py

@@ -5,7 +5,6 @@ from flask_assets import Environment
 from webassets import Bundle
 import time
 from app.models import db, migrate, PlayKey
-from app.schemas import ma
 from app.forms import CustomUserManager
 from flask_user import user_registered, current_user, user_logged_in
 from flask_wtf.csrf import CSRFProtect
@@ -19,7 +18,8 @@ from app.commands import (
     load_property,
     gen_image_cache,
     gen_model_cache,
-    fix_clone_ids
+    fix_clone_ids,
+    remove_buffs
 )
 from app.models import Account, AccountInvitation, AuditLog
 
@@ -95,6 +95,7 @@ def create_app():
     app.cli.add_command(gen_image_cache)
     app.cli.add_command(gen_model_cache)
     app.cli.add_command(fix_clone_ids)
+    app.cli.add_command(remove_buffs)
 
     register_logging(app)
     register_settings(app)
@@ -126,8 +127,6 @@ def register_extensions(app):
     """
     db.init_app(app)
     migrate.init_app(app, db)
-    ma.init_app(app)
-
     scheduler.init_app(app)
     scheduler.start()
 
@@ -202,19 +201,23 @@ def register_settings(app):
     # Load environment specific settings
     app.config['TESTING'] = False
     app.config['DEBUG'] = False
+    app.config['SQLALCHEMY_ENGINE_OPTIONS'] = {
+        "pool_pre_ping": True,
+        "pool_size": 10,
+        "max_overflow": 2,
+        "pool_recycle": 300,
+        "pool_pre_ping": True,
+        "pool_use_lifo": True
+    }
 
-    # always pull these two from the env
     app.config['SECRET_KEY'] = os.getenv(
         'APP_SECRET_KEY',
         app.config['APP_SECRET_KEY']
-
     )
     app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv(
         'APP_DATABASE_URI',
         app.config['APP_DATABASE_URI']
     )
-
-    # try to get overides, otherwise just use what we have already
     app.config['USER_ENABLE_REGISTER'] = os.getenv(
         'USER_ENABLE_REGISTER',
         app.config['USER_ENABLE_REGISTER']
@@ -239,14 +242,6 @@ def register_settings(app):
         'USER_REQUIRE_INVITATION',
         app.config['USER_REQUIRE_INVITATION']
     )
-    app.config['SQLALCHEMY_ENGINE_OPTIONS'] = {
-        "pool_pre_ping": True,
-        "pool_size": 10,
-        "max_overflow": 2,
-        "pool_recycle": 300,
-        "pool_pre_ping": True,
-        "pool_use_lifo": True
-    }
     app.config['MAIL_SERVER'] = os.getenv(
         'MAIL_SERVER',
         app.config['MAIL_SERVER']
@@ -310,6 +305,42 @@ def register_settings(app):
         app.config['CACHE_LOCATION']
     )
 
+    # Recaptcha settings
+    if "RECAPTCHA_ENABLE" not in app.config:
+        app.config['RECAPTCHA_ENABLE'] = False
+    app.config['RECAPTCHA_ENABLE'] = os.getenv(
+        'RECAPTCHA_ENABLE',
+        app.config['RECAPTCHA_ENABLE']
+    )
+    if "RECAPTCHA_PUBLIC_KEY" not in app.config:
+        app.config['RECAPTCHA_PUBLIC_KEY'] = ''
+    app.config['RECAPTCHA_PUBLIC_KEY'] = os.getenv(
+        'RECAPTCHA_PUBLIC_KEY',
+        app.config['RECAPTCHA_PUBLIC_KEY']
+    )
+    if "RECAPTCHA_PRIVATE_KEY" not in app.config:
+        app.config['RECAPTCHA_PRIVATE_KEY'] = ''
+    app.config['RECAPTCHA_PRIVATE_KEY'] = os.getenv(
+        'RECAPTCHA_PRIVATE_KEY',
+        app.config['RECAPTCHA_PRIVATE_KEY']
+    )
+    # Optional
+    if "RECAPTCHA_API_SERVER" in app.config:
+        app.config['RECAPTCHA_API_SERVER'] = os.getenv(
+            'RECAPTCHA_API_SERVER',
+            app.config['RECAPTCHA_API_SERVER']
+        )
+    if "RECAPTCHA_PARAMETERS" in app.config:
+        app.config['RECAPTCHA_PARAMETERS'] = os.getenv(
+            'RECAPTCHA_PARAMETERS',
+            app.config['RECAPTCHA_PARAMETERS']
+        )
+    if "RECAPTCHA_DATA_ATTRS" in app.config:
+        app.config['RECAPTCHA_DATA_ATTRS'] = os.getenv(
+            'RECAPTCHA_DATA_ATTRS',
+            app.config['RECAPTCHA_DATA_ATTRS']
+        )
+
 
 
 def gm_level(gm_level):

app/accounts.py

@@ -19,16 +19,12 @@ from app.models import (
     db,
     Friends
 )
-from app.schemas import AccountSchema
 from app import gm_level, log_audit
 from app.forms import EditGMLevelForm, EditEmailForm
 from sqlalchemy import or_
 
 accounts_blueprint = Blueprint('accounts', __name__)
 
-account_schema = AccountSchema()
-
-
 @accounts_blueprint.route('/', methods=['GET'])
 @login_required
 @gm_level(3)

app/characters.py

@@ -3,20 +3,17 @@ from flask_user import login_required, current_user
 from datatables import ColumnDT, DataTables
 import time
 from app.models import CharacterInfo, CharacterXML, Account, db
-from app.schemas import CharacterInfoSchema
 from app.forms import RescueForm, CharXMLUploadForm
 from app import gm_level, log_audit
 from app.luclient import translate_from_locale
 import xmltodict
 import xml.etree.ElementTree as ET
 import json
+from xml.dom import minidom
 
 
 character_blueprint = Blueprint('characters', __name__)
 
-character_schema = CharacterInfoSchema()
-
-
 @character_blueprint.route('/', methods=['GET'])
 @login_required
 @gm_level(3)
@@ -103,6 +100,88 @@ def view(id):
         character_json=character_json
     )
 
+@character_blueprint.route('/chardata/<id>', methods=['GET'])
+@login_required
+def chardata(id):
+
+    character_data = CharacterInfo.query.filter(CharacterInfo.id == id).first()
+
+    if character_data == {}:
+        abort(404)
+        return
+
+    if current_user.gm_level < 3:
+        if character_data.account_id and character_data.account_id != current_user.id:
+            abort(403)
+            return
+    character_json = xmltodict.parse(
+        CharacterXML.query.filter(
+            CharacterXML.id == id
+        ).first().xml_data.replace("\"stt=", "\" stt="),
+        attr_prefix="attr_"
+    )
+
+    # print json for reference
+    # with open("errorchar.json", "a") as file:
+    #     file.write(
+    #         json.dumps(character_json, indent=4)
+    #     )
+
+    # stupid fix for jinja parsing
+    character_json["obj"]["inv"]["holdings"] = character_json["obj"]["inv"].pop("items")
+    # sort by items slot index
+    if type(character_json["obj"]["inv"]["holdings"]["in"]) == list:
+        for inv in character_json["obj"]["inv"]["holdings"]["in"]:
+                if "i" in inv.keys() and type(inv["i"]) == list:
+                    inv["i"] = sorted(inv["i"], key=lambda i: int(i['attr_s']))
+
+    return render_template(
+        'partials/_charxml.html.j2',
+        character_data=character_data,
+        character_json=character_json
+    )
+
+@character_blueprint.route('/inventory/<id>/<inventory_id>', methods=['GET'])
+@login_required
+def inventory(id, inventory_id):
+    
+    character_data = CharacterInfo.query.filter(CharacterInfo.id == id).first()
+
+    if character_data == {}:
+        abort(404)
+        return
+
+    if current_user.gm_level < 3:
+        if character_data.account_id and character_data.account_id != current_user.id:
+            abort(403)
+            return
+    character_json = xmltodict.parse(
+        CharacterXML.query.filter(
+            CharacterXML.id == id
+        ).first().xml_data.replace("\"stt=", "\" stt="),
+        attr_prefix="attr_"
+    )
+
+    # print json for reference
+    # with open("errorchar.json", "a") as file:
+    #     file.write(
+    #         json.dumps(character_json, indent=4)
+    #     )
+
+    # stupid fix for jinja parsing
+    character_json["obj"]["inv"]["holdings"] = character_json["obj"]["inv"].pop("items")
+    # sort by items slot index
+    if type(character_json["obj"]["inv"]["holdings"]["in"]) == list:
+        for inv in character_json["obj"]["inv"]["holdings"]["in"]:
+                if "i" in inv.keys() and type(inv["i"]) == list:
+                    inv["i"] = sorted(inv["i"], key=lambda i: int(i['attr_s']))
+    for inventory in character_json["obj"]["inv"]["holdings"]["in"]:
+        if inventory["attr_t"] == inventory_id:
+            return render_template(
+                'partials/charxml/_inventory.html.j2',
+                inventory=inventory
+            )
+    return "No Items in Inventory", 404
 
 @character_blueprint.route('/view_xml/<id>', methods=['GET'])
 @login_required
@@ -238,7 +317,7 @@ def upload(id):
         flash("You accept all consequences from these actions", "danger")
         log_audit(f"Updated {character_data.id}'s xml data")
         return redirect(url_for('characters.view', id=id))
-    form.char_xml.data = character_data.xml_data
+    form.char_xml.data = minidom.parseString(character_data.xml_data).toprettyxml(indent="   ")
     return render_template("character/upload.html.j2", form=form)
 
 

app/commands.py

@@ -5,7 +5,7 @@ import string
 import datetime
 from flask_user import current_app
 from app import db
-from app.models import Account, PlayKey, CharacterInfo, Property, PropertyContent, UGC, Mail
+from app.models import Account, PlayKey, CharacterInfo, Property, PropertyContent, UGC, Mail, CharacterXML
 import pathlib
 import zlib
 from wand import image
@@ -15,7 +15,7 @@ from multiprocessing import Pool
 from functools import partial
 from sqlalchemy import func
 import time
-
+import xml.etree.ElementTree as ET
 
 @click.command("init_db")
 @click.argument('drop_tables', nargs=1)
@@ -180,6 +180,20 @@ def load_property(zone, player):
             )
             new_prop_content.save()
 
+@click.command("remove_buffs")
+@with_appcontext
+def remove_buffs():
+    """Clears all buff from all characters"""
+    chars = CharacterXML.query.all()
+    for char in chars:
+        character_xml = ET.XML(char.xml_data.replace("\"stt=", "\" stt="))
+        dest = character_xml.find(".//dest")
+        if dest:
+            buff = character_xml.find(".//buff")
+            if buff:
+                dest.remove(buff)
+        char.xml_data = ET.tostring(character_xml)
+        char.save()
 
 @click.command("gen_image_cache")
 def gen_image_cache():

app/forms.py

@@ -1,17 +1,15 @@
-from flask_wtf import FlaskForm
+from flask_wtf import FlaskForm, Recaptcha, RecaptchaField
 from flask import current_app
 
 from flask_user.forms import (
     unique_email_validator,
-    password_validator,
-    unique_username_validator
+    LoginForm,
+    RegisterForm
 )
 from flask_user import UserManager
 from wtforms.widgets import TextArea, NumberInput
 from wtforms import (
     StringField,
-    HiddenField,
-    PasswordField,
     BooleanField,
     SubmitField,
     validators,
@@ -36,35 +34,19 @@ def validate_play_key(form, field):
         field.data = PlayKey.key_is_valid(key_string=field.data)
     return
 
+class CustomRecaptcha(Recaptcha):
+    def __call__(self, form, field):
+        if not current_app.config.get("RECAPTCHA_ENABLE", False):
+            return True
+        return super(CustomRecaptcha, self).__call__(form, field)
+
 
 class CustomUserManager(UserManager):
     def customize(self, app):
         self.RegisterFormClass = CustomRegisterForm
+        self.LoginFormClass = CustomLoginForm
 
-
-class CustomRegisterForm(FlaskForm):
-    """Registration form"""
-    next = HiddenField()
-    reg_next = HiddenField()
-
-    # Login Info
-    email = StringField(
-        'E-Mail',
-        validators=[
-            Optional(),
-            validators.Email('Invalid email address'),
-            unique_email_validator,
-        ]
-    )
-
-    username = StringField(
-        'Username',
-        validators=[
-            DataRequired(),
-            unique_username_validator,
-        ]
-    )
-
+class CustomRegisterForm(RegisterForm):
     play_key_id = StringField(
         'Play Key',
         validators=[
@@ -72,21 +54,14 @@ class CustomRegisterForm(FlaskForm):
             validate_play_key,
         ]
     )
+    recaptcha = RecaptchaField(
+        validators=[CustomRecaptcha()]
+    )
 
-    password = PasswordField('Password', validators=[
-        DataRequired(),
-        password_validator,
-        validators.length(max=40, message="The maximum length of the password is 40 characters due to game client limitations")
-    ])
-    retype_password = PasswordField('Retype Password', validators=[
-        validators.EqualTo('password', message='Passwords did not match'),
-        validators.length(max=40, message="The maximum length of the password is 40 characters due to game client limitations")
-    ])
-
-    invite_token = HiddenField('Token')
-
-    submit = SubmitField('Register')
-
+class CustomLoginForm(LoginForm):
+    recaptcha = RecaptchaField(
+        validators=[CustomRecaptcha()]
+    )
 
 class CreatePlayKeyForm(FlaskForm):
 

app/main.py

@@ -2,16 +2,12 @@ from flask import render_template, Blueprint, send_from_directory
 from flask_user import current_user, login_required
 
 from app.models import Account, CharacterInfo, ActivityLog
-from app.schemas import AccountSchema, CharacterInfoSchema
 
 import datetime
 import time
 
 main_blueprint = Blueprint('main', __name__)
 
-account_schema = AccountSchema()
-char_info_schema = CharacterInfoSchema()
-
 
 @main_blueprint.route('/', methods=['GET'])
 def index():

app/models.py

@@ -4,7 +4,7 @@ from flask_user import UserMixin
 from wtforms import ValidationError
 
 import logging
-from flask_sqlalchemy import BaseQuery
+from flask_sqlalchemy.query import Query
 from sqlalchemy.dialects import mysql
 from sqlalchemy.exc import OperationalError, StatementError
 from sqlalchemy.types import JSON
@@ -15,7 +15,7 @@ import string
 
 # retrying query to work around python trash collector
 # killing connections of other gunicorn workers
-class RetryingQuery(BaseQuery):
+class RetryingQuery(Query):
     __retry_count__ = 3
 
     def __init__(self, *args, **kwargs):

app/properties.py

@@ -13,7 +13,6 @@ from flask_user import login_required, current_user
 from datatables import ColumnDT, DataTables
 import time
 from app.models import Property, db, UGC, CharacterInfo, PropertyContent, Account, Mail
-from app.schemas import PropertySchema
 from app import gm_level, log_audit
 from app.luclient import query_cdclient
 from app.forms import RejectPropertyForm
@@ -24,9 +23,6 @@ import pathlib
 
 property_blueprint = Blueprint('properties', __name__)
 
-property_schema = PropertySchema()
-
-
 @property_blueprint.route('/', methods=['GET'])
 @login_required
 @gm_level(3)

app/reports.py

@@ -236,13 +236,25 @@ def gen_item_report():
                         if "i" in inv.keys() and type(inv["i"]) == list and (int(inv["attr_t"]) == 0 or int(inv["attr_t"]) == 1):
                             for item in inv["i"]:
                                 if item["attr_l"] in report_data:
-                                    report_data[item["attr_l"]]["item_count"] = report_data[item["attr_l"]]["item_count"] + int(item["attr_c"])
+                                    if ("attr_c" in item):
+                                        report_data[item["attr_l"]]["item_count"] = report_data[item["attr_l"]]["item_count"] + int(item["attr_c"])
+                                    else:
+                                        report_data[item["attr_l"]]["item_count"] = report_data[item["attr_l"]]["item_count"] + 1
                                 else:
-                                    report_data[item["attr_l"]] = {"item_count": int(item["attr_c"]), "chars": {}}
+                                    if ("attr_c" in item):
+                                        report_data[item["attr_l"]] = {"item_count": int(item["attr_c"]), "chars": {}}
+                                    else:
+                                        report_data[item["attr_l"]] = {"item_count": 1, "chars": {}}
                                 if name in report_data[item["attr_l"]]["chars"]:
-                                    report_data[item["attr_l"]]["chars"][name] = report_data[item["attr_l"]]["chars"][name] + int(item["attr_c"])
+                                    if ("attr_c" in item):
+                                        report_data[item["attr_l"]]["chars"][name] = report_data[item["attr_l"]]["chars"][name] + int(item["attr_c"])
+                                    else:
+                                        report_data[item["attr_l"]]["chars"][name] = report_data[item["attr_l"]]["chars"][name] + 1
                                 else:
-                                    report_data[item["attr_l"]]["chars"][name] = int(item["attr_c"])
+                                    if ("attr_c" in item):
+                                        report_data[item["attr_l"]]["chars"][name] = int(item["attr_c"])
+                                    else:
+                                        report_data[item["attr_l"]]["chars"][name] = 1
                 except Exception as e:
                     current_app.logger.error(f"REPORT::ITEMS - ERROR PARSING CHARACTER {char_xml.id}")
                     current_app.logger.error(f"REPORT::ITEMS - {e}")

app/schemas.py

@@ -1,130 +0,0 @@
-from flask_marshmallow import Marshmallow
-from app.models import (
-    PlayKey,
-    PetNames,
-    Mail,
-    UGC,
-    PropertyContent,
-    Property,
-    CharacterXML,
-    CharacterInfo,
-    Account,
-    AccountInvitation,
-    ActivityLog,
-    CommandLog
-)
-ma = Marshmallow()
-
-
-class PlayKeySchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = PlayKey
-        include_relationships = False
-        load_instance = True
-        include_fk = True
-
-
-class PetNamesSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = PetNames
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-
-class MailSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = Mail
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-
-class UGCSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = UGC
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-
-class PropertyContentSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = PropertyContent
-        include_relationships = True
-        load_instance = True
-        include_fk = True
-
-    ugc = ma.Nested(UGCSchema)
-
-
-class PropertySchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = Property
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-    properties_contents = ma.Nested(PropertyContentSchema, many=True)
-
-
-class CharacterXMLSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = CharacterXML
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-
-class CharacterInfoSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = CharacterInfo
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-    charxml = ma.Nested(CharacterXMLSchema)
-    properties_owner = ma.Nested(PropertySchema, many=True)
-    pets = ma.Nested(PetNamesSchema, many=True)
-    mail = ma.Nested(MailSchema, many=True)
-
-
-class AccountSchema(ma.SQLAlchemyAutoSchema):
-    class Meta:
-        model = Account
-        include_relationships = False
-        load_instance = True
-        include_fk = False
-
-    play_key = ma.Nested(PlayKeySchema)
-    charinfo = ma.Nested(CharacterInfoSchema, many=True)
-
-
-class AccountInvitationSchema(ma.SQLAlchemyAutoSchema): #  noqa
-    class Meta:
-        model = AccountInvitation
-        include_relationships = True
-        load_instance = True
-        include_fk = True
-
-    invite_by_user = ma.Nested(AccountSchema)
-
-
-class ActivityLogSchema(ma.SQLAlchemyAutoSchema): #  noqa
-    class Meta:
-        model = ActivityLog
-        include_relationships = True
-        load_instance = True
-        include_fk = True
-
-    character = ma.Nested(CharacterInfoSchema())
-
-
-class CommandLogSchema(ma.SQLAlchemyAutoSchema): #  noqa
-    class Meta:
-        model = CommandLog
-        include_relationships = True
-        load_instance = True
-        include_fk = True
-
-    character = ma.Nested(CharacterInfoSchema())

app/settings_example.py

@@ -61,3 +61,13 @@ USER_AFTER_LOGOUT_ENDPOINT = "main.index"
 
 # Option will be removed once this feature is full implemeted
 ENABLE_CHAR_XML_UPLOAD = False
+
+# Recaptcha settings
+# See: https://flask-wtf.readthedocs.io/en/1.2.x/form/#recaptcha
+RECAPTCHA_ENABLE = False
+RECAPTCHA_PUBLIC_KEY = ''
+RECAPTCHA_PRIVATE_KEY = ''
+# Optional
+# RECAPTCHA_API_SERVER = ''
+# RECAPTCHA_PARAMETERS = ''
+RECAPTCHA_DATA_ATTRS = {'theme': 'white', 'size': 'invisible'}

app/templates/admin/dashboard.html.j2

@@ -1,188 +0,0 @@
-{% extends "bootstrap/base.html" %}
-{% block title %}Key Creation{% endblock %}
-
-{% block navbar %}
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <a class="navbar-brand" href="{{ url_for('dashboard') }}">Dashboard</a>
-    </div>
-    <ul class="nav navbar-nav">
-    </ul>
-    <ul class="nav navbar-nav" style="float: right">
-      <li class="active"><a href="#">Welcome {{ current_user.username }}!</a></li>
-      <li><a href="{{ url_for('logout') }}">Logout</a></li>
-    </ul>
-  </div>
-</nav>
-{% endblock navbar %}}
-
-{% block content %}
-{# LOGO #}
-<div class="container" style="margin-top: 50px">
-
-    {# Display logo #}
-    <div style="margin-bottom: 50px">
-        <img
-                src="{{ url_for('static', filename=resources.LOGO) }}"
-                class="center-block img-responsive mx-auto d-block"
-                alt="Logo"
-                width="100"
-                height="100"
-        >
-    </div>
-
-</div>
-
-{# Key creation #}
-<div class="container">
-    <div class="text-center">
-        <h3>Key Creation</h3>
-    </div>
-
-    <div class="col-lg-3">
-    </div>
-    <div class="col-lg-6">
-
-    {# If the error value is set, display the error in red text #}
-    {% if error %}
-        <div class="alert alert-danger">
-            {{ error }}
-        </div>
-    {% endif %}
-
-    {# If the message value is set, display the message in green text #}
-    {% if message %}
-        <div class="alert alert-success">
-            {{ message }}
-        </div>
-    {% endif %}
-
-    {# Form which takes in Admin Username, Admin Password, and the amount of keys to create. #}
-    <form action="{{ url_for('dashboard') }}" method="post">
-        {# Key count input #}
-        <div class="form-group">
-            <label for="key_count">Generate keys</label>
-            <input type="number" class="form-control" name="key_count" placeholder="Enter number of keys...">
-            <small class="form-text text-muted">Number of keys to create.</small>
-        </div>
-        
-        {# Submit button #}
-        <div class="form-group">
-            <button type="submit" class="btn btn-primary">Generate Keys</button>
-        </div>
-    </form>
-
-    {# If the keys value is set, create a list for each key in keys #}
-    {% if keys %}
-        <div class="alert alert-success">
-            <ul>
-                {% for key in keys %}
-                    <li>{{ key }}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% endif %}
-    </div>
-    <div class="col-lg-3">
-    </div>
-    </div>
-</div>
-
-{# Activity graphs #}
-<div class="container">
-
-    <div class="text-center">
-        <h3>Activity</h3>
-    </div>
-
-    <div class="col-lg-3">
-    </div>
-
-    <div class="col-lg-6">
-
-    <canvas id="sessions_graph" width="400" height="400"></canvas>
-    <canvas id="play_time_graph" width="400" height="400"></canvas>
-    <canvas id="zone_play_time_graph" width="400" height="400"></canvas>
-
-    </div>
-
-    <div class="col-lg-3">
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-<script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-
-<script>
-// Make a get request to the server to load the activity data
-$.get("{{ url_for('load_activities') }}", function(data) {
-
-});
-
-// Make a get request to the server to get the activity data for "sessions"
-$.get("{{ url_for('activity_data', name='sessions') }}", function(data) {
-    // Load data as a json object
-    data = JSON.parse(data);
-    var ctx = document.getElementById('sessions_graph').getContext('2d');
-    var myChart = new Chart(ctx, {
-        type: 'line',
-        data: {
-            labels: data.labels,
-            datasets: data.datasets
-        },
-        options: {
-            scales: {
-                y: {
-                    beginAtZero: true
-                }
-            }
-        }
-    });
-});
-
-// Make a get request to the server to get the activity data for "play_time"
-$.get("{{ url_for('activity_data', name='play_time') }}", function(data) {
-    // Load data as a json object
-    data = JSON.parse(data);
-    var ctx = document.getElementById('play_time_graph').getContext('2d');
-    var myChart = new Chart(ctx, {
-        type: 'line',
-        data: {
-            labels: data.labels,
-            datasets: data.datasets
-        },
-        options: {
-            scales: {
-                y: {
-                    beginAtZero: true
-                }
-            }
-        }
-    });
-});
-
-// Make a get request to the server to get the activity data for "zone_play_time"
-$.get("{{ url_for('activity_data', name='zone_play_time') }}", function(data) {
-    // Load data as a json object
-    data = JSON.parse(data);
-    var ctx = document.getElementById('zone_play_time_graph').getContext('2d');
-    var myChart = new Chart(ctx, {
-        type: 'line',
-        data: {
-            labels: data.labels,
-            datasets: data.datasets
-        },
-        options: {
-            scales: {
-                y: {
-                    beginAtZero: true
-                }
-            }
-        }
-    });
-});
-</script>
-{% endblock scripts %}}

app/templates/base.html.j2

@@ -94,6 +94,24 @@
     $(function () {
       $('[data-toggle="tooltip"]').tooltip()
     })
+    function setInnerHTML(elm, html) {
+      elm.innerHTML = html;
+      $("body").tooltip({ selector: '[data-toggle=tooltip]' });
+      Array.from(elm.querySelectorAll("script"))
+        .forEach( oldScriptEl => {
+          const newScriptEl = document.createElement("script");
+          
+          Array.from(oldScriptEl.attributes).forEach( attr => {
+            newScriptEl.setAttribute(attr.name, attr.value) 
+          });
+          
+          const scriptText = document.createTextNode(oldScriptEl.innerHTML);
+          newScriptEl.appendChild(scriptText);
+          
+          oldScriptEl.parentNode.replaceChild(newScriptEl, oldScriptEl);
+          
+      });
+    }
   </script>
 {% endblock %}
 

app/templates/character/upload.html.j2

@@ -9,10 +9,22 @@
 {% endblock content_before %}
 
 {% block content %}
-  <h3 style="color: orange;">PROCEED WITH CAUTION</h3>
+  <style>
+      .blink {
+          animation: blinker .5s linear infinite;
+          color: red;
+          font-family: sans-serif;
+      }
+      @keyframes blinker {
+          50% {
+              opacity: 0;
+          }
+      }
+  </style>
+  <h3 class="text-center blink">PROCEED WITH CAUTION</h3>
   <form method=post>
     {{ form.csrf_token }}
-    <div class="card shadow-sm mx-auto pb-3 bg-dark border-primary" style="width: 20rem;">
+    <div class="card shadow-sm mx-auto pb-3 bg-dark border-primary" >
       <div class="card-body">
         {{ helper.render_field(form.char_xml) }}
         {{ helper.render_submit_field(form.submit) }}

app/templates/character/view.html.j2

@@ -15,8 +15,9 @@
         {% include 'partials/_character.html.j2' %}
       {% endwith %}
     </div>
-    <div class="col-sm">
-      {% include 'partials/_charxml.html.j2'%}
+    <div class="col-sm" id="charxml">
+      Loading Character Data 
+      {% include 'partials/_loading.html' %}
     </div>
   </div>
 {% endblock content %}
@@ -32,3 +33,14 @@
     {% endfor %}
   </div>
 {% endblock content_after %}
+
+{% block js %}
+  {{ super() }}
+  <script>
+    fetch({{ url_for("characters.chardata", id=character_data.id)|tojson }})
+        .then(response => response.text())
+        .then(text => {
+          setInnerHTML(document.getElementById("charxml"), text);
+        })
+  </script>
+{% endblock js %}

app/templates/flask_user/login.html

@@ -60,7 +60,12 @@
 
     {# Remember me #}
     {% if user_manager.USER_ENABLE_REMEMBER_ME %}
-    {{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
+        {{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
+    {% endif %}
+
+    {# recaptcha #}
+    {% if config.RECAPTCHA_ENABLE %}
+        {{ render_field(form.recaptcha, tabindex=250) }}
     {% endif %}
 
     {# Submit button #}

app/templates/flask_user/login_or_register.html

@@ -29,6 +29,11 @@
     {{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
     {% endif %}
 
+    {# recaptcha #}
+    {% if config.RECAPTCHA_ENABLE %}
+        {{ form.recaptcha }}
+    {% endif %}
+
     {# Submit button #}
     {{ render_submit_field(login_form.submit, tabindex=180) }}
 </form>
@@ -63,6 +68,11 @@
         {{ render_field(register_form.retype_password, tabindex=240) }}
     {% endif %}
 
+    {# recaptcha #}
+    {% if config.RECAPTCHA_ENABLE %}
+        {{ register_form.recaptcha }}
+    {% endif %}
+
     {{ render_submit_field(register_form.submit, tabindex=280) }}
 </form>
 

app/templates/flask_user/register.html

@@ -47,6 +47,11 @@
         {{ render_field(form.retype_password, tabindex=240) }}
     {% endif %}
 
+    {# recaptcha #}
+    {% if config.RECAPTCHA_ENABLE %}
+        {{ render_field(form.recaptcha, tabindex=250) }}
+    {% endif %}
+
     {{ render_submit_field(form.submit, tabindex=280) }}
 </form>
 

app/templates/main/about.html.j2

@@ -82,7 +82,6 @@
         </div>
       {% endif %}
 
-
       <div class="row">
         <div class="col text-right">
           Source

app/templates/partials/_charxml.html.j2

@@ -11,9 +11,11 @@
       <div class="col text-right">
         U-Score: {{ character_json.obj.char.attr_ls }}
       </div>
-      <div class="col">
-        Level: {{ character_json.obj.lvl.attr_l }}
-      </div>
+      {% if "lvl" in character_json.obj %}
+        <div class="col">
+          Level: {{ character_json.obj.lvl.attr_l }}
+        </div>
+      {% endif %}
     </div>
     <br/>
     <div class="row">
@@ -112,99 +114,33 @@
         <div class="tab-content mt-3" id="nav-invContent">
           <div class="tab-pane fade show active" id="nav-items" role="tabpanel" aria-labelledby="nav-items-tab">
             {# Inv ID 0 - Index: 0 #}
-            {% for item in character_json.obj.inv.holdings.in %}
-              {% if item.attr_t == "0" %}
-                {% if item.i is iterable and (item.i is not string and item.i is not mapping) %}
-                  {% for inv_item in item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endfor %}
-                {% else %}
-                  {% with inv_item=item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endwith %}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            Loading Inventory 
+            {% include 'partials/_loading.html' %}
           </div>
           <div class="tab-pane fade" id="nav-vault" role="tabpanel" aria-labelledby="nav-vault-tab">
             {# Inv ID 1 - Index: 1 #}
-            {% for item in character_json.obj.inv.holdings.in %}
-              {% if item.attr_t == "1" %}
-                {% if item.i is iterable and (item.i is not string and item.i is not mapping) %}
-                  {% for inv_item in item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endfor %}
-                {% else %}
-                  {% with inv_item=item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endwith %}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            Loading Inventory 
+            {% include 'partials/_loading.html' %}
           </div>
           <div class="tab-pane fade" id="nav-vault-models" role="tabpanel" aria-labelledby="nav-vault-models-tab">
             {# Inv ID 14 - Index: 10 #}
-            {% for item in character_json.obj.inv.holdings.in %}
-              {% if item.attr_t == "14" %}
-                {% if item.i is iterable and (item.i is not string and item.i is not mapping) %}
-                  {% for inv_item in item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endfor %}
-                {% else %}
-                  {% with inv_item=item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endwith %}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            Loading Inventory 
+            {% include 'partials/_loading.html' %}
           </div>
           <div class="tab-pane fade" id="nav-bricks" role="tabpanel" aria-labelledby="nav-bricks-tab">
             {# Inv ID 2 - Index: 2 #}
-            {% for item in character_json.obj.inv.holdings.in %}
-              {% if item.attr_t == "2" %}
-                {% if item.i is iterable and (item.i is not string and item.i is not mapping) %}
-                  {% for inv_item in item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endfor %}
-                {% else %}
-                  {% with inv_item=item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endwith %}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            Loading Inventory 
+            {% include 'partials/_loading.html' %}
           </div>
           <div class="tab-pane fade" id="nav-models" role="tabpanel" aria-labelledby="nav-models-tab">
             {# Inv ID 5 - Index: 6 #}
-            {% for item in character_json.obj.inv.holdings.in %}
-              {% if item.attr_t == "5" %}
-                {% if item.i is iterable and (item.i is not string and item.i is not mapping) %}
-                  {% for inv_item in item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endfor %}
-                {% else %}
-                  {% with inv_item=item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endwith %}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            Loading Inventory 
+            {% include 'partials/_loading.html' %}
           </div>
           <div class="tab-pane fade" id="nav-behaviors" role="tabpanel" aria-labelledby="nav-behaviors-tab">
             {# Inv ID 7 - Index: 8 #}
-            {% for item in character_json.obj.inv.holdings.in %}
-              {% if item.attr_t == "7" %}
-                {% if item.i is iterable and (item.i is not string and item.i is not mapping) %}
-                  {% for inv_item in item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endfor %}
-                {% else %}
-                  {% with inv_item=item.i %}
-                    {% include 'partials/charxml/_inv_grid.html.j2' %}
-                  {% endwith %}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            Loading Inventory 
+            {% include 'partials/_loading.html' %}
           </div>
         </div>
       </div>
@@ -263,3 +199,40 @@
     </div>
   </div>
 </div>
+<script>
+  fetch({{ url_for("characters.inventory", id=character_data.id, inventory_id=0)|tojson }})
+      .then(response => response.text())
+      .then(text => {
+        setInnerHTML(document.getElementById("nav-items"), text);
+      })
+
+  fetch({{ url_for("characters.inventory", id=character_data.id, inventory_id=1)|tojson }})
+      .then(response => response.text())
+      .then(text => {
+        setInnerHTML(document.getElementById("nav-vault"), text);
+      })
+
+  fetch({{ url_for("characters.inventory", id=character_data.id, inventory_id=14)|tojson }})
+      .then(response => response.text())
+      .then(text => {
+        setInnerHTML(document.getElementById("nav-vault-models"), text);
+      })
+
+  fetch({{ url_for("characters.inventory", id=character_data.id, inventory_id=2)|tojson }})
+      .then(response => response.text())
+      .then(text => {
+        setInnerHTML(document.getElementById("nav-bricks"), text);
+      })
+
+  fetch({{ url_for("characters.inventory", id=character_data.id, inventory_id=5)|tojson }})
+      .then(response => response.text())
+      .then(text => {
+        setInnerHTML(document.getElementById("nav-models"), text);
+      })
+
+  fetch({{ url_for("characters.inventory", id=character_data.id, inventory_id=7)|tojson }})
+      .then(response => response.text())
+      .then(text => {
+        setInnerHTML(document.getElementById("nav-behaviors"), text);
+      })
+</script>

app/templates/partials/_loading.html

@@ -0,0 +1,21 @@
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s;">
+    <span class="sr-only">Loading 0</span>
+</div>
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s; animation-delay: 1s;">
+    <span class="sr-only">Loading 1</span>
+</div>
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s; animation-delay: 2s;">
+    <span class="sr-only">Loading 2</span>
+</div>
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s; animation-delay: 3s;">
+    <span class="sr-only">Loading 3</span>
+</div>
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s; animation-delay: 4s;">
+    <span class="sr-only">Loading 4</span>
+</div>
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s; animation-delay: 5s;">
+    <span class="sr-only">Loading 5</span>
+</div>
+<div class="spinner-grow text-light" role="status" style="animation-duration: 6s; animation-delay: 6s;">
+    <span class="sr-only">Loading 6</span>
+</div>

app/templates/partials/_property.html.j2

@@ -77,6 +77,14 @@
           {{ property.performance_cost }}
       </div>
     </div>
+    <div class="row">
+      <div class="col text-right">
+        Clone ID:
+      </div>
+      <div class="col">
+          {{ property.clone_id }}
+      </div>
+    </div>
     {% if request.endpoint != "properties.view" %}
       <br/>
       <div class="row">

app/templates/partials/charxml/_inv_grid.html.j2

@@ -4,25 +4,29 @@
     alt="{{ inv_item.attr_l|get_lot_name }}"
     class="border p-1 border-primary rounded m-1"
     width="60"
-    {% if inv_item.attr_eq == "true" %}style="background-color:#d16f05;"{% endif %}
+    {% if 'attr_eq' in inv_item %}
+      {% if inv_item.attr_eq == "true" %}style="background-color:#d16f05;"{% endif %}
+    {% endif %}
     height="60"
     data-html="true"
     data-toggle="tooltip"
     data-placement="left"
     title="{% include 'partials/charxml/_item_tooltip.html.j2' %}"
   >
-  {% if inv_item.attr_c != "1" %}
+  {% if 'attr_c' in inv_item %}
     <span class="inventory-count text-bold">
       {%if inv_item.attr_c|int > 999 %}
         +999
-      {% else %}
+      {% elif inv_item.attr_c|int > 1 %}
         {{ inv_item.attr_c }}
       {% endif %}
     </span>
   {% endif %}
-  {% if inv_item.attr_b == "true" %}
-    <span class="inventory-lock">
-      <i class='fas fa-lock'></i>
-    </span>
+  {% if 'attr_b' in inv_item %}
+    {% if inv_item.attr_b == "true" %}
+      <span class="inventory-lock">
+        <i class='fas fa-lock'></i>
+      </span>
+    {% endif %}
   {% endif %}
 </div>

app/templates/partials/charxml/_inventory.html.j2

@@ -0,0 +1,9 @@
+{% if inventory.i is iterable and (inventory.i is not string and inventory.i is not mapping) %}
+    {% for inv_item in inventory.i %}
+        {% include 'partials/charxml/_inv_grid.html.j2' %}
+    {% endfor %}
+{% else %}
+    {% with inv_item=inventory.i %}
+        {% include 'partials/charxml/_inv_grid.html.j2' %}
+    {% endwith %}
+{% endif %}

app/templates/partials/charxml/_item_tooltip.html.j2

@@ -66,7 +66,8 @@
   {% endwith %}
 {% endif %}
 
-{%if inv_item.attr_c|int > 999 %}
-  <br />Count: {{ inv_item.attr_c|numberFormat }}
+{% if 'attr_c' in inv_item %}
+  {%if inv_item.attr_c|int > 999 %}
+    <br />Count: {{ inv_item.attr_c|numberFormat }}
+  {% endif %}
 {% endif %}
-

requirements.txt

@@ -2,37 +2,42 @@ alembic==1.7.5
 APScheduler==3.8.1
 astroid==2.9.1
 autopep8==1.6.0
+backports.zoneinfo==0.2.1
 bcrypt==3.2.0
-blinker==1.4
+blinker==1.7.0
 cffi==1.14.6
-click==8.0.1
+click==8.1.7
 colorama==0.4.4
 cryptography==36.0.0
 dnspython==2.1.0
 dominate==2.6.0
 email-validator==1.1.3
-Flask==2.0.1
+Flask==3.0.0
 Flask-APScheduler==1.12.3
-Flask-Assets==2.0
-Flask-Login==0.5.0
+Flask-Assets==2.1.0
+Flask-Login==0.6.3
 Flask-Mail==0.9.1
-flask-marshmallow==0.14.0
+flask-marshmallow==0.15.0
 Flask-Migrate==3.1.0
-Flask-SQLAlchemy==2.5.1
+Flask-SQLAlchemy==3.1.1
 Flask-User==1.0.2.2
-Flask-WTF==1.0.0
+Flask-WTF==1.2.1
 greenlet==1.1.0
+gunicorn==21.2.0
 idna==3.3
+importlib-metadata==6.8.0
+importlib-resources==6.1.1
 isort==5.10.1
-itsdangerous==2.0.1
-Jinja2==3.0.1
+itsdangerous==2.1.2
+Jinja2==3.1.2
 lazy-object-proxy==1.7.1
 libsass==0.21.0
 Mako==1.2.2
-MarkupSafe==2.0.1
+MarkupSafe==2.1.3
 marshmallow==3.14.1
 marshmallow-sqlalchemy==0.26.1
 mccabe==0.6.1
+packaging==23.2
 passlib==1.7.4
 platformdirs==2.4.1
 pycodestyle==2.8.0
@@ -47,15 +52,17 @@ pytz==2021.3
 pytz-deprecation-shim==0.1.0.post0
 six==1.16.0
 snowballstemmer==2.2.0
-SQLAlchemy==1.4.22
+SQLAlchemy==2.0.23
 sqlalchemy-datatables==2.0.1
 toml==0.10.2
+typing_extensions==4.8.0
 tzdata==2021.5
 tzlocal==4.1
 visitor==0.1.3
 Wand==0.6.7
 webassets==2.0
-Werkzeug==2.0.1
+Werkzeug==3.0.1
 wrapt==1.13.3
 WTForms==3.0.0
 xmltodict==0.12.0
+zipp==3.17.0