diff --git a/index.html b/index.html index dcd93ab..004d354 100644 --- a/index.html +++ b/index.html @@ -53,12 +53,22 @@
-
-
-
-

Do you have any questions? Feel free to contact us at contact@ubhacking.com.

- Contact us -
+
+

UB Hacking

+

400 Hackers

+

November 14 - November 15

+ + Register + Login + +
+ +
+
+
+
+

Do you have any questions? Feel free to contact us at contact@ubhacking.com

+ Contact us
@@ -76,13 +86,9 @@ - - + + + diff --git a/registration/index.html b/registration/index.html index 2074da3..1426afc 100644 --- a/registration/index.html +++ b/registration/index.html @@ -56,7 +56,7 @@

UB Hacking Registration

Thanks for your interest in UBHacking! Please fill in all the fields that you are able to, as it helps us keep track of data.

* Indicates field

-
+

Account Information

@@ -69,7 +69,8 @@

Account Information

  • * - + +

    • @@ -167,7 +168,7 @@

    Hackathon Stuff

  • - +
    • diff --git a/style/css/index.css b/style/css/index.css index c83ba53..84aa33b 100644 --- a/style/css/index.css +++ b/style/css/index.css @@ -44,16 +44,6 @@ select { text-decoration: none; } -.thin { - margin-top: 65px; -} - -/*alex, changed font color*/ -.lead { - font-size: 16px; - color: #212121; -} - .btn { margin-right: 5px; border-radius: 3px; @@ -74,55 +64,52 @@ select { /*changed color of page content bar*/ .blue { - height: 225px; - background-color: #CFD8DC; + padding: 40px 0px 40px; + font-size: 16px; + color: #FFF; + background-color: #607D8B; } .navbar .container { height: 7em; } -body { - padding-top: 7em; /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */ -} - html { -/* font-weight: 800; - padding-top: 18em; - height: 100%;*/ background: url('../images/background_full.jpg') no-repeat center center fixed; -webkit-background-size: cover; -moz-background-size: cover; background-size: cover; - -o-background-size: cover;} + -o-background-size: cover; +} -#tagline { - font-size: 35px; - text-decoration: bold; - transition: all 0s ease 0s; +body { + padding-top: 7em; /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */ } -.subtitle { - font-size: 22px; +#scroll { + position: absolute; + bottom: 0; + right: 20px; } -.main-title { - opacity: .01; +.home-title { + font-size: 60px; font-weight: bold; - text-shadow: 0 0 10px #000; - color: #fff; - -webkit-transition: -webkit-transform 2.5s ease-in-out; - -webkit-font-smoothing: antialiased } -.title-margin { - margin-top: 150px; +.home-subtitle { + font-size: 32px; + font-weight: bold; } .img-center { margin: 0 auto; } +.title-margin { + margin-top: 15%; +} + /*alex, changed footer color*/ footer { padding-top: 20px; @@ -132,11 +119,6 @@ footer { width: 100%; } - -:root{ - background-color: #2c2c2c; -} - ul { list-style: none; padding: 0 10px; @@ -242,7 +224,8 @@ textarea { border-width: 0; } .full-screen { - height: 100vh; +/* height: 100vh;*/ +/* set using javascript */ } .transparent { background-color: rgba(255, 255, 255, 0); @@ -256,27 +239,4 @@ body { color: #212121; } -/* Palette generated by Material Palette - materialpalette.com/blue-grey/indigo */ - -.dark-primary-color { background: #455A64; } -.default-primary-color { background: #607D8B; } -.light-primary-color { background: #CFD8DC; } -.text-primary-color { color: #FFFFFF; } -.accent-color { background: #536DFE; } -.primary-text-color { color: #212121; } -.secondary-text-color { color: #727272; } -.divider-color { border-color: #B6B6B6; } - -/* Palette generated by Material Palette - materialpalette.com/grey/blue */ - -.dark-primary-color { background: #455A64; } -.default-primary-color { background: #607D8B; } -.light-primary-color { background: #CFD8DC; } -.text-primary-color { color: #FFFFFF; } -.accent-color { background: #536DFE; } -.primary-text-color { color: #212121; } -.secondary-text-color { color: #727272; } -.divider-color { border-color: #B6B6B6; } - - /* End Alex's additions */ diff --git a/style/images/background_full copy 2.jpg b/style/images/background_full copy 2.jpg new file mode 100644 index 0000000..e4e49f1 Binary files /dev/null and b/style/images/background_full copy 2.jpg differ diff --git a/style/images/background_full copy.jpg b/style/images/background_full copy.jpg new file mode 100644 index 0000000..31ad68b Binary files /dev/null and b/style/images/background_full copy.jpg differ diff --git a/style/images/background_full.jpg b/style/images/background_full.jpg index 31ad68b..5f6c4ea 100644 Binary files a/style/images/background_full.jpg and b/style/images/background_full.jpg differ diff --git a/style/js/homepage.js b/style/js/homepage.js new file mode 100644 index 0000000..f04c179 --- /dev/null +++ b/style/js/homepage.js @@ -0,0 +1,7 @@ +// make the title the size of the window + +$(document).ready(function() { + var height = $(window).height(); + var element = $("#title"); + element.height(height - $(".container").height()); +}); \ No newline at end of file diff --git a/style/js/registration.js b/style/js/registration.js index 543f431..2a6fa8a 100644 --- a/style/js/registration.js +++ b/style/js/registration.js @@ -1,17 +1,18 @@ $(document).ready(function() { + jsonToDatalist('http://localhost:5000/registration/colleges', '#colleges'); jsonToDatalist('http://localhost:5000/registration/majors', '#majors'); // process the form: sends json of everything except resume via AJAX and separately uploads // file. - $('form').submit(function(event) { + /*$('form').submit(function(event) { - // get the form data + // get the- form data // there are many ways to get this data using jQuery (you can use the class or id also) var formData = { 'email' : $('input[name=email]').val(), - 'password' : $('input[name=password').val(), - 'confirm-password' : $('input[name=confirm-password').val(), + 'password' : $('input[name=password]').val(), + 'confirm-password' : $('input[name=confirm-password]').val(), 'firstname' : $('input[name=firstname]').val(), 'lastname' : $('input[name=lastname]').val(), 'phone' : $('input[name=phone]').val(), @@ -57,12 +58,12 @@ $(document).ready(function() { } - /* + // handle errors for email --------------- EXAMPLE if (data.errors.email) { $('#email-group').addClass('has-error'); // add the error class to show red input $('#email-group').append('
    ' + data.errors.email + '
    '); // add the actual error message under our input - }*/ + } } else { alert("success"); @@ -86,11 +87,23 @@ $(document).ready(function() { // stop the form from submitting the normal way and refreshing the page event.preventDefault(); - }); + });*/ }); //method used to populate datalists from a JSON array +function checkPasswordsMatch() { + + if ($('input[name=password]').val() === $('input[name=confirm-password]').val()) { + $("#confirm-password-header").text("Passwords match :)"); + } + + else { + $("#confirm-password-header").text("Passwords do not match :("); + } + +} + function jsonToDatalist(url, id) { $.getJSON(url, function(data) { var options; @@ -163,54 +176,4 @@ function disable_fields() { x=document.getElementById("other") x.disabled = !x.disabled; -} - -// Validate all the fields -function validateForm() { - - var is_valid; - // An array of all the fields that must be filled out - var required_fields = { - var email = document.forms["hacker_profile"]["email"].value; - var password = document.forms["hacker_profile"]["password"].value; - var confirm-password = document.forms["hacker_profile"]["confirm-password"].value; - var firstname = document.forms["hacker_profile"]["firstname"].value; - var lastname = document.forms["hacker_profile"]["lastname"].value; - var school = document.forms["hacker_profile"]["school"].value; - var major = document.forms["hacker_profile"]["major"].value; - var year = document.forms["hacker_profile"]["year"].value; - var first-hackathon = document.forms["hacker_profile"]["first-hackathon"].value; - var project-type = document.forms["hacker_profile"]["project-type"].value; - var diet = document.forms["hacker_profile"]["diet"].value; - var shirt = document.forms["hacker_profile"]["shirt"].value; - } - - var counter = 0; - - for (var i = 0; i < required_fields.length; i++){ - console.log(required_fields[i].x); //Test to print it out - if(x == null || x == "") - { - ++counter; - alert(required_fields[i].x + "must be filld out."); - } - is_valid = counter > 0 ? true : false; - } - - if (document.forms["hacker_profile"]["password"] != document.forms["hacker_profile"]["confirm-password"]) { - is_valid = false; - } - - return is_valid; -} - -//THIS WAS ABSTRACTED INTO jsonToDatalist -// setup colleges - /*$.getJSON('http://localhost:5000/colleges', function(data) { - var collegeOptions; - $(data).each(function() { - collegeOptions = ""; - $('#colleges').append(collegeOptions); - - }); - });*/ \ No newline at end of file +} \ No newline at end of file