From bcc85b6446d874fa414a2ff9d1930649573a2fba Mon Sep 17 00:00:00 2001 From: Yaman Date: Wed, 24 Dec 2014 12:33:41 -0500 Subject: [PATCH] added google account login and /login page --- chromebook-checkout-meteor/.meteor/packages | 2 ++ chromebook-checkout-meteor/.meteor/versions | 11 +++++++++++ .../client/chromebook.css | 17 +++++++++++++---- chromebook-checkout-meteor/client/login.css | 6 ++++++ chromebook-checkout-meteor/client/login.html | 11 +++++++++++ chromebook-checkout-meteor/client/main.css | 4 ++-- chromebook-checkout-meteor/client/router.js | 4 +++- 7 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 chromebook-checkout-meteor/client/login.css create mode 100644 chromebook-checkout-meteor/client/login.html diff --git a/chromebook-checkout-meteor/.meteor/packages b/chromebook-checkout-meteor/.meteor/packages index fe09757..4ac05ba 100644 --- a/chromebook-checkout-meteor/.meteor/packages +++ b/chromebook-checkout-meteor/.meteor/packages @@ -9,3 +9,5 @@ autopublish insecure iron:router momentjs:moment +accounts-google +accounts-ui diff --git a/chromebook-checkout-meteor/.meteor/versions b/chromebook-checkout-meteor/.meteor/versions index 58fb60f..a0f01ef 100644 --- a/chromebook-checkout-meteor/.meteor/versions +++ b/chromebook-checkout-meteor/.meteor/versions @@ -1,3 +1,8 @@ +accounts-base@1.1.3 +accounts-google@1.0.3 +accounts-oauth@1.1.3 +accounts-ui@1.1.4 +accounts-ui-unstyled@1.1.5 application-configuration@1.0.4 autopublish@1.0.2 autoupdate@1.1.4 @@ -14,6 +19,7 @@ ejson@1.0.5 fastclick@1.0.2 follower-livedata@1.0.3 geojson-utils@1.0.2 +google@1.1.3 html-tools@1.0.3 htmljs@1.0.3 http@1.0.9 @@ -30,7 +36,9 @@ iron:url@1.0.6 jquery@1.0.2 json@1.0.2 launch-screen@1.0.1 +less@1.0.12 livedata@1.0.12 +localstorage@1.0.2 logging@1.0.6 meteor@1.1.4 meteor-platform@1.2.1 @@ -39,6 +47,8 @@ minimongo@1.0.6 mobile-status-bar@1.0.2 momentjs:moment@2.8.4 mongo@1.0.10 +oauth@1.1.3 +oauth2@1.1.2 observe-sequence@1.0.4 ordered-dict@1.0.2 random@1.0.2 @@ -47,6 +57,7 @@ reactive-var@1.0.4 reload@1.1.2 retry@1.0.2 routepolicy@1.0.3 +service-configuration@1.0.3 session@1.0.5 spacebars@1.0.4 spacebars-compiler@1.0.4 diff --git a/chromebook-checkout-meteor/client/chromebook.css b/chromebook-checkout-meteor/client/chromebook.css index c27c483..8ae242c 100644 --- a/chromebook-checkout-meteor/client/chromebook.css +++ b/chromebook-checkout-meteor/client/chromebook.css @@ -1,22 +1,31 @@ +body { + -webkit-user-select: none; +} + .chromebook { font-family: Lato; padding-left:2%; margin-left:3%; - margin-right:0.5%; + margin-right:3%; margin-top:.7%; margin-bottom:.7%; box-shadow: 3px 3px 10px #c2c2c2; color: #000000; } +.time { + font-size: 75%; + color: #6D6E6D; +} + .available { - background-color:#72D376; + background-color:#72D376; } .checkedout { - background-color:#F9DB45; + background-color:#F9DB45; } .unavailable { - background-color:#E14C2B; + background-color:#E14C2B; } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/login.css b/chromebook-checkout-meteor/client/login.css new file mode 100644 index 0000000..432a614 --- /dev/null +++ b/chromebook-checkout-meteor/client/login.css @@ -0,0 +1,6 @@ +#login-buttons { + margin: 0 auto; + padding-left: 26.5%; + padding-bottom: 5%; + padding-top: 5%; +} diff --git a/chromebook-checkout-meteor/client/login.html b/chromebook-checkout-meteor/client/login.html new file mode 100644 index 0000000..fea2845 --- /dev/null +++ b/chromebook-checkout-meteor/client/login.html @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/main.css b/chromebook-checkout-meteor/client/main.css index 8b6c404..314dfd3 100644 --- a/chromebook-checkout-meteor/client/main.css +++ b/chromebook-checkout-meteor/client/main.css @@ -54,7 +54,7 @@ a { padding-bottom:0; padding-top:0; } -button{ +button { background: #d94158; background-image: -webkit-linear-gradient(top, #d94158, #ad3838); background-image: -moz-linear-gradient(top, #d94158, #ad3838); @@ -71,7 +71,7 @@ button{ margin-left:21.15%; margin-top:2%; margin-bottom:2%; - } +} button:hover { background: #db6b6b; background-image: -webkit-linear-gradient(top, #db6b6b, #d64949); diff --git a/chromebook-checkout-meteor/client/router.js b/chromebook-checkout-meteor/client/router.js index 134c56d..dae5a46 100644 --- a/chromebook-checkout-meteor/client/router.js +++ b/chromebook-checkout-meteor/client/router.js @@ -2,4 +2,6 @@ Router.route('/', function() { this.render("initial"); }) -Router.route('/checkout'); \ No newline at end of file +Router.route('/checkout'); + +Router.route('/login'); \ No newline at end of file