summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--StoneIsland/www/index.html138
-rw-r--r--StoneIsland/www/js/lib/account/PaymentView.js23
-rw-r--r--StoneIsland/www/js/lib/account/SignupView.js2
-rw-r--r--StoneIsland/www/js/lib/cart/CartPayment.js1
-rw-r--r--StoneIsland/www/js/lib/nav/AddressView.js22
-rw-r--r--StoneIsland/www/js/lib/nav/CreditCardView.js22
-rw-r--r--StoneIsland/www/js/vendor/view/serializable.js13
-rw-r--r--proxy/index.js6
8 files changed, 127 insertions, 100 deletions
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index d55f6ef6..f56367ae 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -365,80 +365,68 @@
</script>
<script type="text/html" id="address_template">
- <div>
- <label for="ship-name">Name</label>
- <input type="text" name="name" id="ship-name">
- </div>
- <div>
- <label for="ship-address1">Address</label>
- <input type="text" name="address1" id="ship-address1">
- <input type="text" name="address2" id="ship-address2">
- </div>
- <div>
- <label for="ship-city">City</label>
- <input type="text" name="city" id="ship-city">
- </div>
- <div>
- <label for="ship-state">State</label>
- <select id="state" name="state" required>
- <option value="">Please select</option>
- <option value="AL">Alabama</option>
- <option value="AK">Alaska</option>
- <option value="AZ">Arizona</option>
- <option value="AR">Arkansas</option>
- <option value="CA">California</option>
- <option value="CO">Colorado</option>
- <option value="CT">Connecticut</option>
- <option value="DE">Delaware</option>
- <option value="DC">District Of Columbia</option>
- <option value="FL">Florida</option>
- <option value="GA">Georgia</option>
- <option value="HI">Hawaii</option>
- <option value="ID">Idaho</option>
- <option value="IL">Illinois</option>
- <option value="IN">Indiana</option>
- <option value="IA">Iowa</option>
- <option value="KS">Kansas</option>
- <option value="KY">Kentucky</option>
- <option value="LA">Louisiana</option>
- <option value="ME">Maine</option>
- <option value="MD">Maryland</option>
- <option value="MA">Massachusetts</option>
- <option value="MI">Michigan</option>
- <option value="MN">Minnesota</option>
- <option value="MS">Mississippi</option>
- <option value="MO">Missouri</option>
- <option value="MT">Montana</option>
- <option value="NE">Nebraska</option>
- <option value="NV">Nevada</option>
- <option value="NH">New Hampshire</option>
- <option value="NJ">New Jersey</option>
- <option value="NM">New Mexico</option>
- <option value="NY">New York</option>
- <option value="NC">North Carolina</option>
- <option value="ND">North Dakota</option>
- <option value="OH">Ohio</option>
- <option value="OK">Oklahoma</option>
- <option value="OR">Oregon</option>
- <option value="PA">Pennsylvania</option>
- <option value="RI">Rhode Island</option>
- <option value="SC">South Carolina</option>
- <option value="SD">South Dakota</option>
- <option value="TN">Tennessee</option>
- <option value="TX">Texas</option>
- <option value="UT">Utah</option>
- <option value="VT">Vermont</option>
- <option value="VA">Virginia</option>
- <option value="WA">Washington</option>
- <option value="WV">West Virginia</option>
- <option value="WI">Wisconsin</option>
- <option value="WY">Wyoming</option>
- </select>
- </div>
- <div>
- <label for="ship-zip">Zip Code</label>
- <input type="text" name="zip" id="ship-zip">
- </div>
+ <input type="text" name="Name" placeholder="First Name">
+ <input type="text" name="Surname" placeholder="Last Name">
+ <input type="text" name="Address1" placeholder="Address Line 1">
+ <input type="text" name="Address2" placeholder="Address Line 2">
+ <input type="number" name="Zip" placeholder="Zip">
+ <span class="country">United States</span>
+ <input type="text" name="City" placeholder="City">
+ <select id="state" name="state" required>
+ <option value="">State</option>
+ <option value="AL">Alabama</option>
+ <option value="AK">Alaska</option>
+ <option value="AZ">Arizona</option>
+ <option value="AR">Arkansas</option>
+ <option value="CA">California</option>
+ <option value="CO">Colorado</option>
+ <option value="CT">Connecticut</option>
+ <option value="DE">Delaware</option>
+ <option value="DC">District Of Columbia</option>
+ <option value="FL">Florida</option>
+ <option value="GA">Georgia</option>
+ <option value="HI">Hawaii</option>
+ <option value="ID">Idaho</option>
+ <option value="IL">Illinois</option>
+ <option value="IN">Indiana</option>
+ <option value="IA">Iowa</option>
+ <option value="KS">Kansas</option>
+ <option value="KY">Kentucky</option>
+ <option value="LA">Louisiana</option>
+ <option value="ME">Maine</option>
+ <option value="MD">Maryland</option>
+ <option value="MA">Massachusetts</option>
+ <option value="MI">Michigan</option>
+ <option value="MN">Minnesota</option>
+ <option value="MS">Mississippi</option>
+ <option value="MO">Missouri</option>
+ <option value="MT">Montana</option>
+ <option value="NE">Nebraska</option>
+ <option value="NV">Nevada</option>
+ <option value="NH">New Hampshire</option>
+ <option value="NJ">New Jersey</option>
+ <option value="NM">New Mexico</option>
+ <option value="NY">New York</option>
+ <option value="NC">North Carolina</option>
+ <option value="ND">North Dakota</option>
+ <option value="OH">Ohio</option>
+ <option value="OK">Oklahoma</option>
+ <option value="OR">Oregon</option>
+ <option value="PA">Pennsylvania</option>
+ <option value="RI">Rhode Island</option>
+ <option value="SC">South Carolina</option>
+ <option value="SD">South Dakota</option>
+ <option value="TN">Tennessee</option>
+ <option value="TX">Texas</option>
+ <option value="UT">Utah</option>
+ <option value="VT">Vermont</option>
+ <option value="VA">Virginia</option>
+ <option value="WA">Washington</option>
+ <option value="WV">West Virginia</option>
+ <option value="WI">Wisconsin</option>
+ <option value="WY">Wyoming</option>
+ </select>
+ <input type="number" name="Phone" placeholder="Phone Number">
</script>
</body>
@@ -466,6 +454,8 @@
<script src="js/lib/nav/HeaderView.js"></script>
<script src="js/lib/nav/FooterView.js"></script>
<script src="js/lib/nav/SearchView.js"></script>
+<script src="js/lib/nav/AddressView.js"></script>
+<script src="js/lib/nav/CreditCardView.js"></script>
<script src="js/lib/nav/NavView.js"></script>
<script src="js/lib/account/LoginView.js"></script>
diff --git a/StoneIsland/www/js/lib/account/PaymentView.js b/StoneIsland/www/js/lib/account/PaymentView.js
index e43dfc1c..95b63879 100644
--- a/StoneIsland/www/js/lib/account/PaymentView.js
+++ b/StoneIsland/www/js/lib/account/PaymentView.js
@@ -7,6 +7,7 @@ var PaymentView = View.extend({
initialize: function(){
this.address = new AddressView ({ parent: this })
+ this.cc = new CreditCardView ({ parent: this })
},
show: function(){
@@ -14,25 +15,3 @@ var PaymentView = View.extend({
},
})
-
-var AddressView = View.extend({
-
- template: $("#address_template").html(),
-
- events: {
- },
-
- initialize: function(opt){
- this.parent = opt.parent
- },
-
- build: function(){
- },
-
- deserialize: function(){
- },
-
- serialize: function(){
- },
-
-}) \ No newline at end of file
diff --git a/StoneIsland/www/js/lib/account/SignupView.js b/StoneIsland/www/js/lib/account/SignupView.js
index 14fb27a6..0f527d4f 100644
--- a/StoneIsland/www/js/lib/account/SignupView.js
+++ b/StoneIsland/www/js/lib/account/SignupView.js
@@ -1,4 +1,4 @@
-var SignupView = View.extend({
+var SignupView = SerializableView.extend({
el: "#signup",
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index a797765d..69cbf81b 100644
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -7,6 +7,7 @@ var CartPayment = View.extend({
initialize: function(){
this.address = new AddressView ({ parent: this })
+ this.cc = new CreditCardView ({ parent: this })
},
show: function(){
diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js
new file mode 100644
index 00000000..94d20631
--- /dev/null
+++ b/StoneIsland/www/js/lib/nav/AddressView.js
@@ -0,0 +1,22 @@
+
+var AddressView = View.extend({
+
+ template: $("#address_template").html(),
+
+ events: {
+ },
+
+ initialize: function(opt){
+ this.parent = opt.parent
+ },
+
+ build: function(){
+ },
+
+ deserialize: function(){
+ },
+
+ serialize: function(){
+ },
+
+})
diff --git a/StoneIsland/www/js/lib/nav/CreditCardView.js b/StoneIsland/www/js/lib/nav/CreditCardView.js
new file mode 100644
index 00000000..6668053d
--- /dev/null
+++ b/StoneIsland/www/js/lib/nav/CreditCardView.js
@@ -0,0 +1,22 @@
+
+var CreditCardView = View.extend({
+
+ template: $("#creditcard_template").html(),
+
+ events: {
+ },
+
+ initialize: function(opt){
+ this.parent = opt.parent
+ },
+
+ build: function(){
+ },
+
+ deserialize: function(){
+ },
+
+ serialize: function(){
+ },
+
+})
diff --git a/StoneIsland/www/js/vendor/view/serializable.js b/StoneIsland/www/js/vendor/view/serializable.js
new file mode 100644
index 00000000..91d84997
--- /dev/null
+++ b/StoneIsland/www/js/vendor/view/serializable.js
@@ -0,0 +1,13 @@
+var SerializableView = View.extend({
+
+ serialize: function(){
+ var fd = new FormData(), hasCSRF = false
+
+ this.$("input[name], select[name], textarea[name]").each( function(){
+ fd.append(this.name, this.value)
+ })
+
+ return fd
+ },
+
+}) \ No newline at end of file
diff --git a/proxy/index.js b/proxy/index.js
index f9203fc7..09328ba5 100644
--- a/proxy/index.js
+++ b/proxy/index.js
@@ -94,15 +94,15 @@ var mimes = {
}
function stream (req, res) {
- var url = req.url.toLowerCase().split('?')[0]
- var ext_partz = url.split('.'), ext = ext_partz[ext_partz.length-1]
+ var url = req.url.split('?')[0]
+ var ext_partz = url.toLowerCase().split('.'), ext = ext_partz[ext_partz.length-1]
var mime = mimes[ext] || 'application/octet-stream'
if (! url || url == '/') {
url = 'index.html'
mime = 'text/html'
}
- if (url == '/cordova.js' || url == 'favicon.ico') {
+ if (url == '/cordova.js' || url == '/favicon.ico') {
res.writeHead(200, 'OK', { 'Content-type': 'application/javascript' })
res.end('{}')
return