From 0c6bcaa097952ce7ac39d4a4caf8ef8289ddef6c Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 6 Feb 2022 05:34:45 +0000 Subject: [PATCH 1/8] Add if for is no img is provided for credit file This fixes broken image symbol if no img provided in json --- app/frontend/templates/panel/credits.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/frontend/templates/panel/credits.html b/app/frontend/templates/panel/credits.html index fb5a4ad2..e186dd32 100644 --- a/app/frontend/templates/panel/credits.html +++ b/app/frontend/templates/panel/credits.html @@ -39,8 +39,10 @@
+ {% if person['pic'] %} profile image + {% end %}
@@ -108,8 +110,10 @@
+ {% if person['pic'] %} profile image + {% end %}
@@ -178,8 +182,10 @@
+ {% if person['pic'] %} profile image + {% end %}
From 624f755fd4718b648d3a10d3dba6bdd8817d9390 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 6 Feb 2022 05:37:19 +0000 Subject: [PATCH 2/8] Better format of titles for Support & Retired --- app/frontend/templates/panel/credits.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/frontend/templates/panel/credits.html b/app/frontend/templates/panel/credits.html index e186dd32..3440e66d 100644 --- a/app/frontend/templates/panel/credits.html +++ b/app/frontend/templates/panel/credits.html @@ -153,7 +153,7 @@
{% if person['title'] %} -
Crafty's {{ person['title'] }}
+
{{ person['title'] }}
{% end %}

{{ person['blurb'] }}

@@ -225,7 +225,7 @@
{% if person['title'] %} -
Crafty's {{ person['title'] }}
+
{{ person['title'] }}
{% end %}

{{ person['blurb'] }}

