diff --git a/.env b/.env deleted file mode 100644 index d66dd13..0000000 --- a/.env +++ /dev/null @@ -1 +0,0 @@ -source /var/www/sgawebsite/env/bin/activate diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/LICENSE b/LICENSE index 41cb92b..5ad627f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 William Zhang +Copyright (c) 2018 Anubis Watal Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index bad8188..69cf8f4 100644 --- a/README.md +++ b/README.md @@ -1,25 +1 @@ -# SGA Website # - -## Setting up Production ## -* Create a blank sqlite database with `sqlite3 db.sqlite3 ".databases"` -* `source env/bin/activate` -* Initialize the database with `python3 manage.py makemigrations` and then `python3 manage.py migrate` (Do this whenever you make changes to models) - -## Installing ## -* `source env/bin/activate` -* `virtualenv -p python3 env` -* `pip install -r requirements.txt` - -## Running ## -* `source env/bin/activate` -* `python3 manage.py runserver $PORT` where `$PORT` is desired port. - -## Editing Data ## - -### Member Information ### -* Member Information is modified in the django admin interface at `/admin`. -* 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. +# 2018 SGA Website # diff --git a/manage.py b/manage.py deleted file mode 100755 index 5b67c94..0000000 --- a/manage.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/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/requirements.txt b/requirements.txt deleted file mode 100644 index 2248dd0..0000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -certifi==2018.4.16 -chardet==3.0.4 -Django==2.0.5 -idna==2.6 -pytz==2018.4 -requests==2.18.4 -urllib3==1.22 diff --git a/run.sh b/run.sh deleted file mode 100755 index 69facc9..0000000 --- a/run.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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/sga/public/env/bin/python3 manage.py runserver $PORT -#/web/activities/ghs/public/env/bin/python /web/activities/ghs/public/ghswebsite/app.py $PORT diff --git a/sgawebsite/__init__.py b/sgawebsite/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/sgawebsite/apps/__init__.py b/sgawebsite/apps/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/sgawebsite/apps/main/__init__.py b/sgawebsite/apps/main/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/sgawebsite/apps/main/admin.py b/sgawebsite/apps/main/admin.py deleted file mode 100644 index c525d3c..0000000 --- a/sgawebsite/apps/main/admin.py +++ /dev/null @@ -1,14 +0,0 @@ -from django.contrib import admin - -from .models import Member, Resource - -''' -class MemberAdmin(admin.ModelAdmin): - list_display = ('name', 'display') - - -class ResourceAdmin(admin.ModelAdmin): - list_display = ('name', 'display') -''' -admin.site.register(Member) -admin.site.register(Resource) diff --git a/sgawebsite/apps/main/apps.py b/sgawebsite/apps/main/apps.py deleted file mode 100644 index 833bff6..0000000 --- a/sgawebsite/apps/main/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class MainConfig(AppConfig): - name = 'main' diff --git a/sgawebsite/apps/main/migrations/__init__.py b/sgawebsite/apps/main/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/sgawebsite/apps/main/models.py b/sgawebsite/apps/main/models.py deleted file mode 100644 index 1f2dbda..0000000 --- a/sgawebsite/apps/main/models.py +++ /dev/null @@ -1,29 +0,0 @@ -from django.db import models - -# Create your models here. - - -class Member(models.Model): - first_name = models.CharField(max_length=50) - last_name = models.CharField(max_length=50) - year = models.IntegerField(blank=True, default=-1) - intro = models.CharField(max_length=140, blank=True, default='') - title = models.CharField(max_length=30, blank=True, default='') - CATEGORIES = (('officers', 'Officers'), ('excomm', 'Executive Committee'), - ('senators', 'Class Senators'), ('sponsors', 'Sponsors')) - category = models.CharField(max_length=10, choices=CATEGORIES) - - def __str__(self): - return self.first_name + ' ' + self.last_name - - -class Resource(models.Model): - name = models.CharField(max_length=50) - link = models.URLField() - text = models.CharField(max_length=140) - CATEGORIES = (('general', 'General Resources'), - ('event', 'Event Resources')) - category = models.CharField(max_length=1, choices=CATEGORIES) - - def __str__(self): - return self.name diff --git a/sgawebsite/apps/main/tests.py b/sgawebsite/apps/main/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/sgawebsite/apps/main/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/sgawebsite/apps/main/urls.py b/sgawebsite/apps/main/urls.py deleted file mode 100644 index c9ae138..0000000 --- a/sgawebsite/apps/main/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.conf.urls import url - -from .views import * - -urlpatterns = [ - url(r'^$', index, name='index'), - url(r'about', about, name='about'), - url(r'resources', resources, name='resources'), - url(r'events', events, name='events'), - -] diff --git a/sgawebsite/apps/main/views.py b/sgawebsite/apps/main/views.py deleted file mode 100644 index 37d2302..0000000 --- a/sgawebsite/apps/main/views.py +++ /dev/null @@ -1,59 +0,0 @@ -from django.shortcuts import render -from django.template.defaulttags import register -from .models import Member, Resource -from django.contrib.staticfiles.storage import staticfiles_storage -import os - - -def index(request): - return render(request, 'index.html') - - -def about(request): - categories = list(Member.CATEGORIES) - orgs = [c[0] for c in list(Member.CATEGORIES)] - data = dict() - context = dict() - for c in categories: - data[c[0]] = Member.objects.filter(category=c[0]) - print(categories) - context['categories'] = categories - context['orgs'] = orgs - context['data'] = data - return render(request, 'about.html', context) - - -@register.filter -def get_item(dictionary, key): - return dictionary.get(key) - - -@register.filter -def username(obj): - if obj.first_name and obj.last_name: - if obj.year > 0: - return str(str(obj.year) + - obj.first_name[:1] + - obj.last_name[:7]).lower() - else: - return str(obj.first_name[:1] + obj.last_name[:7]).lower() - return None - - -@register.filter -def filename(obj): - uname = username(obj) - folder = 'img' - filepath = os.path.join(folder, 'people', uname + '.jpg') - if uname is not None and staticfiles_storage.exists(filepath): - return os.path.join('static', filepath) - else: - return os.path.join('static', folder, 'profile.jpg') - - -def resources(request): - return render(request, 'resources.html') - - -def events(request): - return render(request, 'events.html') diff --git a/sgawebsite/example_settings.py b/sgawebsite/example_settings.py deleted file mode 100644 index d35834e..0000000 --- a/sgawebsite/example_settings.py +++ /dev/null @@ -1,127 +0,0 @@ -""" -Django settings for sgawebsite project. - -Generated by 'django-admin startproject' using Django 1.11.5. - -For more information on this file, see -https://docs.djangoproject.com/en/1.11/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.11/ref/settings/ -""" - -import os - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'sgawebsite', - 'sgawebsite.apps', - 'sgawebsite.apps.main' -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'sgawebsite.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'sgawebsite.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.11/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - - -# Password validation -# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# Internationalization -# https://docs.djangoproject.com/en/1.11/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# 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/sgawebsite/__init__.py b/sgawebsite/sgawebsite/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/sgawebsite/static/css/about.css b/sgawebsite/static/css/about.css deleted file mode 100644 index 5fed823..0000000 --- a/sgawebsite/static/css/about.css +++ /dev/null @@ -1,99 +0,0 @@ -#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/sgawebsite/static/css/footer.css b/sgawebsite/static/css/footer.css deleted file mode 100644 index c6bf5eb..0000000 --- a/sgawebsite/static/css/footer.css +++ /dev/null @@ -1,43 +0,0 @@ -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/sgawebsite/static/css/header.css b/sgawebsite/static/css/header.css deleted file mode 100644 index 976d3b7..0000000 --- a/sgawebsite/static/css/header.css +++ /dev/null @@ -1,130 +0,0 @@ -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/sgawebsite/static/css/main.css b/sgawebsite/static/css/main.css deleted file mode 100644 index 1a47739..0000000 --- a/sgawebsite/static/css/main.css +++ /dev/null @@ -1,254 +0,0 @@ -/*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/sgawebsite/static/css/responsive.css b/sgawebsite/static/css/responsive.css deleted file mode 100644 index 92e9d94..0000000 --- a/sgawebsite/static/css/responsive.css +++ /dev/null @@ -1,189 +0,0 @@ -@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/sgawebsite/static/icons/favicon.ico b/sgawebsite/static/icons/favicon.ico deleted file mode 100644 index 4c6578f..0000000 Binary files a/sgawebsite/static/icons/favicon.ico and /dev/null differ diff --git a/sgawebsite/static/icons/fb.jpg b/sgawebsite/static/icons/fb.jpg deleted file mode 100644 index e73cded..0000000 Binary files a/sgawebsite/static/icons/fb.jpg and /dev/null differ diff --git a/sgawebsite/static/icons/flickr.png b/sgawebsite/static/icons/flickr.png deleted file mode 100644 index 5b17015..0000000 Binary files a/sgawebsite/static/icons/flickr.png and /dev/null differ diff --git a/sgawebsite/static/icons/mail.jpg b/sgawebsite/static/icons/mail.jpg deleted file mode 100644 index 98462e5..0000000 Binary files a/sgawebsite/static/icons/mail.jpg and /dev/null differ diff --git a/sgawebsite/static/icons/menu.png b/sgawebsite/static/icons/menu.png deleted file mode 100644 index 012fe27..0000000 Binary files a/sgawebsite/static/icons/menu.png and /dev/null differ diff --git a/sgawebsite/static/icons/menu.svg b/sgawebsite/static/icons/menu.svg deleted file mode 100644 index a0efac0..0000000 --- a/sgawebsite/static/icons/menu.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/sgawebsite/static/icons/tw.jpg b/sgawebsite/static/icons/tw.jpg deleted file mode 100644 index 62a15b3..0000000 Binary files a/sgawebsite/static/icons/tw.jpg and /dev/null differ diff --git a/sgawebsite/static/img/DSC09503.jpg b/sgawebsite/static/img/DSC09503.jpg deleted file mode 100644 index f91893b..0000000 Binary files a/sgawebsite/static/img/DSC09503.jpg and /dev/null differ diff --git a/sgawebsite/static/img/bg.jpg b/sgawebsite/static/img/bg.jpg deleted file mode 100644 index f7af999..0000000 Binary files a/sgawebsite/static/img/bg.jpg and /dev/null differ diff --git a/sgawebsite/static/img/dome-original.png b/sgawebsite/static/img/dome-original.png deleted file mode 100644 index 005a1c3..0000000 Binary files a/sgawebsite/static/img/dome-original.png and /dev/null differ diff --git a/sgawebsite/static/img/group.jpg b/sgawebsite/static/img/group.jpg deleted file mode 100644 index fb02106..0000000 Binary files a/sgawebsite/static/img/group.jpg and /dev/null differ diff --git a/sgawebsite/static/img/logo.png b/sgawebsite/static/img/logo.png deleted file mode 100644 index a8881be..0000000 Binary files a/sgawebsite/static/img/logo.png and /dev/null differ diff --git a/sgawebsite/static/img/originals.tar.gz b/sgawebsite/static/img/originals.tar.gz deleted file mode 100644 index 14971d0..0000000 Binary files a/sgawebsite/static/img/originals.tar.gz and /dev/null differ diff --git a/sgawebsite/static/img/people/2018alin.jpg b/sgawebsite/static/img/people/2018alin.jpg deleted file mode 100644 index c326dfc..0000000 Binary files a/sgawebsite/static/img/people/2018alin.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018alulushi.jpg b/sgawebsite/static/img/people/2018alulushi.jpg deleted file mode 100644 index f39076f..0000000 Binary files a/sgawebsite/static/img/people/2018alulushi.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018jprabhal.jpg b/sgawebsite/static/img/people/2018jprabhal.jpg deleted file mode 100644 index 00a8dd4..0000000 Binary files a/sgawebsite/static/img/people/2018jprabhal.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018jwang.jpg b/sgawebsite/static/img/people/2018jwang.jpg deleted file mode 100644 index 00a8dd4..0000000 Binary files a/sgawebsite/static/img/people/2018jwang.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018kdu.jpg b/sgawebsite/static/img/people/2018kdu.jpg deleted file mode 100644 index 1b0c255..0000000 Binary files a/sgawebsite/static/img/people/2018kdu.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018llin.jpg b/sgawebsite/static/img/people/2018llin.jpg deleted file mode 100644 index 65f5dc6..0000000 Binary files a/sgawebsite/static/img/people/2018llin.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018nbegotka.jpg b/sgawebsite/static/img/people/2018nbegotka.jpg deleted file mode 100644 index 2163f68..0000000 Binary files a/sgawebsite/static/img/people/2018nbegotka.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018schappid.jpg b/sgawebsite/static/img/people/2018schappid.jpg deleted file mode 100644 index 64696ed..0000000 Binary files a/sgawebsite/static/img/people/2018schappid.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018sxie.jpg b/sgawebsite/static/img/people/2018sxie.jpg deleted file mode 100644 index c61ee43..0000000 Binary files a/sgawebsite/static/img/people/2018sxie.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2018wzhang.jpg b/sgawebsite/static/img/people/2018wzhang.jpg deleted file mode 100644 index 9e239d0..0000000 Binary files a/sgawebsite/static/img/people/2018wzhang.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019amohidee.jpg b/sgawebsite/static/img/people/2019amohidee.jpg deleted file mode 100644 index 1bc7cf2..0000000 Binary files a/sgawebsite/static/img/people/2019amohidee.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019ephillip.jpg b/sgawebsite/static/img/people/2019ephillip.jpg deleted file mode 100644 index 66e964d..0000000 Binary files a/sgawebsite/static/img/people/2019ephillip.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019lgersony.jpg b/sgawebsite/static/img/people/2019lgersony.jpg deleted file mode 100644 index 0fc515b..0000000 Binary files a/sgawebsite/static/img/people/2019lgersony.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019lkeesing.jpg b/sgawebsite/static/img/people/2019lkeesing.jpg deleted file mode 100644 index 3e07065..0000000 Binary files a/sgawebsite/static/img/people/2019lkeesing.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019mcho.jpg b/sgawebsite/static/img/people/2019mcho.jpg deleted file mode 100644 index df587c1..0000000 Binary files a/sgawebsite/static/img/people/2019mcho.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019skazmi.jpg b/sgawebsite/static/img/people/2019skazmi.jpg deleted file mode 100644 index 00a8dd4..0000000 Binary files a/sgawebsite/static/img/people/2019skazmi.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2019suppalap.jpg b/sgawebsite/static/img/people/2019suppalap.jpg deleted file mode 100644 index 490b859..0000000 Binary files a/sgawebsite/static/img/people/2019suppalap.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2020bandrade.jpg b/sgawebsite/static/img/people/2020bandrade.jpg deleted file mode 100644 index bb8499d..0000000 Binary files a/sgawebsite/static/img/people/2020bandrade.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2020dbedi.jpg b/sgawebsite/static/img/people/2020dbedi.jpg deleted file mode 100644 index 8944d33..0000000 Binary files a/sgawebsite/static/img/people/2020dbedi.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2020mdass.jpg b/sgawebsite/static/img/people/2020mdass.jpg deleted file mode 100644 index 889e62d..0000000 Binary files a/sgawebsite/static/img/people/2020mdass.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2020mhuang.jpg b/sgawebsite/static/img/people/2020mhuang.jpg deleted file mode 100644 index 358e984..0000000 Binary files a/sgawebsite/static/img/people/2020mhuang.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2020mkyryche.jpg b/sgawebsite/static/img/people/2020mkyryche.jpg deleted file mode 100644 index 054377a..0000000 Binary files a/sgawebsite/static/img/people/2020mkyryche.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/2020rkalra.jpg b/sgawebsite/static/img/people/2020rkalra.jpg deleted file mode 100644 index bbc88d2..0000000 Binary files a/sgawebsite/static/img/people/2020rkalra.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/ahurowit.jpg b/sgawebsite/static/img/people/ahurowit.jpg deleted file mode 100644 index 71d3d55..0000000 Binary files a/sgawebsite/static/img/people/ahurowit.jpg and /dev/null differ diff --git a/sgawebsite/static/img/people/convert.sh b/sgawebsite/static/img/people/convert.sh deleted file mode 100755 index 10afcb5..0000000 --- a/sgawebsite/static/img/people/convert.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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/sgawebsite/static/img/people/mrazzino.jpg b/sgawebsite/static/img/people/mrazzino.jpg deleted file mode 100644 index 534ad23..0000000 Binary files a/sgawebsite/static/img/people/mrazzino.jpg and /dev/null differ diff --git a/sgawebsite/static/img/profile.jpg b/sgawebsite/static/img/profile.jpg deleted file mode 100644 index 551e16a..0000000 Binary files a/sgawebsite/static/img/profile.jpg and /dev/null differ diff --git a/sgawebsite/static/img/web-image.sh b/sgawebsite/static/img/web-image.sh deleted file mode 100755 index 95e852c..0000000 --- a/sgawebsite/static/img/web-image.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -convert $1 -sampling-factor 4:2:0 -strip -quality 85 -interlace JPEG -colorspace sRGB $2 diff --git a/sgawebsite/static/js/sidebar-min.js b/sgawebsite/static/js/sidebar-min.js deleted file mode 100644 index a15e311..0000000 --- a/sgawebsite/static/js/sidebar-min.js +++ /dev/null @@ -1,2 +0,0 @@ -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/sgawebsite/static/js/sidebar.js b/sgawebsite/static/js/sidebar.js deleted file mode 100644 index 2946b0d..0000000 --- a/sgawebsite/static/js/sidebar.js +++ /dev/null @@ -1,42 +0,0 @@ -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/sgawebsite/templates/404.html b/sgawebsite/templates/404.html deleted file mode 100644 index 6d7a292..0000000 --- a/sgawebsite/templates/404.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {% include head.html %} - - - - -
-

