gaugendre/DAVIDS
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #2 from Crocmagnon/react

Browse source 
Use React now
This commit is contained in:
Gabriel Augendre 2016-04-21 02:03:21 +02:00
commit 09e9c3ff98
7 changed files with 297 additions and 207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app.js
View file

@ -91,9 +91,16 @@ app.get('/callback', function (req, res) {
refresh_token = body.refresh_token; refresh_token = body.refresh_token;
// we can also pass the token to the browser to make requests from there // we can also pass the token to the browser to make requests from there
res.send('<script>window.token = { access_token: "'+access_token+'", refresh_token: "'+refresh_token+'" };</script>') res.redirect('/#' +
querystring.stringify({
access_token: access_token,
refresh_token: refresh_token
}));
} else { } else {
res.send('<script>window.token = { access_token: "", refresh_token: "" };</script>') res.redirect('/#' +
querystring.stringify({
error: 'invalid_token'
}));
} }
}); });
} }

45
public/index.html
View file

@ -9,50 +9,17 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-default navbar-static-top" role="navigation">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="navbar-header">
<a class="navbar-brand" href="#">DuplicateFinder</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling --> <div id="content"></div>
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Finder</a></li>
</ul>
<ul class="nav navbar-nav navbar-right" ng-controller="AuthCtrl">
<li ng-if="access_token == ''">
<a ng-click="login()" href="#"><b>Login With Spotify</b></a>
</li>
<li ng-if="access_token != ''">
<a ng-click="refresh()" href="#">Refresh my token</a>
</li>
<li ng-if="access_token != ''">
<a ng-click="logout()" href="#"><b>Logout</b></a>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<div class="container">
<ui-view></ui-view>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.4/angular.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.0.1/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.18/angular-ui-router.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.0.1/react-dom.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ngStorage/0.3.6/ngStorage.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.6.16/browser.js"></script>
<script src="https://code.jquery.com/jquery-1.12.3.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="./script.js"></script> <script type="text/babel" src="./script.js"></script>
</body> </body>
</html> </html>

8
public/partials/dups.html
View file

@ -1,8 +0,0 @@
<h2>Duplicates in {{playlistName}}</h2>
<div ng-if="loaded == false">Loading...</div>
<div ng-if="tracks.length == 0 && loaded">No duplicate found</div>
<div ng-if="tracks.length > 0 && loaded">
<div class="list-group-item" ng-repeat="t in tracks">
{{t.track.name}} - <span ng-repeat="artist in t.track.artists">{{artist == t.track.artists[0]?'':', '}}{{artist.name}}</span>
</div>
</div>

1
public/partials/home.html
View file

@ -1 +0,0 @@
<p>Please connect to Spotify to access to the app.</p>

4
public/partials/logged.html
View file

@ -1,4 +0,0 @@
<div class="container row">
<div class="col-md-3"><ui-view name="playlist"></ui-view></div>
<div class="col-md-9"><ui-view name="dups"></ui-view></div>
</div>

8
public/partials/playlist.html
View file

@ -1,8 +0,0 @@
<div class="clearfix">
<h2 class="pull-left">Playlist</h2>
</div>
<div class="list-group ">
<a ng-class="current.playlistId == playlist.id?'list-group-item active':'list-group-item'" ng-repeat="playlist in playlists" ng-click="open(playlist)">
{{playlist.name}}
</a>
</div>

397
public/script.js
View file

