diff --git a/.gitignore b/.gitignore index 33df84b..5378f17 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ __pycache__/ *.py[cod] *$py.class +.sass-cache/ # Packages # ############ @@ -60,4 +61,4 @@ npm-debug.log # VirtualBox Files # ##################### *.ova -scripts/token.js \ No newline at end of file +scripts/token.js diff --git a/apply.html b/2018/apply.html similarity index 100% rename from apply.html rename to 2018/apply.html diff --git a/css/buttons.css b/2018/css/buttons.css similarity index 82% rename from css/buttons.css rename to 2018/css/buttons.css index c90a110..7268fec 100644 --- a/css/buttons.css +++ b/2018/css/buttons.css @@ -1,10 +1,20 @@ +* { + margin: 0; + padding: 0; + color: inherit; + box-sizing: inherit; } + *:focus { + outline: none; } + .social-buttons { height: 50px; + margin: auto; font-size: 0; text-align: center; position: absolute; float: right; bottom: 30px; + min-width: 240px; right: 50px; } .social-button { @@ -48,6 +58,10 @@ background-color: #3f729b; } .social-button.instagram .fa { color: #3f729b; } + .social-button.medium:before { + background-color: #000000; } + .social-button.medium .fa { + color: #000000; } .social-button:hover:before { top: -10%; left: -10%; } @@ -57,4 +71,4 @@ .social-button:focus { opacity: .85; } -/*# sourceMappingURL=buttons.css.map */ +/*# sourceMappingURL=buttons.css.map */ \ No newline at end of file diff --git a/2018/css/buttons.css.map b/2018/css/buttons.css.map new file mode 100644 index 0000000..2a0ae36 --- /dev/null +++ b/2018/css/buttons.css.map @@ -0,0 +1,9 @@ +{ + "version": 3, + "file": "buttons.css", + "sources": [ + "buttons.scss" + ], + "names": [], + "mappings": "AAcA,AAAA,CAAC,CAAC;EACD,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,OAAO;EACd,UAAU,EAAE,OAAO,GAKnB;EATD,AAMC,CANA,AAMA,MAAO,CAAC;IACP,OAAO,EAAE,IAAI,GACb;;AAGF,AAAA,eAAe,CAAC;EACf,MAAM,EAdA,IAAI;EAeV,MAAM,EAAE,IAAI;EACZ,SAAS,EAAE,CAAC;EACZ,UAAU,EAAE,MAAM;EAClB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI,GACX;;AAED,AAAA,cAAc,CAAC;EACd,OAAO,EAAE,YAAY;EACrB,gBAAgB,EAAE,IAAI;EACtB,KAAK,EA3BC,IAAI;EA4BV,MAAM,EA5BA,IAAI;EA6BV,WAAW,EA7BL,IAAI;EA8BV,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,MAAM;EAClB,QAAQ,EAAE,QAAQ;EAClB,QAAQ,EAAE,MAAM;EAEhB,OAAO,EAAE,GAAG;EACZ,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAe;EACtC,UAAU,EAjDE,GAAG,CAAC,KAAK,CAAC,sCAAyC,GAoG/D;EAjED,AAgBC,cAhBa,AAgBb,OAAQ,CAAC;IACR,OAAO,EAAE,EAAE;IACX,gBAAgB,EAAE,IAAI;IACtB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,KAAK;IACX,SAAS,EAAE,aAAa;IACxB,UAAU,EA5DC,GAAG,CAAC,KAAK,CAAC,sCAAyC,GA6D9D;EA1BF,AA4BC,cA5Ba,CA4Bb,GAAG,CAAC;IACH,SAAS,EAAE,IAAI;IACf,cAAc,EAAE,MAAM;IACtB,SAAS,EAAE,UAAS;IACpB,UAAU,EAnEC,GAAG,CAAC,KAAK,CAAC,sCAAyC,GAoE9D;EAjCF,AAuCG,cAvCW,AAqCZ,SAAU,AAEZ,OAAW,CAAC;IACR,gBAAgB,EAAC,OAAC,GAClB;EAzCJ,AA2CG,cA3CW,AAqCZ,SAAU,CAMT,GAAG,CAAC;IACH,KAAK,EAAC,OAAC,GACP;EA7CJ,AAuCG,cAvCW,AAqCZ,QAAS,AAEX,OAAW,CAAC;IACR,gBAAgB,EAAC,IAAC,GAClB;EAzCJ,AA2CG,cA3CW,AAqCZ,QAAS,CAMR,GAAG,CAAC;IACH,KAAK,EAAC,IAAC,GACP;EA7CJ,AAuCG,cAvCW,AAqCZ,UAAW,AAEb,OAAW,CAAC;IACR,gBAAgB,EAAC,OAAC,GAClB;EAzCJ,AA2CG,cA3CW,AAqCZ,UAAW,CAMV,GAAG,CAAC;IACH,KAAK,EAAC,OAAC,GACP;EA7CJ,AAuCG,cAvCW,AAqCZ,OAAQ,AAEV,OAAW,CAAC;IACR,gBAAgB,EAAC,OAAC,GAClB;EAzCJ,AA2CG,cA3CW,AAqCZ,OAAQ,CAMP,GAAG,CAAC;IACH,KAAK,EAAC,OAAC,GACP;EA7CJ,AAmDE,cAnDY,AAiDb,MAAO,AAEN,OAAQ,CAAC;IACR,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,IAAI,GACV;EAtDH,AAwDE,cAxDY,AAiDb,MAAO,CAON,GAAG,CAAC;IACH,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,QAAQ,GACnB;EA3DH,AA8DC,cA9Da,AA8Db,MAAO,CAAC;IACP,OAAO,EAAE,GAAG,GACZ" +} \ No newline at end of file diff --git a/css/buttons.scss b/2018/css/buttons.scss similarity index 97% rename from css/buttons.scss rename to 2018/css/buttons.scss index 40d62ca..246cb75 100644 --- a/css/buttons.scss +++ b/2018/css/buttons.scss @@ -6,6 +6,7 @@ $colors: ( "facebook": "#3B5998", "twitter": "#3CF", "instagram": "#3f729b", + "medium": "#000000" ); //button size @@ -31,6 +32,7 @@ $size: 50px; float: right; bottom: 30px; right: 50px; + min-width: 240px; } .social-button { diff --git a/css/mobile.css b/2018/css/mobile.css similarity index 88% rename from css/mobile.css rename to 2018/css/mobile.css index 7088631..5ec408e 100644 --- a/css/mobile.css +++ b/2018/css/mobile.css @@ -14,7 +14,8 @@ bottom: 10%; } img#schedule-image { - width: 100%; + margin-left: -45%; + width: 90%; } } @media (max-width: 1000px) { @@ -24,7 +25,7 @@ } } /* Portrait mode */ -@media (min-width: 760px) and (max-aspect-ratio: 1/1) { +@media (min-width: 762px) and (max-aspect-ratio: 1/1) { img#front-grass { bottom: 25%; } @@ -70,10 +71,20 @@ } } @media (max-width: 1250px) { + #main { + font-size: 18px; + } +} +@media (max-width: 1120px) { #main { font-size: 16px; } } +@media (max-width: 900px) { + #main { + font-size: 14px; + } +} @media (max-width: 992px) { #about-text > .row { flex-wrap: wrap; @@ -87,7 +98,13 @@ } /* Mobile site */ -@media (max-width: 760px) { +@media (max-width: 762px) { + .ml-xs-auto { + margin-left: auto !important; + } + .button-margin { + margin-top: 0; + } #schedule { margin-top: -128vw; } @@ -119,6 +136,12 @@ padding-right: 10px; font-size: 1.52em; font-family: 'FuturaStd-Heavy'; + border-radius: 0px; + position: static; + top:0; + margin-top: 0; + min-width: 0; + min-height: 0; } #sponsor-button { display: none; @@ -163,6 +186,10 @@ height: 40px; line-height: 40px; } + footer img { + padding-left: 20px; + padding-right: 20px; + } img#backhills { top: 30%; height: 70%; diff --git a/css/nav.css b/2018/css/nav.css similarity index 100% rename from css/nav.css rename to 2018/css/nav.css diff --git a/css/styles.css b/2018/css/styles.css similarity index 77% rename from css/styles.css rename to 2018/css/styles.css index 8d5a83b..27bb75a 100644 --- a/css/styles.css +++ b/2018/css/styles.css @@ -24,8 +24,13 @@ body { position: fixed; right: 30px; z-index: 100; - top: 100%; + top: 120vh; color: #F37154; + transition: all 0.5s ease-in; + transform: translateY(-120vh); +} +#close.hid, #typeform.hid { + transform: translateY(0); } #close > i { width: 1em; @@ -55,28 +60,29 @@ section:nth-of-type(2) { height: 160vh; max-height: 140vw; display: flex; - align-items: center; margin-bottom: -10px; flex-wrap: nowrap; flex-direction: column; - align-content: center; + align-content: space-between; } section:nth-of-type(2) > img { vertical-align: baseline; } footer { - padding-left: 50px !important; - padding-right: 50px !important; color: white; - z-index: 10; } footer img { margin-top: 20px; margin-bottom: 20px; - padding-left: 20px; - padding-right: 20px; + padding-left: 35px; + padding-right: 35px; width: 100%; height: auto; + object-fit: contain; + max-height: 180px; +} +footer a:first-of-type img{ + max-height: 250px; } address { margin-bottom: 0 !important; @@ -90,54 +96,52 @@ address > h2 { } .sponsor-heading { color: #95a3a6; - margin-top: 3em; + margin-top: 2em; margin-bottom: 1em; text-align: center; } -footer > .sponsor-heading:first-of-type { - margin-top: 2em; -} /*Desktop and Tablet Apply Button*/ -@media(min-width: 760px){ - .white-button { - border-color: rgba(255, 255, 255, 0.75); - color: white; - } - #sponsor-button { - width: 12em; - margin-top: 50px; - margin-bottom: -20px; - } - .round-button { - background: transparent; - border: .2rem solid; - border-radius: 30px; - transition: all 0.5s; - transition-timing-function: ease-in-out; - width: 10em; - height: 60px; - display: block; - } - .landing-button { - position: relative; - top: -55px; - } - .white-button:focus { - outline: 0; - } - .round-button:hover { - cursor: pointer; - text-decoration: none; - } - .white-button:hover { - background-color: white; - border-color: white; - color: #52749d; - } +.button-margin { + margin-top: -2em; } -/* Avoids issues on mobile */ -#close, #typeform { - display: none; +.white-button { + border-color: rgba(255, 255, 255, 0.75); + color: white; +} +#sponsor-button { + width: 12em; + margin-top: 50px; + margin-bottom: 20px; +} +.round-button { + background: transparent; + border: .2rem solid; + border-radius: 30px; + transition: all 0.5s; + transition-timing-function: ease-in-out; + min-width: 10em; + min-height: 60px; + display: block; + padding-top: 0.5em; + padding-bottom: 0.5em; + padding-left: 3em; + padding-right: 3em; +} +.landing-button { + position: relative; + top: -2em; +} +.white-button:focus { + outline: 0; +} +.round-button:hover { + cursor: pointer; + text-decoration: none; +} +.white-button:hover { + background-color: white; + border-color: white; + color: #52749d; } #about-text { position: absolute; @@ -160,7 +164,7 @@ footer > .sponsor-heading:first-of-type { font-family: 'FuturaStd-Heavy'; } #about-text p { - font-size: 1em; + font-size: 0.9em; padding-right: 4em; padding-left: 2em; } @@ -168,6 +172,7 @@ footer > .sponsor-heading:first-of-type { display: flex; align-items: center; justify-content: center; + flex-shrink: 0; } .img-absolute { position: absolute; @@ -243,7 +248,6 @@ object[data="img/soil.svg"] { img#cave1 { z-index: 6; margin-top: -10px; - width: calc(100% + 10px); height: 100%; } .caveBackground { @@ -254,6 +258,7 @@ img#cave1 { } .cave { width: calc(100% + 10px); + margin-left: -5px; } img#cave2 { z-index: 5; @@ -266,9 +271,9 @@ img#cave4 { } img#schedule-image { z-index: 7; + left: 50%; + margin-left: -40%; margin-top: 20px; - margin-left: 15px; - margin-right: 15px; height: auto; width: 80%; } @@ -280,6 +285,7 @@ img#schedule-image { padding-left: 15px; padding-top: 30px; position: relative; + align-self: center; z-index: 7; } img#mobile-schedule-image { @@ -325,14 +331,17 @@ iframe { z-index: 15; width: 100%; height: 100%; - top: 100%; left: 0px; + top: 120vh; + transform: translateY(-120vh); position: fixed; + transition: all 0.5s ease-in; } #schedule { color: white; z-index: 8; margin-top: -2.5vw; + text-align: center; } #FAQ { color: white; @@ -354,13 +363,18 @@ iframe { } #FAQ a { color: #1287A8; + margin-top: 15px; + margin-bottom: 15px; } -#FAQ a:hover { +#FAQ a:hover > img { opacity: 0.75; } .no-decorate, .no-decorate:hover { text-decoration: none; } -address h2 { +#FAQ address h2 { font-size: 28px; } +img[src="/img/logos/2017 LOGO att_vt_lkp_rgb_pos.png"] { + max-height: 250px; +} diff --git a/fonts/futura/FuturaStd-Book.otf b/2018/fonts/futura/FuturaStd-Book.otf similarity index 100% rename from fonts/futura/FuturaStd-Book.otf rename to 2018/fonts/futura/FuturaStd-Book.otf diff --git a/fonts/futura/FuturaStd-Heavy.otf b/2018/fonts/futura/FuturaStd-Heavy.otf similarity index 100% rename from fonts/futura/FuturaStd-Heavy.otf rename to 2018/fonts/futura/FuturaStd-Heavy.otf diff --git a/img/back-cave-4.png b/2018/img/back-cave-4.png similarity index 100% rename from img/back-cave-4.png rename to 2018/img/back-cave-4.png diff --git a/img/back-cave.png b/2018/img/back-cave.png similarity index 100% rename from img/back-cave.png rename to 2018/img/back-cave.png diff --git a/img/backgroundsky.svg b/2018/img/backgroundsky.svg similarity index 100% rename from img/backgroundsky.svg rename to 2018/img/backgroundsky.svg diff --git a/img/backhills.png b/2018/img/backhills.png similarity index 100% rename from img/backhills.png rename to 2018/img/backhills.png diff --git a/img/backround-hills.png b/2018/img/backround-hills.png similarity index 100% rename from img/backround-hills.png rename to 2018/img/backround-hills.png diff --git a/img/bottom-cave-background.svg b/2018/img/bottom-cave-background.svg similarity index 100% rename from img/bottom-cave-background.svg rename to 2018/img/bottom-cave-background.svg diff --git a/img/bottom-cave.svg b/2018/img/bottom-cave.svg similarity index 100% rename from img/bottom-cave.svg rename to 2018/img/bottom-cave.svg diff --git a/img/bottom-cave_-background.svg b/2018/img/bottom-cave_-background.svg similarity index 100% rename from img/bottom-cave_-background.svg rename to 2018/img/bottom-cave_-background.svg diff --git a/img/cave-layer-2.png b/2018/img/cave-layer-2.png similarity index 100% rename from img/cave-layer-2.png rename to 2018/img/cave-layer-2.png diff --git a/img/cave-layer-3.png b/2018/img/cave-layer-3.png similarity index 100% rename from img/cave-layer-3.png rename to 2018/img/cave-layer-3.png diff --git a/img/cavelayer1.svg b/2018/img/cavelayer1.svg similarity index 100% rename from img/cavelayer1.svg rename to 2018/img/cavelayer1.svg diff --git a/img/cavelayer2.svg b/2018/img/cavelayer2.svg similarity index 100% rename from img/cavelayer2.svg rename to 2018/img/cavelayer2.svg diff --git a/img/cavelayer3.svg b/2018/img/cavelayer3.svg similarity index 100% rename from img/cavelayer3.svg rename to 2018/img/cavelayer3.svg diff --git a/img/cavelayer4.png b/2018/img/cavelayer4.png similarity index 100% rename from img/cavelayer4.png rename to 2018/img/cavelayer4.png diff --git a/img/cavelayer4.svg b/2018/img/cavelayer4.svg similarity index 100% rename from img/cavelayer4.svg rename to 2018/img/cavelayer4.svg diff --git a/img/centeredwhitelogo.png b/2018/img/centeredwhitelogo.png similarity index 100% rename from img/centeredwhitelogo.png rename to 2018/img/centeredwhitelogo.png diff --git a/img/clouds.png b/2018/img/clouds.png similarity index 100% rename from img/clouds.png rename to 2018/img/clouds.png diff --git a/img/clouds.svg b/2018/img/clouds.svg similarity index 100% rename from img/clouds.svg rename to 2018/img/clouds.svg diff --git a/img/cowandsquirrel.svg b/2018/img/cowandsquirrel.svg similarity index 100% rename from img/cowandsquirrel.svg rename to 2018/img/cowandsquirrel.svg diff --git a/img/cows.png b/2018/img/cows.png similarity index 100% rename from img/cows.png rename to 2018/img/cows.png diff --git a/img/desktop.ini b/2018/img/desktop.ini similarity index 100% rename from img/desktop.ini rename to 2018/img/desktop.ini diff --git a/img/favicon/apple-icon-114x114.png b/2018/img/favicon/apple-icon-114x114.png similarity index 100% rename from img/favicon/apple-icon-114x114.png rename to 2018/img/favicon/apple-icon-114x114.png diff --git a/img/favicon/apple-icon-120x120.png b/2018/img/favicon/apple-icon-120x120.png similarity index 100% rename from img/favicon/apple-icon-120x120.png rename to 2018/img/favicon/apple-icon-120x120.png diff --git a/img/favicon/apple-icon-144x144.png b/2018/img/favicon/apple-icon-144x144.png similarity index 100% rename from img/favicon/apple-icon-144x144.png rename to 2018/img/favicon/apple-icon-144x144.png diff --git a/img/favicon/apple-icon-152x152.png b/2018/img/favicon/apple-icon-152x152.png similarity index 100% rename from img/favicon/apple-icon-152x152.png rename to 2018/img/favicon/apple-icon-152x152.png diff --git a/img/favicon/apple-icon-180x180.png b/2018/img/favicon/apple-icon-180x180.png similarity index 100% rename from img/favicon/apple-icon-180x180.png rename to 2018/img/favicon/apple-icon-180x180.png diff --git a/img/favicon/apple-icon-60x60.png b/2018/img/favicon/apple-icon-60x60.png similarity index 100% rename from img/favicon/apple-icon-60x60.png rename to 2018/img/favicon/apple-icon-60x60.png diff --git a/img/favicon/apple-icon-72x72.png b/2018/img/favicon/apple-icon-72x72.png similarity index 100% rename from img/favicon/apple-icon-72x72.png rename to 2018/img/favicon/apple-icon-72x72.png diff --git a/img/favicon/apple-icon-76x76.png b/2018/img/favicon/apple-icon-76x76.png similarity index 100% rename from img/favicon/apple-icon-76x76.png rename to 2018/img/favicon/apple-icon-76x76.png diff --git a/img/favicon/apple-icon-precomposed.png b/2018/img/favicon/apple-icon-precomposed.png similarity index 100% rename from img/favicon/apple-icon-precomposed.png rename to 2018/img/favicon/apple-icon-precomposed.png diff --git a/img/favicon/blue.png b/2018/img/favicon/blue.png similarity index 100% rename from img/favicon/blue.png rename to 2018/img/favicon/blue.png diff --git a/img/favicon/blue_fav.png b/2018/img/favicon/blue_fav.png similarity index 100% rename from img/favicon/blue_fav.png rename to 2018/img/favicon/blue_fav.png diff --git a/img/favicon/browserconfig.xml b/2018/img/favicon/browserconfig.xml similarity index 100% rename from img/favicon/browserconfig.xml rename to 2018/img/favicon/browserconfig.xml diff --git a/img/favicon/darker_fav.ico b/2018/img/favicon/darker_fav.ico similarity index 100% rename from img/favicon/darker_fav.ico rename to 2018/img/favicon/darker_fav.ico diff --git a/img/favicon/favicon-16x16.png b/2018/img/favicon/favicon-16x16.png similarity index 100% rename from img/favicon/favicon-16x16.png rename to 2018/img/favicon/favicon-16x16.png diff --git a/img/favicon/favicon-32x32.png b/2018/img/favicon/favicon-32x32.png similarity index 100% rename from img/favicon/favicon-32x32.png rename to 2018/img/favicon/favicon-32x32.png diff --git a/img/favicon/favicon-96x96.png b/2018/img/favicon/favicon-96x96.png similarity index 100% rename from img/favicon/favicon-96x96.png rename to 2018/img/favicon/favicon-96x96.png diff --git a/img/favicon/favicon.ico b/2018/img/favicon/favicon.ico similarity index 100% rename from img/favicon/favicon.ico rename to 2018/img/favicon/favicon.ico diff --git a/img/favicon/manifest.json b/2018/img/favicon/manifest.json similarity index 100% rename from img/favicon/manifest.json rename to 2018/img/favicon/manifest.json diff --git a/img/favicon/ms-icon-144x144.png b/2018/img/favicon/ms-icon-144x144.png similarity index 100% rename from img/favicon/ms-icon-144x144.png rename to 2018/img/favicon/ms-icon-144x144.png diff --git a/img/favicon/ms-icon-150x150.png b/2018/img/favicon/ms-icon-150x150.png similarity index 100% rename from img/favicon/ms-icon-150x150.png rename to 2018/img/favicon/ms-icon-150x150.png diff --git a/img/favicon/ms-icon-310x310.png b/2018/img/favicon/ms-icon-310x310.png similarity index 100% rename from img/favicon/ms-icon-310x310.png rename to 2018/img/favicon/ms-icon-310x310.png diff --git a/img/favicon/ms-icon-70x70.png b/2018/img/favicon/ms-icon-70x70.png similarity index 100% rename from img/favicon/ms-icon-70x70.png rename to 2018/img/favicon/ms-icon-70x70.png diff --git a/img/footer.svg b/2018/img/footer.svg similarity index 100% rename from img/footer.svg rename to 2018/img/footer.svg diff --git a/img/front-cave.png b/2018/img/front-cave.png similarity index 100% rename from img/front-cave.png rename to 2018/img/front-cave.png diff --git a/img/front-grass.png b/2018/img/front-grass.png similarity index 100% rename from img/front-grass.png rename to 2018/img/front-grass.png diff --git a/img/grass.svg b/2018/img/grass.svg similarity index 100% rename from img/grass.svg rename to 2018/img/grass.svg diff --git a/img/lantern.png b/2018/img/lantern.png similarity index 100% rename from img/lantern.png rename to 2018/img/lantern.png diff --git a/2018/img/logos/2017 LOGO att_vt_lkp_rgb_pos.png b/2018/img/logos/2017 LOGO att_vt_lkp_rgb_pos.png new file mode 100644 index 0000000..39d13c1 Binary files /dev/null and b/2018/img/logos/2017 LOGO att_vt_lkp_rgb_pos.png differ diff --git a/2018/img/logos/500px-CenteneCorporation_Logo.svg.png b/2018/img/logos/500px-CenteneCorporation_Logo.svg.png new file mode 100644 index 0000000..69789b4 Binary files /dev/null and b/2018/img/logos/500px-CenteneCorporation_Logo.svg.png differ diff --git a/2018/img/logos/Beyond12_logo_PMS.png b/2018/img/logos/Beyond12_logo_PMS.png new file mode 100644 index 0000000..5dde31f Binary files /dev/null and b/2018/img/logos/Beyond12_logo_PMS.png differ diff --git a/img/logos/CWC.png b/2018/img/logos/CWC.png similarity index 100% rename from img/logos/CWC.png rename to 2018/img/logos/CWC.png diff --git a/2018/img/logos/CollegeOfLettersAndScience_long_BlueGold (2).png b/2018/img/logos/CollegeOfLettersAndScience_long_BlueGold (2).png new file mode 100644 index 0000000..b565d51 Binary files /dev/null and b/2018/img/logos/CollegeOfLettersAndScience_long_BlueGold (2).png differ diff --git a/2018/img/logos/Empirically-Main-Logo.png b/2018/img/logos/Empirically-Main-Logo.png new file mode 100644 index 0000000..40e6a15 Binary files /dev/null and b/2018/img/logos/Empirically-Main-Logo.png differ diff --git a/2018/img/logos/GEN_logo_spot.jpg b/2018/img/logos/GEN_logo_spot.jpg new file mode 100644 index 0000000..332d431 Binary files /dev/null and b/2018/img/logos/GEN_logo_spot.jpg differ diff --git a/2018/img/logos/GlobalAffairs_wm_all_white.png b/2018/img/logos/GlobalAffairs_wm_all_white.png new file mode 100644 index 0000000..e223570 Binary files /dev/null and b/2018/img/logos/GlobalAffairs_wm_all_white.png differ diff --git a/2018/img/logos/IET_logo.png b/2018/img/logos/IET_logo.png new file mode 100644 index 0000000..1c16465 Binary files /dev/null and b/2018/img/logos/IET_logo.png differ diff --git a/2018/img/logos/JoyRun Logo White.png b/2018/img/logos/JoyRun Logo White.png new file mode 100644 index 0000000..1be43d9 Binary files /dev/null and b/2018/img/logos/JoyRun Logo White.png differ diff --git a/2018/img/logos/KPMG_NoCP_RGB_279.png b/2018/img/logos/KPMG_NoCP_RGB_279.png new file mode 100644 index 0000000..98d24c0 Binary files /dev/null and b/2018/img/logos/KPMG_NoCP_RGB_279.png differ diff --git a/2018/img/logos/Keysight_Signature_Pref_Color.png b/2018/img/logos/Keysight_Signature_Pref_Color.png new file mode 100644 index 0000000..4173497 Binary files /dev/null and b/2018/img/logos/Keysight_Signature_Pref_Color.png differ diff --git a/img/logos/OSIsoftLogo_White.png b/2018/img/logos/OSIsoftLogo_White.png similarity index 100% rename from img/logos/OSIsoftLogo_White.png rename to 2018/img/logos/OSIsoftLogo_White.png diff --git a/2018/img/logos/StickerYou_Web_Logo_Flat_DarkBackground.png b/2018/img/logos/StickerYou_Web_Logo_Flat_DarkBackground.png new file mode 100644 index 0000000..19830f2 Binary files /dev/null and b/2018/img/logos/StickerYou_Web_Logo_Flat_DarkBackground.png differ diff --git a/img/logos/amazon-alexa.png b/2018/img/logos/amazon-alexa.png similarity index 100% rename from img/logos/amazon-alexa.png rename to 2018/img/logos/amazon-alexa.png diff --git a/2018/img/logos/balsamiq-logo-noborder-screen.png b/2018/img/logos/balsamiq-logo-noborder-screen.png new file mode 100644 index 0000000..550ab71 Binary files /dev/null and b/2018/img/logos/balsamiq-logo-noborder-screen.png differ diff --git a/img/logos/citris-ucdavis.png b/2018/img/logos/citris-ucdavis.png similarity index 100% rename from img/logos/citris-ucdavis.png rename to 2018/img/logos/citris-ucdavis.png diff --git a/img/logos/citris.png b/2018/img/logos/citris.png similarity index 100% rename from img/logos/citris.png rename to 2018/img/logos/citris.png diff --git a/img/logos/clifbar.png b/2018/img/logos/clifbar.png similarity index 100% rename from img/logos/clifbar.png rename to 2018/img/logos/clifbar.png diff --git a/img/logos/collegeofengineering_white.png b/2018/img/logos/collegeofengineering_white.png similarity index 100% rename from img/logos/collegeofengineering_white.png rename to 2018/img/logos/collegeofengineering_white.png diff --git a/img/logos/ctrl.png b/2018/img/logos/ctrl.png similarity index 100% rename from img/logos/ctrl.png rename to 2018/img/logos/ctrl.png diff --git a/img/logos/deptofcs.png b/2018/img/logos/deptofcs.png similarity index 100% rename from img/logos/deptofcs.png rename to 2018/img/logos/deptofcs.png diff --git a/img/logos/drakontas.png b/2018/img/logos/drakontas.png similarity index 100% rename from img/logos/drakontas.png rename to 2018/img/logos/drakontas.png diff --git a/img/logos/esri.png b/2018/img/logos/esri.png similarity index 100% rename from img/logos/esri.png rename to 2018/img/logos/esri.png diff --git a/img/logos/facebook.png b/2018/img/logos/facebook.png similarity index 100% rename from img/logos/facebook.png rename to 2018/img/logos/facebook.png diff --git a/img/logos/gamer-gift.png b/2018/img/logos/gamersgift.png similarity index 100% rename from img/logos/gamer-gift.png rename to 2018/img/logos/gamersgift.png diff --git a/2018/img/logos/genability.png b/2018/img/logos/genability.png new file mode 100644 index 0000000..f3fde02 Binary files /dev/null and b/2018/img/logos/genability.png differ diff --git a/img/logos/github-logo.png b/2018/img/logos/github-logo.png similarity index 100% rename from img/logos/github-logo.png rename to 2018/img/logos/github-logo.png diff --git a/img/logos/google.png b/2018/img/logos/google.png similarity index 100% rename from img/logos/google.png rename to 2018/img/logos/google.png diff --git a/2018/img/logos/googlecloud_logo_horizontal_rgb.png b/2018/img/logos/googlecloud_logo_horizontal_rgb.png new file mode 100644 index 0000000..a598b22 Binary files /dev/null and b/2018/img/logos/googlecloud_logo_horizontal_rgb.png differ diff --git a/2018/img/logos/habitatforhumanity.png b/2018/img/logos/habitatforhumanity.png new file mode 100644 index 0000000..28baa2e Binary files /dev/null and b/2018/img/logos/habitatforhumanity.png differ diff --git a/img/logos/ibm.png b/2018/img/logos/ibm.png similarity index 100% rename from img/logos/ibm.png rename to 2018/img/logos/ibm.png diff --git a/2018/img/logos/linode-logo_standard_dark_medium.png b/2018/img/logos/linode-logo_standard_dark_medium.png new file mode 100644 index 0000000..5a509bd Binary files /dev/null and b/2018/img/logos/linode-logo_standard_dark_medium.png differ diff --git a/2018/img/logos/logomono-intel-mono.png b/2018/img/logos/logomono-intel-mono.png new file mode 100644 index 0000000..901b029 Binary files /dev/null and b/2018/img/logos/logomono-intel-mono.png differ diff --git a/img/logos/makeschool.png b/2018/img/logos/makeschool.png similarity index 100% rename from img/logos/makeschool.png rename to 2018/img/logos/makeschool.png diff --git a/img/logos/mandtvr.png b/2018/img/logos/mandtvr.png similarity index 100% rename from img/logos/mandtvr.png rename to 2018/img/logos/mandtvr.png diff --git a/img/logos/mlh-logo-white.png b/2018/img/logos/mlh-logo-white.png similarity index 100% rename from img/logos/mlh-logo-white.png rename to 2018/img/logos/mlh-logo-white.png diff --git a/img/logos/moringa.png b/2018/img/logos/moringa.png similarity index 100% rename from img/logos/moringa.png rename to 2018/img/logos/moringa.png diff --git a/img/logos/namecheap.png b/2018/img/logos/namecheap.png similarity index 100% rename from img/logos/namecheap.png rename to 2018/img/logos/namecheap.png diff --git a/img/logos/norcal-edu-foundation.png b/2018/img/logos/norcal-edu-foundation.png similarity index 100% rename from img/logos/norcal-edu-foundation.png rename to 2018/img/logos/norcal-edu-foundation.png diff --git a/img/logos/rapid-api.png b/2018/img/logos/rapid-api.png similarity index 100% rename from img/logos/rapid-api.png rename to 2018/img/logos/rapid-api.png diff --git a/img/logos/robotics.png b/2018/img/logos/robotics.png similarity index 100% rename from img/logos/robotics.png rename to 2018/img/logos/robotics.png diff --git a/2018/img/logos/saveourselves.png b/2018/img/logos/saveourselves.png new file mode 100644 index 0000000..de55fd7 Binary files /dev/null and b/2018/img/logos/saveourselves.png differ diff --git a/2018/img/logos/scoop_logo_white_rgb.png b/2018/img/logos/scoop_logo_white_rgb.png new file mode 100644 index 0000000..9a8375f Binary files /dev/null and b/2018/img/logos/scoop_logo_white_rgb.png differ diff --git a/img/logos/servicenow.png b/2018/img/logos/servicenow.png similarity index 100% rename from img/logos/servicenow.png rename to 2018/img/logos/servicenow.png diff --git a/img/logos/splunk_white.png b/2018/img/logos/splunk_white.png similarity index 100% rename from img/logos/splunk_white.png rename to 2018/img/logos/splunk_white.png diff --git a/img/logos/svgporn-stickermule.png b/2018/img/logos/svgporn-stickermule.png similarity index 100% rename from img/logos/svgporn-stickermule.png rename to 2018/img/logos/svgporn-stickermule.png diff --git a/img/logos/swe-logo.png b/2018/img/logos/swe-logo.png similarity index 100% rename from img/logos/swe-logo.png rename to 2018/img/logos/swe-logo.png diff --git a/img/logos/tech.png b/2018/img/logos/tech.png similarity index 100% rename from img/logos/tech.png rename to 2018/img/logos/tech.png diff --git a/2018/img/logos/thredup.png b/2018/img/logos/thredup.png new file mode 100644 index 0000000..aba350f Binary files /dev/null and b/2018/img/logos/thredup.png differ diff --git a/2018/img/logos/ucdavisgsm.png b/2018/img/logos/ucdavisgsm.png new file mode 100644 index 0000000..8c90f0f Binary files /dev/null and b/2018/img/logos/ucdavisgsm.png differ diff --git a/2018/img/logos/varian_lg_1cs_blk_pos_pngNoBack.png b/2018/img/logos/varian_lg_1cs_blk_pos_pngNoBack.png new file mode 100644 index 0000000..37474c6 Binary files /dev/null and b/2018/img/logos/varian_lg_1cs_blk_pos_pngNoBack.png differ diff --git a/img/logos/wolfram.png b/2018/img/logos/wolfram.png similarity index 100% rename from img/logos/wolfram.png rename to 2018/img/logos/wolfram.png diff --git a/img/logos/zillow.png b/2018/img/logos/zillow.png similarity index 100% rename from img/logos/zillow.png rename to 2018/img/logos/zillow.png diff --git a/img/logowhitewebsite.png b/2018/img/logowhitewebsite.png similarity index 100% rename from img/logowhitewebsite.png rename to 2018/img/logowhitewebsite.png diff --git a/img/middle-cave.svg b/2018/img/middle-cave.svg similarity index 100% rename from img/middle-cave.svg rename to 2018/img/middle-cave.svg diff --git a/img/middlecave-background.svg b/2018/img/middlecave-background.svg similarity index 100% rename from img/middlecave-background.svg rename to 2018/img/middlecave-background.svg diff --git a/2018/img/mobile-schedule.png b/2018/img/mobile-schedule.png new file mode 100644 index 0000000..394741b Binary files /dev/null and b/2018/img/mobile-schedule.png differ diff --git a/img/mountains-top.svg b/2018/img/mountains-top.svg similarity index 100% rename from img/mountains-top.svg rename to 2018/img/mountains-top.svg diff --git a/img/mountains.png b/2018/img/mountains.png similarity index 100% rename from img/mountains.png rename to 2018/img/mountains.png diff --git a/img/roadcowshills.svg b/2018/img/roadcowshills.svg similarity index 100% rename from img/roadcowshills.svg rename to 2018/img/roadcowshills.svg diff --git a/2018/img/schedule.png b/2018/img/schedule.png new file mode 100644 index 0000000..8cbb337 Binary files /dev/null and b/2018/img/schedule.png differ diff --git a/img/schedule.svg b/2018/img/schedule.svg similarity index 100% rename from img/schedule.svg rename to 2018/img/schedule.svg diff --git a/img/sky.png b/2018/img/sky.png similarity index 100% rename from img/sky.png rename to 2018/img/sky.png diff --git a/img/soil.svg b/2018/img/soil.svg similarity index 100% rename from img/soil.svg rename to 2018/img/soil.svg diff --git a/img/spooky-lantern.svg b/2018/img/spooky-lantern.svg similarity index 100% rename from img/spooky-lantern.svg rename to 2018/img/spooky-lantern.svg diff --git a/img/top-sky.svg b/2018/img/top-sky.svg similarity index 100% rename from img/top-sky.svg rename to 2018/img/top-sky.svg diff --git a/img/whitehdlogo.png b/2018/img/whitehdlogo.png similarity index 100% rename from img/whitehdlogo.png rename to 2018/img/whitehdlogo.png diff --git a/2018/index.html b/2018/index.html new file mode 100644 index 0000000..f5702c1 --- /dev/null +++ b/2018/index.html @@ -0,0 +1,234 @@ + + HackDavis | January 2018 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + Major League Hacking 2018 Hackathon Season + + +
+
+ + + + + +

