From 3956068c8589d9abd9275f85364da6289cd3e57a Mon Sep 17 00:00:00 2001 From: Lorenzo Iovino Date: Sat, 30 Jan 2016 20:05:22 +0100 Subject: [PATCH] dvdsvsd --- hackatonApp/scss/home-items.scss | 7 ++ hackatonApp/www/home-categories.json | 56 +++++++++++----- hackatonApp/www/img/Camera.png | Bin 0 -> 308 bytes hackatonApp/www/img/Cart.png | Bin 0 -> 323 bytes hackatonApp/www/img/mcdonaldlogo.png | Bin 0 -> 4752 bytes hackatonApp/www/js/controllers.js | 16 ++++- hackatonApp/www/shop-categories.json | 75 ++++++++++++++++++++++ hackatonApp/www/views/app/allTickets.html | 38 ----------- hackatonApp/www/views/app/category.html | 49 +++++++++++++- hackatonApp/www/views/app/home.html | 1 + 10 files changed, 185 insertions(+), 57 deletions(-) create mode 100644 hackatonApp/www/img/Camera.png create mode 100644 hackatonApp/www/img/Cart.png create mode 100644 hackatonApp/www/img/mcdonaldlogo.png create mode 100644 hackatonApp/www/shop-categories.json diff --git a/hackatonApp/scss/home-items.scss b/hackatonApp/scss/home-items.scss index 73521cb..b663a3c 100644 --- a/hackatonApp/scss/home-items.scss +++ b/hackatonApp/scss/home-items.scss @@ -180,3 +180,10 @@ $pre-img-ratios: append($pre-img-ratios, $home-categories-img-ratio); } } } +input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"] { + border: 10px; + margin-top: 10px; + margin-left: 10px; + margin-bottom: 10px; + font-size: 20px; +} \ No newline at end of file diff --git a/hackatonApp/www/home-categories.json b/hackatonApp/www/home-categories.json index 4ae532c..da43340 100644 --- a/hackatonApp/www/home-categories.json +++ b/hackatonApp/www/home-categories.json @@ -7,47 +7,69 @@ { "id":"Trenitalia", "title":"Trenitalia", - "description":"The latest stories from the World section of the BBC News web site.", - "image":"img/trenitalialogo.png", - "url":"http://feeds.bbci.co.uk/news/world/rss.xml" - + "description":"", + "image":"img/trenitalialogo.png" }, { "id":"Trenitalia", "title":"Trenitalia", - "description":"Reuters.com is your source for breaking news, business, financial and investing news, including personal finance and stocks. Reuters is the leading global provider of news, financial information and technology solutions to the world's media, financial institutions, businesses and individuals.", - "image":"img/trenitalialogo.png", - "url":"http://feeds.reuters.com/Reuters/worldNews" + "description":"", + "image":"img/trenitalialogo.png" }, { "id":"Trenitalia", "title":"Trenitalia", - "description":"CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.", - "image":"img/trenitalialogo.png", - "url":"http://rss.cnn.com/rss/cnn_world.rss" + "description":"", + "image":"img/trenitalialogo.png" }, { "id":"Trenitalia", "title":"Trenitalia", - "description":"Latest World news, comment and analysis from the Guardian, the world's leading liberal voice", - "image":"img/trenitalialogo.png", - "url":"http://www.theguardian.com/world/rss" + "description":"", + "image":"img/trenitalialogo.png" } ] }, { "id":"addticketwithphoto", "title":"Aggiungi un biglietto", - "image":"img/feeds/sports.jpg" + "image":"img/Camera.png" }, { "id":"shop", "title":"Spendi i crediti", - "image":"img/feeds/business.jpg" + "image":"img/Cart.png", + "home_sources":[ + { + "id":"McDonald", + "title":"McDonald", + "description":"Sconto di 2 euro sul BigMac.", + "image":"img/mcdonaldlogo.png" + + }, + { + "id":"McDonald", + "title":"McDonald", + "description":"Reuters.com is your source for breaking news, business, financial and investing news, including personal finance and stocks. Reuters is the leading global provider of news, financial information and technology solutions to the world's media, financial institutions, businesses and individuals.", + "image":"img/mcdonaldlogo.png" + }, + { + "id":"McDonald", + "title":"McDonald", + "description":"CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.", + "image":"img/mcdonaldlogo.png" + }, + { + "id":"McDonald", + "title":"McDonald", + "description":"Latest World news, comment and analysis from the Guardian, the world's leading liberal voice", + "image":"img/mcdonaldlogo.png" + } + ] }, { - "id":"ranks", - "title":"Classifica", + "id":"settings", + "title":"Impostazioni", "image":"img/feeds/entertainment.jpg" } ] diff --git a/hackatonApp/www/img/Camera.png b/hackatonApp/www/img/Camera.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ab414cbf4f083f67558f098ab06f65df4a0d65 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^(}1{%g9%7#t1PnsQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JimrLOIEGZ*dUKJHmw|!fu)%@-&y|}eln7n(3;J~@q9K5z zRbZh2*Fpg$5hq0vrxquT7N-uNU;u|8P>@RzB&g^D6x3(|2@VFurFXdu81{Z;VN4fi R69f8?!PC{xWt~$(69A%pQaAtr literal 0 HcmV?d00001 diff --git a/hackatonApp/www/img/Cart.png b/hackatonApp/www/img/Cart.png new file mode 100644 index 0000000000000000000000000000000000000000..13bbabb9b3f97f8499327d6742a2c861f32e4edc GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^(}1{_g9%99DiV1Mq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c6+QKIaSW-r_2wcYF9QR|VS@wvpD%vwsh)UOW%09fOf60t zEgY=@9IXNi1-KRpD2X^Jia3D;ojQPm0UUxrK`up*prQ*bP0l+XkKYYJDY literal 0 HcmV?d00001 diff --git a/hackatonApp/www/img/mcdonaldlogo.png b/hackatonApp/www/img/mcdonaldlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..cbeed0148d36a239368975514ee59c706151c3af GIT binary patch literal 4752 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 literal 0 HcmV?d00001 diff --git a/hackatonApp/www/js/controllers.js b/hackatonApp/www/js/controllers.js index deb32a6..37f8dd6 100644 --- a/hackatonApp/www/js/controllers.js +++ b/hackatonApp/www/js/controllers.js @@ -544,7 +544,6 @@ angular.module('your_app_name.controllers', []) { case "addticketwithphoto": { - console.log("ciao"); takePicture(); break; } @@ -557,6 +556,21 @@ angular.module('your_app_name.controllers', []) }); break; } + case "shop": + { + $http.get('home-categories.json').success(function(response) { + var category = _.find(response, {id: $scope.categoryId}); + $scope.categoryTitle = category.title; + $scope.category_sources = category.home_sources; + }); + break; + } + case "settings": + { + $scope.categoryTitle = "Impostazioni"; + console.log("odod"); + break; + } } diff --git a/hackatonApp/www/shop-categories.json b/hackatonApp/www/shop-categories.json new file mode 100644 index 0000000..902d9a4 --- /dev/null +++ b/hackatonApp/www/shop-categories.json @@ -0,0 +1,75 @@ +[ + { + "id":"booking", + "title":"Prenota", + "image":"img/feeds/news.jpg", + "home_sources":[ + { + "id":"Trenitalia", + "title":"Trenitalia", + "description":"", + "image":"img/trenitalialogo.png" + }, + { + "id":"Trenitalia", + "title":"Trenitalia", + "description":"", + "image":"img/trenitalialogo.png" + }, + { + "id":"Trenitalia", + "title":"Trenitalia", + "description":"", + "image":"img/trenitalialogo.png" + }, + { + "id":"Trenitalia", + "title":"Trenitalia", + "description":"", + "image":"img/trenitalialogo.png" + } + ] + }, + { + "id":"addticketwithphoto", + "title":"Aggiungi un biglietto", + "image":"img/Camera.png" + }, + { + "id":"shop", + "title":"Spendi i crediti", + "image":"img/Cart.png", + "home_sources":[ + { + "id":"McDonald", + "title":"McDonald", + "description":"Sconto di 2 euro sul BigMac.", + "image":"img/mcdonaldlogo.png" + + }, + { + "id":"McDonald", + "title":"McDonald", + "description":"Reuters.com is your source for breaking news, business, financial and investing news, including personal finance and stocks. Reuters is the leading global provider of news, financial information and technology solutions to the world's media, financial institutions, businesses and individuals.", + "image":"img/mcdonaldlogo.png" + }, + { + "id":"McDonald", + "title":"McDonald", + "description":"CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.", + "image":"img/mcdonaldlogo.png" + }, + { + "id":"McDonald", + "title":"McDonald", + "description":"Latest World news, comment and analysis from the Guardian, the world's leading liberal voice", + "image":"img/mcdonaldlogo.png" + } + ] + }, + { + "id":"ranks", + "title":"Classifica", + "image":"img/feeds/entertainment.jpg" + } +] diff --git a/hackatonApp/www/views/app/allTickets.html b/hackatonApp/www/views/app/allTickets.html index 0f33389..e69de29 100644 --- a/hackatonApp/www/views/app/allTickets.html +++ b/hackatonApp/www/views/app/allTickets.html @@ -1,38 +0,0 @@ - - - - - - Bookmarks - - -
-
-
- -

There's nothing here yet. Start exploring!

-
-
-
- - - diff --git a/hackatonApp/www/views/app/category.html b/hackatonApp/www/views/app/category.html index 43c3b54..d109f01 100644 --- a/hackatonApp/www/views/app/category.html +++ b/hackatonApp/www/views/app/category.html @@ -3,6 +3,10 @@ {{categoryTitle}} + + + +
@@ -14,8 +18,51 @@ {{source.title}}

{{source.description}}

- + + +
+ +
    + +
    TOGGLE
    + + Airplane Mode + Wi-Fi + Bluetooth + Personal Hotspot + +
    CHECKBOXES
    + + Option 1 + Option 2 + Option 3 + +
    RADIO
    + + Choose A + Choose B + Choose C + +
    RANGES
    + +
    + + + +
    +
    + + + +
    + +
    + + +
diff --git a/hackatonApp/www/views/app/home.html b/hackatonApp/www/views/app/home.html index 5c9e687..71fef7b 100644 --- a/hackatonApp/www/views/app/home.html +++ b/hackatonApp/www/views/app/home.html @@ -19,6 +19,7 @@ +
{{category.title}}