Skip to content

Commit ba3c8a8

Browse files
authored
Merge pull request #2 from nebula161/master
Update for 2025 election
2 parents f5b4dc8 + b557c4a commit ba3c8a8

File tree

2 files changed

+51
-7
lines changed

2 files changed

+51
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
election: true
3+
layout: "@layouts/news/election.astro"
4+
headline: January Senate (2025)
5+
term: 31
6+
date: 2025-01-05 13:58:00 -05:00
7+
parties:
8+
- bgcolour: "#70b6ff"
9+
txtcolour: "#000000"
10+
members:
11+
- Complexii
12+
- DuckWithAMonocle
13+
- Jaimiemie
14+
- Zolo17
15+
- Dr_Bacon_Hair
16+
exmembers: []
17+
name: Blue New Deal (BND)
18+
- bgcolour: "#3AB3DA"
19+
txtcolour: "#FFFFFF"
20+
members:
21+
- Raeders
22+
exmembers: []
23+
name: Conservatives (CON)
24+
- bgcolour: "#A3A3A3"
25+
txtcolour: "#3D3D3D"
26+
members:
27+
- Minemaster933
28+
exmembers: []
29+
name: Revitalize Icenia Initiative (RII)
30+
icon: /assets/images/election_stock.png
31+
---
32+
33+
The Senate Election was verified with the following results:
34+
35+
* Duck: 27
36+
* Minemaster: 25
37+
* Raeders: 24
38+
* Bacon: 22
39+
* Zolo: 19
40+
* Jaime: 19

src/pages/government/officials.astro

+11-7
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@ import PageLayout from "@layouts/page.astro";
44
55
// Use https://toolscord.com/ to get the pfps
66
const officials = [
7-
Structs.official(["President"], "ChrisChrispie", "https://cdn.discordapp.com/avatars/161282206113857537/17cccf139335fe0ae821b666d1de47f7?size=1024"),
7+
Structs.official(["President"], "ChrisChrispie", "https://cdn.discordapp.com/avatars/161282206113857537/81183329522db094c00feed5b0b72d04.png?size=1024"),
88
Structs.official(["Secretary of Defense"], "Drekamor", "https://cdn.discordapp.com/avatars/1031922996916527124/447fec9f4d18b1f7a0f54449a9fd963c?size=1024"),
9-
Structs.official(["Secretary of Interior"], "Slowlyfunny2", "https://cdn.discordapp.com/avatars/282654846904041483/52275e9653ba625775889b9bb4b72e05?size=1024"),
10-
Structs.official(["Secretary of Treasury"], "Anvil", "https://cdn.discordapp.com/avatars/164188981293088769/2c254c3c8280692107fdbc64612118f6?size=1024"),
9+
Structs.official(["Secretary of Interior"], "1Kayotic", "https://cdn.discordapp.com/avatars/130143362048065537/d5901c3b55dca5bce4a0b7756e4df872?size=1024"),
10+
Structs.official(["Secretary of Treasury"], "Shadno", "https://cdn.discordapp.com/avatars/96706920664006656/7704d451b2f88fbc9c1294f7e2196b96?size=1024"),
1111
12-
Structs.official(["Senator", "Speaker of the Senate"], "Complexii", "https://cdn.discordapp.com/avatars/489416445089021952/079d3f8bcb18a067f56b4c3ca97fabdf?size=1024"),
13-
Structs.official(["Senator"], "zolo17", "https://cdn.discordapp.com/avatars/284408888109957130/d9b10798c40e1ab777015796d0181eb9?size=1024"),
14-
Structs.official(["Senator"], "Raeders", "https://cdn.discordapp.com/avatars/921152800401018970/125071a539f94c2ad1d39f7a94899eb3?size=1024"),
12+
Structs.official(["Senator", "Speaker of the Senate"], "Zolo17", "https://cdn.discordapp.com/avatars/489416445089021952/079d3f8bcb18a067f56b4c3ca97fabdf?size=1024"),
13+
Structs.official(["Senator"], "Complexii", "https://cdn.discordapp.com/avatars/284408888109957130/d9b10798c40e1ab777015796d0181eb9?size=1024"),
14+
Structs.official(["Senator"], "Raeders", "https://cdn.discordapp.com/avatars/921152800401018970/67a2df55b53c7a926979264a7ff4e964?size=1024"),
1515
Structs.official(["Senator"], "Sdorr", "https://cdn.discordapp.com/avatars/787314045766074378/936a72bf777a04db3f19793b8a6d922f?size=1024"),
16-
Structs.official(["Senator"], "Dr_Bacon_Hair", "https://cdn.discordapp.com/avatars/689297659907145831/550889f3d35b69a1cfb67c52fe91b1be?size=1024"),
16+
Structs.official(["Senator"], "Dr_Bacon_Hair", "https://cdn.discordapp.com/avatars/689297659907145831/9b3e84146093ad2ea8a8dc92b0eb58e4.png?size=1024"),
17+
Structs.official(["Senator"], "DuckWithAMonocle", "https://cdn.discordapp.com/avatars/1235900488147406860/3eae5a569f1e7d9480ab4dc10393ea70.png?size=1024"),
18+
Structs.official(["Senator"], "Jaimiemie", "https://cdn.discordapp.com/avatars/689297659907145831/9b3e84146093ad2ea8a8dc92b0eb58e4.png?size=1024"),
19+
Structs.official(["Senator"], "Minemaster933", "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ3Vd_kqZn53ok20t0tVuAukGAHOzVLWvNgKw&s"),
20+
1721
];
1822
---
1923
<style>

0 commit comments

Comments
 (0)