//Code for social good

+ + +
+
+
+
+ +
+
+

What is HackDavis?

+
+

+ Applications for HackDavis are now closed! HackDavis is UC Davis's annual hackathon for students, run by students. + On January 20-21 2018, over 700 students, hackers, and creators will come + together for 24 hours of hacking. For the 3rd year in a row, we're bringing together the most talented + students in California to address the world's most pressing social issues. +

+

+ There are three main tracks to the hackathon: Environment, Health & Wellness, + and Education. With these 3 tracks, we hope to inspire change and cultivate a growing + hacker opportunity dedicated to social change at UC Davis. +

+
+
+
+
+ +
+ +
+
+ + + + +
+ + +

Schedule

+ +
+
+
+

Frequently Asked Questions

+
+
+
+

What is a hackathon?

+

+ A hackathon is where you turn your crazy ideas into real stuff. + Hundreds of hackers from across California will gather and build something they're passionate about. + You take care of building. We'll take care of you. +

+

+ We will be following MLH's Code Of Conduct. +

+

How many people can be in a team?

+

We allow up to 4 people per team which will be checked when you submit your project. Applications are still limited to individuals, but we will host a team mixer before the event to help attendees form teams.

+

Where is HackDavis?

+

HackDavis will be held in the ARC Pavillion

