From bbc060a56b7f55e9dccfaa4a005513e2b5224211 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Tue, 18 Jul 2017 13:28:43 -0400 Subject: [PATCH] fix encoding --- .gitignore | 12 +++--- README.md | 58 +++++++++++++------------- app.json | 12 +++--- composer.json | 20 ++++----- public/assets/css/fonts.css | 44 ++++++++++---------- public/assets/css/main.css | 82 ++++++++++++++++++------------------- 6 files changed, 114 insertions(+), 114 deletions(-) diff --git a/.gitignore b/.gitignore index fe986be..a2086c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -# os generated files -Thumbs.db -.DS_Store - -vendor/ -.env +# os generated files +Thumbs.db +.DS_Store + +vendor/ +.env diff --git a/README.md b/README.md index 45f6b7c..d5100b7 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,30 @@ -# Spoons Web Manager -Online manager for offline spooning, created for and by [**iD Tech Camps**](https://www.idtech.com/) at **Princeton University**. - -![screenshot](screenshot.png) - -## Notes - -This was quickly hacked together in a short amount of time by multiple tired staffers with very little time on our hands, so I can guarantee there are serious goofs and gaffes, possibly with some security implications. Use at your own risk and feel free to [report back](https://github.com/jakejarvis/spoons/issues)! - -[**Click here to view Snake's Spooning Statutes™, the official Spoons rulebook.**](https://docs.google.com/document/d/1Gc0H1ITcNZ0Fg3WQI4Q4HtMpMUBrT_2PReOWc62RIQU/edit?usp=sharing) - - -## Deploying to Heroku - -Easily deployable (for free!) to [Heroku](https://www.heroku.com/) as of Summer 2017. Just sign up for an account, create a new app, add the [JawsDB MySQL add-on](https://elements.heroku.com/addons/jawsdb) (free tier is plenty), run the `db_structure.sql` file to initialize the empty tables, and [set the following environment variables](https://devcenter.heroku.com/articles/config-vars#setting-up-config-vars-for-a-deployed-application) in the Heroku dashboard: - -- `SITE_URL`: base URL with no trailing slash; ex: https://idspoons.herokuapp.com -- `SITE_PASSWORD`: the password that allows staff members past the login page -- `TZ`: time zone in [TZ format](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones); ex: America/New_York - -Optional (but really [**awesome**](http://synonymsforawesome.com)) SMS reporting capabilities can be added for very little cost — just a few bucks should get you through the whole summer. [Sign up for a Twilio account](https://www.twilio.com/), add some credit, claim a catchy phone number, and point its text webhook callback to `http://{your domain}/sms_hook.php` via HTTP POST. Set the following additional [environment variables](https://devcenter.heroku.com/articles/config-vars#setting-up-config-vars-for-a-deployed-application) so the header knows to show a link to the SMS how-to page (`sms.php`) and what number to show on that page: - -- `PHONENUM`: numeric phone number claimed through Twilio; ex: +1 (917) 477-6667 -- `PHONENUM_FRIENDLY` (optional): phone number in text-based format if you [searched for one containing SPOONS on Twilio](https://support.twilio.com/hc/en-us/articles/223135247-How-to-search-for-phone-numbers); ex: +1 (917) 4-SPOONS - ---- - -with love, - +# Spoons Web Manager +Online manager for offline spooning, created for and by [**iD Tech Camps**](https://www.idtech.com/) at **Princeton University**. + +![screenshot](screenshot.png) + +## Notes + +This was quickly hacked together in a short amount of time by multiple tired staffers with very little time on our hands, so I can guarantee there are serious goofs and gaffes, possibly with some security implications. Use at your own risk and feel free to [report back](https://github.com/jakejarvis/spoons/issues)! + +[**Click here to view Snake's Spooning Statutes™, the official Spoons rulebook.**](https://docs.google.com/document/d/1Gc0H1ITcNZ0Fg3WQI4Q4HtMpMUBrT_2PReOWc62RIQU/edit?usp=sharing) + + +## Deploying to Heroku + +Easily deployable (for free!) to [Heroku](https://www.heroku.com/) as of Summer 2017. Just sign up for an account, create a new app, add the [JawsDB MySQL add-on](https://elements.heroku.com/addons/jawsdb) (free tier is plenty), run the `db_structure.sql` file to initialize the empty tables, and [set the following environment variables](https://devcenter.heroku.com/articles/config-vars#setting-up-config-vars-for-a-deployed-application) in the Heroku dashboard: + +- `SITE_URL`: base URL with no trailing slash; ex: https://idspoons.herokuapp.com +- `SITE_PASSWORD`: the password that allows staff members past the login page +- `TZ`: time zone in [TZ format](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones); ex: America/New_York + +Optional (but really [**awesome**](http://synonymsforawesome.com)) SMS reporting capabilities can be added for very little cost — just a few bucks should get you through the whole summer. [Sign up for a Twilio account](https://www.twilio.com/), add some credit, claim a catchy phone number, and point its text webhook callback to `http://{your domain}/sms_hook.php` via HTTP POST. Set the following additional [environment variables](https://devcenter.heroku.com/articles/config-vars#setting-up-config-vars-for-a-deployed-application) so the header knows to show a link to the SMS how-to page (`sms.php`) and what number to show on that page: + +- `PHONENUM`: numeric phone number claimed through Twilio; ex: +1 (917) 477-6667 +- `PHONENUM_FRIENDLY` (optional): phone number in text-based format if you [searched for one containing SPOONS on Twilio](https://support.twilio.com/hc/en-us/articles/223135247-How-to-search-for-phone-numbers); ex: +1 (917) 4-SPOONS + +--- + +with love, + [**Scrabble** ♥](https://jakejarvis.com) \ No newline at end of file diff --git a/app.json b/app.json index 89c86d2..bc0722e 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ -{ - "name": "Spoons", - "description": "Online manager for offline spooning @ iD Princeton", - "repository": "https://github.com/jakejarvis/spoons", - "addons": [] -} +{ + "name": "Spoons", + "description": "Online manager for offline spooning @ iD Princeton", + "repository": "https://github.com/jakejarvis/spoons", + "addons": [] +} diff --git a/composer.json b/composer.json index 1c63e09..de2b7cf 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ -{ - "require" : { - "php": "^5.6.0", - "ext-mbstring": "*", - "mpdf/mpdf": "^6.1" - }, - "require-dev": { - "heroku/heroku-buildpack-php": "*" - } -} +{ + "require" : { + "php": "^5.6.0", + "ext-mbstring": "*", + "mpdf/mpdf": "^6.1" + }, + "require-dev": { + "heroku/heroku-buildpack-php": "*" + } +} diff --git a/public/assets/css/fonts.css b/public/assets/css/fonts.css index 46d3862..eb50e69 100644 --- a/public/assets/css/fonts.css +++ b/public/assets/css/fonts.css @@ -1,23 +1,23 @@ -@font-face { - font-family: 'Proxima Nova'; - src: url('../fonts/proximanova-regular-webfont.eot'); - src: url('../fonts/proximanova-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/proximanova-regular-webfont.woff') format('woff'), - url('../fonts/proximanova-regular-webfont.ttf') format('truetype'), - url('../fonts/proximanova-regular-webfont.svg#proxima_nova_rgregular') format('svg'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'Proxima Nova'; - src: url('../fonts/proximanova-semibold-webfont.eot'); - src: url('../fonts/proximanova-semibold-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/proximanova-semibold-webfont.woff') format('woff'), - url('../fonts/proximanova-semibold-webfont.ttf') format('truetype'), - url('../fonts/proximanova-semibold-webfont.svg#proxima_nova_rgsemibold') format('svg'); - font-weight: bold; - font-style: normal; -} -* { - font-family: "Proxima Nova", "Helvetica Neue", Helvetica, Arial, sans-serif !important; +@font-face { + font-family: 'Proxima Nova'; + src: url('../fonts/proximanova-regular-webfont.eot'); + src: url('../fonts/proximanova-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/proximanova-regular-webfont.woff') format('woff'), + url('../fonts/proximanova-regular-webfont.ttf') format('truetype'), + url('../fonts/proximanova-regular-webfont.svg#proxima_nova_rgregular') format('svg'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Proxima Nova'; + src: url('../fonts/proximanova-semibold-webfont.eot'); + src: url('../fonts/proximanova-semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/proximanova-semibold-webfont.woff') format('woff'), + url('../fonts/proximanova-semibold-webfont.ttf') format('truetype'), + url('../fonts/proximanova-semibold-webfont.svg#proxima_nova_rgsemibold') format('svg'); + font-weight: bold; + font-style: normal; +} +* { + font-family: "Proxima Nova", "Helvetica Neue", Helvetica, Arial, sans-serif !important; } \ No newline at end of file diff --git a/public/assets/css/main.css b/public/assets/css/main.css index cf123a8..d33eceb 100644 --- a/public/assets/css/main.css +++ b/public/assets/css/main.css @@ -1,42 +1,42 @@ -body { - padding: 20px 0px !important; - font-size: 18px; - line-height: 24px; - overflow-x: hidden; - /* disable text highlight */ - -moz-user-select: none; - -webkit-user-select: none; - cursor:default; -} -a, a:hover, strong { - color: #79ad36; - font-weight: bold; -} -small { - font-size: 14px; -} -.nav-pills { - font-size:16px; -} -.nav-pills .active a, .nav-pills .active a:hover { - background-color: #79ad36; -} -.align-left { - text-align: left; -} -.align-center { - text-align: center; -} -.align-right { - text-align: right; -} -.footer { - font-size: 13px; - line-height: 40px; -} -td { - background-color: #fff; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin-bottom: -1px; +body { + padding: 20px 0px !important; + font-size: 18px; + line-height: 24px; + overflow-x: hidden; + /* disable text highlight */ + -moz-user-select: none; + -webkit-user-select: none; + cursor:default; +} +a, a:hover, strong { + color: #79ad36; + font-weight: bold; +} +small { + font-size: 14px; +} +.nav-pills { + font-size:16px; +} +.nav-pills .active a, .nav-pills .active a:hover { + background-color: #79ad36; +} +.align-left { + text-align: left; +} +.align-center { + text-align: center; +} +.align-right { + text-align: right; +} +.footer { + font-size: 13px; + line-height: 40px; +} +td { + background-color: #fff; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + margin-bottom: -1px; } \ No newline at end of file