Skip to content

Commit 9bf21a0

Browse files
committed
fix: переименованы модули во view, eslint
1 parent e19f993 commit 9bf21a0

File tree

10 files changed

+20
-23
lines changed

10 files changed

+20
-23
lines changed

src/js/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export const initApp = () => {
1616

1717
form.addEventListener("submit", (e) => {
1818
e.preventDefault();
19-
model.form.validateInput()
19+
model.form
20+
.validateInput()
2021
.then(() => model.feed.add())
2122
.catch((error) => {
2223
console.log("валидация не пройдена:", error.message);
@@ -31,7 +32,7 @@ export const initApp = () => {
3132
});
3233

3334
closeModalBtns.forEach((btn) => {
34-
btn.addEventListener('click', () => {
35+
btn.addEventListener("click", () => {
3536
model.post.setActive(null);
3637
});
3738
});

src/js/model/form.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ const schema = yup
66
.string()
77
.url("notUrl")
88
.required("required")
9-
.test(
10-
"no-duplicate",
11-
"exists",
12-
(value) => !state.feedsList.includes(value)
13-
);
9+
.test("no-duplicate", "exists", (value) => !state.feedsList.includes(value));
1410

1511
export const validateInput = () => {
1612
state.ui.success = false;

src/js/model/update.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@ export const startFeedChecks = () => {
3333
setTimeout(startFeedChecks, 10000);
3434
});
3535
};
36-

src/js/state.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const createState = () => {
1515
ui: {
1616
error: null,
1717
pending: false,
18-
success: false
19-
}
18+
success: false,
19+
},
2020
};
2121

2222
return onChange(object, (path, value) => {
@@ -41,7 +41,7 @@ const createState = () => {
4141
view.form.renderInputValue(value);
4242
}
4343
if (path === "ui.error") {
44-
view.ui.renderUi('error', value);
44+
view.ui.renderUi("error", value);
4545
}
4646
if (path === "ui.success") {
4747
view.ui.renderUi("success");

src/js/view/renderFeeds.js renamed to src/js/view/feed.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const renderFeeds = (feeds) => {
1515
<h3 class="h6 m-0">${feed.title}</h3>
1616
<p class="m-0 small text-black-50">${feed.description}</p>
1717
</li>
18-
`
18+
`,
1919
)
2020
.join("")}
2121
</ul>

src/js/view/renderForm.js renamed to src/js/view/form.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ export const renderSuccess = () => {
1616
feedback.classList.add("text-success");
1717
feedback.textContent = i18next.t(`ui.success`);
1818
};
19-

src/js/view/index.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
import * as ui from "./renderUi.js";
2-
import * as form from "./renderForm.js";
3-
import * as feeds from "./renderFeeds.js";
4-
import * as posts from "./renderPosts.js";
5-
import * as modal from "./renderModal.js";
1+
import * as ui from "./ui.js";
2+
import * as form from "./form.js";
3+
import * as feeds from "./feed.js";
4+
import * as posts from "./post.js";
5+
import * as modal from "./modal.js";
66

77
export const view = {
8-
ui, feeds, form, posts, modal
8+
ui,
9+
feeds,
10+
form,
11+
posts,
12+
modal,
913
};

src/js/view/renderModal.js renamed to src/js/view/modal.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ export const closeModal = () => {
2929

3030
document.querySelector(".modal-backdrop").remove();
3131
};
32-

src/js/view/renderPosts.js renamed to src/js/view/post.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@ export const renderViewedPost = (id) => {
4141
viewedPost.classList.remove("fw-bold");
4242
viewedPost.classList.add("fw-normal");
4343
};
44-

src/js/view/renderUi.js renamed to src/js/view/ui.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import i18next from "../../i18n.js";
2-
import { renderErrors, renderSuccess } from "./renderForm.js";
3-
import { renderFeedsPending } from "./renderFeeds.js";
2+
import { renderErrors, renderSuccess } from "./form.js";
3+
import { renderFeedsPending } from "./feed.js";
44
const title = document.querySelector("#main-title");
55
const subtitle = document.querySelector("#subtitle");
66
const input = document.querySelector("#url-input");

0 commit comments

Comments
 (0)