diff --git a/.gitignore b/.gitignore index 279da1f..c939764 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,21 @@ -_site -.sass-cache +.DS_Store +*.pyc +*.pyo +env +env* +dist +build +*.egg +*.egg-info +_mailinglist +.tox +.cache/ +.idea/ +__pycache__/ +migrations/ +config.py settings.py -.jekyll-metadata -Gemfile.lock -gems/ env/ +ghswebsite/slideshow/ +ghswebsite/ghswebsite/secret.py +ghswebsite/settings/secret.py diff --git a/_plugins/file_exists.rb b/_plugins/file_exists.rb deleted file mode 100644 index 30480ca..0000000 --- a/_plugins/file_exists.rb +++ /dev/null @@ -1,23 +0,0 @@ -module Jekyll - class FileExistsTag < Liquid::Tag - - def initialize(tag_name, path, tokens) - super - @path = path - end - - def render(context) - # Pipe parameter through Liquid to make additional replacements possible - url = Liquid::Template.parse(@path).render context - - # Adds the site source, so that it also works with a custom one - site_source = context.registers[:site].config['source'] - file_path = site_source + '/' + url - - # Check if file exists (returns true or false) - "#{File.exist?(file_path.strip!)}" - end - end -end - -Liquid::Template.register_tag('file_exists', Jekyll::FileExistsTag) \ No newline at end of file diff --git a/_plugins/jekyll_get.rb b/_plugins/jekyll_get.rb deleted file mode 100644 index f5fb7e3..0000000 --- a/_plugins/jekyll_get.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'json' -require 'hash-joiner' -require 'open-uri' - -module Jekyll_Get - class Generator < Jekyll::Generator - safe true - priority :highest - - def generate(site) - config = site.config['jekyll_get'] - if !config - return - end - if !config.kind_of?(Array) - config = [config] - end - config.each do |d| - begin - target = site.data[d['data']] - source = JSON.load(open(d['json'])) - if target - HashJoiner.deep_merge target, source - else - site.data[d['data']] = source - end - if d['cache'] - data_source = (site.config['data_source'] || '_data') - path = "#{data_source}/#{d['data']}.json" - open(path, 'wb') do |file| - file << JSON.generate(site.data[d['data']]) - end - end - rescue - next - end - end - end - end -end diff --git a/_site/LICENSE b/_site/LICENSE new file mode 100644 index 0000000..41cb92b --- /dev/null +++ b/_site/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 William Zhang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/_site/README.md b/_site/README.md new file mode 100644 index 0000000..3bcba63 --- /dev/null +++ b/_site/README.md @@ -0,0 +1,18 @@ +# SGA Website # + +## Installing ## +* `bundle install --path gems/` + +## Running ## +* `bundle exec jekyll serve --port $PORT` where `$PORT` is desired port. + +## Editing Data ## + +### Officer Information ### +* Officer information is contained within .json files in the _data/about subdirectory. Changes made in these files will be reflected on the generated website. +* Each type of officer has a separate .json file, ExComm has `excomm.json`, for example. +* Sponsors have a -1 year to filter out the graduation year field in the generated website. +* Officer bios are optional. + +### Forms ### +* This feature is currently being worked on. diff --git a/_site/about.html b/_site/about.html new file mode 100644 index 0000000..d8c5f32 --- /dev/null +++ b/_site/about.html @@ -0,0 +1 @@ + About - TJSGA

Contact Us!

"The world is moved not only by the mighty shoves of the heroes, but also by the aggregate of the tiny pushes of each honest worker." - Helen Keller
Contact us at sga.tjhsst@gmail.com. We would love to answer questions or hear about how you think we can improve TJ!

SGA Officers

Nick Begotka 2018

Sherry Xie 2018

Shreya Chappidi 2018

Sitara Uppalapati 2019

SGA Executive Committee

MiJin Cho 2019 General Activities Coordinator
Michael Huang 2020 General Activities Coordinator
Rohan Kalra 2020 General Activities Coordinator
Michael Kyrychenko 2020 General Activities Coordinator
Jade Wang 2018 General Activities Coordinator
Liana Keesing 2019 Policy Specialist
Lulu Lin 2018 Policy Specialist
Afreen Mohideen 2019 Policy Specialist
Ethan Phillips 2019 Policy Specialist
Jahnavi Prabhala 2018 Policy Specialist
William Zhang 2018 Technology Specialist
Beyonce Andrades 2020 Technology Specialist
Katherine Du 2018 Technology Specialist

SGA Class Senators

Ashley Lin 2018 Senator
Anna Lulushi 2018 Senator
Laura Gersony 2019 Senator
Sabria Kazmi 2019 Senator
Divjot Bedi 2020 Senator
Megan Dass 2020 Senator

SGA Sponsors

