diff --git a/.htaccess b/.htaccess index b5b463d..778cbf6 100755 --- a/.htaccess +++ b/.htaccess @@ -1,7 +1,5 @@ RewriteEngine On -RewriteRule ^spotify-authorization?$ /app/services/spotify/authenticate.php$1 [L,QSA] - # If an existing asset or directory is requested go to it as it is RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR] RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d diff --git a/app/app.js b/app/app.js index 3d6c90c..cbc58a6 100755 --- a/app/app.js +++ b/app/app.js @@ -9,7 +9,6 @@ angular.module('spotmop', [ 'ngResource', 'ngStorage', 'ngTouch', - 'ngAnimate', 'ui.router', 'angular-loading-bar', @@ -43,9 +42,10 @@ angular.module('spotmop', [ 'spotmop.browse.new' ]) -.config(function($stateProvider, $locationProvider, $urlRouterProvider){ +.config(function($stateProvider, $locationProvider, $urlRouterProvider, $httpProvider){ $locationProvider.html5Mode(true); $urlRouterProvider.otherwise("/queue"); + $httpProvider.interceptors.push('SpotifyServiceIntercepter'); }) @@ -172,6 +172,11 @@ angular.module('spotmop', [ BackgroundCheck.refresh(); }); + $(document).on('click', '#body', function(event){ + if( $(event.target).closest('.menu-reveal-trigger').length <= 0 ) + $scope.hideMenu(); + }); + // show menu (this is triggered by swipe event) $scope.showMenu = function(){ $(document).find('body').addClass('menu-revealed'); @@ -258,23 +263,11 @@ angular.module('spotmop', [ },0 ); - - // watch for re-authorizations of spotify - $scope.$watch( - function(){ - return $localStorage.spotify; - }, - function(newVal,oldVal){ - getSpotifyAccount(); - } - ); - - // figure out who we are on Spotify - // TODO: Hold back on this to make sure we're authorized - - getSpotifyAccount(); + /** + * Spotify account is authorized + **/ + $scope.$on('mopidy:state:online', function(){ - function getSpotifyAccount(){ SpotifyService.getMe() .then( function(response){ $scope.spotifyUser = response; @@ -291,7 +284,7 @@ angular.module('spotmop', [ $scope.updatePlaylists(); } }); - } + }); /** diff --git a/app/browse/album/template.html b/app/browse/album/template.html index 3d97c6c..df74e67 100755 --- a/app/browse/album/template.html +++ b/app/browse/album/template.html @@ -1,4 +1,6 @@
+ +
diff --git a/app/browse/artist/template.html b/app/browse/artist/template.html index eac51ed..fe7cf52 100755 --- a/app/browse/artist/template.html +++ b/app/browse/artist/template.html @@ -1,5 +1,7 @@
+ +
diff --git a/app/browse/featured/template.html b/app/browse/featured/template.html index 048036a..2426f41 100755 --- a/app/browse/featured/template.html +++ b/app/browse/featured/template.html @@ -1,5 +1,7 @@
+ +
diff --git a/app/browse/genre/category.template.html b/app/browse/genre/category.template.html index 8ff3dee..16ee70d 100755 --- a/app/browse/genre/category.template.html +++ b/app/browse/genre/category.template.html @@ -1,7 +1,10 @@
- -

+ +
+ +

+
diff --git a/app/browse/genre/template.html b/app/browse/genre/template.html index 1377a08..a2826ff 100755 --- a/app/browse/genre/template.html +++ b/app/browse/genre/template.html @@ -1,6 +1,11 @@
+
+ +

Genre / Category

+
+
diff --git a/app/browse/new/template.html b/app/browse/new/template.html index b709e78..4615558 100755 --- a/app/browse/new/template.html +++ b/app/browse/new/template.html @@ -1,7 +1,10 @@
-

New releases

+
+ +

New releases

+
diff --git a/app/browse/playlist/template.html b/app/browse/playlist/template.html index 852401f..db3781f 100755 --- a/app/browse/playlist/template.html +++ b/app/browse/playlist/template.html @@ -1,5 +1,7 @@
+ +
diff --git a/app/browse/user/template.html b/app/browse/user/template.html index 15ad36c..0060b51 100755 --- a/app/browse/user/template.html +++ b/app/browse/user/template.html @@ -1,5 +1,10 @@
+ +
+ +

User

