Skip to content
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.

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

Jump to bottom

convert functions and variables to e6 syntax #352

Merged
merged 19 commits into from Aug 13, 2019
Merged

convert functions and variables to e6 syntax #352

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d4492a4
convert functions and variables to e6 syntax
mayeedwin Aug 7, 2019
3d85423
let to var
mayeedwin Aug 9, 2019
f691de0
let to const - es6 syntax
mayeedwin Aug 9, 2019
c34c2f3
remove empty line
mayeedwin Aug 9, 2019
bc61c76
Update FriendlyEats.Data.js
mayeedwin Aug 9, 2019
821a238
change let to const where necessary
mayeedwin Aug 9, 2019
4941e8b
revert to default / test ci
mayeedwin Aug 10, 2019
a9b222a
convert to es6 syntax / arrow functions and var to const / let
mayeedwin Aug 10, 2019
6da9477
fix => error 'query' is constant no-const-assign
mayeedwin Aug 10, 2019
790a7b0
fix => error 'query' is constant no-const-assign
mayeedwin Aug 10, 2019
b228930
redeclaration fix = > use let at ln 50
mayeedwin Aug 13, 2019
68a75cb
let to const declaration
mayeedwin Aug 13, 2019
c39876b
functions and variables set to es6 syntax
mayeedwin Aug 13, 2019
b49d14f
functions and variables set to es6 syntax
mayeedwin Aug 13, 2019
db34a99
functions and variables set to es6 syntax
mayeedwin Aug 13, 2019
36721a6
functions and variables set to es6 syntax
mayeedwin Aug 13, 2019
9628c76
revert commit
mayeedwin Aug 13, 2019
215972f
revert commit
mayeedwin Aug 13, 2019
b94394f
revert commit
mayeedwin Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions firestore/scripts/FriendlyEats.Data.js
View file
Open in desktop
Expand Up @@ -15,39 +15,39 @@
*/
'use strict';

FriendlyEats.prototype.addRestaurant = function(data) {
var collection = firebase.firestore().collection('restaurants');
FriendlyEats.prototype.addRestaurant = (data) => {
const collection = firebase.firestore().collection('restaurants');
return collection.add(data);
};

FriendlyEats.prototype.getAllRestaurants = function(render) {
var query = firebase.firestore()
FriendlyEats.prototype.getAllRestaurants = (render) => {
const query = firebase.firestore()
.collection('restaurants')
.orderBy('avgRating', 'desc')
.limit(50);
this.getDocumentsInQuery(query, render);
};

FriendlyEats.prototype.getDocumentsInQuery = function(query, render) {
query.onSnapshot(function (snapshot) {
FriendlyEats.prototype.getDocumentsInQuery = (query, render) => {
query.onSnapshot((snapshot) => {
if (!snapshot.size) {
return render();
}

snapshot.docChanges().forEach(function(change) {
snapshot.docChanges().forEach((change) => {
if (change.type === 'added' || change.type === 'modified') {
render(change.doc);
}
});
});
};

FriendlyEats.prototype.getRestaurant = function(id) {
FriendlyEats.prototype.getRestaurant = (id) => {
return firebase.firestore().collection('restaurants').doc(id).get();
};

FriendlyEats.prototype.getFilteredRestaurants = function(filters, render) {
var query = firebase.firestore().collection('restaurants');
FriendlyEats.prototype.getFilteredRestaurants = (filters, render) => {
let query = firebase.firestore().collection('restaurants');

if (filters.category !== 'Any') {
query = query.where('category', '==', filters.category);
Expand All @@ -70,16 +70,16 @@ FriendlyEats.prototype.getFilteredRestaurants = function(filters, render) {
this.getDocumentsInQuery(query, render);
};

FriendlyEats.prototype.addRating = function(restaurantID, rating) {
var collection = firebase.firestore().collection('restaurants');
var document = collection.doc(restaurantID);
var newRatingDocument = document.collection('ratings').doc();
FriendlyEats.prototype.addRating = (restaurantID, rating) => {
const collection = firebase.firestore().collection('restaurants');
const document = collection.doc(restaurantID);
const newRatingDocument = document.collection('ratings').doc();

return firebase.firestore().runTransaction(function(transaction) {
return transaction.get(document).then(function(doc) {
var data = doc.data();
return firebase.firestore().runTransaction((transaction) => {
return transaction.get(document).then((doc) => {
const data = doc.data();

var newAverage =
const newAverage =
(data.numRatings * data.avgRating + rating.rating) /
(data.numRatings + 1);

Expand Down