Amanda Hurowitz TJ Humanities
Marianne Razzino TJ Mathematics
diff --git a/_site/feed.xml b/_site/feed.xml new file mode 100644 index 0000000..bab3363 --- /dev/null +++ b/_site/feed.xml @@ -0,0 +1,2 @@ +Jekyll2018-05-02T15:42:13-04:00http://localhost:8000/TJSGAThomas Jefferson High School Student Government Association + \ No newline at end of file diff --git a/_site/forms.html b/_site/forms.html new file mode 100644 index 0000000..688c408 --- /dev/null +++ b/_site/forms.html @@ -0,0 +1 @@ + About - TJSGA

General

Events

diff --git a/_site/index.html b/_site/index.html new file mode 100644 index 0000000..deb5201 --- /dev/null +++ b/_site/index.html @@ -0,0 +1 @@ + Home - TJSGA

Welcome!

    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.

    Here at Jefferson, we not only challenge ourselves academically, but also extracurricularly. And so, tjSGA is pushing forward this year to not only continue school-wide traditions such as Homecoming Week, Dancing with the Faculty, Service Week, and J-Day, but also both establish new and revive discontinued traditions such as the February Snow Ball and March Volleyball tournament. Moreover, as we face obstacles such as the stigma against mental illness and TJ Renovation restrictions, we hope to continually find effective solutions for the student body.

    Please don't hesitate to contact me or SGA at anytime with any concerns, suggestions, or questions and we'll do our best to address them.

Sincerely,
Tim Cho
SGA President 2016-17

TJSGA Group Photo

Twitter

Feedback

diff --git a/_site/resources.html b/_site/resources.html new file mode 100644 index 0000000..2cf9417 --- /dev/null +++ b/_site/resources.html @@ -0,0 +1 @@ + Resources - TJSGA

General

Mental Health

Course for Action

An SGA initiative, designed by the students, for the students. Learn about the courses available at TJHSST from students who've taken them and the teachers that teach them! Visit the YouTube channel here.

Student Advocacy

