Merge branch 'tweak/update-credits-json' into 'dev'

Update Credits

See merge request crafty-controller/crafty-commander!87

app/classes/web/panel_handler.py

@@ -87,9 +87,11 @@ class PanelHandler(BaseHandler):
         elif page == 'credits':
             with open(helper.credits_cache) as republic_credits_will_do:
                 credits = json.load(republic_credits_will_do)
-                page_data["patreons"] = credits["patreons"]
+                timestamp = credits["lastUpdate"] / 1000.0
+                page_data["patrons"] = credits["patrons"]
                 page_data["staff"] = credits["staff"]
                 page_data["translations"] = credits["translations"]
+                page_data["lastUpdate"] = str(datetime.datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S'))
             template = "panel/credits.html"
 
         elif page == 'contribute':

app/config/credits.json

@@ -1,150 +1,271 @@
 {
-  "patreons": [
-    {
-      "name": "Dean of Approval",
-      "level": "sustainer"
-    },
-    {
-      "name": "iSilverfyre",
-      "level": "sustainer"
-    },
-    {
-      "name": "Lightkeeper",
-      "level": "sustainer"
-    },
-    {
-      "name": "Lino",
-      "level": "sustainer"
-    },
-    {
-      "name": "Nicolas T",
-      "level": "sustainer"
-    },
-    {
-      "name": "Richard B",
-      "level": "sustainer"
-    },
-    {
-      "name": "ryuk228",
-      "level": "sustainer"
-    },
-    {
-      "name": "Zedifus",
-      "level": "sustainer"
-    },
-    {
-      "name": "John C",
-      "level": "advocate"
-    }
-  ],
-  "staff": {
-    "development": [
-      {
-        "name":  "Phil Tarrant",
-        "title": "Benevolent Dictator for Life",
-        "loc":   "Atlanta, GA",
-        "tags":  [ "Staff", "Developer", [ "BDFL", "https://en.wikipedia.org/wiki/Benevolent_dictator_for_life" ] ],
-        "blurb": "For best results, apply a thin layer of Phillip to code, cyber security, parenthood for maximum effectiveness. Phillip often spends too much time with his chickens.",
-        "pic":   "/static/assets/images/credits/ptarrant_cropped.png"
-      },
-      {
-        "name":  "Pita Bread",
-        "title": null,
-        "loc":   "Midwest, USA",
-        "tags":  [ "Staff", null, "Community Leader" ],
-        "blurb": "His interests include bread, Linux, and networking. He enjoys pumpkins, organizing, and long-winded emails, but hates wifi.",
-        "pic":   "/static/assets/images/credits/pita_cropped.png"
-      },
-      {
-        "name":  "macgeek",
-        "title": null,
-        "loc":   "Midwest, USA",
-        "tags":  [ "Staff", "Developer", "Project Manager" ],
-        "blurb": "Sysadmin for work and sysadmin for fun (avid homelabber). He enjoys a good tech tangent and gaming.",
-        "pic":   "/static/assets/images/credits/macgeek_cropped.png"
-      },
-      {
-        "name":  "parzivaldewey",
-        "title": null,
-        "loc":   "East Coast, USA",
-        "tags":  [ "Staff", "Developer", "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/andrew_cropped.png"
-      },
-      {
-        "name":  "MC Gaming",
-        "title": null,
-        "loc":   "Central, UK",
-        "tags":  [ "Staff", "Developer", null ],
-        "blurb": "His interests include learning, Linux, programming. He loves pentesting apps and gaming.",
-        "pic":   "/static/assets/images/credits/mcgaming.png"
-      },
-      {
-        "name":  "Silversthorn",
-        "title": null,
-        "loc":   null,
-        "tags":  [ "Staff", "Developer", null ],
-        "blurb": "Often in it's cave, he sometimes goes out to help or do silly jokes. He's an IT clown (not the film), but seriously do the job when it's needed.",
-        "pic":   "/static/assets/images/credits/silversthorn.png"
-      },
-      {
-        "name":  "ThatOneLukas",
-        "title": null,
-        "loc":   "Helsinki, FI",
-        "tags":  [ "Staff", "Developer", null ],
-        "blurb": "Lukas enjoys bashing his head at the table while his code does not work",
-        "pic":   "/static/assets/images/credits/lukas_cropped.png"
-      }
-    ],
-    "support": [
-      {
-        "name":  "iSilverfyre",
-        "title": null,
-        "loc":   null,
-        "tags":  [ "Staff", "Wiki", null ],
-        "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,
-        "loc":   null,
-        "tags":  [ "Staff", "Developer", null ],
-        "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", "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_cropped.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_cropped.png"
-      }
-    ]
-  },
-  "translations": {
-    "Lukas": [ "Finnish" ],
-    "Manu": [ "French" ],
-    "ptarrant": [ "Sarcasm", "Wit" ],
-    "UltraBlack": [ "German" ]
-  }
-}
+	"staff": {
+		"development": [
+			{
+				"name": "Phil Tarrant",
+				"title": "Benevolent Dictator for Life",
+				"loc": "Atlanta, GA",
+				"tags": [
+					"Staff",
+					"Developer",
+					[
+						"BDFL",
+						"https://en.wikipedia.org/wiki/Benevolent_dictator_for_life"
+					]
+				],
+				"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",
+					null,
+					"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",
+				"loc": "Midwest, USA",
+				"tags": [
+					"Staff",
+					"Developer",
+					"Project Manager"
+				],
+				"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,
+				"loc": "East Coast, USA",
+				"tags": [
+					"Staff",
+					"Developer",
+					"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": "Xithical",
+				"title": null,
+				"loc": "Midwest, USA",
+				"tags": [
+					"Staff",
+					"Developer",
+					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",
+					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,
+				"loc": null,
+				"tags": [
+					"Staff",
+					"Developer",
+					null
+				],
+				"blurb": "Often in his cave, he sometimes goes out to help or do silly jokes. He's an IT clown (not the film), but seriously do the job when it's needed.",
+				"pic": "/static/assets/images/credits/silversthorn.png"
+			},
+			{
+				"name": "ThatOneLukas",
+				"title": null,
+				"loc": "Helsinki, FI",
+				"tags": [
+					"Staff",
+					"Developer",
+					null
+				],
+				"blurb": "Lukas enjoys bashing his head at the table while his code does not work",
+				"pic": "/static/assets/images/credits/lukas.png"
+			},
+			{
+				"name": "Zedifus",
+				"title": null,
+				"loc": "Scotland, UK",
+				"tags": [
+					"Staff",
+					"Developer",
+					"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": null,
+				"loc": null,
+				"tags": [
+					"Staff",
+					"Wiki",
+					null
+				],
+				"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,
+				"loc": null,
+				"tags": [
+					"Staff",
+					"Developer",
+					null
+				],
+				"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",
+					"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"
+			}
+		]
+	},
+	"translations": {
+		"Lukas": [
+			"Finnish"
+		],
+		"Manu": [
+			"French"
+		],
+		"ptarrant": [
+			"Sarcasm",
+			"Wit"
+		],
+		"UltraBlack": [
+			"German"
+		]
+	},
+	"patrons": [
+		{
+			"name": "Richard B",
+			"level": "Crafty Sustainer"
+		},
+		{
+			"name": "JOHN C",
+			"level": "Crafty Advocate"
+		},
+		{
+			"name": "iSilverfyre",
+			"level": "Crafty Sustainer"
+		},
+		{
+			"name": "Dean R",
+			"level": "Crafty Sustainer"
+		},
+		{
+			"name": "scott m",
+			"level": "Crafty Sustainer"
+		},
+		{
+			"name": "zedifus",
+			"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": "Chris T",
+			"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": "Steven T",
+			"level": "Crafty Sustainer"
+		},
+		{
+			"name": "Row H",
+			"level": "Crafty Supporter"
+		}
+	],
+	"lastUpdate": 1637281075498
+}

app/frontend/templates/panel/credits.html

@@ -232,7 +232,7 @@
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Patreon Supporters</h4>
-          <p class="card-description"> A huge <code>thank you</code>&nbsp; to our Patreon supporters </p>
+          <p class="card-description"> A huge <code>thank you</code>&nbsp; to our Patreon supporters! | <span style="color: #9365B8">Last Update: {{ data["lastUpdate"] }}</span></p>
           <table class="table table-hover">
             <thead>
               <tr>
@@ -241,15 +241,15 @@
               </tr>
             </thead>
             <tbody>
-              {% for pat in data["patreons"] %}
+              {% for pat in data["patrons"] %}
               <tr>
                 <td>{{ pat["name"] }}</td>
                 <td>
-                  {% if pat["level"] == "sustainer" %}
+                  {% if pat["level"] == "Crafty Sustainer" %}
                   <span class="btn btn-sm btn-info mr-2">Sustainer</span>
-                  {% elif pat["level"] == "advocate" %}
+                  {% elif pat["level"] == "Crafty Advocate" %}
                   <span class="btn btn-sm btn-primary mr-2">Advocate</span>
-                  {% elif pat["level"] == "supporter" %}
+                  {% elif pat["level"] == "Crafty Supporter" %}
                   <span class="btn btn-sm btn-inverse-success mr-2">Supporter</span>
                   {% else %}
                   <span class="btn btn-sm btn-secondary mr-2">Other</span>
@@ -310,4 +310,4 @@ $( document ).ready(function() {
 });
 </script>
 
-{% end %}
+{% end %}