= textNodeArray.map((node) => {
+ // Для текстовых узлов нужно получить родительский элемент
+ const parentElement = node.parentElement;
+ if (!parentElement) {
+ console.warn('Parent element not found for text node:', node);
+ return null;
+ }
+
+ const {width, height} = parentElement.getBoundingClientRect();
+ return this.cloneBlockService.getSize(parentElement, node.textContent, new SizeModel(width, height));
+ }).filter(Boolean); // Убираем null значения
console.log(cloneArray.length);
diff --git a/src/popup.ts b/src/popup.ts.backup
similarity index 100%
rename from src/popup.ts
rename to src/popup.ts.backup
diff --git a/src/popup/ApiPopupService.js b/src/popup/ApiPopupService.js
new file mode 100644
index 0000000..4339a61
--- /dev/null
+++ b/src/popup/ApiPopupService.js
@@ -0,0 +1,61 @@
+import {SettingsService} from "./settings/SettingsService";
+import {NavbarBuilder} from "./navbar/NavbarBuilder";
+import {WordbookScroll} from "./scroll/WordbookScroll";
+import {Context} from "../core/Context";
+import {SettingsBuilder} from "./settings/SettingsBuilder";
+import {NavButtons} from "./navbar/NavButtons";
+import {ScrollBuilder} from "./scroll/ScrollBuilder";
+import {InfoBarBuilder} from "./info/InfoBarBuilder";
+import {ApiStore} from "../core/ApiStore";
+
+export class ApiPopupService {
+
+ #navbarBuilder;
+ #settingsBuilder;
+ #scrollBuilder;
+ #infoBarBuilder;
+ #apiStore;
+
+ constructor() {
+ this.#settingsBuilder = new SettingsBuilder();
+ this.#navbarBuilder = new NavbarBuilder();
+ this.#scrollBuilder = new ScrollBuilder();
+ this.#infoBarBuilder = new InfoBarBuilder();
+ this.#apiStore = new ApiStore();
+ }
+
+ run = async () => {
+ try {
+ // Проверяем авторизацию в API
+ const isAuth = await this.#apiStore.ensureAuth();
+ Context.add("apiAvailable", isAuth);
+
+ if (isAuth) {
+ // Получаем информацию о пользователе
+ const user = await this.#apiStore.getCurrentUser();
+ Context.add("currentUser", user);
+ }
+ } catch (error) {
+ Context.add("apiAvailable", false);
+ }
+
+ this.#buildPopupDOM();
+ const settings = new SettingsService();
+ settings.fillSettings();
+ const scroll = new WordbookScroll();
+ scroll.fillScroll(0);
+ this.#setupNavButtons();
+ }
+
+ #buildPopupDOM = () => {
+ this.#navbarBuilder.buildButtons();
+ this.#settingsBuilder.buildSettingsContentStructure();
+ this.#scrollBuilder.build();
+ }
+
+ #setupNavButtons = () => {
+ const navButtons = new NavButtons();
+ navButtons.onClickNavButtons();
+ navButtons.checkButtonsAndSetContentVisibility();
+ }
+}
\ No newline at end of file
diff --git a/test-api.html b/test-api.html
new file mode 100644
index 0000000..53134c4
--- /dev/null
+++ b/test-api.html
@@ -0,0 +1,90 @@
+
+
+
+
+
+ API Test
+
+
+ Reckue API Test
+ Проверка подключения к API...
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 6299487..e59a358 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,10 +1,12 @@
const path = require("path");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
module.exports = {
- mode: "production",
+ mode: "development",
+ devtool: "source-map",
entry: {
- page: "./src/page.ts",
- popup: "./src/popup.ts"
+ page: "./src/api-page.ts",
+ popup: "./src/api-popup.ts"
},
module: {
rules: [
@@ -21,6 +23,15 @@ module.exports = {
output: {
path: path.resolve(__dirname),
filename: "dist/[name]/[name].js"
- }
-};
-
+ },
+ plugins: [
+ new CopyWebpackPlugin({
+ patterns: [
+ {
+ from: "dist/popup/popup.html",
+ to: "dist/popup/popup.html"
+ }
+ ]
+ })
+ ]
+};
\ No newline at end of file
diff --git a/webpack.config.js.backup b/webpack.config.js.backup
new file mode 100644
index 0000000..6299487
--- /dev/null
+++ b/webpack.config.js.backup
@@ -0,0 +1,26 @@
+const path = require("path");
+
+module.exports = {
+ mode: "production",
+ entry: {
+ page: "./src/page.ts",
+ popup: "./src/popup.ts"
+ },
+ module: {
+ rules: [
+ {
+ test: /\.tsx?$/,
+ use: 'ts-loader',
+ exclude: /node_modules/,
+ },
+ ],
+ },
+ resolve: {
+ extensions: ['.tsx', '.ts', '.js'],
+ },
+ output: {
+ path: path.resolve(__dirname),
+ filename: "dist/[name]/[name].js"
+ }
+};
+
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
new file mode 100644
index 0000000..2d8ac2a
--- /dev/null
+++ b/webpack.dev.config.js
@@ -0,0 +1,37 @@
+const path = require("path");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+
+module.exports = {
+ mode: "development",
+ devtool: "source-map",
+ entry: {
+ page: "./src/api-page.ts",
+ popup: "./src/api-popup.ts"
+ },
+ module: {
+ rules: [
+ {
+ test: /\.tsx?$/,
+ use: 'ts-loader',
+ exclude: /node_modules/,
+ },
+ ],
+ },
+ resolve: {
+ extensions: ['.tsx', '.ts', '.js'],
+ },
+ output: {
+ path: path.resolve(__dirname),
+ filename: "dist/[name]/[name].js"
+ },
+ plugins: [
+ new CopyWebpackPlugin({
+ patterns: [
+ {
+ from: "dist/popup/popup.html",
+ to: "dist/popup/popup.html"
+ }
+ ]
+ })
+ ]
+};
\ No newline at end of file