At Jefferson, students have rights and responsibilities that they are guaranteed as a part of their educational experience. The Student Advocacy Guidlines were created to help students be aware of how they can proactively manage their learning, self-advocate, and succeed in school.
Use this form to report divergences from the Student Advocacy Guidelines. Submissions will be kept strictly confidential, but name & grade are required for follow-up of the situation.
diff --git a/_site/robots.txt b/_site/robots.txt new file mode 100644 index 0000000..f6bf050 --- /dev/null +++ b/_site/robots.txt @@ -0,0 +1,6 @@ +User-agent: Google +Disallow: /icons + +User-agent: * +Disallow: /img +Disallow: /icons diff --git a/_site/run.sh b/_site/run.sh new file mode 100755 index 0000000..05862b8 --- /dev/null +++ b/_site/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +#export LC_ALL=C.UTF-8 +#export LANG=C.UTF-8 +#export FLASK_APP=ghswebsite +#export APP_SETTINGS="config.ProductionConfig" +#/web/activities/ghs/public/env/bin/python run.py $PORT +#export PATH=$PATH:/home/2018wzhang/.gem/ruby/2.3.0/bin; +#/home/2018wzhang/.gem/ruby/2.3.0/bin/bundler exec jekyll serve --port $PORT +/web/activities/sga/sgawebsite/manage.py runserver $PORT +#/web/activities/ghs/public/env/bin/python /web/activities/ghs/public/ghswebsite/app.py $PORT diff --git a/sgawebsite/main/admin.py b/_site/sgawebsite/main/admin.py similarity index 100% rename from sgawebsite/main/admin.py rename to _site/sgawebsite/main/admin.py diff --git a/sgawebsite/main/apps.py b/_site/sgawebsite/main/apps.py similarity index 100% rename from sgawebsite/main/apps.py rename to _site/sgawebsite/main/apps.py diff --git a/sgawebsite/main/models.py b/_site/sgawebsite/main/models.py similarity index 100% rename from sgawebsite/main/models.py rename to _site/sgawebsite/main/models.py diff --git a/sgawebsite/main/tests.py b/_site/sgawebsite/main/tests.py similarity index 100% rename from sgawebsite/main/tests.py rename to _site/sgawebsite/main/tests.py diff --git a/sgawebsite/main/views.py b/_site/sgawebsite/main/views.py similarity index 100% rename from sgawebsite/main/views.py rename to _site/sgawebsite/main/views.py diff --git a/_site/sgawebsite/manage.py b/_site/sgawebsite/manage.py new file mode 100755 index 0000000..5b67c94 --- /dev/null +++ b/_site/sgawebsite/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sgawebsite.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/_site/sgawebsite/sgawebsite/urls.py b/_site/sgawebsite/sgawebsite/urls.py new file mode 100644 index 0000000..d130071 --- /dev/null +++ b/_site/sgawebsite/sgawebsite/urls.py @@ -0,0 +1,21 @@ +"""sgawebsite URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/_site/sgawebsite/sgawebsite/wsgi.py b/_site/sgawebsite/sgawebsite/wsgi.py new file mode 100644 index 0000000..73c3257 --- /dev/null +++ b/_site/sgawebsite/sgawebsite/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for sgawebsite project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sgawebsite.settings") + +application = get_wsgi_application() diff --git a/_site/sgawebsite/static/css/about.css b/_site/sgawebsite/static/css/about.css new file mode 100644 index 0000000..5fed823 --- /dev/null +++ b/_site/sgawebsite/static/css/about.css @@ -0,0 +1,99 @@ +#contact { + width: 100%; + display: block; + text-align: center; + margin-bottom: 2.5vh; +} + +#contact>.desc { + font-size: 1.1em; +} + +.quote { + color: #fff; + font-style: italic; + display: inline-block; + opacity: 0.7; +} + +.officers-image, +.excomm-image, +.senators-image, +.sponsors-image { + width: 17vw; + max-width: 200px; + height: 17vw; + max-height: 200px; + margin-bottom: 1vh; +} + +.officers-image:after, +.excomm-image:after, +.senators-image:after, +.sponsors-image:after { + width: 100%; + height: 100%; + display: block; + position: relative; + background-image: url('../img/profile.jpg'); + background-size: contain; + background-position: center; + border-radius: 50%; +} + +.officers-image img, +.excomm-image img, +.senators-image img, +.sponsors-image img { + width: 100%; + height: 100%; + border-radius: 50%; +} + +.officers-text, +#excomm-desc, +.excomm-text, +#senators-desc, +.senators-text, +#sponsors-desc, +.sponsors-text { + font-size: 1.1em; + color: #fff; + width: 100%; +} + +.officers-text>span, +.excomm-text>span, +.senators-text>span, +.sponsors-text>span { + font-size: 1.4em; + font-weight: bold; + display: inline-block; + width: 100%; +} + +.officers-intro, +.excomm-intro, +.senators-intro, +.sponsors-intro { + text-align: center; + margin: 1.5vw; + width: 17vw; + max-width: 200px; + flex-wrap: wrap; + flex-basis: 50%; +} + +#excomm-desc, +#senators-desc, +#sponsors-desc { + margin: 0 10vw; +} + +#contact>h2, +#officers>h2, +#excomm>h2, +#senators>h2, +#sponsors>h2 { + text-align: center; +} diff --git a/_site/sgawebsite/static/css/footer.css b/_site/sgawebsite/static/css/footer.css new file mode 100644 index 0000000..c6bf5eb --- /dev/null +++ b/_site/sgawebsite/static/css/footer.css @@ -0,0 +1,43 @@ +footer { + position: relative; + width: 100%; + padding: calc((2.75em + 42px) / 4) 0; + bottom: 0; + left: 0; + right: 0; + text-align: center; + color: #fff; + background-color: #393939; + z-index: 2; +} + +button.social { + cursor: pointer; + outline: none; + border-radius: 50%; + width: 36px; + height: 36px; + margin: 3px; + background-color: transparent; +} + +button.social#fb { + background: url('../icons/fb.jpg'); + background-size: cover; +} + +button.social#tw { + background: url('../icons/tw.jpg'); + background-size: cover; +} + +button.social#flickr { + background: url('../icons/flickr.png'); + background-size: cover; + background-color: #fff; +} + +button.social#mail { + background: url('../icons/mail.jpg'); + background-size: cover; +} diff --git a/_site/sgawebsite/static/css/header.css b/_site/sgawebsite/static/css/header.css new file mode 100644 index 0000000..976d3b7 --- /dev/null +++ b/_site/sgawebsite/static/css/header.css @@ -0,0 +1,130 @@ +header { + position: relative; + width: 100%; +} + +#banner { + width: 100%; + display: flex; + justify-content: center; + background-color: #fff; + position: relative; + z-index: 3; + vertical-align: middle; + font-size: 2.5em; + font-weight: bold; + overflow: hidden; +} + +#logo { + width: 15vh; + height: 12vh; + background-image: url('../img/logo.png'); + background-size: 100%; + background-position: center; + background-repeat: no-repeat; +} + +#menu-toggle { + cursor: pointer; + background-color: #fff; + outline: none; + display: none; +} + +#menu-toggle:hover { + background-color: #f5f5f5; +} + +#menu-toggle:active { + background-color: #e0e0e0; +} + +#menu-toggle>i { + width: 48px; + height: 48px; + display: block; + background-image: url('../icons/menu.png'); + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + +nav#menu { + width: 100%; + display: inline-flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: center; + border-bottom: 3px solid rgb(164, 38, 44); +} + +a.menu-item { + width: 12vw; + color: #000; + font-size: 1em; + z-index: 10; + display: inline-block; + float: left; +} + +button.menu-item { + cursor: pointer; + font-size: 1.8em; + width: 100%; + height: 100%; + outline: none; + color: #000; + background-color: transparent; + border: none; +} + +button.menu-item:hover { + color: #767676; +} + +button.menu-item:active { + font-size: 1.4em; + color: #9f9f9f; +} + +#dome:before { + position: absolute; + width: 100%; + height: 40vh; + min-height: 280px; + top: 0vh; + content: ''; + display: block; + background-color: rgba(255, 255, 255, 0.1); + -webkit-filter: blur(10px); + filter: blur(10px); + z-index: -1; +} + +#dome { + position: relative; + width: 100%; + height: 40vh; + min-height: 280px; + color: #000; + background-color: rgba(255, 255, 255, 0.6); +} + +#dome:after { + position: absolute; + width: 100%; + height: 40vh; + min-height: 280px; + top: 0vh; + content: ''; + display: block; + background-color: #010318; + background-image: url('../img/bg.jpg'); + background-size: cover; + background-position-x: center; + background-position-y: 0; + background-repeat: no-repeat; + background-attachment: fixed; + z-index: -2; +} diff --git a/_site/sgawebsite/static/css/main.css b/_site/sgawebsite/static/css/main.css new file mode 100644 index 0000000..1a47739 --- /dev/null +++ b/_site/sgawebsite/static/css/main.css @@ -0,0 +1,254 @@ +/*http://meyerweb.com/eric/tools/css/reset/*/ +html,body,div,span,button,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video { + font: inherit; + font-family: 'Lato', 'Helvetica Neue', Helvetica, sans-serif; + font-size: 100%; + margin: 0; + padding: 0; + vertical-align: baseline; + border: 0 +} + +html { + width: 100%; +} + +body { + overflow-x: hidden; + width: 100%; + height: 100%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + -webkit-touch-callout: none +} + +.fluid { + -webkit-transition: all .1s ease; + -moz-transition: all .1s ease; + -ms-transition: all .1s ease; + -o-transition: all .1s ease; + transition: all .1s ease; +} + +.fluid-slow { + -webkit-transition: all .5s ease; + -moz-transition: all .5s ease; + -ms-transition: all .5s ease; + -o-transition: all .5s ease; + transition: all .5s ease; +} + +hr { + width: 100%; + height: 1px; + float: left; + border: none; + background-image: linear-gradient(to right, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0)); +} + +a { + color: #3A96DD; + text-decoration: none; +} + +li { + color: #fff; +} + +button.flip>i { + height: 3vh; + width: 3vh; + display: block; + background-size: cover; +} + +button.expand>i {} + +i.left { + background-image: url("../icons/ic_keyboard_arrow_left_black_48px.svg"); +} + +i.right { + background-image: url("../icons/ic_keyboard_arrow_right_black_48px.svg"); +} + +i.expand { + background-image: url("../icons/ic_expand_less_white_48px.svg"); +} + +button.flip { + cursor: pointer; + position: absolute; + height: 6vh; + width: 3vh; + outline: none; + background-color: rgba(255, 255, 255, 0.5); +} + +button.flip.left { + top: calc(50% - 3vh); + left: 0; +} + +button.flip.right { + top: calc(50% - 3vh); + right: 0; +} + +button.flip:hover { + background-color: rgba(255, 255, 255, 0.7); +} + +button.flip:active { + background-color: rgba(255, 255, 255, 0.9); +} + +button.expand { + cursor: pointer; + position: absolute; + height: 6vh; + width: 4vh; + outline: none; + background-color: rgba(255, 255, 255, 0.5); +} + +span>a:hover { + color: #767676; +} + +span>a:active { + color: #393939; +} + +#wrapper { + position: relative; + width: 100%; + z-index: 1; + background-color: #4C4A48; + height: auto; + min-height: 100%; + overflow: hidden; +} + +#wrapper:before { + position: absolute; + z-index: -1; + width: 100%; + min-height: 100vh; + top: 0vh; + content: ''; + display: block; +} + +section { + width: 100%; + min-height: 100%; + display: flex; + justify-content: center; + z-index: 2; +} + +#intro, +#calendar, +#updates, +#officers, +#excomm, +#senators, +#sponsors, +#resources, +#forms { + /*max-width: 1200px;*/ + display: flex; + margin: 0 12.5vw; + width: 75vw; + height: 100%; + justify-content: center; + flex-flow: row wrap; +} + +#intro, +#calendar, +#updates, +#resources, +#forms { + padding: 2.5vh 0; +} + +#resources, +#forms { + min-height: calc(60vh - ((2.75em + 42px) / 4)); +} + +#sponsors { + padding-bottom: 2.5vh; +} + +section h1 { + font-size: 3.5em; + margin-top: 0.5em; +} + +section h2, +#intro-title { + width: 100%; + font-size: 2.1em; + font-weight: bold; + color: #fff; + margin: 2.5vh 0; + display: inline-block; + text-align: left; +} + +#intro-text { + text-align: center; + flex-grow: calc(50% - 8vw); + margin: 0 2vw; +} + +#intro-image { + text-align: center; + flex-grow: calc(50% - 8vw); +} + +#intro-image>img { + margin-top: calc(5vh + 3.1em); + width: 100%; +} + +#tweets, #feedback { + text-align: center; + margin: 0 2vw; +} + + +#letter { + width: 100%; + font-size: 1.2em; + display: inline-block; + text-align: left; + color: #fff; + clear: both; +} + +#letter>p { + margin: 0.5em 0; +} + +.desc { + font-size: 1.1em; + color: #fff; + margin: 0.5em 5vw; +} + +.list>ul { + font-size: 1.1em; + margin: 0 2vw 0 8vw; +} + +.desc>span { + display: inline-block; +} + +.links>h2, +.list>h2 { + text-align: center; +} diff --git a/_site/sgawebsite/static/css/responsive.css b/_site/sgawebsite/static/css/responsive.css new file mode 100644 index 0000000..92e9d94 --- /dev/null +++ b/_site/sgawebsite/static/css/responsive.css @@ -0,0 +1,189 @@ +@media screen and (max-width: 1150px) { + #dome:after { + background-position-y: 0; + } + #banner { + height: 48px; + display: block; + top: 0; + position: fixed; + box-shadow: 0 28rem 79rem 0 rgba(91, 194, 182, .08), 0 40rem 32rem 0 rgba(0, 0, 0, .04); + border-bottom: 3px solid rgb(164, 38, 44); + } + #banner #logo { + height: 100%; + width: 100%; + background: none; + } + #menu-toggle { + position: absolute; + left: 0; + } + #banner>h1 { + position: absolute; + left: 48px; + width: calc(100% - 48px); + height: 100%; + overflow: hidden; + } + #menu>a { + width: 100%; + min-height: 75px; + height: 10vh; + flex-basis: auto; + } + button.menu-item { + font-size: 1.2em; + width: 100%; + height: 100%; + } + button.menu-item:hover { + color: #fff; + background-color: rgb(164, 38, 44); + } + button.menu-item:active { + font-size: 1.1em; + } + #logo-wrapper { + display: none; + } + nav#menu { + width: 30vw; + max-width: 200px; + height: 100vh; + top: 0; + left: -30vw; + padding-top: 48px; + display: block; + position: fixed; + z-index: 2; + transition: all 130ms ease; + background-color: #fff; + border: none; + } + #menu-toggle { + display: block; + } + .officers-intro, + .excomm-intro, + .senators-intro, + .sponsors-intro { + width: 22vw; + max-width: 200px; + } + .officers-image, + .excomm-image, + .senators-image, + .sponsors-image { + width: 22vw; + height: 22vw; + } + #intro-image { + } + #intro-image > img { + margin-top: 1.2em; + } + #tweets, #feedback { + margin: 0 2vw; + } +} + +@media screen and (max-width: 1000px) { + #intro-text, + #intro-image, + #tweets, + #feedback, + .list, + .links { + width: 100%; + } + section { + max-width: 750px; + flex-grow: 1; + flex-shrink: 0; + } + #banner > h1 { + font-size: 40px; + } +} + +@media screen and (max-width: 700px) { + #banner > h1 { + display: none; + } + #dome:after { + background-position-y: 5vh; + } + .officers-intro, + .excomm-intro, + .senators-intro, + .sponsors-intro { + width: 97vw; + max-width: 200px; + } + .officers-image, + .excomm-image, + .senators-image, + .sponsors-image { + width: 97vw; + height: 97vw; + } +} + +@media screen and (max-width: 500px) { + ul { + margin: 0 10vw; + } + #dome { + display: none; + } + #wrapper { + height: auto; + min-height: calc(100vh - 130px); + } + #wrapper, + footer { + top: 48px; + } + #intro, + #updates, + #officers, + #excomm, + #senators, + #sponsors, + #resources, + #forms { + margin: 0 10vw; + width: 80vw; + } + #intro-text { + margin: 0 5vw; + } + nav#menu { + overflow: hidden; + } +} +@media screen and (min-width: 1150px) { + #intro-text, + #intro-image, + .list, + .links { + width: 37.5vw; + max-width: 550px; + } + .desc, + .list>ul { + font-size: 1.3em; + } +} + +@media screen and (min-width: 1800px) { + #letter { + font-size: 1.4em; + } + #excomm-desc, + #senators-desc, + #sponsors-desc { + margin: 0 20vw; + } +} diff --git a/_site/sgawebsite/static/icons/favicon.ico b/_site/sgawebsite/static/icons/favicon.ico new file mode 100644 index 0000000..4c6578f Binary files /dev/null and b/_site/sgawebsite/static/icons/favicon.ico differ diff --git a/_site/sgawebsite/static/icons/fb.jpg b/_site/sgawebsite/static/icons/fb.jpg new file mode 100644 index 0000000..e73cded Binary files /dev/null and b/_site/sgawebsite/static/icons/fb.jpg differ diff --git a/_site/sgawebsite/static/icons/flickr.png b/_site/sgawebsite/static/icons/flickr.png new file mode 100644 index 0000000..5b17015 Binary files /dev/null and b/_site/sgawebsite/static/icons/flickr.png differ diff --git a/_site/sgawebsite/static/icons/mail.jpg b/_site/sgawebsite/static/icons/mail.jpg new file mode 100644 index 0000000..98462e5 Binary files /dev/null and b/_site/sgawebsite/static/icons/mail.jpg differ diff --git a/_site/sgawebsite/static/icons/menu.png b/_site/sgawebsite/static/icons/menu.png new file mode 100644 index 0000000..012fe27 Binary files /dev/null and b/_site/sgawebsite/static/icons/menu.png differ diff --git a/_site/sgawebsite/static/icons/menu.svg b/_site/sgawebsite/static/icons/menu.svg new file mode 100644 index 0000000..a0efac0 --- /dev/null +++ b/_site/sgawebsite/static/icons/menu.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/_site/sgawebsite/static/icons/tw.jpg b/_site/sgawebsite/static/icons/tw.jpg new file mode 100644 index 0000000..62a15b3 Binary files /dev/null and b/_site/sgawebsite/static/icons/tw.jpg differ diff --git a/_site/sgawebsite/static/img/DSC09503.jpg b/_site/sgawebsite/static/img/DSC09503.jpg new file mode 100644 index 0000000..f91893b Binary files /dev/null and b/_site/sgawebsite/static/img/DSC09503.jpg differ diff --git a/_site/sgawebsite/static/img/bg.jpg b/_site/sgawebsite/static/img/bg.jpg new file mode 100644 index 0000000..f7af999 Binary files /dev/null and b/_site/sgawebsite/static/img/bg.jpg differ diff --git a/_site/sgawebsite/static/img/dome-original.png b/_site/sgawebsite/static/img/dome-original.png new file mode 100644 index 0000000..005a1c3 Binary files /dev/null and b/_site/sgawebsite/static/img/dome-original.png differ diff --git a/_site/sgawebsite/static/img/group.jpg b/_site/sgawebsite/static/img/group.jpg new file mode 100644 index 0000000..fb02106 Binary files /dev/null and b/_site/sgawebsite/static/img/group.jpg differ diff --git a/_site/sgawebsite/static/img/logo.png b/_site/sgawebsite/static/img/logo.png new file mode 100644 index 0000000..a8881be Binary files /dev/null and b/_site/sgawebsite/static/img/logo.png differ diff --git a/_site/sgawebsite/static/img/originals.tar.gz b/_site/sgawebsite/static/img/originals.tar.gz new file mode 100644 index 0000000..14971d0 Binary files /dev/null and b/_site/sgawebsite/static/img/originals.tar.gz differ diff --git a/_site/sgawebsite/static/img/people/2018alin.jpg b/_site/sgawebsite/static/img/people/2018alin.jpg new file mode 100644 index 0000000..c326dfc Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018alin.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018alulushi.jpg b/_site/sgawebsite/static/img/people/2018alulushi.jpg new file mode 100644 index 0000000..f39076f Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018alulushi.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018jprabhal.jpg b/_site/sgawebsite/static/img/people/2018jprabhal.jpg new file mode 100644 index 0000000..00a8dd4 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018jprabhal.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018jwang.jpg b/_site/sgawebsite/static/img/people/2018jwang.jpg new file mode 100644 index 0000000..00a8dd4 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018jwang.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018kdu.jpg b/_site/sgawebsite/static/img/people/2018kdu.jpg new file mode 100644 index 0000000..1b0c255 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018kdu.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018llin.jpg b/_site/sgawebsite/static/img/people/2018llin.jpg new file mode 100644 index 0000000..65f5dc6 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018llin.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018nbegotka.jpg b/_site/sgawebsite/static/img/people/2018nbegotka.jpg new file mode 100644 index 0000000..2163f68 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018nbegotka.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018schappid.jpg b/_site/sgawebsite/static/img/people/2018schappid.jpg new file mode 100644 index 0000000..64696ed Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018schappid.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018sxie.jpg b/_site/sgawebsite/static/img/people/2018sxie.jpg new file mode 100644 index 0000000..c61ee43 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018sxie.jpg differ diff --git a/_site/sgawebsite/static/img/people/2018wzhang.jpg b/_site/sgawebsite/static/img/people/2018wzhang.jpg new file mode 100644 index 0000000..9e239d0 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2018wzhang.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019amohidee.jpg b/_site/sgawebsite/static/img/people/2019amohidee.jpg new file mode 100644 index 0000000..1bc7cf2 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019amohidee.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019ephillip.jpg b/_site/sgawebsite/static/img/people/2019ephillip.jpg new file mode 100644 index 0000000..66e964d Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019ephillip.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019lgersony.jpg b/_site/sgawebsite/static/img/people/2019lgersony.jpg new file mode 100644 index 0000000..0fc515b Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019lgersony.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019lkeesing.jpg b/_site/sgawebsite/static/img/people/2019lkeesing.jpg new file mode 100644 index 0000000..3e07065 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019lkeesing.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019mcho.jpg b/_site/sgawebsite/static/img/people/2019mcho.jpg new file mode 100644 index 0000000..df587c1 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019mcho.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019skazmi.jpg b/_site/sgawebsite/static/img/people/2019skazmi.jpg new file mode 100644 index 0000000..00a8dd4 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019skazmi.jpg differ diff --git a/_site/sgawebsite/static/img/people/2019suppalap.jpg b/_site/sgawebsite/static/img/people/2019suppalap.jpg new file mode 100644 index 0000000..490b859 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2019suppalap.jpg differ diff --git a/_site/sgawebsite/static/img/people/2020bandrade.jpg b/_site/sgawebsite/static/img/people/2020bandrade.jpg new file mode 100644 index 0000000..bb8499d Binary files /dev/null and b/_site/sgawebsite/static/img/people/2020bandrade.jpg differ diff --git a/_site/sgawebsite/static/img/people/2020dbedi.jpg b/_site/sgawebsite/static/img/people/2020dbedi.jpg new file mode 100644 index 0000000..8944d33 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2020dbedi.jpg differ diff --git a/_site/sgawebsite/static/img/people/2020mdass.jpg b/_site/sgawebsite/static/img/people/2020mdass.jpg new file mode 100644 index 0000000..889e62d Binary files /dev/null and b/_site/sgawebsite/static/img/people/2020mdass.jpg differ diff --git a/_site/sgawebsite/static/img/people/2020mhuang.jpg b/_site/sgawebsite/static/img/people/2020mhuang.jpg new file mode 100644 index 0000000..358e984 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2020mhuang.jpg differ diff --git a/_site/sgawebsite/static/img/people/2020mkyryche.jpg b/_site/sgawebsite/static/img/people/2020mkyryche.jpg new file mode 100644 index 0000000..054377a Binary files /dev/null and b/_site/sgawebsite/static/img/people/2020mkyryche.jpg differ diff --git a/_site/sgawebsite/static/img/people/2020rkalra.jpg b/_site/sgawebsite/static/img/people/2020rkalra.jpg new file mode 100644 index 0000000..bbc88d2 Binary files /dev/null and b/_site/sgawebsite/static/img/people/2020rkalra.jpg differ diff --git a/_site/sgawebsite/static/img/people/ahurowit.jpg b/_site/sgawebsite/static/img/people/ahurowit.jpg new file mode 100644 index 0000000..71d3d55 Binary files /dev/null and b/_site/sgawebsite/static/img/people/ahurowit.jpg differ diff --git a/_site/sgawebsite/static/img/people/convert.sh b/_site/sgawebsite/static/img/people/convert.sh new file mode 100755 index 0000000..10afcb5 --- /dev/null +++ b/_site/sgawebsite/static/img/people/convert.sh @@ -0,0 +1,10 @@ +#!/bin/sh +FILES=. +for f in $FILES/*.jpg +do + mkdir -p $FILES/out; + convert $f -sampling-factor 4:2:0 -strip -resize 300x300 -quality 85 -interlace JPEG -colorspace sRGB ${f%.*}-new.jpg; + mv $FILES/*-new.jpg $FILES/out/$f; + +done + diff --git a/_site/sgawebsite/static/img/people/mrazzino.jpg b/_site/sgawebsite/static/img/people/mrazzino.jpg new file mode 100644 index 0000000..534ad23 Binary files /dev/null and b/_site/sgawebsite/static/img/people/mrazzino.jpg differ diff --git a/_site/sgawebsite/static/img/profile.jpg b/_site/sgawebsite/static/img/profile.jpg new file mode 100644 index 0000000..551e16a Binary files /dev/null and b/_site/sgawebsite/static/img/profile.jpg differ diff --git a/_site/sgawebsite/static/img/web-image.sh b/_site/sgawebsite/static/img/web-image.sh new file mode 100755 index 0000000..95e852c --- /dev/null +++ b/_site/sgawebsite/static/img/web-image.sh @@ -0,0 +1,2 @@ +#!/bin/sh +convert $1 -sampling-factor 4:2:0 -strip -quality 85 -interlace JPEG -colorspace sRGB $2 diff --git a/_site/sgawebsite/static/js/sidebar-min.js b/_site/sgawebsite/static/js/sidebar-min.js new file mode 100644 index 0000000..a15e311 --- /dev/null +++ b/_site/sgawebsite/static/js/sidebar-min.js @@ -0,0 +1,2 @@ +function toggleSidebar(e){""!=sb.style.left&&"-30vw"!=sb.style.left||!e?(sb.style.disabled=!0,sb.style.left="-30vw"):(sb.style.disabled=!1,sb.style.left="0px")}var mb=document.querySelector("#menu-toggle"),sb=document.querySelector("nav#menu"),tb=document.querySelector("#logo"),dm=document.querySelector("#dome"),wr=document.querySelector("#wrapper") +mb.addEventListener("click",function(){toggleSidebar(!0)},!1),wr.addEventListener("click",function(){toggleSidebar(!1)},!1),tb.addEventListener("click",function(){toggleSidebar(!1)},!1),dm.addEventListener("click",function(){toggleSidebar(!1)},!1),mb.addEventListener("touchleave",function(){toggleSidebar(!0)},!1),wr.addEventListener("touchleave",function(){toggleSidebar(!1)},!1),tb.addEventListener("touchleave",function(){toggleSidebar(!1)},!1),dm.addEventListener("touchleave",function(){toggleSidebar(!1)},!1),sb.style.disabled=!0 diff --git a/_site/sgawebsite/static/js/sidebar.js b/_site/sgawebsite/static/js/sidebar.js new file mode 100644 index 0000000..2946b0d --- /dev/null +++ b/_site/sgawebsite/static/js/sidebar.js @@ -0,0 +1,42 @@ +var mb = document.querySelector("#menu-toggle"), + sb = document.querySelector("nav#menu"), + tb = document.querySelector("#logo"), + dm = document.querySelector("#dome"), + wr = document.querySelector("#wrapper"); + +mb.addEventListener("click", function () { + toggleSidebar(true) +}, false); +wr.addEventListener("click", function () { + toggleSidebar(false) +}, false); +tb.addEventListener("click", function () { + toggleSidebar(false) +}, false); +dm.addEventListener("click", function () { + toggleSidebar(false) +}, false); +mb.addEventListener("touchleave", function () { + toggleSidebar(true) +}, false); +wr.addEventListener("touchleave", function () { + toggleSidebar(false) +}, false); +tb.addEventListener("touchleave", function () { + toggleSidebar(false) +}, false); +dm.addEventListener("touchleave", function () { + toggleSidebar(false) +}, false); +sb.style.disabled = true; + + +function toggleSidebar(toggleOpenAllowed) { + if ((sb.style.left == "" || sb.style.left == "-30vw") && toggleOpenAllowed) { + sb.style.disabled = false; + sb.style.left = "0px"; + } else { + sb.style.disabled = true; + sb.style.left = "-30vw"; + } +} diff --git a/_site/sgawebsite/templates/404/index.html b/_site/sgawebsite/templates/404/index.html new file mode 100644 index 0000000..bdd4cbf --- /dev/null +++ b/_site/sgawebsite/templates/404/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + +
+

