From 35ed8465b5289df897c5a2615a13944499924954 Mon Sep 17 00:00:00 2001 From: Lorenzo Iovino Date: Sat, 30 Jan 2016 18:42:06 +0100 Subject: [PATCH] Aggiunto Photocamera --- hackatonApp/.io-config.json | 1 + hackatonApp/ionic.project | 4 +- hackatonApp/scss/home-items.scss | 3 + hackatonApp/www/home-categories.json | 33 +++++++++- hackatonApp/www/img/trenitalialogo.png | Bin 0 -> 7388 bytes hackatonApp/www/js/app.js | 31 ++++++++- hackatonApp/www/js/controllers.js | 47 ++++++++++---- hackatonApp/www/js/filters.js | 7 +++ .../www/views/app/addTicketWithPhoto.html | 33 +--------- hackatonApp/www/views/app/booking.html | 35 ----------- hackatonApp/www/views/app/bookmarks.html | 35 ----------- .../www/views/app/category-entries.html | 8 +++ hackatonApp/www/views/app/category.html | 59 +++++------------- hackatonApp/www/views/app/settings.html | 2 +- hackatonApp/www/views/app/side-menu.html | 2 +- 15 files changed, 137 insertions(+), 163 deletions(-) create mode 100644 hackatonApp/.io-config.json create mode 100644 hackatonApp/www/img/trenitalialogo.png create mode 100644 hackatonApp/www/views/app/category-entries.html diff --git a/hackatonApp/.io-config.json b/hackatonApp/.io-config.json new file mode 100644 index 0000000..dd2ba25 --- /dev/null +++ b/hackatonApp/.io-config.json @@ -0,0 +1 @@ +{"app_id":"8f8adae8","api_key":"52ee0b2198eb660371fbc95ab8d0d107ce58b962fda15a74"} \ No newline at end of file diff --git a/hackatonApp/ionic.project b/hackatonApp/ionic.project index 014394c..6463758 100644 --- a/hackatonApp/ionic.project +++ b/hackatonApp/ionic.project @@ -1,6 +1,6 @@ { "name": "ionFullApp", - "app_id": "", + "app_id": "8f8adae8", "gulpStartupTasks": [ "sass", "templatecache", @@ -11,4 +11,4 @@ "!www/lib/**/*" ], "documentRoot": "www" -} \ No newline at end of file +} diff --git a/hackatonApp/scss/home-items.scss b/hackatonApp/scss/home-items.scss index a6edb8e..73521cb 100644 --- a/hackatonApp/scss/home-items.scss +++ b/hackatonApp/scss/home-items.scss @@ -29,10 +29,13 @@ $pre-img-ratios: append($pre-img-ratios, $home-categories-img-ratio); position: absolute; left: 10px; width: 40px; + height:80px; .thumbnail { width: 100%; + height:80px; + } } diff --git a/hackatonApp/www/home-categories.json b/hackatonApp/www/home-categories.json index b0eb0cf..4ae532c 100644 --- a/hackatonApp/www/home-categories.json +++ b/hackatonApp/www/home-categories.json @@ -2,7 +2,38 @@ { "id":"booking", "title":"Prenota", - "image":"img/feeds/news.jpg" + "image":"img/feeds/news.jpg", + "home_sources":[ + { + "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" + + }, + { + "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" + }, + { + "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" + }, + { + "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" + } + ] }, { "id":"addticketwithphoto", diff --git a/hackatonApp/www/img/trenitalialogo.png b/hackatonApp/www/img/trenitalialogo.png new file mode 100644 index 0000000000000000000000000000000000000000..2c339e287451df1fb167117677b45afe53b69429 GIT binary patch literal 7388 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 literal 0 HcmV?d00001 diff --git a/hackatonApp/www/js/app.js b/hackatonApp/www/js/app.js index 966457c..a15ff2b 100644 --- a/hackatonApp/www/js/app.js +++ b/hackatonApp/www/js/app.js @@ -1,5 +1,19 @@ // Ionic Starter App +function takePicture() + { + console.log("PSOO"); + navigator.camera.getPicture(function(imageURI) { + + // imageURI is the URL of the image that we can use for + // an element or backgroundImage. + + }, function(err) { + + // Ruh-roh, something bad happened + + }, cameraOptions); + } angular.module('underscore', []) .factory('_', function() { return window._; // assumes underscore has already been loaded on the page @@ -27,6 +41,8 @@ angular.module('your_app_name', [ 'youtube-embed' ]) + + .run(function($ionicPlatform, PushNotificationsService, $rootScope, $ionicConfig, $timeout) { $ionicPlatform.on("deviceready", function(){ @@ -296,8 +312,8 @@ angular.module('your_app_name', [ } } }) - .state('app.addTicketWithPhoto', { - url: "/addTicketWithPhoto", + .state('app.addticketwithphoto', { + url: "/addticketwithphoto", views: { 'menuContent': { templateUrl: "views/app/addTicketWithPhoto.html", @@ -334,7 +350,7 @@ angular.module('your_app_name', [ }) .state('app.category', { - url: "/category/:categoryId", + url: "/:categoryId", views: { 'menuContent': { templateUrl: "views/app/category.html", @@ -342,6 +358,15 @@ angular.module('your_app_name', [ } } }) + .state('app.category-entries', { + url: "/booking/:sourceId", + views: { + 'menuContent': { + templateUrl: "views/app/category-entries.html", + controller: 'CategoryEntriesCtrl' + } + } + }) ; // if none of the above states are matched, use this as the fallback diff --git a/hackatonApp/www/js/controllers.js b/hackatonApp/www/js/controllers.js index 91b918e..deb32a6 100644 --- a/hackatonApp/www/js/controllers.js +++ b/hackatonApp/www/js/controllers.js @@ -14,6 +14,9 @@ angular.module('your_app_name.controllers', []) $scope.user.telephone="3477608470"; $scope.user.picture="img/laura.jpg"; $scope.user.score="15463"; + + + }) //LOGIN @@ -475,7 +478,7 @@ angular.module('your_app_name.controllers', []) .controller('ImagePickerCtrl', function($scope, $rootScope, $cordovaCamera) { - $scope.images = []; + /*$scope.images = []; $scope.selImages = function() { @@ -504,7 +507,7 @@ angular.module('your_app_name.controllers', []) $scope.shareAll = function() { window.plugins.socialsharing.share(null, null, $scope.images); - }; + };*/ }) .controller('BookingCtrl', function($scope, $http) { }) @@ -515,7 +518,9 @@ angular.module('your_app_name.controllers', []) }) .controller('BookingCtrl', function($scope, $http) { }) -.controller('AddTicketWithCtrl', function($scope, $http) { +.controller('AddTicketWithPhotoCtrl', function($scope, $http) { + console.log("OSOSSOS"); + }) .controller('AllTicketsCtrl', function($scope, $http) { }) @@ -528,22 +533,40 @@ angular.module('your_app_name.controllers', []) }); console.log("HOME"); }) + .controller('CategoryCtrl', function($scope, $http, $stateParams) { $scope.category_sources = []; $scope.categoryId = $stateParams.categoryId; + console.log($scope.categoryId); - $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; - }); + switch($scope.categoryId) + { + case "addticketwithphoto": + { + console.log("ciao"); + takePicture(); + break; + } + case "booking": + { + $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; + } + } + + }) -.controller('HomeEntriesCtrl', function($scope, $stateParams, $http, $q, $ionicLoading) { - $scope.home = []; - var categoryId = $stateParams.categoryId, - sourceId = $stateParams.sourceId; +.controller('CategoryEntriesCtrl', function($scope, $stateParams, $http) { + $scope.category_sources = []; + $scope.sourceId = $stateParams.sourceId; + $scope.entriesTitle = $stateParams.sourceId; + console.log("ciao"); }) ; diff --git a/hackatonApp/www/js/filters.js b/hackatonApp/www/js/filters.js index 0b5f3af..8222510 100644 --- a/hackatonApp/www/js/filters.js +++ b/hackatonApp/www/js/filters.js @@ -12,4 +12,11 @@ angular.module('your_app_name.filters', []) }; }) +.filter('capitalize', function() { + return function(input, all) { + var reg = (all) ? /([^\W_]+[^\s-]*) */g : /([^\W_]+[^\s-]*)/; + return (!!input) ? input.replace(reg, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}) : ''; + }; + }) + ; diff --git a/hackatonApp/www/views/app/addTicketWithPhoto.html b/hackatonApp/www/views/app/addTicketWithPhoto.html index eefe39d..2beb260 100644 --- a/hackatonApp/www/views/app/addTicketWithPhoto.html +++ b/hackatonApp/www/views/app/addTicketWithPhoto.html @@ -1,35 +1,8 @@ - + - Bookmarks + Fai una foto al biglietto -
-
-
- -

There's nothing here yet. Start exploring!

-
-
-
- + dff diff --git a/hackatonApp/www/views/app/booking.html b/hackatonApp/www/views/app/booking.html index eefe39d..e69de29 100644 --- a/hackatonApp/www/views/app/booking.html +++ b/hackatonApp/www/views/app/booking.html @@ -1,35 +0,0 @@ - - - Bookmarks - - -
-
-
- -

There's nothing here yet. Start exploring!

-
-
-
- - - diff --git a/hackatonApp/www/views/app/bookmarks.html b/hackatonApp/www/views/app/bookmarks.html index eefe39d..e69de29 100644 --- a/hackatonApp/www/views/app/bookmarks.html +++ b/hackatonApp/www/views/app/bookmarks.html @@ -1,35 +0,0 @@ - - - Bookmarks - - -
-
-
- -

There's nothing here yet. Start exploring!

-
-
-
- - - diff --git a/hackatonApp/www/views/app/category-entries.html b/hackatonApp/www/views/app/category-entries.html new file mode 100644 index 0000000..22da492 --- /dev/null +++ b/hackatonApp/www/views/app/category-entries.html @@ -0,0 +1,8 @@ + + + {{entriesTitle | capitalize}} + + + + + diff --git a/hackatonApp/www/views/app/category.html b/hackatonApp/www/views/app/category.html index de8be83..43c3b54 100644 --- a/hackatonApp/www/views/app/category.html +++ b/hackatonApp/www/views/app/category.html @@ -1,48 +1,21 @@ - - + - Settings + {{categoryTitle}} -
    - -
    TOGGLE
    - - Airplane Mode - Wi-Fi - Bluetooth - Personal Hotspot - -
    CHECKBOXES
    - - Option 1 - Option 2 - Option 3 - -
    RADIO
    - - Choose A - Choose B - Choose C - -
    RANGES
    - -
    - - - -
    -
    - - - -
    - -
    - - -
+
+ +
+ + + +
+
+ {{source.title}} +

{{source.description}}

+
+ + +
diff --git a/hackatonApp/www/views/app/settings.html b/hackatonApp/www/views/app/settings.html index 42d7a22..6be2cce 100644 --- a/hackatonApp/www/views/app/settings.html +++ b/hackatonApp/www/views/app/settings.html @@ -3,7 +3,7 @@ - Settings + fvvv
    diff --git a/hackatonApp/www/views/app/side-menu.html b/hackatonApp/www/views/app/side-menu.html index 116b457..922a8b8 100644 --- a/hackatonApp/www/views/app/side-menu.html +++ b/hackatonApp/www/views/app/side-menu.html @@ -24,7 +24,7 @@

    Tutti i biglietti

    - +

    Impostazioni