From c56453dabf6dfcc43f9b76b7968a933027ddc119 Mon Sep 17 00:00:00 2001 From: luukas Date: Tue, 8 Feb 2022 02:07:40 +0200 Subject: [PATCH 3/8] EditorConfig file!! --- .editorconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..c6a6fff7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +# https://editorconfig.org + +root = true + +[*.{js,py,html}] +charset = utf-8 +insert_final_newline = true +# end_of_line = lf + +[*.py] +indent_style = space +indent_size = 4 + +[*.{js,html}] +indent_style = space +indent_size = 2 From 6cce6b93addf137195f2536da9445bef9345e6d5 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Wed, 9 Feb 2022 00:20:56 +0000 Subject: [PATCH 4/8] Update to latest credits --- app/config/credits.json | 306 +++++++++++++++++++++++++++++----------- 1 file changed, 221 insertions(+), 85 deletions(-) diff --git a/app/config/credits.json b/app/config/credits.json index 3f5540a4..2361d40f 100644 --- a/app/config/credits.json +++ b/app/config/credits.json @@ -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 +} \ No newline at end of file From c25bc723154dcbd4b8500c7334c189e7a22cf940 Mon Sep 17 00:00:00 2001 From: luukas Date: Thu, 10 Feb 2022 00:26:16 +0200 Subject: [PATCH 5/8] Added better navigation. * Double chevrons on the top right to expand/collapse the sidebar * Save sidebar preference on extra large (>= 1200px) viewports * Auto collapse sidebar on large (>= 992px) viewports * (Old behavior) Medium (>= 768px) and smaller viewports are mobile Check app/frontend/templates/main_menu.html line 45 onwards for more --- app/frontend/static/assets/js/shared/misc.js | 6 +- app/frontend/templates/base.html | 13 +++- app/frontend/templates/main_menu.html | 64 +++++++++++++++++++- 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/app/frontend/static/assets/js/shared/misc.js b/app/frontend/static/assets/js/shared/misc.js index 5d05697f..f39bf482 100755 --- a/app/frontend/static/assets/js/shared/misc.js +++ b/app/frontend/static/assets/js/shared/misc.js @@ -207,6 +207,10 @@ if ($('canvas').length) { body.toggleClass('sidebar-hidden'); } else { body.toggleClass('sidebar-icon-only'); + const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0); + if (vw >= 1200) { + localStorage.setItem('crafty-sidebar-expanded', !body.hasClass('sidebar-icon-only')); + } } }); @@ -231,4 +235,4 @@ if ($('canvas').length) { $(this).not(".brand-logo").attr('toggle-status', 'closed'); } }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index b70091b4..05c8e457 100644 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -47,8 +47,17 @@ logo
+ {% include notify.html %} @@ -423,4 +432,4 @@ - \ No newline at end of file + diff --git a/app/frontend/templates/main_menu.html b/app/frontend/templates/main_menu.html index dc27b9ec..20c9e10a 100644 --- a/app/frontend/templates/main_menu.html +++ b/app/frontend/templates/main_menu.html @@ -1,6 +1,68 @@
+ + - \ No newline at end of file + From 1596c720cbbbe45b76e1df8b179d2a01715a90f1 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Thu, 10 Feb 2022 06:13:52 +0000 Subject: [PATCH 6/8] Add ability to load credits from remote --- app/classes/web/panel_handler.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 8a6abe67..f97f7611 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -264,13 +264,25 @@ class PanelHandler(BaseHandler): template = "public/error.html" elif page == 'credits': - with open(helper.credits_cache, encoding='utf-8') as republic_credits_will_do: - credits_dict: dict = json.load(republic_credits_will_do) + with open(helper.credits_cache, encoding='utf-8') as credits_default_local: + try: + remote = requests.get('https://craftycontrol.com/credits', allow_redirects=True) + credits_dict: dict = remote.json() + if not credits_dict["staff"]: + logger.error("Issue with upstream Staff, using local.") + credits_dict: dict = json.load(credits_default_local) + except: + logger.error("Request to credits bucket failed, using local.") + credits_dict: dict = json.load(credits_default_local) + timestamp = credits_dict["lastUpdate"] / 1000.0 page_data["patrons"] = credits_dict["patrons"] page_data["staff"] = credits_dict["staff"] page_data["translations"] = credits_dict["translations"] - page_data["lastUpdate"] = str(datetime.datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')) + if timestamp == 0: + page_data["lastUpdate"] = '😿' + else: + page_data["lastUpdate"] = str(datetime.datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')) template = "panel/credits.html" elif page == 'contribute': From 9a8be824de7e0b168d981646f8edff152e56c2f0 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Thu, 10 Feb 2022 06:15:09 +0000 Subject: [PATCH 7/8] Establish default credits file If remote is unavailable --- app/config/credits.json | 561 +++++++++------------------------------- 1 file changed, 123 insertions(+), 438 deletions(-) diff --git a/app/config/credits.json b/app/config/credits.json index 2361d40f..1b2888aa 100644 --- a/app/config/credits.json +++ b/app/config/credits.json @@ -1,447 +1,132 @@ { "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": "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": [ - { - "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": "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" + } + ], + "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": { - "Belgian Dutch": [ - "TurtleKing" - ], - "Chinese (Simplified)": [ - "ThrRip" - ], - "Croatian": [ - "flappytomato" - ], - "Finnish": [ - "Lukas" - ], - "French": [ - "Manu", - "Silversthorn" - ], - "German": [ - "UltraBlack", - "ThunfischEis", - "Freddy0" - ], - "Indonesia": [ - "godgaming91" - ], - "Italian": [ - "Gallu" - ], - "Spanish": [ - "Lucy" - ], - "*Sarcasm": [ - "ptarrant" - ], - "*Wit": [ - "ptarrant" - ], - "*LOLCAT (Kingdum ov Katz)": [ - "Zedifus" - ] + "Data Unavailable": ["🌎🪣🔗👎😭"] }, "patrons": [ { - "name": "Richard B", - "level": "Crafty Sustainer" - }, - { - "name": "JOHN C", - "level": "Crafty Advocate" - }, - { - "name": "Dean R", - "level": "Crafty Sustainer" - }, - { - "name": "scott m", - "level": "Crafty Sustainer" - }, - { - "name": "Lino", - "level": "Crafty Sustainer" - }, - { - "name": "PeterPorker3", - "level": "Crafty Supporter" - }, - { - "name": "Ewari", - "level": "Crafty Supporter" - }, - { - "name": "Thyodas", - "level": "Crafty Sustainer" - }, - { - "name": "AngryPanda", - "level": "Crafty Sustainer" - }, - { - "name": "Adam B", - "level": "Crafty Sustainer" - }, - { - "name": "Eric G", - "level": "Crafty Sustainer" - }, - { - "name": "Chris B", - "level": "Crafty Sustainer" - }, - { - "name": "Emmet d", - "level": "Crafty Sustainer" - }, - { - "name": "Row H", - "level": "Crafty Supporter" - }, - { - "name": "vorboid", - "level": "Crafty Supporter" - }, - { - "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" + "name": "Data Unavailable 🌎🪣🔗👎😭", + "level": "" } ], - "lastUpdate": 1644365894482 -} \ No newline at end of file + "lastUpdate": 0 +} From 78224a9a55cfae4760b7f6fecae64b704c6f8f51 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Thu, 10 Feb 2022 06:49:35 +0000 Subject: [PATCH 8/8] Update wiki link to wiki It's back from holiday --- app/frontend/templates/main_menu.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/frontend/templates/main_menu.html b/app/frontend/templates/main_menu.html index dc27b9ec..26dcc18a 100644 --- a/app/frontend/templates/main_menu.html +++ b/app/frontend/templates/main_menu.html @@ -37,7 +37,7 @@
  • - +   {{ translate('sidebar', 'documentation', data['lang']) }} @@ -68,4 +68,4 @@ - \ No newline at end of file +