404

- -

Page not found :(

-

The requested page could not be found.

-
diff --git a/sgawebsite/templates/about.html b/sgawebsite/templates/about.html deleted file mode 100644 index d1e700a..0000000 --- a/sgawebsite/templates/about.html +++ /dev/null @@ -1,57 +0,0 @@ - - -{% load static %} - - - {% include 'head.html' %} - About - TJSGA - - - {% include 'header.html' %} -
-
-

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! -
-
-
- {% for org in categories %} -
-

{{ org.1 }}

- {% with key=data|get_item:org.0 %} - {% for member in key %} -
-
- -
-
- {{ member.first_name }} {{ member.last_name }} - {% if member.category != 'sponsors' and member.category != 'senators' %} - {{ member.year }} - {% endif %} - - {% if member.category != "officers" %} - {{ member.title }} - {% endif %} - - {% if member.category == "officers" and member.intro != '' %} -

{{ member.intro }}

- {% endif %} -
-
- {% endfor %} - {% endwith %} -
- {% endfor %} -
- {% include 'footer.html' %} - - diff --git a/sgawebsite/templates/events.html b/sgawebsite/templates/events.html deleted file mode 100644 index 77313c4..0000000 --- a/sgawebsite/templates/events.html +++ /dev/null @@ -1,20 +0,0 @@ -{% load static %} - - - - - {% include 'head.html' %} - Events - TJSGA - - - {% include 'header.html' %} -
-
- -
-
-
-
- {% include 'footer.html' %} - - diff --git a/sgawebsite/templates/footer.html b/sgawebsite/templates/footer.html deleted file mode 100644 index 7c2e910..0000000 --- a/sgawebsite/templates/footer.html +++ /dev/null @@ -1,20 +0,0 @@ -{% load static %} - - diff --git a/sgawebsite/templates/forms.html b/sgawebsite/templates/forms.html deleted file mode 100644 index 9c67698..0000000 --- a/sgawebsite/templates/forms.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {% include head.html %} - About - TJSGA - - - {% include header.html %} -
-
- {% for form in site.data.forms %} -
-

{{ form['name'] }}

- -
- {% endfor %} -
-
- {% include footer.html %} - - diff --git a/sgawebsite/templates/head.html b/sgawebsite/templates/head.html deleted file mode 100644 index 9249f99..0000000 --- a/sgawebsite/templates/head.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load static %} - - - - - - - - - - - diff --git a/sgawebsite/templates/header.html b/sgawebsite/templates/header.html deleted file mode 100644 index 239c360..0000000 --- a/sgawebsite/templates/header.html +++ /dev/null @@ -1,28 +0,0 @@ -{% load static %} -
- - -
-
-
diff --git a/sgawebsite/templates/index.html b/sgawebsite/templates/index.html deleted file mode 100644 index fcad916..0000000 --- a/sgawebsite/templates/index.html +++ /dev/null @@ -1,48 +0,0 @@ - - -{% load static %} - - {% include 'head.html' %} - Home - TJSGA - - - {% include 'header.html' %} -
-
-
-

