From 13a0500e861b1d9eb0711684fdf5cf3df8d68cd2 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Fri, 5 Aug 2022 23:38:32 +0100 Subject: [PATCH 1/4] Switch to v2 credits schema --- app/classes/web/panel_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index b5a07eb3..cd9590d0 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -368,7 +368,7 @@ class PanelHandler(BaseHandler): ) as credits_default_local: try: remote = requests.get( - "https://craftycontrol.com/credits", allow_redirects=True + "https://craftycontrol.com/credits-v2", allow_redirects=True ) credits_dict: dict = remote.json() if not credits_dict["staff"]: From 0af2def7b05f17c8738586dd9b87f4dad50fc1d2 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Fri, 5 Aug 2022 23:39:31 +0100 Subject: [PATCH 2/4] Update credits panel to handle v2 schema --- app/frontend/templates/panel/credits.html | 6 +++++- app/translations/en_EN.json | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/frontend/templates/panel/credits.html b/app/frontend/templates/panel/credits.html index 89b3678e..f10507fa 100644 --- a/app/frontend/templates/panel/credits.html +++ b/app/frontend/templates/panel/credits.html @@ -342,7 +342,11 @@
{% for language in data['translations'][person] %} - {{ language }} + {% if language['status'] %} + {{ language['name'] }} + {% else %} + {{ language['name'] }} + {% end %} {% end %}
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 041e4615..d8ca9a16 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -48,7 +48,7 @@ "subscriptionLevel": "Level", "supportTeam": "Support and Documentation Team", "thankYou": "THANK YOU", - "translationDesc": "to our community who translate!", + "translationDesc": "to our community who translate! [ Active = 🟢 Inactive/Retired = ⚪ ]", "translationName": "Name", "translationTitle": "Language Translation", "translator": "Translators" @@ -540,4 +540,4 @@ "userSettings": "User Settings", "uses": "Number of uses allowed (-1==No Limit)" } -} \ No newline at end of file +} From d3a6228d7e68da813bb9e7420223b72ee00b850e Mon Sep 17 00:00:00 2001 From: Zedifus Date: Fri, 5 Aug 2022 23:57:54 +0100 Subject: [PATCH 3/4] Update offline credits.json to schema v2 Also remove non-perm staff & update promoted staff --- app/config/credits.json | 352 +++++++++++++++++++++++++--------------- 1 file changed, 225 insertions(+), 127 deletions(-) diff --git a/app/config/credits.json b/app/config/credits.json index 9417c784..b62c3690 100644 --- a/app/config/credits.json +++ b/app/config/credits.json @@ -1,134 +1,232 @@ { "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", - "loc": "Southeast, USA", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/Ptarrant1" ], "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": "macgeek", - "title": "Lead Software Engineer", - "loc": "Midwest, USA", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/computergeek125" ], "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": "Support Manager", - "loc": "East Coast, USA", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/amcmanu3" ], "Support Manager" ], - "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": "Silversthorn", - "title": "Software Engineer", - "loc": "Provence, FR", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/Silversthorn" ], null ], - "blurb": "Developer at work and at home, testing his own code is a pain, so his coding precept is \"Testing is Doubting\"", - "pic": "/static/assets/images/credits/silversthorn.png" - }, - { - "name": "ThatOneLukas", - "title": "Software Engineer", - "loc": "Helsinki, FI", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/LukasDoesDev" ], null ], - "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": "DevOps Engineer", - "loc": "Scotland, UK", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/Zedifus" ], "DevOps" ], - "blurb": "A Streamer, who is currently working in the insurance industry, self-teaching software development & DevOps, with the hopes of a career change! Enjoys playing games and has a sassy cat called Eve.", - "pic": "/static/assets/images/credits/zedifus.jpg" - } - ], - "support": [ - { - "name": "iSilverfyre", - "title": "Community Manager", - "loc": "South Central, US", - "tags": [ "Staff", 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": "Document Curator", - "loc": null, - "tags": [ "Staff", [ "Developer", "https://gitlab.com/qub3d" ], "Wiki" ], - "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": "DarthLeo", - "title": "Support Engineer", - "loc": "East Coast, US", - "tags": [ "Staff", null, "Discord" ], - "blurb": "Just a simple gamer.", - "pic": "/static/assets/images/credits/darthLeo.png" - } - ], - "retired": [ - { - "name": "Kev Dagoat", - "title": "Head of Development", - "loc": "East Coast, AU", - "tags": [ "Staff", [ "Developer", "https://gitlab.com/kevdagoat" ], "HOD" ], - "blurb": "His interests include Linux, programming, and goats of course. He enjoys building APIs, K8s, and geeking over video cards.", - "pic": "/static/assets/images/credits/kevdagoat.jpeg" - }, - { - "name": "Manu", - "title": null, - "loc": "Eastern, CA", - "tags": [ "Staff", "Developer", "Project Manager" ], - "blurb": "His interests include learning, Linux, and programming. He enjoys speaking French, doing 6 things at once, and testing software.", - "pic": "/static/assets/images/credits/manu.png" - }, - { - "name": "UltraBlack", - "title": null, - "loc": "Bavaria, DE", - "tags": [ "Staff", null, "Idea Manager" ], - "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" - } - ] + "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", + "loc": "Southeast, USA", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/Ptarrant1" + ], + "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": "macgeek", + "title": "Lead Software Engineer", + "loc": "Midwest, USA", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/computergeek125" + ], + "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": "pretzeldewey 🥨", + "title": "Support Manager & Software Engineer", + "loc": "East Coast, USA", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/amcmanu3" + ], + "Crafty Advisor" + ], + "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": "Zedifus", + "title": "DevOps Manager", + "loc": "Scotland, UK", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/Zedifus" + ], + "Crafty Advisor" + ], + "blurb": "A Streamer, who is currently working in the insurance industry, self-teaching software development & DevOps, with the hopes of a career change! Enjoys playing games and has a sassy cat called Eve.", + "pic": "/static/assets/images/credits/zedifus.jpg" + }, + { + "name": "Silversthorn", + "title": "Software Engineer", + "loc": "Provence, FR", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/Silversthorn" + ], + null + ], + "blurb": "Developer at work and at home, testing his own code is a pain, so his coding precept is \"Testing is Doubting\"", + "pic": "/static/assets/images/credits/silversthorn.png" + }, + { + "name": "ThatOneLukas", + "title": "Software Engineer", + "loc": "Helsinki, FI", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/LukasDoesDev" + ], + null + ], + "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" + } + ], + "support": [ + { + "name": "iSilverfyre", + "title": "Community Manager", + "loc": "South Central, US", + "tags": [ + "Staff", + 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": "Document Curator", + "loc": null, + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/qub3d" + ], + "Wiki" + ], + "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": "Kornster", + "title": null, + "loc": "Victoria, Australia", + "tags": [ + "Discord Mod", + null, + null + ], + "blurb": "Day to day I am a Network Administrator, dealing with a range of vendors and products. Outside of work my hobbies are handyman things, such as carpentry and motor mechanics having grown up around them. My home-lab consists of Linux distros ranging from Debian, Ubuntu & Centos having self taught myself Linux for the last 12+ years.", + "pic": null + } + ], + "retired": [ + { + "name": "Kev Dagoat", + "title": "Head of Development", + "loc": "East Coast, AU", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/kevdagoat" + ], + "HOD" + ], + "blurb": "His interests include Linux, programming, and goats of course. He enjoys building APIs, K8s, and geeking over video cards.", + "pic": "/static/assets/images/credits/kevdagoat.jpeg" + }, + { + "name": "Manu", + "title": null, + "loc": "Eastern, CA", + "tags": [ + "Staff", + "Developer", + "Project Manager" + ], + "blurb": "His interests include learning, Linux, and programming. He enjoys speaking French, doing 6 things at once, and testing software.", + "pic": "/static/assets/images/credits/manu.png" + }, + { + "name": "UltraBlack", + "title": null, + "loc": "Bavaria, DE", + "tags": [ + "Staff", + null, + "Idea Manager" + ], + "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": { - "Data Unavailable": ["🌎🪣🔗👎😭"] + "Data Unavailable": [ + { + "name": "🌎🪣🔗👎😭", + "status": false + } + ] }, "patrons": [ { From 98d6dd661754065302a6cbf697d847e776435c8a Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 6 Aug 2022 00:05:01 +0100 Subject: [PATCH 4/4] Update changelog !421 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf41452..7a931dea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## --- [4.0.9] - 2022/TBD +## --- [4.0.9] - 2022/08/06 ### New features TBD ### Bug fixes TBD ### Tweaks -TBD +- credits-v2| Translator status ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/421)) ### Lang TBD