Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
06/11/2022 Pre-Release Bug Fixes

See merge request crafty-controller/crafty-4!316
This commit is contained in:
Iain Powrie 2022-06-11 22:02:24 +00:00
commit 336da21ac8
5 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/classes/controllers/servers_controller.py
View File

@ -273,7 +273,9 @@ class ServersController(metaclass=Singleton):
latest = srv.stats_helper.get_latest_server_stats()
server_data.append(
{
"server_data": server["server_data_obj"],
"server_data": ServersController.get_server_data_by_id(
server.get("server_id")
),
"stats": latest,
"user_command_permission": True,
}
@ -328,7 +330,9 @@ class ServersController(metaclass=Singleton):
user_command_permission = False
server_data.append(
{
"server_data": DatabaseShortcuts.get_data_obj(server.server_object),
"server_data": ServersController.get_server_data_by_id(
server.server_id
),
"stats": latest,
"user_command_permission": user_command_permission,
}

5
app/classes/web/panel_handler.py
View File

@ -17,6 +17,7 @@ from tornado import iostream
from tzlocal import get_localzone
from croniter import croniter
from app.classes.controllers.roles_controller import RolesController
from app.classes.controllers.servers_controller import ServersController
from app.classes.models.servers import Servers
from app.classes.models.server_permissions import EnumPermissionsServer
@ -258,7 +259,7 @@ class PanelHandler(BaseHandler):
for server in defined_servers[:]:
if str(server.server_id) == str(server_id):
page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object)
ServersController.get_server_data_by_id(server.server_id)
)
user_order.remove(server_id)
defined_servers.remove(server)
@ -267,7 +268,7 @@ class PanelHandler(BaseHandler):
server_ids.append(str(server.server_id))
if server not in page_servers:
page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object)
ServersController.get_server_data_by_id(server.server_id)
)
for server_id in user_order[:]:

BIN
app/frontend/static/assets/images/kofi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 KiB

BIN
app/frontend/static/assets/images/kofi_cross.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 213 KiB

76
app/frontend/templates/panel/contribute.html
View File

@ -13,7 +13,7 @@
<div class="row page-title-header">
<div class="col-12">
<div class="page-header">
<h4 class="page-title">Contribute</h4>
<h1 class="page-title">Contribute</h1>
</div>
</div>
@ -26,40 +26,65 @@
<div class="card">
<div class="card-body">
<h4 class="card-title">Recurring Support</h4>
<h1 class="card-title">Recurring Support</h1>
<div class="media-body">
<p class="card-text">
Patrons get access to several perks, such as behind the scenes videos, posts, and updates.<br>
Patrons also get early access to new software!
</p>
<ul class="card-text">
<li>Kofi Subscribers and Patrons get access to several perks, such as behind the scenes videos, posts,
and
updates.</li>
<li>Kofi Subscribers and Patrons also get early access to new software!</li>
</ul>
<br />
<div class="text-center">
<a href='https://ko-fi.com/C0C1AIIZS' target='_blank'><img style='border:0px;width:100%;'
src='../static/assets/images/kofi_cross.png' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
</div>
<br>
<div class="text-center">
<a href="https://www.patreon.com/bePatron?u=27882946"
data-patreon-widget-type="become-patron-button">Become a Patron!</a>
<script async src="https://c6.patreon.com/becomePatronButton.bundle.js"></script>
<br>
<iframe id='kofiframe'
src='https://ko-fi.com/arcadiatech/?hidefeed=true&widget=true&embed=true&preview=true'
style='border:none;width:69%;padding:4px;background:#1d1d2f;' height='712' title='arcadiatech'></iframe>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4 grid-margin">
<div class="card">
<div class="card-body">
<h4 class="card-title">Volunteer Time!</h4>
<h1 class="card-title">One Time Support</h1>
<div class="media-body">
<p class="card-text">
Any donation is much appreciated!
</p>
<br />
<div class="text-center">
<iframe id='kofiframe'
src='https://ko-fi.com/arcadiatech/?hidefeed=true&widget=true&embed=true&preview=true'
style='border:none;width:100%;padding:4px;background:#1d1d2f;' height='650'
title='arcadiatech'></iframe>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4 grid-margin">
<div class="card">
<div class="card-body">
<h1 class="card-title">Volunteer Time!</h1>
<div class="media-body">
<p class="card-text">
Join the discord and volunteer to help others solve issues, write documentation, translate Crafty into a
new language.
Come for the support, stay for the community. We have a very strong community full of people who are great
Come for the support, stay for the community. We have a very strong community full of people who are
great
to be around.
</p>
<br />
@ -72,29 +97,6 @@
</div>
</div>
<div class="col-md-4 grid-margin">
<div class="card">
<div class="card-body">
<h4 class="card-title">More Ways Coming Soon...</h4>
<div class="media-body">
<p class="card-text">
Thank you for your interest in contributing to Aracdia Technology's Crafty Controller.
We are always thinking of new ways for our community to contribute to this awesome project. <br><br> If
you don't see
a contribution method that peaks your interest now please check back soon.
</p>
<br />
<div class="text-center">
</div>
</div>
</div>
</div>
</div>
</div>
@ -115,4 +117,4 @@
});
</script>
{% end %}
{% end %}