Welcome!

-
-

- Welcome to Thomas Jefferson High School for Science and Technology’s student leadership site! Here, you can find information about your class and school-wide officers, our current goals and initiatives, and important events and forms. -

-

- We meet every 8th period block in the Student Leadership Room (Room 224), and all members of the student body are welcome to attend. If you can’t make it to an SGA meeting and have any questions, concerns, or suggestions, feel free to contact us at sga.tjhsst@gmail.com. -

-

- Best,
Nick Begotka
SGA President 2017-18 -

-
-
-
- TJSGA Group Photo -
-
-
-
-
-

Twitter

- - -
-
-

Feedback

- -
-
-
- {% include 'footer.html' %} - - diff --git a/sgawebsite/templates/resources.html b/sgawebsite/templates/resources.html deleted file mode 100644 index f9b4048..0000000 --- a/sgawebsite/templates/resources.html +++ /dev/null @@ -1,90 +0,0 @@ - - -{% load static %} - - {% include 'head.html' %} - Resources - TJSGA - - - {% include 'header.html' %} -
-
-
-

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. -
-
-
-
- {% include 'footer.html' %} - - diff --git a/sgawebsite/templates/robots.txt b/sgawebsite/templates/robots.txt deleted file mode 100644 index f6bf050..0000000 --- a/sgawebsite/templates/robots.txt +++ /dev/null @@ -1,6 +0,0 @@ -User-agent: Google -Disallow: /icons - -User-agent: * -Disallow: /img -Disallow: /icons diff --git a/sgawebsite/urls.py b/sgawebsite/urls.py deleted file mode 100644 index 681e913..0000000 --- a/sgawebsite/urls.py +++ /dev/null @@ -1,34 +0,0 @@ -"""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 include, url -from django.views.generic import TemplateView -from django.contrib import admin -from .apps.main import urls as main -import requests - -about = requests.get('https://sgawebsite-e30e2.firebaseio.com/about.json') -forms = requests.get('https://sgawebsite-e30e2.firebaseio.com/forms.json') -with open('about.json', 'w') as f: - f.write(str(about.json()[0])) -with open('forms.json', 'w') as f: - f.write(str(forms.json()[0])) - - -urlpatterns = [ - url(r'^admin/', admin.site.urls), - url(r'^', include(main)), - url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt'), name='robots.txt') -] diff --git a/sgawebsite/wsgi.py b/sgawebsite/wsgi.py deleted file mode 100644 index 73c3257..0000000 --- a/sgawebsite/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -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()