Функции возвращаются

js/create-photo.js

@@ -1,24 +1,53 @@
 import { getPhotoData } from './data.js';
-import { getPhotoSettings } from './photo-settings.js';
 import { getRandomUniqueNumbers, getRandomArrayElement, getRandomNumber } from './utils.js';
 
+const PhotosQuantity = {
+  MIN: 1,
+  MAX: 25,
+};
+
+const AvatarsQuantity = {
+  MIN: 1,
+  MAX: 6,
+};
+
+const LikesQuantity = {
+  MIN: 15,
+  MAX: 200,
+};
+
+const CommentsIdQuantity = {
+  MIN: 1,
+  MAX: 1000,
+};
+
+const CommentsForPhotoQuantity = {
+  MIN: 0,
+  MAX: 30,
+};
+
+const MessagesForCommentQuantity = {
+  MIN: 1,
+  MAX: 2,
+};
+
 const createPhoto = () => {
 
-  const generateCommentIds = getRandomUniqueNumbers(getPhotoSettings().CommentsIdQuantity.MIN, getPhotoSettings().CommentsIdQuantity.MAX);
-  const generagePtohoIds = getRandomUniqueNumbers(getPhotoSettings().PhotosQuantity.MIN, getPhotoSettings().PhotosQuantity.MAX);
-  const generatePhotoUrls = getRandomUniqueNumbers(getPhotoSettings().PhotosQuantity.MIN, getPhotoSettings().PhotosQuantity.MAX);
+  const generateCommentIds = getRandomUniqueNumbers(CommentsIdQuantity.MIN, CommentsIdQuantity.MAX);
+  const generagePtohoIds = getRandomUniqueNumbers(PhotosQuantity.MIN, PhotosQuantity.MAX);
+  const generatePhotoUrls = getRandomUniqueNumbers(PhotosQuantity.MIN, PhotosQuantity.MAX);
 
   const getCommentMessages = (messages) => {
     const array = [];
-    for (let i = 1; i <= getRandomNumber(getPhotoSettings().MessagesForCommentQuantity.MIN, getPhotoSettings().MessagesForCommentQuantity.MAX); i++) {
+    for (let i = 1; i <= getRandomNumber(MessagesForCommentQuantity.MIN, MessagesForCommentQuantity.MAX); i++) {
       array.push(getRandomArrayElement(messages));
     }
     return array;
   };
 
   const createComment = () => ({
     id: generateCommentIds(),
-    avatar: `img/avatar-${getRandomNumber(getPhotoSettings().AvatarsQuantity.MIN, getPhotoSettings().AvatarsQuantity.MAX)}.svg`,
+    avatar: `img/avatar-${getRandomNumber(AvatarsQuantity.MIN, AvatarsQuantity.MAX)}.svg`,
     message: getCommentMessages(getPhotoData().MESSAGES).join(' '),
     name: getRandomArrayElement(getPhotoData().NAMES),
   });
@@ -27,11 +56,9 @@ const createPhoto = () => {
     id: generagePtohoIds(),
     url: `photos/${generatePhotoUrls()}.jpg`,
     description: getPhotoData().DESCRIPTIONS[getRandomNumber(0, getPhotoData().DESCRIPTIONS.length - 1)],
-    likes: getRandomNumber(getPhotoSettings().LikesQuantity.MIN, getPhotoSettings().LikesQuantity.MAX),
-    comments: Array.from({length: getRandomNumber(getPhotoSettings().CommentsForPhotoQuantity.MIN, getPhotoSettings().CommentsForPhotoQuantity.MAX)}, createComment),
+    likes: getRandomNumber(LikesQuantity.MIN, LikesQuantity.MAX),
+    comments: Array.from({length: getRandomNumber(CommentsForPhotoQuantity.MIN, CommentsForPhotoQuantity.MAX)}, createComment),
   };
 };
 
-export { createPhoto };
-
-
+export { createPhoto, PhotosQuantity };

js/data.js

@@ -50,6 +50,6 @@ const getPhotoData = () => {
   ];
 
   return { DESCRIPTIONS, NAMES, MESSAGES };
-}
+};
 
 export { getPhotoData };

js/functions.js

@@ -1,11 +1,10 @@
 // Функция для проверки, является ли строка длиннее заданного числа
 
 const isStringLonger = (string = '', maxLength = 1) => string.length <= maxLength;
 
-
 // Функция для проверки, является ли строка палиндромом
 
 const isPalindrom = (string = '') => {
   string = string.toLowerCase().replaceAll(' ', '');
   let reverseString = '';
   for (let i = 0; i < string.length; i++) {
@@ -16,7 +15,7 @@
 
 // Функция для извлечения числа из строки
 
 const extractNumber = (string) => {
   string = string.toString();
   let number = '';
   for (let i = 0; i < string.length; i++) {
@@ -26,3 +25,25 @@
   }
   return parseInt(number, 10);
 };
+
+// Функция, опеределяющая, выходит вреча за рамки рабочего времени или нет
+
+const isDelayAtWork = (starWorkDayTime, endWorkDayTime, startMeetingTime, meetingTimeInMinute) => {
+  const toNumber = (string) => {
+    const number = string.split(':');
+    number[1] /= 60;
+    const result = Number(number[0]) + number[1];
+    return result;
+  };
+
+  const startDay = toNumber(starWorkDayTime);
+  const endDay = toNumber(endWorkDayTime);
+  const startMeeting = toNumber(startMeetingTime);
+  const meetingTimeInHour = meetingTimeInMinute / 60;
+
+  if (startDay > startMeeting || endDay <= startMeeting || meetingTimeInHour > (endDay - startMeeting)) {
+    return false;
+  }
+
+  return true;
+};

js/main.js

@@ -1,4 +1,3 @@
-import { getPhotoSettings } from './photo-settings.js';
-import { createPhoto } from './create-photo.js';
+import { createPhoto, PhotosQuantity } from './create-photo.js';
 
-const photos = Array.from({length: getPhotoSettings().PhotosQuantity.MAX}, createPhoto);
+const photos = Array.from({length: PhotosQuantity.MAX}, createPhoto);