diff --git a/_data/orgs/excomm.json b/_data/excomm.json similarity index 97% rename from _data/orgs/excomm.json rename to _data/excomm.json index 46cec2e..08966ca 100644 --- a/_data/orgs/excomm.json +++ b/_data/excomm.json @@ -1,4 +1,5 @@ { + "username" : "excomm", "name": "SGA Executive Committee", "description": "The Executive Committee (ExComm) is a integral sub-group of the SGA. Its members act as representatives of the student body. The members work with the officers to organize events and activities throughout to year. While several ExComm positions may have more specific roles, all are working towards the goals of the SGA. Applications to be on ExComm are released every June after Class Council elections have been completed.", "members": [ diff --git a/_data/orgs/officers.json b/_data/officers.json similarity index 97% rename from _data/orgs/officers.json rename to _data/officers.json index 30f36ce..61684d0 100644 --- a/_data/orgs/officers.json +++ b/_data/officers.json @@ -1,4 +1,5 @@ { + "username" : "officers", "name": "SGA Officers", "description": "", "members": [ diff --git a/_data/orgs/yml/excomm.yml b/_data/orgs/yml/excomm.yml deleted file mode 100644 index e69de29..0000000 diff --git a/_data/orgs/yml/officers.yml b/_data/orgs/yml/officers.yml deleted file mode 100644 index fb55599..0000000 --- a/_data/orgs/yml/officers.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: SGA Officers -description: -members: - - name: Nick Begotka - - year: 2018 - - title: - - intro: > - Welcome to Thomas Jefferson High School for Science and Technology's Student Government Association - - - name: Sherry Xie - - year: 2018 - - title: - - intro: > - Welcome to Thomas Jefferson High School for Science and Technology's Student Government Association - - - name: Shreya Chappidi - - year: 2018 - - title: - - intro: > - Welcome to Thomas Jefferson High School for Science and Technology's Student Government Association - - - name: Sitara Uppalapati - - year: 2019 - - title: - - intro: > - Welcome to Thomas Jefferson High School for Science and Technology's Student Government Association diff --git a/_data/orgs/yml/senators.yml b/_data/orgs/yml/senators.yml deleted file mode 100644 index e69de29..0000000 diff --git a/_data/orgs/yml/sponsors.yml b/_data/orgs/yml/sponsors.yml deleted file mode 100644 index e69de29..0000000 diff --git a/_data/orgs/senators.json b/_data/senators.json similarity index 97% rename from _data/orgs/senators.json rename to _data/senators.json index 63c3880..673ee5e 100644 --- a/_data/orgs/senators.json +++ b/_data/senators.json @@ -1,4 +1,5 @@ { + "username" : "senators", "name": "SGA Class Senators", "description": "Jefferson's student government is divided into school-wide student government (SGA) and grade-level student government (Class Council). While the SGA organizes school-wide events and addresses school-wide concerns and issues, Class Councils represent their grade's needs and host fundraisers and events with the goal to raise money for both Prom and Graduation at the end of senior year. SGA Class Senators serve as Class Council members who are liaisons with the SGA.", "members": [ diff --git a/_data/orgs/sponsors.json b/_data/sponsors.json similarity index 95% rename from _data/orgs/sponsors.json rename to _data/sponsors.json index 91d62e8..4814dfa 100644 --- a/_data/orgs/sponsors.json +++ b/_data/sponsors.json @@ -1,4 +1,5 @@ { + "username" : "sponsors", "name": "SGA Sponsors", "description": "The SGA Sponsors attend all SGA meetings and functions. They also provide invaluable guidance and feedback - whether through late night emails, frigid-cold morning meetings, lunch discussions, or anything in between.", "members": [ diff --git a/about.html b/about.html index 4a45250..4e801ac 100644 --- a/about.html +++ b/about.html @@ -1,5 +1,6 @@ --- permalink: /about +orgs: ["officers", "excomm", "senators", "sponsors"] --- @@ -27,246 +28,35 @@ permalink: /about
-
-

SGA Officers

-
-
+ {% for org_name in site.data %} + {% assign name = page.orgs[forloop.index0] %} + {% assign org = site.data[name] %} +
+

{{ org.name }}

+ {% for member in org.members %} +
+
-
- Nick Begotka '18 -

-     Welcome to Thomas Jefferson High School for Science and Technology's school-wide Student Government - Association's new home on the web! As you know, TJ is going through some very exciting times, and - we want you to be a part of it with us. -

-
-
-
-
-
-
- Nick Begotka '18 -

-     Welcome to Thomas Jefferson High School for Science and Technology's school-wide Student Government - Association's new home on the web! As you know, TJ is going through some very exciting times, and - we want you to be a part of it with us. -

-
-
-
-
-
-
- Nick Begotka '18 -

-     Welcome to Thomas Jefferson High School for Science and Technology's school-wide Student Government - Association's new home on the web! As you know, TJ is going through some very exciting times, and - we want you to be a part of it with us. -

-
-
-
-
-
-
- Nick Begotka '18 -

-     Welcome to Thomas Jefferson High School for Science and Technology's school-wide Student Government - Association's new home on the web! As you know, TJ is going through some very exciting times, and - we want you to be a part of it with us. -

+
+ {% assign year = member.year | downcase %} + {{ member.first }} {{ member.last }} + {% if name != "sponsors" %} + '{{ year | slice: 2, 3 }} + {% endif %} + + {% if name != "officers" %} + {{ member.title }} + {% endif %} + + {% if name == "officers" %} +

{{ member.intro }}

+ {% endif %}
+ {% endfor %}
-
-

SGA Executive Committee

-
- The Executive Committee (ExComm) is a integral sub-group of the SGA. Its members act as representatives of the student body. - The members work with the officers to organize events and activities throughout to year. While several ExComm - positions may have more specific roles, all are working towards the goals of the SGA. Applications to be - on ExComm are released every June after Class Council elections have been completed. -
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-
- William Zhang '18 - Technology Specialist -
-
-
-
-
-

SGA Class Senators

-
- Jefferson's student government is divided into school-wide student government (SGA) and grade-level student government (Class - Council). While the SGA organizes school-wide events and addresses school-wide concerns and issues, Class - Councils represent their grade's needs and host fundraisers and events with the goal to raise money for both - Prom and Graduation at the end of senior year. SGA Class Senators serve as Class Council members who are - liaisons with the SGA. -
-
-
-
-
- Sabria Kazmi '19 - 2019 Senator -
-
-
-
-
-
- Sabria Kazmi '19 - 2019 Senator -
-
-
-
-
-
- Sabria Kazmi '19 - 2019 Senator -
-
-
-
-
-
- Sabria Kazmi '19 - 2019 Senator -
-
-
-
-
-
- Sabria Kazmi '19 - 2019 Senator -
-
-
-
-
-
- Sabria Kazmi '19 - 2019 Senator -
-
-
-
-
-

SGA Sponsors

-
- The SGA Sponsors attend all SGA meetings and functions. They also provide invaluable guidance and feedback - whether through - late night emails, frigid-cold morning meetings, lunch discussions, or anything in between. -
- - -
+ {% endfor %}
{% include footer.html %} diff --git a/css/about.css b/css/about.css index cd37b8b..b8fb334 100644 --- a/css/about.css +++ b/css/about.css @@ -1,4 +1,5 @@ #contact { + max-width: 1200px; display: block; text-align: center; } @@ -16,16 +17,16 @@ .officers-image, .excomm-image, -.senator-image, -.sponsor-image { +.senators-image, +.sponsors-image { width: 100%; height: 20vh; } .officers-image:after, .excomm-image:after, -.senator-image:after, -.sponsor-image:after { +.senators-image:after, +.sponsors-image:after { width: 20vh; height: 20vh; content: ''; @@ -42,9 +43,9 @@ #excomm-desc, .excomm-text, #senators-desc, -.senator-text, +.senators-text, #sponsors-desc, -.teacher-text { +.sponsors-text { font-size: 1.1em; color: #fff; width: 100%; @@ -52,8 +53,8 @@ .officers-text>span, .excomm-text>span, -.senator-text>span, -.teacher-text { +.senators-text>span, +.sponsors-text>span { font-size: 1.4em; font-weight: bold; display: inline-block; @@ -62,8 +63,8 @@ .officers-intro, .excomm-intro, -.senator-intro, -.sponsor-intro { +.senators-intro, +.sponsors-intro { text-align: center; margin: 2vw; flex-basis: calc(25% - 4vw); @@ -77,18 +78,10 @@ margin: 0 10vw; } -#officers, -#excomm, -#senators, -#sponsors { - display: flex; - flex-wrap: wrap; -} - #contact>h2, #officers>h2, #excomm>h2, #senators>h2, #sponsors>h2 { text-align: center; -} \ No newline at end of file +} diff --git a/css/main.css b/css/main.css index 80ab597..0371e96 100644 --- a/css/main.css +++ b/css/main.css @@ -166,6 +166,7 @@ section { #senators, #sponsors, #resources { + max-width: 1200px; display: flex; height: 100%; justify-content: center; @@ -255,4 +256,4 @@ section h2, .links>h2, .list>h2 { text-align: center; -} \ No newline at end of file +} diff --git a/css/responsive.css b/css/responsive.css index 9db131e..e3995ea 100644 --- a/css/responsive.css +++ b/css/responsive.css @@ -136,4 +136,4 @@ #sponsors-desc { margin: 0 20vw; } -} \ No newline at end of file +}