@ -1,156 +1,293 @@
'use strict'; 'use strict';
(function(){ /**
* Obtains parameters from the hash of the URL
* @return Object
*/
function getHashParams() {
var hashParams = {};
var e, r = /([^&;=]+)=?([^&;]*)/g,
q = window.location.hash.substring(1);
while (e = r.exec(q)) {
hashParams[e[1]] = decodeURIComponent(e[2]);
}
return hashParams;
}
var app = angular.module('app',['ui.router', 'ngStorage']); var Duplicate = React.createClass({
render: function () {
var authors = "";
this.props.track.artists.forEach(function (item, index) {
if (index != 0) {
authors += ', ';
}
authors += item.name;
});
return (
<div className="list-group-item">{this.props.track.name} - {authors}</div>
);
}
});
app.config(['$stateProvider','$urlRouterProvider',function($stateProvider, $urlRouterProvider){ var DuplicatesBox = React.createClass({
$stateProvider render: function () {
.state('finder_public',{ if (this.props.dups && this.props.dups.length > 0) {
templateUrl:'partials/home.html', var duplicates = this.props.dups.map(function (duplicate) {
url: '/', return (
controller: 'HomeCtrl' <Duplicate track={duplicate.track} key={duplicate.track.id}/>
}) );
.state('finder',{ });
abstract: true, return (
templateUrl:'partials/logged.html', <div className="duplicatesBox list-group">
url: '/finder', {duplicates}
controller: 'MainCtrl' </div>
}) );
.state('finder.playlist',{ }
url: '/playlist', else {
views: { return (
playlist:{ <p>No duplicate found</p>
templateUrl: 'partials/playlist.html', );
controller: 'PlaylistCtrl' }
}
});
var PlaylistBox = React.createClass({
getInitialState: function () {
return {
currentId: null
};
}, },
dups:{ clickOnItem: function (id, uid) {
template: '' this.setState({currentId: id});
} this.props.handleClick(id, uid);
} },
}) render: function () {
.state('finder.playlist.dups',{ var currentId = this.state.currentId;
url: '/:uid/:id/:playlist', var playlists;
views: { if (this.props.playlists) {
'dups@finder': { playlists = this.props.playlists.map(function (pl) {
templateUrl: 'partials/dups.html', var id = pl.id;
controller: 'DupsCtrl' var classes = "list-group-item" + (currentId == id ? " active" : "");
return (
<a onClick={this.clickOnItem.bind(this, id, pl.owner.id)} className={classes} key={id}>{pl.name}</a>
);
}, this);
} }
return (
<div className="playListBox list-group">
{playlists}
</div>
);
} }
}); });
$urlRouterProvider.otherwise("/");
}]);
app.run(['$rootScope', '$state', '$localStorage',function($rootScope, $state, $localStorage){ var DuplicateFinderBox = React.createClass({
$rootScope.$storage = $localStorage.$default({ getInitialState: function () {
access_token: "", return {
refresh_token: "" currentId: null,
currentUId: null,
dups: null,
dupsLoading: false
};
},
handlePlaylistClick: function (id, uid) {
this.setState({
currentId: id,
currentUId: uid,
dupsLoading: true
}); });
$rootScope.access_token = $rootScope.$storage.access_token; var self = this;
$rootScope.refresh_token = $rootScope.$storage.refresh_token;
$rootScope.$watch('access_token', function(newVal, oldVal, scope){ $.ajax({
url: "/pl/" + uid + "/" + id,
$rootScope.$storage.access_token = $rootScope.access_token; data: {
$rootScope.$storage.refresh_token = $rootScope.refresh_token; 'access_token': self.props.auth.access_token
},
if(oldVal == "" && newVal != ""){ success: function (data) {
$state.go('finder.playlist'); var dups = data.data;
} else if (oldVal != "" && newVal == ""){ self.setState({
$state.go('finder_public'); dups: dups,
dupsLoading: false
});
},
error: function (xhr, response, err) {
console.error(response, err);
} }
}); });
$rootScope.$on('$stateChangeStart', },
function (event, toState) { render: function () {
if ((toState.name != "finder_public") && $rootScope.access_token == "") { var duplicates = <p>Loading...</p>;
if (!this.state.dupsLoading) {
duplicates = <DuplicatesBox dups={this.state.dups}/>;
}
var playlistBox = <p>Loading...</p>;
if (!this.props.playlistsLoading) {
playlistBox = <PlaylistBox handleClick={this.handlePlaylistClick} playlists={this.props.playlists}/>;
}
return (
<div className="duplicateFinderBox">
<div className="col-md-3">
<h2>Playlists</h2>
{playlistBox}
</div>
<div className="col-md-6">
<h2>Duplicates</h2>
{duplicates}
</div>
</div>
);
}
});
var Authenticate = React.createClass({
logout: function () {
this.props.refreshAuth(null, null);
},
refreshToken: function (event) {
event.preventDefault(); event.preventDefault();
$state.go('finder_public'); var self = this;
$.ajax({
url: '/refresh_token',
data: {
'refresh_token': self.props.auth.refresh_token
},
success: function (data) {
self.props.refreshAuth(data.access_token, self.props.auth.refresh_token);
},
error: function (xhr, status, err) {
console.error(status, err);
} }
}); });
}]); },
render: function () {
app.controller("HomeCtrl",['$scope',function($scope){ var auth;
if (this.props.auth.access_token == null) {
}]); auth = (
<ul className="nav navbar-nav navbar-right">
app.controller("MainCtrl",['$scope', '$state',function($scope, $state){ <li>
$scope.current = {playlistId: undefined}; <a href="/login"><strong>Login With Spotify</strong></a>
}]); </li>
</ul>
app.controller("PlaylistCtrl",['$scope', '$http', '$state',function($scope, $http, $state){ );
$scope.playlists = [];
$scope.load = function(){
$http.get('/get_playlists', {
params:{
access_token: $scope.access_token
} }
}).then(function(result){ else {
var r = result.data; auth = (
if(r.data){ <ul className="nav navbar-nav navbar-right">
$scope.playlists = r.data; <li>
<a href="#" onClick={this.refreshToken}>Refresh my token</a>
</li>
<li>
<a href="#" onClick={this.logout}><strong>Logout</strong></a>
</li>
</ul>
);
} }
})
};
$scope.open = function(playlist) {
$scope.current.playlistId = playlist.id;
$state.go('finder.playlist.dups',{uid: playlist.owner.id, id: playlist.id, playlist: encodeURIComponent(playlist.name)})
};
$scope.load();
}]);
app.controller("DupsCtrl",['$scope', '$stateParams', '$http',function($scope, $stateParams, $http){ return (
$scope.uid = $stateParams['uid']; <nav className="navbar navbar-default navbar-static-top" role="navigation">
$scope.id = $stateParams['id']; <div className="container-fluid">
$scope.playlistName = decodeURIComponent($stateParams.playlist); <button type="button" className="navbar-toggle" data-toggle="collapse"
$scope.current.playlistId = $scope.id; data-target=".navbar-ex1-collapse">
$scope.tracks = []; <span className="sr-only">Toggle navigation</span>
$scope.loaded = false; <span className="icon-bar"></span>
$scope.load = function () { <span className="icon-bar"></span>
$http.get('/pl/' + $scope.uid + '/' + $scope.id, { <span className="icon-bar"></span>
params: { </button>
access_token: $scope.access_token <div className="navbar-header">
<a className="navbar-brand" href="#">DuplicateFinder</a>
</div>
<div className="collapse navbar-collapse navbar-ex1-collapse">
<ul className="nav navbar-nav">
<li className="active"><a href="#">Finder</a></li>
</ul>
{auth}
</div>
</div>
</nav>
);
} }
}).then(function(result) {
var r = result.data;
$scope.tracks = r.data;
$scope.loaded = true;
}); });
};
$scope.load();
}]);
app.controller('AuthCtrl',['$scope', '$rootScope', '$interval', '$http', function($scope, $rootScope, $interval, $http){ var App = React.createClass({
$scope.login = function(){ getInitialState: function () {
var openUrl = '/login'; var params = getHashParams();
window.$windowScope = $scope; var access_token = params.access_token || null;
$scope.popup = window.open(openUrl, "Authenticate Account", "width=500, height=500"); var refresh_token = params.refresh_token || null;
var checker = $interval(function(){
if($scope.popup.closed){ return {
$interval.cancel(checker); access_token: access_token,
} else if ($scope.popup.token != undefined && $scope.popup.token != null) { refresh_token: refresh_token,
$rootScope.access_token = $scope.popup.token.access_token; playlists: null,
$rootScope.refresh_token = $scope.popup.token.refresh_token; playlistsLoading: true
$scope.popup.close();
$interval.cancel(checker);
}
}, 500);
return false;
}; };
$scope.logout = function(){ },
$rootScope.refresh_token = ""; getPlaylists: function () {
$rootScope.access_token = ""; this.setState({
}; playlistsLoading: true
$scope.refresh = function(){
if($rootScope.refresh_token)
$http.get('/refresh_token',{params: {refresh_token: $rootScope.refresh_token}})
.then(function(result){
$rootScope.access_token = result.data.access_token || "";
}, function(failResult){
$rootScope.access_token = "";
$rootScope.refresh_token = "";
}); });
return false; var self = this;
$.ajax({
url: '/get_playlists',
data: {
'access_token': this.state.access_token
},
success: function (data) {
var pl = data.data;
self.setState({
playlists: pl,
playlistsLoading: false
});
},
error: function (xhr, response, err) {
console.error(response, err);
} }
}]) });
},
isLoggedIn: function () {
return !(this.state.access_token == null && this.state.refresh_token == null);
},
refreshAuth: function (access, refresh) {
this.setState({
access_token: access,
refresh_token: refresh
});
})(); if (!(access == null && refresh == null)) {
this.getPlaylists();
}
},
componentDidMount: function () {
if (this.isLoggedIn()) {
this.getPlaylists();
}
},
render: function () {
var auth = {
access_token: this.state.access_token,
refresh_token: this.state.refresh_token
};
var content = <p>Please log in with Spotify :)</p>;
if (this.isLoggedIn()) {
var playlistsLoading = this.state.playlistsLoading;
content = (
<DuplicateFinderBox playlistsLoading={playlistsLoading} auth={auth} playlists={this.state.playlists}/>
);
}
return (
<div>
<Authenticate auth={auth} refreshAuth={this.refreshAuth}/>
<div className="container-fluid">
{content}
</div>
</div>
);
}
});
ReactDOM.render(
<App />,
document.getElementById('content')
);