Merge pull request #6 from dennyhappysomuch/module7-task1

Module7 task1

js/data.js

@@ -55,7 +55,7 @@ function describePhoto() {
 }
 
 function createArrayPhoto() {
-  Array.from({length: 25}, describePhoto);
+  return Array.from({length: 25}, describePhoto);
 }
 
 export {createArrayPhoto};

js/main.js

@@ -1,4 +1,6 @@
 import './utils.js';
+import './pictures.js';
 import {createArrayPhoto} from './data.js';
+import { renderPosts } from './pictures.js';
 
-createArrayPhoto();
+renderPosts(createArrayPhoto());

js/pictures.js

@@ -0,0 +1,20 @@
+const pictures = document.querySelector('.pictures');
+const picturesTemplate = document.querySelector('#picture').content.querySelector('.picture');
+const fragment = document.createDocumentFragment();
+
+function renderPosts (posts) {
+  posts.forEach((picture) => {
+    const clonedPicture = picturesTemplate.cloneNode(true);
+
+    clonedPicture.querySelector('.picture__img').src = picture.url;
+    clonedPicture.querySelector('.picture__img').alt = picture.description;
+    clonedPicture.querySelector('.picture__likes').textContent = picture.likes;
+    clonedPicture.querySelector('.picture__comments').textContent = picture.comments.length;
+
+    fragment.appendChild(clonedPicture);
+  });
+
+  pictures.appendChild(fragment);
+}
+
+export {renderPosts};

js/utils.js

@@ -13,10 +13,17 @@ function createRandomIdFromRangeGenerator (min, max) {
 
   return function () {
     let currentValue = getRandomInteger(min, max);
-    if (previousValues.includes(currentValue)) {
+
+    if (previousValues.length >= (max - min + 1)) {
+      return null;
+    }
+
+    while (previousValues.includes(currentValue)) {
       currentValue = getRandomInteger(min, max);
     }
+
     previousValues.push(currentValue);
+
     return currentValue;
   };
 }