diff --git a/.htaccess b/.htaccess deleted file mode 100644 index d937d9d..0000000 --- a/.htaccess +++ /dev/null @@ -1,23 +0,0 @@ - - -Options +FollowSymlinks -RewriteEngine on -RewriteBase / - -#RewriteRule ^status.json$ status.php?format=json [L] - -# The following rule tells Apache that if the requested filename -# exists, simply serve it. -RewriteCond %{REQUEST_FILENAME} -s [OR] -RewriteCond %{REQUEST_FILENAME} -l [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^.*$ - [NC,L] - -#RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$ -RewriteRule ^(.*)$ index.php [NC,L] - -# Make the .git directory inaccessible -RedirectMatch 404 /\.git.*$ -RedirectMatch 404 /config.json - - diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/config.json b/config.json old mode 100644 new mode 100755 index 1630e9f..b56cf26 --- a/config.json +++ b/config.json @@ -1,3 +1,3 @@ { - "api_key": "86f7896f97asdf89u0a9s7d7fdasgsda88af" + "api_key": "qCUlkiJTqzI3ClxguW2v.etqpOUwi85djis7p.Vicg3a8vjPfCcEG" } \ No newline at end of file diff --git a/css/spaceapi.css b/css/spaceapi.css old mode 100644 new mode 100755 index 0932fcb..57e6b89 --- a/css/spaceapi.css +++ b/css/spaceapi.css @@ -1,4 +1,4 @@ -@import "../font/kavoon-regular.css"; +@import "../font/bender/bender.css"; body { text-align: center; @@ -23,24 +23,29 @@ body { * https://blueprints.launchpad.net/inkscape/+spec/allow-browser-resizing * */ -#svg4534 { - width: 410px; - display: none; -} h2 { - font-family: KavoonRegular; + font-family: bender_bold; font-size: 40px; /* the letter spaceing breaks the centering */ /*letter-spacing: 0.7em;*/ } -#svg4534, h2 { +h1 { + font-family: bender_bold; + font-size: 40px; +} + +#svg4534, h2, h1 { transition: all 0.3s ease 0s; } @media (max-width: 500px) { + h1 { + font-size: 30px; + } + h2 { font-size: 30px; } @@ -53,6 +58,10 @@ h2 { @media (max-width: 380px) { + h1 { + font-size: 25px; + } + h2 { font-size: 25px; } @@ -65,6 +74,10 @@ h2 { @media (max-width: 220px) { + h1 { + font-size: 20px; + } + h2 { font-size: 20px; } @@ -77,6 +90,10 @@ h2 { @media (max-width: 160px) { + h1 { + font-size: 18px; + } + h2 { font-size: 18px; } @@ -89,6 +106,10 @@ h2 { @media (max-width: 125px) { + h1 { + font-size: 18px; + } + h2 { font-size: 18px; } @@ -101,6 +122,10 @@ h2 { @media (max-width: 90px) { + h1 { + font-size: 16px; + } + h2 { font-size: 16px; } @@ -114,21 +139,29 @@ h2 { #button { display: none; margin: 0 auto; - text-align: left; + text-align: center; + /* original: width: 128px; - height: 128px; + height: 128px;*/ + /*full logo: + width: 545px; + height: 428px; + */ + width: 256px; + height: 261px; } #button.open { - background: url('/img/button/green.png') no-repeat; + background: url('/img/logo_green.png') no-repeat; } #button.closed { - background: url('/img/button/red.png') no-repeat; + background: url('/img/logo_red.png') no-repeat; } -#button.undefined { - background: url('/img/button/gray.png') no-repeat; +#button.undefined\3f \21 { + background: url('/img/logo_gray.png') no-repeat; } + #circle3371, #path3339 { -webkit-transition: all linear 1s; @@ -156,4 +189,5 @@ h2 { } #path3339.undefined { fill: #0f91ec !important; -} \ No newline at end of file +} + diff --git a/css/spaceapi.css.old b/css/spaceapi.css.old new file mode 100755 index 0000000..b6e3b8a --- /dev/null +++ b/css/spaceapi.css.old @@ -0,0 +1,161 @@ +@import "../font/bender/bender.css"; + +body { + text-align: center; + padding: 20px 0px 0px 0px; + margin: 0; + overflow: hidden; +} + +/** + * In order to use the width property to scale the svg + * the following attributes had to be added to the outer + * svg element: + * + * preserveAspectRatio="xMinYMin meet" + * viewBox="0 0 410 430" + * + * See: + * + * http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute + * http://www.w3.org/TR/SVG/coords.html#ViewBoxAttribute + * http://stackoverflow.com/questions/644896/how-do-i-scale-a-stubborn-svg-embedded-with-the-object-tag + * https://blueprints.launchpad.net/inkscape/+spec/allow-browser-resizing + * + */ +#svg4534 { + width: 410px; + display: none; +} + +h2 { + font-family: bender_bold; + font-size: 40px; + /* the letter spaceing breaks the centering */ + /*letter-spacing: 0.7em;*/ +} + +#svg4534, h2 { + transition: all 0.3s ease 0s; +} + +@media (max-width: 500px) { + + h2 { + font-size: 30px; + } + + #svg4534 { + width: 350px; + } + +} + +@media (max-width: 380px) { + + h2 { + font-size: 25px; + } + + #svg4534 { + width: 210px; + } + +} + +@media (max-width: 220px) { + + h2 { + font-size: 20px; + } + + #svg4534 { + width: 150px; + } + +} + +@media (max-width: 160px) { + + h2 { + font-size: 18px; + } + + #svg4534 { + width: 120px; + } + +} + +@media (max-width: 125px) { + + h2 { + font-size: 18px; + } + + #svg4534 { + width: 80px; + } + +} + +@media (max-width: 90px) { + + h2 { + font-size: 16px; + } + + #svg4534 { + width: 50px; + } + +} + +#button { + display: none; + margin: 0 auto; + text-align: left; + width: 128px; + height: 128px; +} + +#button.open { + background: url('/img/button/green.png') no-repeat; +} +#button.closed { + background: url('/img/button/red.png') no-repeat; +} +#button.undefined { + background: url('/img/button/gray.png') no-repeat; +} + + +#circle3371, +#path3339 { + -webkit-transition: all linear 1s; + -moz-transition: all linear 1s; + -o-transition: all linear 1s; + transition: all linear 1s; +} + +#circle3371.open { + fill: #2dd2b8 !important; +} +#circle3371.closed { + fill: #ff7f00 !important; +} +#circle3371.undefined { + fill: #00cfff !important; +} + + +#path3339.open { + fill: #007f3f !important; +} +#path3339.closed { + fill: #ec370f !important; +} +#path3339.undefined { + fill: #0f91ec !important; +} + diff --git a/data/.gitignore b/data/.gitignore deleted file mode 100644 index 72e8ffc..0000000 --- a/data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/data/state.open b/data/state.open new file mode 100644 index 0000000..ac19f46 --- /dev/null +++ b/data/state.open @@ -0,0 +1 @@ +boolean: \ No newline at end of file diff --git a/docs/update_use_cases.svg b/docs/update_use_cases.svg old mode 100644 new mode 100755 diff --git a/docs/vhosts/php b/docs/vhosts/php old mode 100644 new mode 100755 diff --git a/docs/vhosts/python b/docs/vhosts/python old mode 100644 new mode 100755 diff --git a/font/OFL.txt b/font/OFL.txt deleted file mode 100644 index 2f3786e..0000000 --- a/font/OFL.txt +++ /dev/null @@ -1,92 +0,0 @@ -Copyright (c) 2012 by Sorkin Type Co (www.sorkintype.com), with Reserved Font Name 'Kavoon' -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/font/bender/bender.css b/font/bender/bender.css new file mode 100755 index 0000000..da1b5bb --- /dev/null +++ b/font/bender/bender.css @@ -0,0 +1,4 @@ +@font-face { + font-family: 'bender_bold'; + src: url('bender_bold.otf') format('opentype'); +} diff --git a/font/bender/bender_bold.otf b/font/bender/bender_bold.otf new file mode 100644 index 0000000..204e9e6 Binary files /dev/null and b/font/bender/bender_bold.otf differ diff --git a/font/kavoon-regular.css b/font/kavoon-regular.css deleted file mode 100644 index fc5b476..0000000 --- a/font/kavoon-regular.css +++ /dev/null @@ -1,8 +0,0 @@ -@font-face { - font-family: 'KavoonRegular'; - src: url('kavoon-regular.eot'); - src: url('kavoon-regular.eot') format('embedded-opentype'), - url('kavoon-regular.woff') format('woff'), - url('kavoon-regular.ttf') format('truetype'), - url('kavoon-regular.svg#KavoonRegular') format('svg'); -} diff --git a/font/kavoon-regular.eot b/font/kavoon-regular.eot deleted file mode 100644 index 2bd0232..0000000 Binary files a/font/kavoon-regular.eot and /dev/null differ diff --git a/font/kavoon-regular.svg b/font/kavoon-regular.svg deleted file mode 100644 index 7ef9774..0000000 --- a/font/kavoon-regular.svg +++ /dev/null @@ -1,1254 +0,0 @@ - - - - -Created by FontForge 20110222 at Sun Sep 15 04:39:55 2013 - By Orthosie Webhosting -Copyright (c) 2011-2013, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name 'Kavoon' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/font/kavoon-regular.ttf b/font/kavoon-regular.ttf deleted file mode 100644 index 0fc0eac..0000000 Binary files a/font/kavoon-regular.ttf and /dev/null differ diff --git a/font/kavoon-regular.woff b/font/kavoon-regular.woff deleted file mode 100644 index b9d563c..0000000 Binary files a/font/kavoon-regular.woff and /dev/null differ diff --git a/img/button/gray.png b/img/button/gray.png old mode 100644 new mode 100755 diff --git a/img/button/green.png b/img/button/green.png old mode 100644 new mode 100755 diff --git a/img/button/red.png b/img/button/red.png old mode 100644 new mode 100755 diff --git a/img/logo_gray.png b/img/logo_gray.png new file mode 100755 index 0000000..b53369a Binary files /dev/null and b/img/logo_gray.png differ diff --git a/img/logo_green.png b/img/logo_green.png new file mode 100755 index 0000000..d202bbc Binary files /dev/null and b/img/logo_green.png differ diff --git a/img/logo_red.png b/img/logo_red.png new file mode 100755 index 0000000..7693319 Binary files /dev/null and b/img/logo_red.png differ diff --git a/img/monster/monster.svg b/img/monster/monster.svg old mode 100644 new mode 100755 diff --git a/img/monster/readme b/img/monster/readme old mode 100644 new mode 100755 diff --git a/img/osaa_bg.jpg b/img/osaa_bg.jpg new file mode 100644 index 0000000..8d31716 Binary files /dev/null and b/img/osaa_bg.jpg differ diff --git a/img/osaa_bg.png b/img/osaa_bg.png new file mode 100755 index 0000000..bad1423 Binary files /dev/null and b/img/osaa_bg.png differ diff --git a/img/osaa_logo_gray.png b/img/osaa_logo_gray.png new file mode 100755 index 0000000..3a7544f Binary files /dev/null and b/img/osaa_logo_gray.png differ diff --git a/img/osaa_logo_green.png b/img/osaa_logo_green.png new file mode 100755 index 0000000..a94ac33 Binary files /dev/null and b/img/osaa_logo_green.png differ diff --git a/img/osaa_logo_red.png b/img/osaa_logo_red.png new file mode 100755 index 0000000..a59aa82 Binary files /dev/null and b/img/osaa_logo_red.png differ diff --git a/index.php b/index.php old mode 100644 new mode 100755 index 844c04a..3fd1bf8 --- a/index.php +++ b/index.php @@ -1,5 +1,4 @@ " + exit 1 +fi + +if [ "$1" == "open" ] +then + echo "Marking the space as open" + curl $ARG_OPEN $ARG_KEY $ENDPOINT_SET_URL + echo "The space is open!" + exit 0 +elif [ "$1" == "close" ] +then + echo "Marking the space as closed" + curl $ARG_CLOSE $ARG_KEY $ENDPOINT_SET_URL + echo "The space is closed!" + exit 0 +else + echo "input not recognized.." + echo "usage: $(basename $0) " + exit 1 +fi diff --git a/template.html b/template.html old mode 100644 new mode 100755 index 1b84473..52374c8 --- a/template.html +++ b/template.html @@ -15,18 +15,19 @@ // uncomment one of both in order to use either the // monster or a simple button to display the status - $("#svg4534").fadeIn(); - //$("#button").fadeIn(); + //$("#svg4534").fadeIn(); + $("#button").fadeIn(); }); - - +{# #} + +

THE SPACE IS CURRENTLY

+

-
-{{ monster }} +{# used to be a {{ monster }} here #} diff --git a/tests/test.php b/tests/test.php old mode 100644 new mode 100755