Skip to content

Refactoring #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kminevskiy wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Refactoring #7

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8d4104
:art: Refactor ES5 and ES6 syntax
Dec 6, 2017
d8db584
:fire: Fix shuffleList implementation and improve readability
Dec 6, 2017
13fe5a1
:art: Refactor ES5 and ES6 syntax
Dec 6, 2017
682f400
:fire: Fix return value and slice argument, refactor syntax
Dec 6, 2017
e7b8638
:fire: :tada: Add helper function, refactor ES5 to ES6 syntax
Dec 6, 2017
7cb1819
:fire: Refactor getPersonList
Dec 6, 2017
5b4e933
I don't have much experience with React, so it's very hard for me to …
Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 26 additions & 35 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,14 @@
* ...
* ]
*/

function getPersonList() {
return new Promise((resolve, reject) => {
fetch('https://willowtreeapps.com/api/v1.0/profiles')
.then(response => {
if (response.status !== 200) {
reject(new Error("Error!"));
}

response.json().then(imageList => {
resolve(imageList);
});
});
});
return fetch('https://willowtreeapps.com/api/v1.0/profiles')
.then(response => response.json())
.then(imageList => { return imageList })
.catch(error => { return error })
}


/*==================================================

DATA TRANSFORMS
Expand All @@ -128,13 +120,13 @@
return person.lastName;
}

const getFirstName = (person) => {
function getFirstName(person) {
return person.firstName;
};

// headshot URLs are scheme relative //
// prepend http: to prevent invalid schemes like file:// or uri://
const getImageUrl = (person) => {
function getImageUrl(person) {
return `http:${person.headshot.url}`;
};

Expand All @@ -143,15 +135,16 @@
*/
function shuffleList(list) {
// Make a copy & don't mutate the passed in list
let result = list.slice(1);
let tmp, j, i;
let result = list.slice(0);
let len = list.length;

let tmp, j, i = list.length - 1

for (; i > 0; i -= 1) {
for (i = 0; i < len; i++) {
j = Math.floor(Math.random() * (i + 1));
tmp = list[i];
list[i] = list[j];
list[j] = tmp;
tmp = result[i];
result[i] = result[j];
result[j] = tmp;
}

return result;
Expand All @@ -163,7 +156,7 @@
* searching for.
*/
function filterByName(searchForName, personList) {
return personList.filter((person) => {
return personList.filter(function(person) {
return person.firstName === searchForName || person.lastName === searchForName;
});
}
Expand All @@ -188,35 +181,33 @@
function sortObjListByProp(prop) {
return function(objList) {
// Make a copy & don't mutate the passed in list
let result = objList.slice(1);
let result = objList.slice(0);

result.sort((a, b) => {
if (a[prop] < b[prop]) {
return -1;
}

if (a[prop] > b[prop]) {
return 1;
}

return 1;
result.sort(function(a, b) {
if (a[prop] < b[prop]) return -1;
if (a[prop] > b[prop]) return 1;
return 0;
});

return result;
};
}

const sortByFirstName = sortObjListByProp('firstName');
const sortByFirstName = sortObjListByProp('firstName');

const sortByLastName = (personList) => sortByFirstName(personList).reverse();
const sortByLastName = sortObjListByProp('lastName');

const sortDescendingByLastName = function(personList) {
return sortByLastName(personList).reverse();
};

/*==================================================

VIEW (React)

***************************************************/


const Search = (props) => React.DOM.input({
type: 'input',
onChange: props.onChange
Expand Down