Add new fields from database

Author: TheLukaszNs

src/api/Api.js

@@ -25,11 +25,11 @@ class Api {
     const finalArr = [];
     categories()
       .then((categoriesData) => {
-        Object.keys(categoriesData).map((key, index) => {
+        Object.keys(categoriesData).map((key) => {
           const title = key;
           const newTitle = title.charAt(0).toUpperCase() + title.slice(1);
-          return finalArr.push({ id: index + 1, title: newTitle, thumbnail: undefined });
-          // we have to add Thumbnail (both - to Firebase and a[[)
+          return finalArr.push({ id: categoriesData[key], title: newTitle, thumbnail: undefined });
+          // we have to add Thumbnail (both - to Firebase and app)
         });
         return finalArr;
       })
@@ -40,8 +40,9 @@ class Api {
             const itemsArray = []; // helper Array to store all formatted items
             Object.keys(siteData).map((key1, index1) => itemsArray.push({
               id: `${finalArr[index].id}_${index1}`,
-              title: key1,
+              title: siteData[key1].title,
               url: `http://${siteData[key1].url}`, // for now it will produce bad URL for links starting with http:// or https:// [needs to be changed in database]
+              thumbnail: siteData[key1].thumbnail,
             }));
             newArray.push({ ...finalArr[index], items: itemsArray });
             if (newArray.length === finalArr.length) {