+
diff --git a/app/common/directives.js b/app/common/directives.js index 20adc7c..fcddcf5 100755 --- a/app/common/directives.js +++ b/app/common/directives.js @@ -327,12 +327,18 @@ angular.module('spotmop.directives', []) context.canvas.height = canvasHeight; } - // zoom image to fill canvas - // TODO: test tall skinny images and different device sizes - if( image.width < canvasWidth ){ - var upscale = canvasWidth / image.width; - image.width = image.width * upscale; - image.height = image.height * upscale; + // zoom image to fill canvas, widthwise + if( image.width < canvasWidth || image.width > canvasWidth ){ + var scale = canvasWidth / image.width; + image.width = image.width * scale; + image.height = image.height * scale; + } + + // now check for fill heightwise, and zoom in if necessary + if( image.height < canvasHeight ){ + var scale = canvasHeight / image.height; + image.width = image.width * scale; + image.height = image.height * scale; } // figure out where we want the image to be, based on scroll position diff --git a/app/discover/template.html b/app/discover/template.html index c982585..e1ef763 100755 --- a/app/discover/template.html +++ b/app/discover/template.html @@ -9,8 +9,11 @@
-

Discover new music

- +
+ +

Discover

+
+

Recommended for you

diff --git a/app/library/artists.template.html b/app/library/artists.template.html index 6db02cf..accb7de 100755 --- a/app/library/artists.template.html +++ b/app/library/artists.template.html @@ -1,7 +1,10 @@
-

Artists

+
+ +

Artists

+
diff --git a/app/library/controller.js b/app/library/controller.js index f585104..bd961ef 100755 --- a/app/library/controller.js +++ b/app/library/controller.js @@ -178,6 +178,59 @@ angular.module('spotmop.library', []) $scope.createPlaylist = function(){ DialogService.create('createPlaylist', $scope); } + + $scope.playlists = []; + + // if we've got a userid already in storage, use that + var userid = SettingsService.getSetting('spotifyuserid',$scope.$parent.spotifyUser.id); + + SpotifyService.getPlaylists( userid ) + .then( function( response ){ // successful + $scope.playlists = response; + + // if it was 401, refresh token + if( typeof(response.error) !== 'undefined' && response.error.status == 401 ) + Spotify.refreshToken(); + }); + + + /** + * Load more of the album's tracks + * Triggered by scrolling to the bottom + **/ + + var loadingMorePlaylists = false; + + // go off and get more of this playlist's tracks + function loadMorePlaylists( $nextUrl ){ + + if( typeof( $nextUrl ) === 'undefined' ) + return false; + + // update our switch to prevent spamming for every scroll event + loadingMorePlaylists = true; + + // go get our 'next' URL + SpotifyService.getUrl( $nextUrl ) + .then(function( response ){ + + // append these new tracks to the main tracklist + $scope.playlists.items = $scope.playlists.items.concat( response.items ); + + // save the next set's url (if it exists) + $scope.playlists.next = response.next; + + // update loader and re-open for further pagination objects + loadingMorePlaylists = false; + }); + } + + // once we're told we're ready to load more albums + $scope.$on('spotmop:loadMore', function(){ + if( !loadingMorePlaylists && typeof( $scope.playlists.next ) !== 'undefined' && $scope.playlists.next ){ + loadMorePlaylists( $scope.playlists.next ); + } + }); }); diff --git a/app/library/playlists.template.html b/app/library/playlists.template.html index 517e6dd..be50201 100755 --- a/app/library/playlists.template.html +++ b/app/library/playlists.template.html @@ -1,12 +1,15 @@
-

Playlists

+
+ +

Playlists

+
-
-
+
+
@@ -19,7 +22,7 @@

Playlists

-
+
No items
diff --git a/app/library/tracks.template.html b/app/library/tracks.template.html index 33bb95c..ba79ea5 100755 --- a/app/library/tracks.template.html +++ b/app/library/tracks.template.html @@ -1,7 +1,10 @@
-

Tracks

+
+ +

Tracks

+
diff --git a/app/queue/template.html b/app/queue/template.html index 2106dc3..12ba153 100755 --- a/app/queue/template.html +++ b/app/queue/template.html @@ -1,6 +1,11 @@
- + +
+ +

Now Playing

+
+
diff --git a/app/search/template.html b/app/search/template.html index 69dd98d..4e2302e 100755 --- a/app/search/template.html +++ b/app/search/template.html @@ -1,5 +1,10 @@
+ +
+ +

Search Results

