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 'bugfix/credits-parsing-fix' into 'dev'

Browse Source 
Credits page formatting tweaks

See merge request crafty-controller/crafty-commander!160
This commit is contained in:
xithical 2022-02-09 04:30:10 +00:00
commit 3dbbc69753
2 changed files with 229 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

306
app/config/credits.json
View File

@ -1,6 +1,36 @@
{
"staff": {
"development": [
{
"name": "Pita Bread",
"title": "CEO",
"loc": "Midwest, USA",
"tags": [
"Staff",
[
"Developer",
"https://gitlab.com/craftbreadth"
],
"Crafty Leadership"
],
"blurb": "Baked goods enthusiast who dabbles in Linux and sets up networks for fun. Can be found writing long-winded emails, debugging strange wifi issues, or taking care of his extensive houseplant collection.",
"pic": "/static/assets/images/credits/pita.png"
},
{
"name": "Xithical",
"title": "CFO/COO",
"loc": "Midwest, USA",
"tags": [
"Staff",
[
"Developer",
"https://gitlab.com/xithical"
],
"Crafty Leadership"
],
"blurb": "Having sold his soul to the IT administration gods many eons ago, you can usually find him working, going home to do work, or continuing to work in the support Discord.",
"pic": "/static/assets/images/credits/xithical.png"
},
{
"name": "Phil Tarrant",
"title": "Creator",
@ -11,29 +41,14 @@
"Developer",
"https://gitlab.com/Ptarrant1"
],
"Creator"
"Crafty Advisor"
],
"blurb": "For best results, apply a thin layer of Phillip to code, cyber security, and parenthood for maximum effectiveness. Phillip often spends too much time with his chickens.",
"pic": "/static/assets/images/credits/ptarrant.png"
},
{
"name": "Pita Bread",
"title": "Leadership Team",
"loc": "Midwest, USA",
"tags": [
"Staff",
[
"Developer",
"https://gitlab.com/craftbreadth"
],
"Community Leader"
],
"blurb": "Baked goods enthusiast who dabbles in Linux and sets up networks for fun. Can be found writing long-winded emails, debugging strange wifi issues, or taking care of his extensive houseplant collection.",
"pic": "/static/assets/images/credits/pita.png"
},
{
"name": "macgeek",
"title": "Leadership Team",
"title": "Lead Software Engineer",
"loc": "Midwest, USA",
"tags": [
"Staff",
@ -41,14 +56,14 @@
"Developer",
"https://gitlab.com/computergeek125"
],
"Project Manager"
"Crafty Advisor"
],
"blurb": "Sysadmin for work and sysadmin for fun (avid homelabber). He enjoys a good tech tangent and gaming.",
"pic": "/static/assets/images/credits/macgeek.png"
},
{
"name": "parzivaldewey",
"title": null,
"title": "Support Manager",
"loc": "East Coast, USA",
"tags": [
"Staff",
@ -61,39 +76,9 @@
"blurb": "His interests include Linux, gaming, and helping others. When he's able to unplug he enjoys biking, hiking, and playing soccer.",
"pic": "/static/assets/images/credits/parzivaldewey.png"
},
{
"name": "Xithical",
"title": null,
"loc": "Midwest, USA",
"tags": [
"Staff",
[
"Developer",
"https://gitlab.com/xithical"
],
null
],
"blurb": "Having sold his soul to the IT administration gods many eons ago, you can usually find him working, going home to do work, or continuing to work in the support Discord.",
"pic": "/static/assets/images/credits/xithical.png"
},
{
"name": "MC Gaming",
"title": null,
"loc": "Central, UK",
"tags": [
"Staff",
[
"Developer",
"https://gitlab.com/MCgamin1738"
],
null
],
"blurb": "His interests include learning, Linux, and programming. He loves pentesting apps and gaming.",
"pic": "/static/assets/images/credits/mcgaming.png"
},
{
"name": "Silversthorn",
"title": null,
"title": "Software Engineer",
"loc": "Provence, FR",
"tags": [
"Staff",
@ -108,7 +93,7 @@
},
{
"name": "ThatOneLukas",
"title": null,
"title": "Software Engineer",
"loc": "Helsinki, FI",
"tags": [
"Staff",
@ -118,12 +103,12 @@
],
null
],
"blurb": "Lukas enjoys bashing his head at the table while his code does not work",
"blurb": "Arch Linux enthusiast who likes 80s/90s music, Rust (The programming language) and light distros like Arch Linux btw. Dislikes C, C++, Go and Microsoft. Also doesn't like Finnish weather that freezes molten snow to (deadly) ice.",
"pic": "/static/assets/images/credits/lukas.png"
},
{
"name": "Zedifus",
"title": null,
"title": "DevOps Engineer",
"loc": "Scotland, UK",
"tags": [
"Staff",
@ -140,19 +125,19 @@
"support": [
{
"name": "iSilverfyre",
"title": null,
"loc": null,
"title": "Community Manager",
"loc": "South Central, US",
"tags": [
"Staff",
"Wiki",
null
null,
"Wiki"
],
"blurb": "Silver enjoys helping others with their computer needs, writing documentation, and loving her cat.",
"pic": "/static/assets/images/credits/isilverfyre.png"
},
{
"name": "Quentin",
"title": null,
"title": "Document Curator",
"loc": null,
"tags": [
"Staff",
@ -164,6 +149,102 @@
],
"blurb": "Hosts Minecraft servers for his weird friends, works for an IoT company as his dayjob. The 's' in IoT stands for 'secure'.",
"pic": "/static/assets/images/credits/qub3d.png"
},
{
"name": "bobsfriend21",
"title": null,
"loc": "Probably Earth",
"tags": [
"Helper",
null,
"WebDev"
],
"blurb": "We've heard rumours he's Bob's friend but does Bob even exist? Who knows... What we do know is he has a linux distro as a brother and that he likes flashy light towers. (Light houses)",
"pic": null
},
{
"name": "Freddy0",
"title": null,
"loc": "Germany",
"tags": [
"Helper",
null,
"UnRaid"
],
"blurb": "Improvise! adapt! overcome! Local Unraid Ninja here to assist.🥷",
"pic": null
},
{
"name": "_iEpic",
"title": null,
"loc": "Virginia, US",
"tags": [
"Helper",
null,
"Dev"
],
"blurb": "I'm a simple person who likes to learn and program!",
"pic": null
},
{
"name": "Turtleking",
"title": null,
"loc": "Palestine",
"tags": [
"Helper",
null,
"Dev"
],
"blurb": "I am king of the turtles!🐢",
"pic": null
},
{
"name": "Lino³",
"title": null,
"loc": "Texas, US",
"tags": [
"Helper",
null,
"Discord"
],
"blurb": "One of Crafty's Government Drones, might actually just be a pigeon or something… can never be too sure.",
"pic": null
},
{
"name": "DarthLeo",
"title": null,
"loc": "East Coast, US",
"tags": [
"Helper",
null,
"Discord"
],
"blurb": "Just a simple gamer.",
"pic": null
},
{
"name": "MikeMart77",
"title": null,
"loc": null,
"tags": [
"Helper",
null,
"Discord"
],
"blurb": "",
"pic": null
},
{
"name": "Tempus Thanos",
"title": null,
"loc": null,
"tags": [
"Helper",
null,
"Discord"
],
"blurb": "",
"pic": null
}
],
"retired": [
@ -205,28 +286,63 @@
],
"blurb": "Hi, my name is Tim, and I'm a huge fan of linux. I'm often gaming and occasionally coding.",
"pic": "/static/assets/images/credits/ultrablack.png"
},
{
"name": "MC Gaming",
"title": null,
"loc": "Central, UK",
"tags": [
"Staff",
[
"Developer",
"https://gitlab.com/MCgamin1738"
],
null
],
"blurb": "His interests include learning, Linux, and programming. He loves pentesting apps and gaming.",
"pic": "/static/assets/images/credits/mcgaming.png"
}
]
},
"translations": {
"ptarrant": [
"Sarcasm",
"Wit"
"Belgian Dutch": [
"TurtleKing"
],
"Lukas": [
"Finnish"
"Chinese (Simplified)": [
"ThrRip"
],
"Manu": [
"French"
"Croatian": [
"flappytomato"
],
"Silversthorn": [
"French"
"Finnish": [
"Lukas"
],
"UltraBlack": [
"German"
"French": [
"Manu",
"Silversthorn"
],
"Zedifus": [
"LOLCAT (Kingdum ov Katz)"
"German": [
"UltraBlack",
"ThunfischEis",
"Freddy0"
],
"Indonesia": [
"godgaming91"
],
"Italian": [
"Gallu"
],
"Spanish": [
"Lucy"
],
"*Sarcasm": [
"ptarrant"
],
"*Wit": [
"ptarrant"
],
"*LOLCAT (Kingdum ov Katz)": [
"Zedifus"
]
},
"patrons": [
@ -238,10 +354,6 @@
"name": "JOHN C",
"level": "Crafty Advocate"
},
{
"name": "iSilverfyre",
"level": "Crafty Sustainer"
},
{
"name": "Dean R",
"level": "Crafty Sustainer"
@ -270,10 +382,6 @@
"name": "AngryPanda",
"level": "Crafty Sustainer"
},
{
"name": "Chris T",
"level": "Crafty Sustainer"
},
{
"name": "Adam B",
"level": "Crafty Sustainer"
@ -290,10 +398,6 @@
"name": "Emmet d",
"level": "Crafty Sustainer"
},
{
"name": "Steven T",
"level": "Crafty Sustainer"
},
{
"name": "Row H",
"level": "Crafty Supporter"
@ -305,7 +409,39 @@
{
"name": "Justman",
"level": "Crafty Sustainer"
},
{
"name": "RoscoP",
"level": "Crafty Supporter"
},
{
"name": "Alexandre D",
"level": "Crafty Supporter"
},
{
"name": "TurtleKIng",
"level": "Crafty Sustainer"
},
{
"name": "Benjamin L",
"level": "Crafty Supporter"
},
{
"name": "CaptSpicyWeiner",
"level": "Crafty Supporter"
},
{
"name": "Mednis",
"level": "Crafty Sustainer"
},
{
"name": "Sad P",
"level": "Crafty Supporter"
},
{
"name": "Dog",
"level": "Crafty Supporter"
}
],
"lastUpdate": 1637635758855
}
"lastUpdate": 1644365894482
}

10
app/frontend/templates/panel/credits.html
View File

@ -39,8 +39,10 @@
<div class="col-md-4">
<div class="user-avatar mb-auto">
{% if person['pic'] %}
<img src="{{ person['pic'] }}"
alt="profile image" class="profile-img img-lg rounded-circle">
{% end %}
</div>
<div class="wrapper">
@ -108,8 +110,10 @@
<div class="col-md-4">
<div class="user-avatar mb-auto">
{% if person['pic'] %}
<img src="{{ person['pic'] }}"
alt="profile image" class="profile-img img-lg rounded-circle">
{% end %}
</div>
<div class="wrapper">
@ -149,7 +153,7 @@
<div class="wrapper align-items-start pt-3">
{% if person['title'] %}
<h5><strong>Crafty's {{ person['title'] }}</strong></h5>
<h5><strong>{{ person['title'] }}</strong></h5>
{% end %}
<p>{{ person['blurb'] }}</p>
</div>
@ -178,8 +182,10 @@
<div class="col-md-4">
<div class="user-avatar mb-auto">
{% if person['pic'] %}
<img src="{{ person['pic'] }}"
alt="profile image" class="profile-img img-lg rounded-circle">
{% end %}
</div>
<div class="wrapper">
@ -219,7 +225,7 @@
<div class="wrapper align-items-start pt-3">
{% if person['title'] %}
<h5><strong>Crafty's {{ person['title'] }}</strong></h5>
<h5><strong>{{ person['title'] }}</strong></h5>
{% end %}
<p>{{ person['blurb'] }}</p>
</div>