fix(a[[): readmi

Makefile

@@ -1,59 +1,13 @@
 HOOK_NAME=pre-push
 HOOK_PATH=.git/hooks/$(HOOK_NAME)
 
-restart:
+build_repo:
-	docker build -t proxy-ui-vue .
+	@echo "Building repo..."
-	docker run -d --name proxy-ui-vue --rm -p 5000:80 proxy-ui-vue
+	cd repo && make build
+	@echo "Building success!"
 
-stoprestart:
+packs_list:
-	docker stop proxy-ui-vue
+	cd repo && make packs_list
-	docker build -t proxy-ui-vue .
-	docker run -d --name proxy-ui-vue --rm -p 5000:80 proxy-ui-vue
 
-rmrestart:
+list_packs:
-	docker image rm proxy-ui-vue
+	make packs_list
-	docker build -t proxy-ui-vue .
-	docker stop proxy-ui-vue
-	docker run -d --name proxy-ui-vue --rm -p 5000:80 proxy-ui-vue
-
-pre_proxy_hook:
-	@echo "Setting up pre-push hook..."
-	@rm -f $(HOOK_PATH)
-	@echo '#!/bin/sh'								>> $(HOOK_PATH)
-	@echo 'echo "Running lint for proxy-ui"'		>> $(HOOK_PATH)
-	@echo 'cd ./proxy-ui-app'				    	>> $(HOOK_PATH)
-	@echo 'yarn lint'						    	>> $(HOOK_PATH)
-	@echo 'if [ $$? -ne 0 ]; then'					>> $(HOOK_PATH)
-	@echo '  echo "Tests failed, push aborted."'	>> $(HOOK_PATH)
-	@echo '  exit 1'								>> $(HOOK_PATH)
-	@echo 'fi' 										>> $(HOOK_PATH)
-	@echo 'echo "Running tests for proxy-ui"'		>> $(HOOK_PATH)
-	@echo 'yarn test_ones'						  	>> $(HOOK_PATH)
-	@echo 'if [ $$? -ne 0 ]; then'					>> $(HOOK_PATH)
-	@echo '  echo "Tests failed, push aborted."'	>> $(HOOK_PATH)
-	@echo '  exit 1'								>> $(HOOK_PATH)
-	@echo 'fi' 										>> $(HOOK_PATH)
-	@echo 'exit 0' 									>> $(HOOK_PATH)
-	@chmod +x $(HOOK_PATH)
-	@echo "Pre-push hook set successfully."
-
-pre_users_hook:
-	@echo "Setting up pre-push hook..."
-	@rm -f $(HOOK_PATH)
-	@echo '#!/bin/sh'								>> $(HOOK_PATH)
-	@echo 'echo "Running lint for proxy-ui"'		>> $(HOOK_PATH)
-	@echo 'cd ./users-manage'				    	>> $(HOOK_PATH)
-	@echo 'yarn lint'						    	>> $(HOOK_PATH)
-	@echo 'if [ $$? -ne 0 ]; then'					>> $(HOOK_PATH)
-	@echo '  echo "Tests failed, push aborted."'	>> $(HOOK_PATH)
-	@echo '  exit 1'								>> $(HOOK_PATH)
-	@echo 'fi' 										>> $(HOOK_PATH)
-	@echo 'echo "Running tests for proxy-ui"'		>> $(HOOK_PATH)
-	@echo 'yarn test_ones'						  	>> $(HOOK_PATH)
-	@echo 'if [ $$? -ne 0 ]; then'					>> $(HOOK_PATH)
-	@echo '  echo "Tests failed, push aborted."'	>> $(HOOK_PATH)
-	@echo '  exit 1'								>> $(HOOK_PATH)
-	@echo 'fi' 										>> $(HOOK_PATH)
-	@echo 'exit 0' 									>> $(HOOK_PATH)
-	@chmod +x $(HOOK_PATH)
-	@echo "Pre-push hook set successfully."

README.md

@@ -1,14 +1,47 @@
 # Репозиторий фронтенд приложений
 
-* Репозиторий будет переименован. microapps-admin-vue -> frontend-apps
-
 ## Приложения:
 * live_monitor_vue - приложение калькулятора
 * proxy-ui-app - приложение управления роутерами на сайтах и сайтами
 * users-manage - приложение управления пользователями
-* [repo](./repo/Readme.md) - Репозиторий пакетов
+* [repo](./repo/README.md) - Репозиторий пакетов
 
-### Установка пакета
+## Скачивание и установка
+* По умолчанию пакеты в гите хранятся сыром виде. После скачиваия репозитория необходимо выполнить команду установки пакетов.
+
+```bash
+make build_repo
+```
+
+## Список пакетов в репозитории
+### Пример команды
+```bash
+make packs_list
+```
+### Команда для Makefile в папке проекта
+```makefile
+packs_list:
+	cd .. && make packs_list
+
+list_packs:
+	make packs_list
+```
+
+## Установка пакета
+### Упращенная установка пакета. 
+* Команда должена быть прописана команда в Makefile.
+```bash
+ make add pack="1-toolkits-helpers"
+```
+### Команда в Makefile
+```makefile
+add:
+ifeq ($(pack),)
+	$(error mn is not set)
+endif
+	yarn add "../repo/${pack}/"
+```
+### Общий случай: 
 * Для того чтобы установить пакет из репозитория, необходимо указать путь к пакету. Путь может быть абсолютным или относительным. Путь указывается к папке, содержащей файл `package.json`. Путь указывается относительно файла, в котором выполняется команда установки.
 
 ```bash

repo/0-tools-eslint/.gitignore

@@ -1,7 +1,5 @@
 /node_modules
 /dist
 
-
-
 .env
 .DS_Store

repo/0-tools-eslint/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "3-class-complex-assistants",
+  "name": "0-tools-eslint",
   "description": "",
-  "version": "0.0.6",
+  "version": "0.0.1",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -21,9 +21,8 @@
     "registry": "https://vniac.ru:4873"
   },
   "keywords": [
-    "Logger",
+    "eslint",
-    "helpers",
+    "tools"
-    "utils"
   ],
   "author": "vbuglov",
   "license": "ISC",
@@ -31,11 +30,8 @@
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
     "eslint": "^8.57.0",
-    "moment": "^2.30.1",
     "tsup": "^8.0.2",
     "typescript": "^5.4.2",
-    "typescript-eslint": "^7.2.0",
+    "typescript-eslint": "^7.2.0"
-    "vite": "^5.1.6",
-    "vitest": "^1.4.0"
   }
 }

repo/0-tools-eslint/src/index.ts

@@ -1 +1,9 @@
-import jsEslintConfig from './javascript-eslint-config.ts';
+import jsEslintConfig  from './javascript-eslint-config';
+import tsEslintConfig  from './typescript-eslint-config';
+import vueEslintConfig from "./vue-eslint-config";
+
+export {
+  jsEslintConfig,
+  tsEslintConfig,
+  vueEslintConfig,
+}

repo/0-tools-eslint/src/javascript-eslint-config.ts

@@ -1,4 +1,5 @@
-module.exports = {
+
+const jsEslintConfig = {
   extends: [
     "eslint:recommended",
   ],
@@ -8,3 +9,5 @@ module.exports = {
     "no-mixed-spaces-and-tabs": "error",
   }
 }
+
+export default jsEslintConfig;

repo/0-tools-eslint/src/typescript-eslint-config.ts

@@ -1,4 +1,4 @@
-let tsEslintConfig = {
+const tsEslintConfig = {
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin

repo/0-tools-eslint/src/vue-eslint-config.ts

@@ -1,4 +1,4 @@
-vueEslintConfig = {
+const vueEslintConfig = {
   extends: [
     "eslint:recommended",
     "plugin:vue/vue3-recommended",
@@ -28,3 +28,5 @@ vueEslintConfig = {
     }]
   }
 }
+
+export default vueEslintConfig;

repo/1-toolkits-helpers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "1-toolkits-helpers",
   "description": "",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

repo/Makefile

@@ -0,0 +1,25 @@
+
+build:
+	@echo "Building repo..."
+	make build_0-tools-eslint
+	make build_1-toolkits-helpers
+	make build_3-class-complex-assistants
+
+build_0-tools-eslint:
+	@echo "Building 0-tools-eslint..."
+	cd 0-tools-eslint && yarn build
+	@echo "Building build_0-tools-eslint success!"
+
+build_1-toolkits-helpers:
+	@echo "Building 1-toolkits-helpers..."
+	cd 1-toolkits-helpers && yarn build
+	@echo "Building build_1-toolkits-helpers success!"
+
+build_3-class-complex-assistants:
+	@echo "Building 1-toolkits-helpers..."
+	cd 3-class-complex-assistants && yarn build
+	@echo "Building build_3-class-complex-assistants success!"
+
+packs_list:
+	@echo "Packages in folder:"
+	ls -l | grep '^d'

users-manage/src/components/3_organisms/UsersManager/UsersManagerUsersTable.vue

@@ -1,5 +1,5 @@
 <script>
-import VTabulator from '@molecules/Tabulator/VTabulator.vue';
+import VTabulator from '@molecules/VTabulator/VTabulator.vue';
 
 export default {
   name: 'UsersManagerUsersTable',

users-manage/src/router/index.js

@@ -10,7 +10,7 @@ const routes = [
   {
     path: "/users/:mod",
     name: "users",
-    component: import("@pages/UserManage/index.vue")
+    component: import("@pages/UserManage/ButtonModal.vue")
   },
 ];
 

users-manage/tests/views/2_molecules/Tabulator.test.js

@@ -1,6 +1,6 @@
 import {test, describe, expect, vi } from 'vitest'
 import { mount} from '@vue/test-utils'
-import VTabulator from '@molecules/Tabulator/VTabulator.vue';
+import VTabulator from '@molecules/VTabulator/VTabulator.vue';
 
 describe("tests VTabulator component", () => {