+
'a87fb4dbed30475b8cec38523dff53e2', - 'client_secret' => 'd7c89d0753ef4068bba1678c6cf26ed6', - 'grant_type' => 'authorization_code', - 'code' => $code, - 'redirect_uri' => $url - ); - - curl_setopt($ch, CURLOPT_URL,"https://accounts.spotify.com/api/token"); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post_data)); - curl_setopt($ch, CURLINFO_HEADER_OUT, true); - curl_setopt($ch, CURLOPT_VERBOSE, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - - $response = curl_exec($ch); - - if(curl_errno($ch)){ - echo 'CURL Error: '. curl_error($ch); - } - - curl_close($ch); - - return $response; -} - -/* - * Refresh a token - * Creates a request to Spotify, which returns a new access_token, refresh_token and token_expiry object - * @var $refresh_token = string -*/ -function refreshToken($refresh_token){ - - $ch = curl_init(); - - $post_data = array( - 'client_id' => 'a87fb4dbed30475b8cec38523dff53e2', - 'client_secret' => 'd7c89d0753ef4068bba1678c6cf26ed6', - 'grant_type' => 'refresh_token', - 'refresh_token' => $refresh_token - ); - - curl_setopt($ch, CURLOPT_URL,"https://accounts.spotify.com/api/token"); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post_data)); - curl_setopt($ch, CURLINFO_HEADER_OUT, true); - curl_setopt($ch, CURLOPT_VERBOSE, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - $response = curl_exec($ch); - curl_close ($ch); - - return $response; -} - - -/* - * Parse the authorization code, once Spotify has received the OK from the user - * This is the first instance where we get the authorization_code, so should only happen once - * URL Parameter of ?code= is required -*/ -if( isset($_GET['authorization']) ){ - getAuthorizationCode( $url ); -} - -/* - * Parse the authorization code, once Spotify has received the OK from the user - * This is the first instance where we get the authorization_code, so should only happen once - * URL Parameter of ?code= is required -*/ -if( isset($_GET['code']) ){ - - // take our spotify response, and inject it to our localStorage - ?> - - '); + $(body).append(frame); + + // set container for spotify storage + if( typeof($localStorage.spotify) === 'undefined' ) + $localStorage.spotify = {}; + + if( typeof($localStorage.spotify.AccessToken) === 'undefined' ) + $localStorage.spotify.AccessToken = null; + + if( typeof($localStorage.spotify.RefreshToken) === 'undefined' ) + $localStorage.spotify.RefreshToken = null; + + if( typeof($localStorage.spotify.AuthorizationCode) === 'undefined' ) + $localStorage.spotify.AuthorizationCode = null; + + if( typeof($localStorage.spotify.AccessTokenExpiry) === 'undefined' ) + $localStorage.spotify.AccessTokenExpiry = null; + + // on load, get a new token + // this means we [easily] know how long it's been since last refreshed + service.refreshToken(); + + // setup automatic refreshing (tokens last for 3600 seconds = 1 hour, so let's refresh every 3500 seconds = 59 minutes) + $interval( service.refreshToken, 3500000 ); + + // listen for incoming messages from the authorization iframe + window.addEventListener('message', function(event){ + + // only allow incoming data from our authorized authenticator proxy + if( event.origin !== "http://jamesbarnsley.co.nz" ) + return false; + + // convert to json + var data = JSON.parse(event.data); + + console.info('Spotify authorization successful'); + + // take our returned data, and save it to our localStorage + $localStorage.spotify.AuthorizationCode = data.authorization_code; + $localStorage.spotify.AccessToken = data.access_token; + $localStorage.spotify.RefreshToken = data.refresh_token; + $rootScope.spotifyOnline = true; + $rootScope.$broadcast('spotmop:spotify:online'); + }, false); + + // specify the base URL for the API endpoints + var urlBase = 'https://api.spotify.com/v1/'; + var country = SettingsService.getSetting("spotifycountry", 'NZ'); + var locale = SettingsService.getSetting("spotifylocale", "en_NZ"); + + // and finally, give us our service! + return service; +}]) + + + +/** + * Authentication Intercepter which checks spotify's requests results for a 401 error + * SOURCE: https://github.com/dirkgroenen + **/ +.factory('SpotifyServiceIntercepter', function SpotifyServiceIntercepter($q, $rootScope, $injector, $localStorage){ + + "use strict"; + + var retrystarted = false; + + var responseInterceptor = { + responseError: function(response){ + + if(response.status == 401 && response.config.url.search('https://api.spotify.com/') >= 0){ + + console.log( 'Request rejected' ); + + if(!retrystarted){ + retrystarted = true; + + // if we're already authorized, we just need to force a token refresh + if( $localStorage.spotify.AuthorizationCode && $localStorage.spotify.RefreshToken ){ + + // and re-authorize + $injector.get('SpotifyService').refreshToken(); + + // not yet authorized, so authorize! + }else{ + // remove our current authorization + $localStorage.spotify = {}; + $rootScope.spotifyOnline = false; + + // and re-authorize + $injector.get('SpotifyService').authorize(); + } + } + + return $q.reject(response); + } + + return response; + } + }; + + return responseInterceptor; +}); + + + + diff --git a/app/settings/controller.js b/app/settings/controller.js index a0f5d5e..c02987d 100755 --- a/app/settings/controller.js +++ b/app/settings/controller.js @@ -28,12 +28,10 @@ angular.module('spotmop.settings', []) }; $scope.refreshSpotifyToken = function(){ NotifyService.notify( 'Refreshing token' ); - $.when(SpotifyService.getNewToken()).then( function(){}); + SpotifyService.refreshToken().then( function(){}); }; $scope.spotifyLogout = function(){ SpotifyService.logout(); - $scope.$parent.spotifyOnline = false; - NotifyService.notify( 'Logging you out' ); }; $scope.toggleSetting = function( setting ){ if( SettingsService.getSetting(setting, false) ){ diff --git a/app/settings/template.html b/app/settings/template.html index 7c576d5..63ada3a 100755 --- a/app/settings/template.html +++ b/app/settings/template.html @@ -1,5 +1,10 @@
+ +
+ +

Settings

+
@@ -54,14 +59,6 @@

Offline

-
-
Application Client ID
-
- - -
-
-
Country code
@@ -86,6 +83,8 @@

() +    +   Log out

diff --git a/assets/css/core.css b/assets/css/core.css index 09b0d1e..3020bfa 100755 --- a/assets/css/core.css +++ b/assets/css/core.css @@ -239,6 +239,18 @@ body { .main-menu .menu-item:not(.active) > a:hover { background-color: rgba(255,255,255,0.05); } + +.menu-reveal-trigger { + position: absolute; + top: 1px; + left: 0; + display: none; + color: #FFFFFF; + font-size: 17px; + padding: 16px; + cursor: pointer; + z-index: 9; +} @@ -733,7 +745,7 @@ h1 .flag { .body .button { display: inline-block; padding: 12px 22px; - margin-right: -2px; + margin-right: -3px; border: 0; cursor: pointer; color: #FFFFFF; @@ -897,7 +909,6 @@ h1 .flag { .artist-grid { padding: 0; - margin-top: 1px; } .artist-grid .artist { @@ -923,7 +934,7 @@ h1 .flag { position: absolute; top: 0; left: 0; - bottom: 0; + bottom: -0.5px; right: 0; text-align: center; color: #FFFFFF; @@ -940,11 +951,6 @@ h1 .flag { font-weight: bold; } -.artist-grid .artist:nth-child(2n+2) .image{ - margin-left: -1px; - border-left: 1px solid #F2F2F2; -} - /** * Square panels @@ -1116,10 +1122,8 @@ h1 .flag { .track .duration { width: 5%; } .track .popularity { width: 5%; } -.track.no-album .title { width: 45%; } -.track.no-album .artist { width: 45%; } -.track.no-album .duration { width: 5%; } -.track.no-album .popularity { width: 5%; } +.tracklist.album-items .track .title { width: 35%; } +.tracklist.album-items .track .popularity { display: none; } body:not(.dragging):not(.touchDevice) .tracklist .track:not(.selected):hover { background: #F4F4F4; @@ -1182,6 +1186,11 @@ body.dragging .tracklist .track.selected { padding-bottom: 20px; } +.now-playing-page .page-header { + display: none; +} + + /** * Album page @@ -1232,7 +1241,7 @@ body.dragging .tracklist .track.selected { .playlist-page .asset-sidebar .buttons, .album-page .asset-sidebar .buttons { - margin-top: 1px; + position: relative; } .playlist-page .content, @@ -1299,7 +1308,7 @@ body.dragging .tracklist .track.selected { position: relative; margin: -40px -40px 30px; padding: 0 20px; - height: 40vh; + height: 50vh; } .artist-intro h1 { @@ -1752,6 +1761,10 @@ body.dragging .tracklist .track.selected { background-size: cover; background-position: 50% 50%; } + +#full-player .volume { + display: none; +} #full-player .track-info { color: #000000; @@ -1797,7 +1810,7 @@ body.dragging .tracklist .track.selected { position: relative; } -#full-player .progress.slider .track { +#full-player .slider .track { background: #DDDDDD; height: 4px; } diff --git a/assets/css/responsive.css b/assets/css/responsive.css index 9a74e03..df4a285 100755 --- a/assets/css/responsive.css +++ b/assets/css/responsive.css @@ -24,6 +24,7 @@ } @media( max-height: 300px ){ + } @@ -37,16 +38,12 @@ display: none; } - #player .progress { - display: none; - } - /** * Menus **/ - .sub-page-navigation .menu-item.active { + .page:not(.search-page) .sub-page-navigation .menu-item.active { border-color: #FFFFFF; } @@ -71,6 +68,38 @@ left: 0%; } + .menu-reveal-trigger { + display: block; + } + + #loading-bar-spinner { + right: 10px !important; + left: auto !important; + } + + + /** + * Page headings (that also foster the swipe trigger button) + **/ + .page-header { + display: block !important; + margin: -40px -40px 20px -40px; + background: #333333; + color: #FFFFFF; + padding: 15px 20px; + } + + .album-page .page-header, .playlist-page .page-header { + margin: 0; + } + + .page-header h1 { + padding: 0; + margin: 0; + font-size: 18px; + text-align: center; + } + /** * Notifications @@ -132,7 +161,7 @@ **/ .artist-page .artist-intro { - margin-bottom: 1px; + margin-bottom: 0; } .artist-page .info-panel .thumbnail { @@ -209,10 +238,10 @@ /** * Player - **/ + **/ #body { - bottom: 70px; + bottom: 50px; } #player { @@ -222,9 +251,14 @@ left: 0; width: auto; height: 40px; - padding: 15px 0 15px; + padding: 12px 0 2px; background-color: #222222; overflow: hidden; + line-height: 1.2em; + } + + .player .button { + margin: 0 3px; } #player .button.previous, @@ -236,12 +270,13 @@ float: right; width: 80%; padding: 0; + font-size: 13px; } #player .playback { position: absolute; padding-left: 10px; - top: 24px; + top: 16px; } #player > .background-image { @@ -265,6 +300,45 @@ background-size: cover; } + #player .slider.progress { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: auto; + padding: 0; + } + + #player .slider.progress .track, + #player .slider.progress:hover .track { + height: 2px; + } + + + /** + * Full player (now playing) + **/ + + #full-player .controls { + padding-bottom: 15px; + } + + #full-player .track-timer, + #full-player .progress.slider { + display: none; + } + + #full-player .volume { + display: inline-block; + } + + #full-player .volume .slider { + width: 50px; + display: inline-block; + vertical-align: bottom; + margin-bottom: 10px; + } + } @@ -285,6 +359,14 @@ } + /** + * Page headings (that also foster the swipe trigger button) + **/ + .page-header { + margin: -20px -20px 20px -20px; + } + + /** * Body layout **/ @@ -340,6 +422,10 @@ margin-left: -20px; margin-top: 0; } + + .artist-intro { + height: 60vh; + } /** @@ -353,7 +439,7 @@ } .square-panels.smaller .square-panel { - width: 16%; + width: 21%; margin: 0 2% 5%; } @@ -435,6 +521,24 @@ } + /** + * Player + **/ + + #full-player .artwork { + width: 100%; + padding-bottom: 100%; + } + + #full-player .controls { + width: 100%; + } + + #full-player .button { + padding: 3px 6px; + } + + /** * Artwork panels **/ @@ -507,20 +611,21 @@ /** - * Player + * Tracklists **/ - #full-player .artwork { - width: 100%; - padding-bottom: 100%; - } - - #full-player .controls { - width: 100%; + + .tracklist .track .title, + .tracklist .track .artist { + width: 50%; } - #full-player .button { - padding: 3px 6px; + .tracklist .track .album { + clear: left; + width: auto; + padding-right: 10px; + opacity: 0.5; } + } diff --git a/authorize.php b/authorize.php new file mode 100755 index 0000000..acbb61a --- /dev/null +++ b/authorize.php @@ -0,0 +1,149 @@ +Authorization frame'; +echo '

If you\'re seeing this, you\'re doing it wrong

'; + + + + +/* ================================================================================= INIT ================ */ +/* ======================================================================================================= */ + +// we've just completed authorization, now create credentials (access_token, etc) +if( isset($_GET['code']) ){ + + echo 'Fetching credentials...
'; + + $script = 'parent.postMessage("Stuff", "*")'; + echo ''; + + // go get our credentials + $response = getToken( $_GET['code'], $url ); + $responseArray = json_decode( $response, true ); + + // add our code to the array of credentials, etc + $responseArray['authorization_code'] = $_GET['code']; + $response = json_encode($responseArray); + + // make sure we have a successful response + if( !isset($responseArray['access_token']) ){ + echo 'Error!'; + die(); + } + + // send our data back to Spotmop + ?> + + '; + getAuthorizationCode( $url ); +} + + + + + +/* ================================================================================= GETTERS ============= */ +/* ======================================================================================================= */ + + + +/** + * Acquire an authorization code. + * + * This is what connects an account's authorization for this app to use their account + * for future tokens and queries. Redirects to Spotify. + * @param $url = redirect url (this script) +*/ +function getAuthorizationCode( $url ){ + + $popup = 'https://accounts.spotify.com/authorize?client_id=a87fb4dbed30475b8cec38523dff53e2&redirect_uri='.$url.'&scope=playlist-modify-private%20playlist-modify-public%20playlist-read-private%20playlist-modify-private%20user-library-read%20user-library-modify%20user-follow-modify&response_type=code&show_dialog=true'; + + ?> + + 'a87fb4dbed30475b8cec38523dff53e2', + 'client_secret' => 'd7c89d0753ef4068bba1678c6cf26ed6', + 'grant_type' => 'authorization_code', + 'code' => $code, + 'redirect_uri' => $url + ); + + curl_setopt($ch, CURLOPT_URL,"https://accounts.spotify.com/api/token"); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post_data)); + curl_setopt($ch, CURLINFO_HEADER_OUT, true); + curl_setopt($ch, CURLOPT_VERBOSE, true); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + + $response = curl_exec($ch); + + if(curl_errno($ch)){ + echo 'CURL Error: '. curl_error($ch); + } + + curl_close($ch); + + return $response; +} + + + + diff --git a/index.html b/index.html index b2b3b69..f865795 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,6 @@ - @@ -95,6 +94,6 @@
- + \ No newline at end of file diff --git a/vendor/angular-animate.min.js b/vendor/angular-animate.min.js deleted file mode 100755 index 878798e..0000000 --- a/vendor/angular-animate.min.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - AngularJS v1.4.0-rc.1 - (c) 2010-2015 Google, Inc. http://angularjs.org - License: MIT -*/ -(function(E,t,U){'use strict';function ra(a,b,c){if(!a)throw ngMinErr("areq",b||"?",c||"required");return a}function sa(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;V(a)&&(a=a.join(" "));V(b)&&(b=b.join(" "));return a+" "+b}function Aa(a){var b={};a&&(a.to||a.from)&&(b.to=a.to,b.from=a.from);return b}function Z(a,b,c){var d="";a=V(a)?a:a&&S(a)&&a.length?a.split(/\s+/):[];f(a,function(a,u){a&&0=J&&b>=G&&(L=!0,l())}if(!H){var h,p=[],n=function(a){if(L)v&&a&&(v=!1,l());else if(v=!a,y.animationDuration)if(a=ka(w,v),v)k.push(a);else{var b=k,c=b.indexOf(a);0<=a&&b.splice(c,1)}},x=0< -S&&(y.transitionDuration&&0===R.transitionDuration||y.animationDuration&&0===R.animationDuration)&&Math.max(R.animationDelay,R.transitionDelay);x?B(b,Math.floor(x*S*1E3),!1):b();A.resume=function(){n(!0)};A.pause=function(){n(!1)}}}var w=a[0];c=ga(c);var k=[],n=a.attr("class"),h=Aa(c),H,v,L,p,A,t,J,G,E;if(0===c.duration||!x.animations&&!x.transitions)l();else{var C=c.event&&V(c.event)?c.event.join(" "):c.event,P="",M="";C&&c.structural?P=Z(C,"ng-",!0):C&&(P=C);c.addClass&&(M+=Z(c.addClass,"-add")); -c.removeClass&&(M.length&&(M+=" "),M+=Z(c.removeClass,"-remove"));c.applyClassesEarly&&M.length&&(W(a,c),M="");var X=[P,M].join(" ").trim(),ea=n+" "+X,U=Z(X,"-active"),n=h.to&&0