create adapter for new api (#15)

* feat(fix(core): service tests):
* feat(feat(core): change books adapter & add create book button):

.github/workflows/vue.yml

@@ -2,10 +2,14 @@ name: vue
 
 on:
  push:
+ paths:
+ - books-ui/**
  branches:
  - main
  - books-ui
  pull_request:
+ paths:
+ - books-ui/**
  branches:
  - main
  - books-ui

books-ui/Makefile

@@ -1,3 +1,6 @@
+HOOK_NAME=pre-push
+HOOK_PATH=../.git/hooks/$(HOOK_NAME)
+
 restart:
  docker build -t proxy-ui-vue .
  docker run -d --name proxy-ui-vue --rm -p 5000:80 proxy-ui-vue
@@ -13,9 +16,34 @@ rmrestart:
  docker stop proxy-ui-vue
  docker run -d --name proxy-ui-vue --rm -p 5000:80 proxy-ui-vue
 
-// feat():
-// git add . && git commit -m "feat(): " && git push
+
+prehook:
+ @echo "Setting up pre-push hook..."
+ @rm -f $(HOOK_PATH)
+ @echo '#!/bin/sh' >> $(HOOK_PATH)
+ @echo 'echo "Running lint for books-ui"' >> $(HOOK_PATH)
+ @echo 'cd ./books-ui' >> $(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."
+
+
+
 push:
- git add .
- git commit -m "${commit}"
- git push
+ifeq ($(commit),)
+ $(error mn is not set)
+endif
+ make prehook
+ git add . && git commit -m "feat($(commit)):" && git push
+

books-ui/package.json

@@ -16,6 +16,7 @@
  "axios": "^1.6.7",
  "flowbite": "^2.3.0",
  "flowbite-vue": "^0.1.2",
+ "moment": "^2.30.1",
  "postcss-import": "^16.0.1",
  "ramda": "^0.29.1",
  "socket.io-client": "^4.7.4",

books-ui/src/App.vue

@@ -1,7 +1,9 @@
 <script>
 import Head from '@frames/Head.vue';
 import SideMenu from '@frames/SideMenu/SideMenu.vue';
-import {mapActions} from "vuex";
+import {mapGetters} from "vuex";
+import AdapterOfBooks from "@adapters/AdapterOfBooks.js";
+import ServiceOfBooks from "@services/ServiceOfBooks.js";
 
 
 export default {
@@ -14,21 +16,24 @@ export default {
  return {}
  },
  computed: {
+ ...mapGetters('books', ['userBooks']),
  pageName() {
  if (!this.$route) return "pending"
  return this.$route.name
  }
  },
- mounted() {
- this.initScreenSizeRecalc()
+ mounted() {
+ const url = import.meta.env.VITE_API_ADDR
+ const adapterOfBooks = new AdapterOfBooks(url)
+ const store = this.$store
+
+ const serviceOfBooks = new ServiceOfBooks(adapterOfBooks, store)
+ serviceOfBooks.fetchUserBooks()
+
  },
- methods: {
- ...mapActions('layout', ['initScreenSizeRecalc'])
- }
 }
 </script>
 
-
 <template>
  <div
  v-if="pageName && pageName !== 'auth'"

books-ui/src/adapters/AdapterOfBooks.js

@@ -0,0 +1,146 @@
+import {get, post, put, remove} from '@helpers/apiHelpers.js'
+import {convertList, convertObject} from '@helpers/adapter/adapter.js'
+import {reverseObject} from '@helpers/objectUtils'
+import {path} from 'ramda'
+
+const adapterConfig = {
+ "id": "id",
+ "created_at": "createdAt",
+ "updated_at": "updatedAt",
+ "deleted_at": "deletedAt",
+ "owner": "owner",
+ "title": "title",
+ "author": "author",
+ "description": "description",
+ "is_public": "isPublic",
+ "publication": "publication",
+ "image_link": "imageLink",
+ "map_link": "mapLink",
+ "map_params_id": "mapParamsId",
+ "variables": "variables"
+}
+
+
+/**
+ * @deftypes Book
+ * @property {String} title "Тестовая книга",
+ * @property {String} author "Васильев А.В.",
+ * @property {String} owner "e75aae0d-c1eb-4199-a1d8-2177f57d6a1e",
+ * @property {String} description "test description",
+ * @property {Boolean} is_public false,
+ * @property {Any} publication null
+ *
+ */
+
+/**
+ * BooksApi class
+ *
+ * @class
+ */
+
+class AdapterOfBooks {
+
+ /**
+ * @constructor
+ * @param {Object | undefined } adapterFromApiConfig - конфигурация адаптера для преобразования объектов из API
+ * @param {Object | undefined | any} params - параметры
+ * @param {Object} params.adapterToApiConfig - конфигурация адаптера для преобразования объектов в API, по дефолту преобразование происходит в обратном порядке из adapterFromApiConfig
+ */
+ constructor(url) {
+ this.adapterFromApiConfig = adapterConfig
+ this.adapterToApiConfig = reverseObject(this.adapterFromApiConfig)
+ this.url = url
+ }
+
+ /**
+ *
+ * @returns {Promise<Object[]>}
+ */
+ async getBooks() {
+ let {books} = await get(`${this.url}/books`)
+ books = convertList(books, {config: this.adapterFromApiConfig})
+ return books
+ }
+
+ /**
+ *
+ * @param {Object} book
+ * @returns {Promise<*|void|Object>}
+ */
+ async updateBook(book) {
+ const bookToApi = convertObject(book, {config: this.adapterToApiConfig})
+ const bookFromApi = await put(`${this.url}/books/${book.id}`, {
+ book: bookToApi
+ })
+
+ const updatedBook = convertObject(bookFromApi.book, {config: this.adapterFromApiConfig})
+ return updatedBook
+ }
+
+ /**
+ *
+ * @param {Object} book
+ * @returns {Promise<*|void|Object>}
+ */
+ async createBook(book) {
+ const bookToApi = convertObject(book, {config: this.adapterToApiConfig})
+ let bookFromApi = await post(`${this.url}/books`, {
+ book: bookToApi
+ })
+ bookFromApi = convertObject(bookFromApi.book, {config: this.adapterFromApiConfig})
+ return bookFromApi
+ }
+
+
+ /**
+ *
+ * @param {Number} id
+ * @returns {Promise<Object>}
+ */
+ async getBookById(id) {
+ const {book} = await get(`${this.url}/books/${id}`)
+ return convertObject(book, {config: this.adapterFromApiConfig})
+ }
+
+ /**
+ *
+ * @param {Number} id
+ * @returns {Promise<Object>}
+ */
+ async deleteBookById(id) {
+ const {book} = await remove(`${this.url}/books/${id}`)
+ const updatedBook = convertObject(book, {config: this.adapterFromApiConfig})
+ return updatedBook
+ }
+
+ /**
+ * @param {Function} logFunction
+ * @returns {Promise<null>}
+ */
+ async integrationTests(logFunction) {
+ logFunction("Список книг")
+ const books = await this.getBooks()
+ logFunction(books)
+ logFunction("Создание книги")
+ const newBook = await this.createBook({
+ "title": "Тестовая книга",
+ "author": "Васильев А.В.",
+ "owner": "e75aae0d-c1eb-4199-a1d8-2177f57d6a1e",
+ "description": "test description",
+ "is_public": false,
+ "publication": null
+ })
+ logFunction(newBook)
+ logFunction("Получение книги по id(Созданной)")
+ const bookById = await this.getBookById(newBook.id)
+ logFunction(bookById)
+ logFunction("Обновление книги")
+ const updatedBook = await this.updateBook({...bookById, title: "Обновленная книга"})
+ logFunction(updatedBook)
+ logFunction("Удаление книги")
+ const deletedBook = await this.deleteBookById(bookById.id)
+ logFunction(deletedBook)
+ }
+}
+
+export default AdapterOfBooks

books-ui/src/components/1_atoms/BackgroundImage.vue

@@ -0,0 +1,28 @@
+<script>
+export default {
+ name: 'BackgroundImage',
+ props: {
+ imageLink: {
+ type: String,
+ required: true
+ },
+ alt: {
+ type: String,
+ required: true
+ }
+ },
+}
+
+</script>
+
+<template>
+ <div class="absolute inset-0 overflow-hidden transition-all">
+ <figure class="h-full w-full overflow-hidden">
+ <img
+ class="object-cover w-full h-full"
+ :src="imageLink"
+ :alt="alt"
+ >
+ </figure>
+ </div>
+</template>

books-ui/src/components/2_molecules/VCardsContainer.vue

@@ -0,0 +1,17 @@
+<script>
+export default {
+ name: 'VCardsContainer',
+ components: {},
+ data() {},
+ computed: {},
+ mounted() {},
+ methods: {}
+}
+
+</script>
+
+<template>
+ <div class="">
+ template
+ </div>
+</template>

books-ui/src/components/3_organisms/BookEditor/BookEditor.vue

@@ -0,0 +1,25 @@
+<script>
+import BookEditorHeader from "@organisms/BookEditor/BookEditorHeader.vue";
+import BookEditorChaptersMenu from "@organisms/BookEditor/BookEditorChaptersMenu.vue";
+import BookEditorBody from "@organisms/BookEditor/BookEditorBody.vue";
+
+export default {
+ name: 'BookEditor',
+ components: {BookEditorHeader, BookEditorChaptersMenu, BookEditorBody},
+ data() {},
+ computed: {},
+ mounted() {},
+ methods: {}
+}
+
+</script>
+
+<template>
+ <div class="w-full h-full">
+ <BookEditorHeader />
+ <div>
+ <BookEditorChaptersMenu />
+ <BookEditorBody />
+ </div>
+ </div>
+</template>

books-ui/src/components/3_organisms/BookEditor/BookEditorBody.vue

@@ -0,0 +1,17 @@
+<script>
+export default {
+ name: 'BookEditorBody',
+ components: {},
+ data() {},
+ computed: {},
+ mounted() {},
+ methods: {}
+}
+
+</script>
+
+<template>
+ <div class="">
+ template
+ </div>
+</template>

books-ui/src/components/3_organisms/BookEditor/BookEditorChaptersMenu.vue

@@ -0,0 +1,17 @@
+<script>
+export default {
+ name: 'BookEditorChaptersMenu',
+ components: {},
+ data() {},
+ computed: {},
+ mounted() {},
+ methods: {}
+}
+
+</script>
+
+<template>
+ <div class="">
+ template
+ </div>
+</template>

books-ui/src/components/3_organisms/BookEditor/BookEditorHeader.vue

@@ -0,0 +1,17 @@
+<script>
+
+
+export default {
+ name: 'BookEditorHeader',
+ components: {},
+ data() {},
+ computed: {},
+ mounted() {},
+ methods: {}
+}
+
+</script>
+
+<template>
+ <div class="w-full h-10 border-b border-slate-300" />
+</template>