парсинг и изменения state для фидов разделены

Author: daria-z

src/index.html

@@ -121,6 +121,6 @@ <h1 id="main-title" class="display-3 mb-0">RSS агрегатор</h1>
       </div>
     </footer>
     <deepl-input-controller translate="no"></deepl-input-controller>
-    <script type="module" src="./js/main.js"></script>
+    <script type="module" src="./js/index.js"></script>
   </body>
 </html>

src/js/index.js

@@ -0,0 +1,6 @@
+import "../i18n.js";
+import { initApp } from "./main.js";
+
+initApp();
+
+// validateInput -> fetchRssData -> parseRss -> state -> render

src/js/initApp.js

@@ -1,4 +1,39 @@
-import "../i18n.js";
-import { initApp } from "./initApp.js";
+import { renderUIText } from "./view.js";
+import {
+  updateInputValue,
+  addRssFeed,
+  validateInput,
+  setActivePost,
+  checkRssFeed,
+} from "./model.js";
+
+export const initApp = () => {
+  renderUIText();
+
+  const input = document.querySelector("#url-input");
+  const form = document.querySelector("#rss-form");
+  const postsContainer = document.querySelector(".posts");
+
+  setInterval(checkRssFeed, 5000);
+
+  input.addEventListener("input", (e) => {
+    updateInputValue(e.target.value);
+  });
+
+  form.addEventListener("submit", (e) => {
+    e.preventDefault();
+    validateInput()
+      .then(() => addRssFeed())
+      .catch(() => console.log("валидация не пройдена"));
+  });
+
+  postsContainer.addEventListener("click", (e) => {
+    const button = e.target.closest(".modal-btn");
+    console.log("id:", button.dataset.id);
+    if (button && button.dataset.id) {
+      setActivePost(button.dataset.id);
+    }
+  });
+};
+
 
-initApp();

src/js/main.js

@@ -39,10 +39,14 @@ export const updateInputValue = (value) => {
   if (state.form.errors) state.form.errors = null;
 };
 
-export const addRssFeed = () => {
-  return fetchRssData(state.form.inputValue)
-    .then((xmlString) => parseRss(xmlString))
-    .then(({ channel, items }) => {
+const fetchAndParseFeed = (url) => {
+  return fetchRssData(url).then((xmlString) => parseRss(xmlString)).catch((error) => {
+    console.error("fetchAndParseRss:", error);
+    throw error;
+  })
+};
+
+const updateFeedsAndPostsState = ({ channel, items}) => {
       if (state.feeds.some((feed) => feed.link === channel.link)) {
         state.form.errors = i18next.t("no_duplicate");
         return;
@@ -53,7 +57,11 @@ export const addRssFeed = () => {
       state.posts = [...state.posts, ...newItems];
       state.form.inputValue = "";
       console.log("обновлён список rss", state.feeds);
-    })
+};
+
+export const addRssFeed = () => {
+  return fetchAndParseFeed(state.form.inputValue)
+    .then(({ channel, items }) => updateFeedsAndPostsState({ channel, items }))
     .catch((error) => {
       throw error;
     });