404

+ +

Page not found :(

+

The requested page could not be found.

+
diff --git a/sgawebsite/main/__init__.py b/sgawebsite/apps/main/__init__.py similarity index 100% rename from sgawebsite/main/__init__.py rename to sgawebsite/apps/main/__init__.py diff --git a/sgawebsite/apps/main/admin.py b/sgawebsite/apps/main/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/sgawebsite/apps/main/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/sgawebsite/apps/main/apps.py b/sgawebsite/apps/main/apps.py new file mode 100644 index 0000000..833bff6 --- /dev/null +++ b/sgawebsite/apps/main/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class MainConfig(AppConfig): + name = 'main' diff --git a/sgawebsite/main/migrations/__init__.py b/sgawebsite/apps/main/migrations/__init__.py similarity index 100% rename from sgawebsite/main/migrations/__init__.py rename to sgawebsite/apps/main/migrations/__init__.py diff --git a/sgawebsite/apps/main/models.py b/sgawebsite/apps/main/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/sgawebsite/apps/main/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/sgawebsite/apps/main/tests.py b/sgawebsite/apps/main/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/sgawebsite/apps/main/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/sgawebsite/apps/main/views.py b/sgawebsite/apps/main/views.py new file mode 100644 index 0000000..acf40c6 --- /dev/null +++ b/sgawebsite/apps/main/views.py @@ -0,0 +1,14 @@ +from django.shortcuts import render + +@app.route("/") +def index(): + announcements = Announcement.query.all() + return render_template( + "index.html", + prefix=ROOT_URL, + announcements=announcements) + +# Create your views here. + +def index(): + return diff --git a/sgawebsite/sgawebsite/settings.py b/sgawebsite/sgawebsite/settings.py index af3bba9..473f90b 100644 --- a/sgawebsite/sgawebsite/settings.py +++ b/sgawebsite/sgawebsite/settings.py @@ -118,3 +118,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/1.11/howto/static-files/ STATIC_URL = '/static/' +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, 'static'), +] +LOGIN_REDIRECT_URL = '/' diff --git a/sgawebsite/templates/about.html b/sgawebsite/templates/about.html index 97dd1e2..2f9a7b7 100644 --- a/sgawebsite/templates/about.html +++ b/sgawebsite/templates/about.html @@ -1,8 +1,3 @@ ---- -layout: compress -permalink: /about -orgs: ["officers", "excomm", "senators", "sponsors"] ---- diff --git a/sgawebsite/templates/forms.html b/sgawebsite/templates/forms.html index 2be2879..9c67698 100644 --- a/sgawebsite/templates/forms.html +++ b/sgawebsite/templates/forms.html @@ -1,8 +1,3 @@ ---- -layout: compress -permalink: /forms -sections: ["general", "events", "elections"] ---- diff --git a/sgawebsite/templates/index.html b/sgawebsite/templates/index.html index 0fb1033..a996e73 100644 --- a/sgawebsite/templates/index.html +++ b/sgawebsite/templates/index.html @@ -1,7 +1,3 @@ ---- -layout: compress -permalink: / ---- diff --git a/sgawebsite/templates/resources.html b/sgawebsite/templates/resources.html index 0192bf0..2bf4cf6 100644 --- a/sgawebsite/templates/resources.html +++ b/sgawebsite/templates/resources.html @@ -1,7 +1,3 @@ ---- -layout: compress -permalink: /resources ----