+
+
+

What can I build?

+

+ You can build whatever your heart desires, whether its a web app, mobile app, hardware hack, or an open source tool. + Any project under one of the three tracks (health/wellness, education, and environment) is recommended. +

+

Who can attend?

+

+ HackDavis is open to all majors! + We accept college students, alumni who left their school within a year, and high school students above 18 years old. + We will be holding workshops where students can learn how to use new and upcoming tools that assist with + web development, mobile development, and more. +

+
+
+

Why Social Good?

+

+ We find that hackathons often don't result with projects as practical solutions to specific societal problems + and we're looking to change that. Our goal is to foster a community that uses technology to pave the way for social change. +

+

How much does it cost?

+

+ HackDavis is free for all admitted participants. + Don't sweat it! We gotchu for your WiFi, meals, caffeine, swag, and workspace for the entire weekend. + If you need help with travel, we will be providing buses for certain California schools. Otherwise we will be providing up to $50 in travel reinbursements to each hacker. +

+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/js/jquery.transit.js b/2018/js/jquery.transit.js similarity index 100% rename from js/jquery.transit.js rename to 2018/js/jquery.transit.js diff --git a/js/jquery.transit.min.js b/2018/js/jquery.transit.min.js similarity index 100% rename from js/jquery.transit.min.js rename to 2018/js/jquery.transit.min.js diff --git a/js/parallax.js b/2018/js/parallax.js similarity index 87% rename from js/parallax.js rename to 2018/js/parallax.js index 89c274a..2745720 100644 --- a/js/parallax.js +++ b/2018/js/parallax.js @@ -94,6 +94,9 @@ $(window).resize(function(event) { /* Navbar links */ let duration = 1500; +$("#clickLive").click(function(){ + $(this).children()[0].click(); +}) $("#click2017").click(function(){ $(this).children()[0].click(); }) @@ -111,28 +114,11 @@ $("#clickFAQ").click(function(){ }); var closeTimeout; /* Apply button */ -$("#apply-button").click(function(){ - if(window.innerWidth <= 750 && sBrowser == 'Mozilla Firefox') { - window.location.href="./apply.html"; - } - if(closeTimeout) - { - clearInterval(closeTimeout); - closeTimeout = null; - } - $("#typeform,#close").show(); - $('html').css('overflow', 'hidden'); - $("#close").transition({top: '10px'}); - $('#typeform').transition({top: 0}); -}); + $("#close").click(function(){ - $("#close").transition({top: "100%"}); - $("#typeform").transition({top: "100%"}); + //$("#close").velocity({top: "100%"}); + //$("#typeform").velocity({top: "100%"}); + $("#close").toggleClass("hid"); + $("#typeform").toggleClass("hid"); $("html").removeAttr("style"); - if(closeTimeout) { - clearInterval(closeTimeout); - } - closeTimeout = setTimeout(function() { - $("#typeform,#close").hide(); - }, 1000); }) diff --git a/scripts/compile_current.js b/2018/scripts/compile_current.js similarity index 100% rename from scripts/compile_current.js rename to 2018/scripts/compile_current.js diff --git a/scripts/deploy_map.js b/2018/scripts/deploy_map.js similarity index 83% rename from scripts/deploy_map.js rename to 2018/scripts/deploy_map.js index 673a31a..f4c350d 100644 --- a/scripts/deploy_map.js +++ b/2018/scripts/deploy_map.js @@ -8,7 +8,7 @@ var $ = require('jquery')(index); var table = JSON.parse(fs.readFileSync(path.resolve(__dirname, "generate_map.json"), {encoding: 'utf-8'})); var row = index.document.createElement("div"); -row.setAttribute("class", "row justify-content-center"); +row.setAttribute("class", "row justify-content-center px-5"); var heading = index.document.createElement("h1"); heading.setAttribute("class", "sponsor-heading"); if(table.nonprofits.length > 0){ @@ -17,7 +17,7 @@ if(table.nonprofits.length > 0){ $("footer").prepend(heading); } row = index.document.createElement("div"); -row.setAttribute("class", "row justify-content-center"); +row.setAttribute("class", "row justify-content-center px-5"); heading = index.document.createElement("h1"); heading.setAttribute("class", "sponsor-heading"); if(table.partners.length > 0){ @@ -37,7 +37,7 @@ $(atag).prepend(button); $(buttonDiv).prepend(atag); $("footer").prepend(buttonDiv); row = index.document.createElement("div"); -row.setAttribute("class", "row justify-content-center align-items-center"); +row.setAttribute("class", "row justify-content-center align-items-center px-5"); heading = index.document.createElement("h1"); heading.setAttribute("class", "sponsor-heading"); if(table.previous_sponsors.length > 0){ @@ -46,7 +46,7 @@ if(table.previous_sponsors.length > 0){ $("footer").prepend(heading); } let count = 0; -for(let sponsor of table.previous_sponsors) { +for(let [i, sponsor] of table.previous_sponsors.entries()) { if(sponsor.src) { let tag = index.document.createElement("a"); @@ -55,7 +55,10 @@ for(let sponsor of table.previous_sponsors) { count++; } else*/ - tag.setAttribute("class", "col-lg-3 col-md-4 col-sm-6 col-xs-10"); + if(i < 2) tag.setAttribute("class", "col-lg-10 col-xs-10"); + else if(sponsor.amount >= 4000) tag.setAttribute("class", "col-sm-6 col-xs-10"); + else if(sponsor.amount >= 1000) tag.setAttribute("class", "col-md-4 col-xs-10") + else tag.setAttribute("class", "col-md-2 col-xs-4"); tag.setAttribute("href", sponsor.href); let image = index.document.createElement("img"); @@ -68,7 +71,7 @@ for(let sponsor of table.previous_sponsors) { for(let sponsor of table.partners) { if(sponsor.src) { let tag = index.document.createElement("a"); - tag.setAttribute("class", "col-lg-2 col-md-4 col-sm-4 col-xs-10"); + tag.setAttribute("class", "col-lg-3 col-md-4 col-sm-6 col-xs-10"); tag.setAttribute("href", sponsor.href); let image = index.document.createElement("img"); image.setAttribute("src", sponsor.src); @@ -85,7 +88,7 @@ for(let sponsor of table.nonprofits) { let image = index.document.createElement("img"); image.setAttribute("src", sponsor.src); tag.appendChild(image); - $("footer > div.row:nth-child(6)").append(tag); + $("footer > div.row:nth-child(7)").append(tag); } } diff --git a/2018/scripts/generate_map.json b/2018/scripts/generate_map.json new file mode 100644 index 0000000..32299ab --- /dev/null +++ b/2018/scripts/generate_map.json @@ -0,0 +1,148 @@ +{ + "previous_sponsors": [ + { + "src": "/img/logos/logomono-intel-mono.png", + "href": "https://www.intel.com", + "amount": 7000 + }, + { + "src": "/img/logos/googlecloud_logo_horizontal_rgb.png", + "href": "http://cloud.google.com/", + "amount": 5000 + }, + { + "src": "/img/logos/Keysight_Signature_Pref_Color.png", + "href": "http://www.keysight.com/", + "amount": 5000 + }, + { + "src": "/img/logos/KPMG_NoCP_RGB_279.png", + "href": "https://home.kpmg.com/us/en/home.html", + "amount": 4000 + }, + { + "src": "/img/logos/500px-CenteneCorporation_Logo.svg.png", + "href": "https://www.centene.com/", + "amount": 4000 + }, + { + "src": "/img/logos/JoyRun Logo White.png", + "href": "http://joyrun.com/", + "amount": 3500 + }, + { + "src": "/img/logos/OSIsoftLogo_White.png", + "href": "https://www.osisoft.com/", + "amount": 2500 + }, + { + "src": "/img/logos/2017 LOGO att_vt_lkp_rgb_pos.png", + "href": "http://www.att.com/", + "amount": 2000 + }, + { + "src": "/img/logos/balsamiq-logo-noborder-screen.png", + "href": "https://balsamiq.com/", + "amount": 1500 + }, + { + "src": "/img/logos/scoop_logo_white_rgb.png", + "href": "https://www.takescoop.com/", + "amount": 1500 + }, + { + "src": "/img/logos/varian_lg_1cs_blk_pos_pngNoBack.png", + "href": "https://www.varian.com/?multilink=switch", + "amount": 1500 + }, + { + "href": "http://citrisfoundry.org/", + "src": "img/logos/citris-ucdavis.png", + "name": "citris", + "amount": 1500 + }, + { + "src": "/img/logos/linode-logo_standard_dark_medium.png", + "href": "https://linode.com", + "amount": 1000 + }, + { + "src": "/img/logos/StickerYou_Web_Logo_Flat_DarkBackground.png", + "href": "https://www.stickeryou.com/products/roll-labels/627", + "amount": -1 + }, + { + "src": "/img/logos/genability.png", + "href": "http://genability.com/", + "amount": -1 + }, + { + "src": "/img/logos/svgporn-stickermule.png", + "href": "https://www.stickermule.com/uses/laptop-stickers", + "amount": -1 + }, + { + "src": "/img/logos/Empirically-Main-Logo.png", + "href": "http://empirically.co", + "amount": -1 + }, + { + "href": "http://www.clifbar.com/", + "src": "img/logos/clifbar.png", + "name": "clifbar", + "amount": -1 + }, + { + "src": "/img/logos/tech.png", + "href": "http://get.tech/", + "amount": -2 + } + ], + "partners": [ + { + "src": "/img/logos/deptofcs.png", + "href": "http://http//www.cs.ucdavis.edu", + "amount": 6000 + }, + { + "src": "/img/logos/collegeofengineering_white.png", + "href": "http://engineering.ucdavis.edu", + "amount": 2000 + }, + { + "src": "/img/logos/GlobalAffairs_wm_all_white.png", + "href": "https://globalaffairs.ucdavis.edu/", + "amount": 2500 + }, + { + "src": "/img/logos/CollegeOfLettersAndScience_long_BlueGold (2).png", + "href": "https://ls.ucdavis.edu" + }, + { + "src": "/img/logos/IET_logo.png", + "href": "https://iet.ucdavis.edu" + }, + { + "src": "/img/logos/ucdavisgsm.png", + "href": "http://gsm.ucdavis.edu/" + }, + { + "src": "/img/logos/thredup.png", + "href": "http://www.thredup.com/" + } + ], + "nonprofits": [ + { + "src": "/img/logos/habitatforhumanity.png", + "href": "http://habitatgreatersac.org/" + }, + { + "src": "/img/logos/Beyond12_logo_PMS.png", + "href": "https://beyond12.org/" + }, + { + "src": "/img/logos/saveourselves.png", + "href": "http://save-ourselves.org/" + } + ] +} \ No newline at end of file diff --git a/scripts/initial_map.json b/2018/scripts/initial_map.json similarity index 95% rename from scripts/initial_map.json rename to 2018/scripts/initial_map.json index 366b610..42c59fe 100644 --- a/scripts/initial_map.json +++ b/2018/scripts/initial_map.json @@ -31,7 +31,8 @@ }, { "href": "https://www.splunk.com/", - "src": "img/logos/splunk_white.png" + "src": "img/logos/splunk_white.png", + "name": "splunk" }, { "href": "https://www.servicenow.com/", @@ -63,7 +64,8 @@ }, { "href": "http://www.clifbar.com/", - "src": "img/logos/clif-bar.png" + "src": "img/logos/clifbar.png", + "name": "clifbar" }, { "href": "http://mandtvr.com/", diff --git a/scripts/sync.js b/2018/scripts/sync.js similarity index 71% rename from scripts/sync.js rename to 2018/scripts/sync.js index 06963a4..9d86f6e 100644 --- a/scripts/sync.js +++ b/2018/scripts/sync.js @@ -20,13 +20,23 @@ var optionsMoney = { } var source = JSON.parse(fs.readFileSync(path.resolve(__dirname, "initial_map.json"), {encoding: 'utf-8'})); +source.previous_sponsors = source.previous_sponsors.filter(function(val){ + if(val.name) return true; +}); +source.partners = source.partners.filter(function(val){ + if(val.name) return true; +}); +source.nonprofits = source.nonprofits.filter(function(val){ + if(val.name) return true; +}); + var table = {previous_sponsors: [], partners:[], nonprofits:[]}; var files = fs.readdirSync(path.resolve(__dirname, "../img/logos")); function getSrc(card, callback) { card.name = card.name.replace('.', ''); for(let file of files) { - file = file.replace(" ", "").toLowerCase(); - if(file.indexOf(card.name) != -1) + let f = file.replace(" ", "").toLowerCase(); + if(f.indexOf(card.name) != -1) { var ret = "/img/logos/" + file; callback(null, ret); @@ -38,7 +48,7 @@ function getSrc(card, callback) { function getHref(card, callback) { if(card.desc.includes("link:")) { let sub = card.desc.slice(card.desc.indexOf("link: ") + 6); - let string = S(sub.slice(0, sub.indexOf(" "))); + let string = S(sub.slice(0, sub.indexOf("\n"))); var href; if(string.contains("https://")) href = string.s; else href = string.ensureLeft("http://").s; @@ -55,19 +65,27 @@ function getHref(card, callback) { } function getObjectForName(card, key, array, callback) { var object = {}; + var amount = null; + if(card.desc.includes("amount:")) { + let sub = card.desc.slice(card.desc.indexOf("amount: ") + 8); + let string = sub.indexOf("\n") != -1 ? sub.slice(0, sub.indexOf("\n")) : sub; + amount = Number(string); + } for(let item of source[key]) { - if(item.name) { - item.name = item.name.split(' ').join('').toLowerCase(); - if(item.name.indexOf(card.name) != -1) - { - array.push(item); - return callback(null); - } + item.name = item.name.split(' ').join('').toLowerCase(); + if(item.name.indexOf(card.name) != -1) + { + item.amount = amount; + array.push(item); + return callback(null); } } async.applyEach([getSrc, getHref], card, function(err, results){ - if(results[0] && results[1]) - array.push({src: results[0], href: results[1]}); + if(results[0] && results[1]) { + let obj = {src: results[0], href: results[1]}; + if(amount) obj.amount = amount; + array.push(obj); + } callback(err); }); } @@ -78,7 +96,7 @@ function parseList(error, response, body, call) { console.log(card.name); if(card.labels.length > 0) { for(let label of card.labels) { - if(label.name == "Nonprofit") { + if(label.name == "Non-Profit") { getObjectForName(card, "nonprofits", table.nonprofits, callback); } else if(label.name == "Partner") { @@ -102,5 +120,10 @@ async.parallel([ if(err) console.error(err); console.log("done"); + table.previous_sponsors.sort(function(a, b){ + a.amount = a.amount || -1; + b.amount = b.amount || -1; + return b.amount - a.amount; + }) fs.writeFileSync(path.join(__dirname, "generate_map.json"), JSON.stringify(table, null, '\t')); }); \ No newline at end of file diff --git a/template.html b/2018/template.html similarity index 91% rename from template.html rename to 2018/template.html index 437aa67..0949f3f 100644 --- a/template.html +++ b/2018/template.html @@ -29,8 +29,8 @@ - - + + @@ -44,7 +44,7 @@

HACK Schedule - + @@ -67,9 +67,6 @@

//Code for social good

-
- -
@@ -78,7 +75,7 @@

//Code for social good

What is HackDavis?

- Applications for HackDavis are now open! HackDavis is UC Davis's annual hackathon for students, run by students. + Applications for HackDavis are now closed! HackDavis is UC Davis's annual hackathon for students, run by students. On January 20-21 2018, over 700 students, hackers, and creators will come together for 24 hours of hacking. For the 3rd year in a row, we're bringing together the most talented students in California to address the world's most pressing social issues. @@ -103,8 +100,7 @@

What is HackDavis?

- - +

Schedule

@@ -116,19 +112,17 @@

Frequently Asked Questions

What is a hackathon?

- A hackathon is where you turn your crazy ideas into real stuff. + A hackathon is where you turn your crazy ideas into real stuff. Hundreds of hackers from across California will gather and build something they're passionate about. You take care of building. We'll take care of you.

We will be following MLH's Code Of Conduct.

-

- We participate in Major League Hacking (MLH) as a MLH Member Event. - You authorize us to share certain application/registration information for event administration, - ranking, MLH administration, pre and post-event informational e-mails, - and occasional messages about hackathons in line with the MLH Privacy Policy. -

+

How many people can be in a team?

+

We allow up to 4 people per team which will be checked when you submit your project. Applications are still limited to individuals, but we will host a team mixer before the event to help attendees form teams.

+

Where is HackDavis?

+

HackDavis will be held in the ARC Pavillion

What can I build?

@@ -139,7 +133,7 @@

What can I build?

Who can attend?

HackDavis is open to all majors! - As long as you're prepared to learn, brainstorm, and build cool things, we welcome you to join. + We accept college students, alumni who left their school within a year, and high school students above 18 years old. We will be holding workshops where students can learn how to use new and upcoming tools that assist with web development, mobile development, and more.

@@ -154,13 +148,14 @@

How much does it cost?

HackDavis is free for all admitted participants. Don't sweat it! We gotchu for your WiFi, meals, caffeine, swag, and workspace for the entire weekend. - Info on travel reimbursements will be released closer to the event date. + If you need help with travel, we will be providing buses for certain California schools. Otherwise we will be providing up to $50 in travel reinbursements to each hacker.

-
-