From 6b9d75897cb7515315590a8fc82da26dfddd70f9 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:11:16 +0300
Subject: [PATCH 01/17] Extract usePoints composable

---
 frontend/src/components/PieceItem.vue | 21 ++++---------------
 frontend/src/composables/points.js    | 30 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 frontend/src/composables/points.js

diff --git a/frontend/src/components/PieceItem.vue b/frontend/src/components/PieceItem.vue
index 84b5656..2d79ceb 100644
--- a/frontend/src/components/PieceItem.vue
+++ b/frontend/src/components/PieceItem.vue
@@ -2,6 +2,7 @@
   import { computed, ref } from 'vue'
 
   import divmod from '@/utils/divmod'
+  import { usePoints } from '@/composables/points'
 
   const props = defineProps({
     piece: Object,
@@ -15,12 +16,7 @@
   const rotation = computed(() => props.piece.rotations[props.piece.base_version]) 
   const points = computed(() => rotation.value.points)
   const colorString =  computed(() => `#${props.piece.color.toString(16)}`)
-  const maxX = computed(() => Math.max(...points.value.map((point) => point[1])))
-  const minX = computed(() => Math.min(...points.value.map((point) => point[1])))
-  const maxY = computed(() => Math.max(...points.value.map((point) => point[0])))
-  const diameter = computed(() => (1 + Math.max(maxX.value - minX.value, maxY.value)))
-  const grid = computed(make_grid)
-  const width = computed(() => maxX.value - minX.value + 1)
+  const {left, width, diameter, grid } = usePoints(points)
   const canRotate = computed(() => props.piece.rotations.length > 1)
   const flipIndex = computed(() => 1 + props.piece.rotations.findLastIndex((item) => item.flipped === 0))
   const canFlip = computed(() => flipIndex.value < props.piece.rotations.length)
@@ -33,15 +29,6 @@
   const touchShiftX = computed(() => Math.round(touchCurrent.value.length ? touchCurrent.value[0] - touchStart.value[0] : 0) + "px")
   const touchShiftY = computed(() => Math.round(touchCurrent.value.length ? touchCurrent.value[1] - touchStart.value[1] - scrollShift.value : 0) + "px")
 
-
-  function make_grid(){
-    const grid = Array(maxY.value + 1).fill().map(()=>Array(maxX.value - minX.value + 1).fill(false))
-    for (const [y, x] of points.value){
-      grid[y][x - minX.value] = true
-    }
-    return grid
-  }
-
   function on_mouse_down(index){
     console.log(`mouse down in cell #${index}`)
     mouse_index.value = index
@@ -57,7 +44,7 @@
       const offsetY = Math.round(evt.clientY - pieceRect.top) % cellSize - halfSize
       const piece_data = {
         dy: -dy,
-        dx: -dx - minX.value,
+        dx: -dx - left.value,
         pieceId: props.piece.id,
         rotationId: rotation.value.id,
         offsetX: offsetX,
@@ -106,7 +93,7 @@
     const [dy, dx] = divmod(mouse_index.value, width.value)
     const piece_data = {
       dy: -dy,
-      dx: -dx - minX.value,
+      dx: -dx - left.value,
       pieceId: props.piece.id,
       rotationId: rotation.value.id,
       touchXY: touchCurrent.value
diff --git a/frontend/src/composables/points.js b/frontend/src/composables/points.js
new file mode 100644
index 0000000..82b9a5c
--- /dev/null
+++ b/frontend/src/composables/points.js
@@ -0,0 +1,30 @@
+import { ref, toValue, watchEffect } from 'vue'
+
+export function usePoints(points){
+    const grid = ref([])
+    const left = ref(0)
+    const width = ref(0)
+    const diameter = ref(0)
+
+    const process = () => {
+        const _points = toValue(points)
+        const maxX = Math.max(..._points.map((point) => point[1]))
+        const minX = Math.min(..._points.map((point) => point[1]))
+        const maxY = Math.max(..._points.map((point) => point[0]))
+        const _width = maxX - minX + 1
+        const _height = maxY + 1
+        left.value = minX
+        width.value = _width
+        diameter.value = Math.max(_width, _height)    
+    
+        const _grid = Array(maxY + 1).fill().map(()=>Array(_width).fill(false))
+        for (const [y, x] of _points){
+          _grid[y][x - minX] = true
+        }
+        grid.value = _grid
+    }
+
+    watchEffect(process)
+
+    return {left, width, diameter, grid }
+}

From b78739176d9ba59d8ae904b770e3980acd92c2db Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:55:49 +0300
Subject: [PATCH 02/17] Extract useTransform composable

---
 frontend/src/components/PieceItem.vue | 40 ++++-----------------------
 frontend/src/composables/transform.js | 39 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 34 deletions(-)
 create mode 100644 frontend/src/composables/transform.js

diff --git a/frontend/src/components/PieceItem.vue b/frontend/src/components/PieceItem.vue
index 2d79ceb..56e9e71 100644
--- a/frontend/src/components/PieceItem.vue
+++ b/frontend/src/components/PieceItem.vue
@@ -3,6 +3,7 @@
 
   import divmod from '@/utils/divmod'
   import { usePoints } from '@/composables/points'
+  import { useTransform } from '@/composables/transform'
 
   const props = defineProps({
     piece: Object,
@@ -17,9 +18,7 @@
   const points = computed(() => rotation.value.points)
   const colorString =  computed(() => `#${props.piece.color.toString(16)}`)
   const {left, width, diameter, grid } = usePoints(points)
-  const canRotate = computed(() => props.piece.rotations.length > 1)
-  const flipIndex = computed(() => 1 + props.piece.rotations.findLastIndex((item) => item.flipped === 0))
-  const canFlip = computed(() => flipIndex.value < props.piece.rotations.length)
+  const { flip, rotate } = useTransform(props.piece.rotations)
 
   const mouse_index = ref(null)
 
@@ -102,33 +101,6 @@
     console.log("touch end")
     emit("pieceTouch", piece_data)
   }
-
-
-  function rotate(index, turns) {
-        const piece = props.piece
-        const length = piece.rotations.length
-        if (canFlip.value){
-        const half_length = length / 2
-        if (index < half_length){
-            return (half_length + index + turns) % half_length
-        } else {
-           return half_length + (index - turns) % half_length
-        }
-        } else { // no flips for this piece
-            return (length + index + turns) % length
-        }
-    }
-
-    function flip(index, horizontal){
-        const piece = props.piece
-        const cycleLength = piece.rotations.length > 2 ? Math.floor(piece.rotations.length / 2) : 0
-        const new_index = (index + cycleLength) % piece.rotations.length
-        if (horizontal && flipIndex.value > 2){
-            return rotate(new_index, 2)
-        }
-        return new_index
-    }
-
 </script>
 
 <style scoped>
@@ -186,7 +158,7 @@
 <template>
   <div class="hover" @mouseenter="hovering=true" @mouseleave="hovering=false">
     <div class="container-row" >
-      <button type="button" title="повернуть влево" class="transparent-button" :class="{invisible: !(hovering && canRotate)}" @click="emit('changeVersion', rotate(props.piece.base_version, 1))">
+      <button type="button" title="повернуть влево" class="transparent-button" :class="{invisible: !(hovering && rotate)}" @click="emit('changeVersion', rotate(props.piece.base_version, 1))">
         ↪️
       </button>
       <div class="piece-box movable">
@@ -202,15 +174,15 @@
           </div>
         </div>
       </div>
-      <button type="button" title="повернуть вправо" class="transparent-button" :class="{invisible: !(hovering && canRotate)}" @click="emit('changeVersion', rotate(props.piece.base_version, -1))">
+      <button type="button" title="повернуть вправо" class="transparent-button" :class="{invisible: !(hovering && rotate)}" @click="emit('changeVersion', rotate(props.piece.base_version, -1))">
         ↩️
       </button>
     </div>
     <div class="flex-center-content">
-      <button type="button" title="перевернуть сверху вниз" class="centered padded transparent-button" :class="{invisible: !(hovering && canFlip)}" @click="emit('changeVersion', flip(props.piece.base_version, false))">
+      <button type="button" title="перевернуть сверху вниз" class="centered padded transparent-button" :class="{invisible: !(hovering && flip)}" @click="emit('changeVersion', flip(props.piece.base_version, false))">
         🔃
       </button>
-      <button type="button" title="перевернуть слева направо" class="centered padded transparent-button" :class="{invisible: !(hovering && canFlip)}" @click="emit('changeVersion', flip(props.piece.base_version, true))">
+      <button type="button" title="перевернуть слева направо" class="centered padded transparent-button" :class="{invisible: !(hovering && flip)}" @click="emit('changeVersion', flip(props.piece.base_version, true))">
         🔄
       </button>
     </div>
diff --git a/frontend/src/composables/transform.js b/frontend/src/composables/transform.js
new file mode 100644
index 0000000..221db8a
--- /dev/null
+++ b/frontend/src/composables/transform.js
@@ -0,0 +1,39 @@
+import { ref, toValue } from 'vue';
+
+export function useTransform(rotations){
+    const rotate = ref(null)
+    const flip = ref(null)
+
+    const _rotations = toValue(rotations)
+    const length = _rotations.length
+    const canRotate = length > 1
+    const flipIndex = 1 + _rotations.findLastIndex((item) => item.flipped === 0)
+    const canFlip = flipIndex < length
+
+    function _rotate(index, turns) {
+        if (canFlip){
+            const half_length = length / 2
+            if (index < half_length){
+                return (half_length + index + turns) % half_length
+            } else {
+                return half_length + (index - turns) % half_length
+            }
+        } else { // no flips for this piece
+            return (length + index + turns) % length
+        }
+    }
+
+    function _flip(index, horizontal){
+        const cycleLength = length > 2 ? Math.floor(length / 2) : 0
+        const new_index = (index + cycleLength) % length
+        if (horizontal && flipIndex > 2){
+            return _rotate(new_index, 2)
+        }
+        return new_index
+    }
+
+    rotate.value = canRotate ? _rotate : null
+    flip.value = canFlip ? _flip : null
+
+    return { flip, rotate }
+}

From d6e57b35b6293328669a8aa3859c6e57e9c72582 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:57:14 +0300
Subject: [PATCH 03/17] Fromatting

---
 frontend/src/components/PieceItem.vue | 2 +-
 frontend/src/composables/points.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/PieceItem.vue b/frontend/src/components/PieceItem.vue
index 56e9e71..979ac8e 100644
--- a/frontend/src/components/PieceItem.vue
+++ b/frontend/src/components/PieceItem.vue
@@ -17,7 +17,7 @@
   const rotation = computed(() => props.piece.rotations[props.piece.base_version]) 
   const points = computed(() => rotation.value.points)
   const colorString =  computed(() => `#${props.piece.color.toString(16)}`)
-  const {left, width, diameter, grid } = usePoints(points)
+  const { left, width, diameter, grid } = usePoints(points)
   const { flip, rotate } = useTransform(props.piece.rotations)
 
   const mouse_index = ref(null)
diff --git a/frontend/src/composables/points.js b/frontend/src/composables/points.js
index 82b9a5c..f8b0aff 100644
--- a/frontend/src/composables/points.js
+++ b/frontend/src/composables/points.js
@@ -26,5 +26,5 @@ export function usePoints(points){
 
     watchEffect(process)
 
-    return {left, width, diameter, grid }
+    return { left, width, diameter, grid }
 }

From 9b2ae89072ad65c43b8dd8284a2df8bc179a4841 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Thu, 22 Aug 2024 00:01:59 +0300
Subject: [PATCH 04/17] Change units to px to make v-auto-animate work better

---
 frontend/src/components/PieceItem.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/PieceItem.vue b/frontend/src/components/PieceItem.vue
index 979ac8e..98affa8 100644
--- a/frontend/src/components/PieceItem.vue
+++ b/frontend/src/components/PieceItem.vue
@@ -129,7 +129,8 @@
     justify-content: center;
     width: calc(var(--cell-width) * v-bind(diameter));
     height: calc(var(--cell-width) * v-bind(diameter));
-    margin: 0.3rem;
+    /* margin: 0.3rem; */
+    margin:5px;
   }
   .invisible {
     visibility: hidden;

From c924b0b9abc4eb5e1d7d11743a554c6e3592dc94 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:23:48 +0300
Subject: [PATCH 05/17] Add httpx and pytest-asyncio

---
 backend/poetry.lock           | 76 ++++++++++++++++++++++++++++++++++-
 backend/pyproject.toml        |  2 +
 backend/test-requirements.txt |  4 ++
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/backend/poetry.lock b/backend/poetry.lock
index eb6df50..a9fe875 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -292,6 +292,17 @@ files = [
     {file = "cachetools-5.4.0.tar.gz", hash = "sha256:b8adc2e7c07f105ced7bc56dbb6dfbe7c4a00acce20e2227b3f355be89bc6827"},
 ]
 
+[[package]]
+name = "certifi"
+version = "2024.7.4"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
+    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+]
+
 [[package]]
 name = "cffi"
 version = "1.16.0"
@@ -637,6 +648,27 @@ files = [
     {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"},
 ]
 
+[[package]]
+name = "httpcore"
+version = "1.0.5"
+description = "A minimal low-level HTTP client."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"},
+    {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"},
+]
+
+[package.dependencies]
+certifi = "*"
+h11 = ">=0.13,<0.15"
+
+[package.extras]
+asyncio = ["anyio (>=4.0,<5.0)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (==1.*)"]
+trio = ["trio (>=0.22.0,<0.26.0)"]
+
 [[package]]
 name = "httptools"
 version = "0.6.1"
@@ -685,6 +717,30 @@ files = [
 [package.extras]
 test = ["Cython (>=0.29.24,<0.30.0)"]
 
+[[package]]
+name = "httpx"
+version = "0.27.0"
+description = "The next generation HTTP client."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
+    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+]
+
+[package.dependencies]
+anyio = "*"
+certifi = "*"
+httpcore = "==1.*"
+idna = "*"
+sniffio = "*"
+
+[package.extras]
+brotli = ["brotli", "brotlicffi"]
+cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (==1.*)"]
+
 [[package]]
 name = "idna"
 version = "3.7"
@@ -1215,6 +1271,24 @@ tomli = {version = ">=1", markers = "python_version < \"3.11\""}
 [package.extras]
 dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
 
+[[package]]
+name = "pytest-asyncio"
+version = "0.24.0"
+description = "Pytest support for asyncio"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "pytest_asyncio-0.24.0-py3-none-any.whl", hash = "sha256:a811296ed596b69bf0b6f3dc40f83bcaf341b155a269052d82efa2b25ac7037b"},
+    {file = "pytest_asyncio-0.24.0.tar.gz", hash = "sha256:d081d828e576d85f875399194281e92bf8a68d60d72d1a2faf2feddb6c46b276"},
+]
+
+[package.dependencies]
+pytest = ">=8.2,<9"
+
+[package.extras]
+docs = ["sphinx (>=5.3)", "sphinx-rtd-theme (>=1.0)"]
+testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"]
+
 [[package]]
 name = "python-dotenv"
 version = "1.0.1"
@@ -1681,4 +1755,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "40f213fd4c955d813f53a384d9c578f36c082ad02866df3938e6f81b12c245fa"
+content-hash = "0a28ba8b2fcd8097f70b0016102daf5a2fc4382e69066ed763579b7f76a98d17"
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index 7257d08..681b00d 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -33,6 +33,8 @@ black = "^24.8.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^8.3.2"
+httpx = "^0.27.0"
+pytest-asyncio = "^0.24.0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/backend/test-requirements.txt b/backend/test-requirements.txt
index b2dbdf6..1c47a3b 100644
--- a/backend/test-requirements.txt
+++ b/backend/test-requirements.txt
@@ -7,6 +7,7 @@ async-timeout==4.0.3 ; python_version >= "3.10" and python_version < "3.12.0"
 asyncpg==0.29.0 ; python_version >= "3.10" and python_version < "4.0"
 bcrypt==4.1.2 ; python_version >= "3.10" and python_version < "4.0"
 cachetools==5.4.0 ; python_version >= "3.10" and python_version < "4.0"
+certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0"
 cffi==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
 click==8.1.7 ; python_version >= "3.10" and python_version < "4.0"
 colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows")
@@ -19,7 +20,9 @@ fastapi-users==13.0.0 ; python_version >= "3.10" and python_version < "4.0"
 fastapi==0.112.0 ; python_version >= "3.10" and python_version < "4.0"
 greenlet==3.0.3 ; python_version >= "3.10" and python_version < "4.0"
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
+httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0"
 httptools==0.6.1 ; python_version >= "3.10" and python_version < "4.0"
+httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0"
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0"
 iniconfig==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
 makefun==1.15.4 ; python_version >= "3.10" and python_version < "4.0"
@@ -34,6 +37,7 @@ pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0"
 pydantic-settings==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
 pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0"
 pyjwt[crypto]==2.8.0 ; python_version >= "3.10" and python_version < "4.0"
+pytest-asyncio==0.24.0 ; python_version >= "3.10" and python_version < "4.0"
 pytest==8.3.2 ; python_version >= "3.10" and python_version < "4.0"
 python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
 python-multipart==0.0.9 ; python_version >= "3.10" and python_version < "4.0"

From 1bbe543ab6c99c45daa0d56e52824e83a4be0e74 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:25:49 +0300
Subject: [PATCH 06/17] Add menu model

---
 .../alembic/versions/1f37e3800cd9_add_menu.py | 36 +++++++++++++++++++
 backend/app/models/menu.py                    | 16 +++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 backend/alembic/versions/1f37e3800cd9_add_menu.py
 create mode 100644 backend/app/models/menu.py

diff --git a/backend/alembic/versions/1f37e3800cd9_add_menu.py b/backend/alembic/versions/1f37e3800cd9_add_menu.py
new file mode 100644
index 0000000..84b6df5
--- /dev/null
+++ b/backend/alembic/versions/1f37e3800cd9_add_menu.py
@@ -0,0 +1,36 @@
+"""Add Menu
+
+Revision ID: 1f37e3800cd9
+Revises: 81641f63833f
+Create Date: 2024-08-24 02:39:40.192287
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '1f37e3800cd9'
+down_revision: Union[str, None] = '81641f63833f'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('menu',
+    sa.Column('order', sa.SmallInteger(), nullable=False),
+    sa.Column('title', sa.String(), nullable=False),
+    sa.Column('query', sa.JSON(), nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.PrimaryKeyConstraint('id', name=op.f('pk_menu'))
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('menu')
+    # ### end Alembic commands ###
diff --git a/backend/app/models/menu.py b/backend/app/models/menu.py
new file mode 100644
index 0000000..7c13f85
--- /dev/null
+++ b/backend/app/models/menu.py
@@ -0,0 +1,16 @@
+from sqlalchemy import JSON, SmallInteger
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.models.base import Base
+
+
+class Menu(Base):
+    order: Mapped[int] = mapped_column(SmallInteger)
+    title: Mapped[str]
+    query: Mapped[dict[str, str]] = mapped_column(JSON)
+
+    def __repr__(self) -> str:
+        return (
+            f"Menu(id={self.id}, title={self.title}, "
+            f"query={self.query}, order={self.order})"
+        )

From 128351bd426b12085def8647999a393a5f8a77ac Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:26:22 +0300
Subject: [PATCH 07/17] Add menu schemas

---
 backend/app/schemas/menu.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 backend/app/schemas/menu.py

diff --git a/backend/app/schemas/menu.py b/backend/app/schemas/menu.py
new file mode 100644
index 0000000..452ada1
--- /dev/null
+++ b/backend/app/schemas/menu.py
@@ -0,0 +1,20 @@
+from typing import Optional
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class MenuBase(BaseModel):
+    title: str = Field(..., min_length=1)
+    query: dict[str, str | int]
+    order: int = Field(..., ge=0)
+
+
+class MenuUpdateRequest(BaseModel):
+    title: Optional[str] = Field(None, min_length=1)
+    query: Optional[dict[str, str | int]] = Field(None)
+    order: Optional[int] = Field(None, ge=0)
+
+
+class MenuResponse(MenuBase):
+    id: int
+
+    model_config = ConfigDict(from_attributes=True)

From 21b9e4d83218c7a250a5523a606c6b3bd7dec698 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:26:55 +0300
Subject: [PATCH 08/17] Add menu model into list for alembic

---
 backend/app/core/base.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/app/core/base.py b/backend/app/core/base.py
index 556baf6..ca2dade 100644
--- a/backend/app/core/base.py
+++ b/backend/app/core/base.py
@@ -2,4 +2,5 @@
 
 from app.models.base import Base  # noqa
 from app.models.game import Game, GamePieces, Piece, PieceRotation  # noqa
+from app.models.menu import Menu  # noqa
 from app.models.user import User  # noqa

From 9c393576e387ddcf3c3e6ea95040607fdee7c093 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:27:26 +0300
Subject: [PATCH 09/17] Add menu repository

---
 backend/app/repositories/menu.py | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 backend/app/repositories/menu.py

diff --git a/backend/app/repositories/menu.py b/backend/app/repositories/menu.py
new file mode 100644
index 0000000..89c8111
--- /dev/null
+++ b/backend/app/repositories/menu.py
@@ -0,0 +1,9 @@
+from app.models.menu import Menu
+from app.repositories.repository import RepositoryBase
+
+
+class MenuRepository(RepositoryBase[Menu]):
+    pass
+
+
+menu_repository = MenuRepository(Menu)

From 223a319a970414b0c776350da79040137f3ce966 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:27:49 +0300
Subject: [PATCH 10/17] Add menu endpoints

---
 backend/app/api/endpoints/main.py | 59 +++++++++++++++++++++++++++++++
 backend/app/api/exceptions.py     |  7 ++++
 backend/app/api/routers.py        |  2 ++
 3 files changed, 68 insertions(+)
 create mode 100644 backend/app/api/endpoints/main.py

diff --git a/backend/app/api/endpoints/main.py b/backend/app/api/endpoints/main.py
new file mode 100644
index 0000000..6d6f8ca
--- /dev/null
+++ b/backend/app/api/endpoints/main.py
@@ -0,0 +1,59 @@
+from fastapi import APIRouter, Depends, status
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.user import superuser
+from app.schemas.menu import MenuBase, MenuResponse, MenuUpdateRequest
+from app.repositories.menu import menu_repository
+from app.core.db import get_async_session
+from app.api.exceptions import MenuNotFoundException
+
+router = APIRouter(prefix="/main", tags=["Main"])
+
+
+@router.get("/menu/", response_model=list[MenuResponse])
+async def list_menu(session: AsyncSession = Depends(get_async_session)):
+    return await menu_repository.list(session)
+
+
+@router.post(
+    "/menu/",
+    response_model=MenuResponse,
+    response_model_exclude_none=True,
+    status_code=status.HTTP_201_CREATED,
+    dependencies=[Depends(superuser)],
+)
+async def create_menu(
+    menu_data: MenuBase,
+    session: AsyncSession = Depends(get_async_session),
+):
+    return await menu_repository.create(session, menu_data)
+
+
+@router.patch(
+    "/menu/{menu_id}/",
+    response_model=MenuResponse,
+    dependencies=[Depends(superuser)],
+)
+async def update_menu(
+    menu_id: int,
+    menu_data: MenuUpdateRequest,
+    session: AsyncSession = Depends(get_async_session),
+):
+    menu = await menu_repository.get(session, menu_id)
+    if not menu:
+        raise MenuNotFoundException
+    return await menu_repository.update(session, menu, menu_data)
+
+
+@router.delete(
+    "/menu/{menu_id}/",
+    status_code=status.HTTP_204_NO_CONTENT,
+    dependencies=[Depends(superuser)],
+)
+async def delete_menu(
+    menu_id: int, session: AsyncSession = Depends(get_async_session)
+):
+    menu = await menu_repository.get(session, menu_id)
+    if not menu:
+        raise MenuNotFoundException
+    await menu_repository.remove(session, menu)
diff --git a/backend/app/api/exceptions.py b/backend/app/api/exceptions.py
index 3b5ba46..e37fb8c 100644
--- a/backend/app/api/exceptions.py
+++ b/backend/app/api/exceptions.py
@@ -43,3 +43,10 @@ def __init__(self):
         super().__init__(
             status_code=status.HTTP_400_BAD_REQUEST, detail="User not verified"
         )
+
+
+class MenuNotFoundException(HTTPException):
+    def __init__(self):
+        super().__init__(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Menu not found"
+        )
diff --git a/backend/app/api/routers.py b/backend/app/api/routers.py
index 03dd309..00eb5f3 100644
--- a/backend/app/api/routers.py
+++ b/backend/app/api/routers.py
@@ -2,6 +2,7 @@
 
 from app.api.endpoints.cover import router as cover_router
 from app.api.endpoints.game import router as game_router
+from app.api.endpoints.main import router as main_page_router
 from app.api.endpoints.piece import router as piece_router
 from app.api.endpoints.play import router as play_router
 from app.api.endpoints.user import router as user_router
@@ -11,6 +12,7 @@
 main_router = APIRouter(prefix="/api/v1")
 main_router.include_router(cover_router)
 main_router.include_router(game_router)
+main_router.include_router(main_page_router)
 main_router.include_router(piece_router)
 main_router.include_router(play_router)
 main_router.include_router(user_router)

From 167e3a04e3a33106e7222ae050f9c7785c99d3f2 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:28:08 +0300
Subject: [PATCH 11/17] Add menu tests

---
 backend/tests/test_app/__init__.py  |  0
 backend/tests/test_app/conftest.py  | 90 +++++++++++++++++++++++++++
 backend/tests/test_app/test_menu.py | 94 +++++++++++++++++++++++++++++
 3 files changed, 184 insertions(+)
 create mode 100644 backend/tests/test_app/__init__.py
 create mode 100644 backend/tests/test_app/conftest.py
 create mode 100644 backend/tests/test_app/test_menu.py

diff --git a/backend/tests/test_app/__init__.py b/backend/tests/test_app/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/tests/test_app/conftest.py b/backend/tests/test_app/conftest.py
new file mode 100644
index 0000000..17ac50f
--- /dev/null
+++ b/backend/tests/test_app/conftest.py
@@ -0,0 +1,90 @@
+# https://gist.github.com/e-kondr01/969ae24f2e2f31bd52a81fa5a1fe0f96
+
+from typing import AsyncGenerator
+
+import pytest
+from httpx import ASGITransport, AsyncClient
+from sqlalchemy.ext.asyncio import (
+    AsyncConnection,
+    AsyncSession,
+    AsyncTransaction,
+    create_async_engine,
+)
+
+# Importing fastapi.Depends that is used to retrieve SQLAlchemy's session
+from app.core.db import get_async_session
+
+# Importing main FastAPI instance
+from app.main import app
+
+# Importing model base
+from app.core.base import Base
+
+# To run async tests
+pytestmark = pytest.mark.anyio
+
+# Supply connection string
+engine = create_async_engine("sqlite+aiosqlite:///:memory:")
+
+
+SAVEPOINT_MODE = "conditional_savepoint"
+
+
+# Required per
+# https://anyio.readthedocs.io/en/stable/testing.html#using-async-fixtures-with-higher-scopes
+@pytest.fixture(scope="session")
+def anyio_backend():
+    return "asyncio"
+
+
+@pytest.fixture(scope="session", autouse=True)
+async def create_db():
+    async with engine.connect() as conn:
+        await conn.run_sync(Base.metadata.create_all)
+
+
+@pytest.fixture(scope="session")
+async def connection(anyio_backend) -> AsyncGenerator[AsyncConnection, None]:
+    async with engine.connect() as connection:
+        yield connection
+
+
+@pytest.fixture()
+async def transaction(
+    connection: AsyncConnection,
+) -> AsyncGenerator[AsyncTransaction, None]:
+    async with connection.begin() as transaction:
+        print("Yield transaction", id(transaction))
+        yield transaction
+        print("Roll back transaction", id(transaction))
+        await transaction.rollback()
+
+
+@pytest.fixture()
+async def session(
+    connection: AsyncConnection, transaction: AsyncTransaction
+) -> AsyncGenerator[AsyncSession, None]:
+    async_session = AsyncSession(
+        bind=connection,
+        join_transaction_mode=SAVEPOINT_MODE,
+    )
+    print("Yield session", id(session))
+    yield async_session
+    print("Close session", id(session))
+
+
+@pytest.fixture()
+async def user_client(
+    session: AsyncSession, transaction: AsyncTransaction
+) -> AsyncGenerator[AsyncClient, None]:
+
+    async def override_get_async_session() -> (
+        AsyncGenerator[AsyncSession, None]
+    ):
+        yield session
+
+    app.dependency_overrides[get_async_session] = override_get_async_session
+    # https://www.python-httpx.org/advanced/transports/#asgi-transport
+    transport = ASGITransport(app=app)  # type: ignore until 0.27.1 of httpx
+    yield AsyncClient(transport=transport, base_url="http://testserver")
+    del app.dependency_overrides[get_async_session]
diff --git a/backend/tests/test_app/test_menu.py b/backend/tests/test_app/test_menu.py
new file mode 100644
index 0000000..252a095
--- /dev/null
+++ b/backend/tests/test_app/test_menu.py
@@ -0,0 +1,94 @@
+from fastapi import status
+from httpx import AsyncClient
+import pytest
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.user import superuser
+from app.main import app
+from app.models.menu import Menu
+from app.models.user import User
+
+
+SAMPLE_1 = {"title": "5x5", "query": {"height": 5, "width": 5}, "order": 1}
+SAMPLE_2 = {"title": "6x6", "query": {"height": 6, "width": 6}, "order": 2}
+
+SUPER_USER = User(is_active=True, is_superuser=True, is_verified=True)
+
+CASES = [
+    ["list_menu", "GET", {}, {}, status.HTTP_200_OK],
+    ["create_menu", "POST", {}, SAMPLE_1, status.HTTP_401_UNAUTHORIZED],
+    [
+        "update_menu",
+        "PATCH",
+        {"menu_id": 1},
+        SAMPLE_2,
+        status.HTTP_401_UNAUTHORIZED,
+    ],
+    [
+        "delete_menu",
+        "DELETE",
+        {"menu_id": 1},
+        {},
+        status.HTTP_401_UNAUTHORIZED,
+    ],
+]
+
+
+@pytest.mark.parametrize("case", CASES)
+async def test_menu_access(user_client: AsyncClient, case):
+    endpoint, method, params, json, expected_status = case
+    async with user_client as client:
+        response = await client.request(
+            method=method, url=app.url_path_for(endpoint, **params), json=json
+        )
+        assert response.status_code == expected_status
+
+
+async def test_menu_read(session: AsyncSession, user_client: AsyncClient):
+    session.add(Menu(**SAMPLE_2))
+    await session.commit()
+    async with user_client as client:
+        response = await client.get(url=app.url_path_for("list_menu"))
+        assert response.status_code == status.HTTP_200_OK
+        data = response.json()
+        assert len(data) == 1
+        menu_dict = data[0]
+        del menu_dict["id"]
+        assert menu_dict == SAMPLE_2
+
+
+async def test_menu_create(session: AsyncSession, user_client: AsyncClient):
+    async with user_client as client:
+        app.dependency_overrides[superuser] = lambda: SUPER_USER
+        response = await client.post(
+            url=app.url_path_for("create_menu"), json=SAMPLE_1
+        )
+        del app.dependency_overrides[superuser]
+        assert response.status_code == status.HTTP_201_CREATED
+    menus = (await session.scalars(select(Menu))).all()
+    assert len(menus) == 1
+    menu = menus[0]
+    assert menu.title == SAMPLE_1["title"]
+    assert menu.order == SAMPLE_1["order"]
+    assert menu.query == SAMPLE_1["query"]
+
+
+async def test_menu_update(session: AsyncSession, user_client: AsyncClient):
+    menu = Menu(**SAMPLE_2)
+    session.add(menu)
+    await session.commit()
+    await session.refresh(menu)
+    async with user_client as client:
+        app.dependency_overrides[superuser] = lambda: SUPER_USER
+        response = await client.patch(
+            url=app.url_path_for("update_menu", menu_id=menu.id), json=SAMPLE_1
+        )
+        del app.dependency_overrides[superuser]
+        assert response.status_code == status.HTTP_200_OK
+    menus = (await session.scalars(select(Menu))).all()
+    assert len(menus) == 1
+    menu = menus[0]
+    assert menu.title == SAMPLE_1["title"]
+    assert menu.order == SAMPLE_1["order"]
+    assert menu.query == SAMPLE_1["query"]

From d5f98c67239beb5dd1747ef5c88b82e7045043fd Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:28:28 +0300
Subject: [PATCH 12/17] Add token lifetime setting

---
 backend/app/core/config.py | 1 +
 backend/app/core/user.py   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/app/core/config.py b/backend/app/core/config.py
index ff56f4c..bb5ca76 100644
--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -15,6 +15,7 @@ class Settings(BaseSettings):
     first_superuser_email: EmailStr | Literal[""] = ""
     first_superuser_password: str = ""
     unverified_user_can_login: bool = True
+    token_seconds_lifetime: int = 60 * 60 * 24 * 30
     max_cells: int = 120
     page_limit: int = 20
     max_page: int = 100
diff --git a/backend/app/core/user.py b/backend/app/core/user.py
index 76de2e1..bc90d89 100644
--- a/backend/app/core/user.py
+++ b/backend/app/core/user.py
@@ -92,7 +92,9 @@ def get_database_strategy(
         get_access_token_db
     ),
 ) -> DatabaseStrategy:
-    return DatabaseStrategy(access_token_db, lifetime_seconds=3600)
+    return DatabaseStrategy(
+        access_token_db, lifetime_seconds=settings.token_seconds_lifetime
+    )
 
 
 cookie_transport = CookieTransport(cookie_name="puzzleuserauth")

From 7fe13dee4423489cfc21d72edae7697caff1f72f Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:28:47 +0300
Subject: [PATCH 13/17] Fix typing

---
 backend/app/schemas/game.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/app/schemas/game.py b/backend/app/schemas/game.py
index 3e09dd2..ae2009f 100644
--- a/backend/app/schemas/game.py
+++ b/backend/app/schemas/game.py
@@ -5,7 +5,7 @@
     computed_field,
     field_validator,
 )
-from pydantic_core.core_schema import FieldValidationInfo
+from pydantic_core.core_schema import ValidationInfo
 
 
 class PieceColor(BaseModel):
@@ -13,7 +13,7 @@ class PieceColor(BaseModel):
     color: int | str
 
     @field_validator("color")
-    def validate_color(cls, value, info: FieldValidationInfo):
+    def validate_color(cls, value, info: ValidationInfo):
         if isinstance(value, str):
             return int(value, 16)
         if isinstance(value, int):

From 3be6100f59350d697376b34c5e7475f697bd2c13 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:31:26 +0300
Subject: [PATCH 14/17] Add aiosqlite to test packages

---
 backend/poetry.lock           | 2 +-
 backend/pyproject.toml        | 1 +
 backend/test-requirements.txt | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/poetry.lock b/backend/poetry.lock
index a9fe875..3df9fa0 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -1755,4 +1755,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "0a28ba8b2fcd8097f70b0016102daf5a2fc4382e69066ed763579b7f76a98d17"
+content-hash = "6318372388a8950c20740f4705b07f453ecd42b95a625decbea5c47f76657827"
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index 681b00d..d827b97 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -35,6 +35,7 @@ black = "^24.8.0"
 pytest = "^8.3.2"
 httpx = "^0.27.0"
 pytest-asyncio = "^0.24.0"
+aiosqlite = "^0.20.0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/backend/test-requirements.txt b/backend/test-requirements.txt
index 1c47a3b..03f2ee2 100644
--- a/backend/test-requirements.txt
+++ b/backend/test-requirements.txt
@@ -1,3 +1,4 @@
+aiosqlite==0.20.0 ; python_version >= "3.10" and python_version < "4.0"
 alembic==1.13.2 ; python_version >= "3.10" and python_version < "4.0"
 annotated-types==0.7.0 ; python_version >= "3.10" and python_version < "4.0"
 anyio==4.4.0 ; python_version >= "3.10" and python_version < "4.0"

From 3c578d7a920e373011c75a8569fa01abab9266ad Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 21:56:24 +0300
Subject: [PATCH 15/17] Generate clients for menu

---
 frontend/src/api/generated/schemas.gen.ts  | 120 +++++++++++++++++++++
 frontend/src/api/generated/services.gen.ts |  68 +++++++++++-
 frontend/src/api/generated/types.gen.ts    |  97 +++++++++++++++++
 3 files changed, 284 insertions(+), 1 deletion(-)

diff --git a/frontend/src/api/generated/schemas.gen.ts b/frontend/src/api/generated/schemas.gen.ts
index bbaae6f..7559b2b 100644
--- a/frontend/src/api/generated/schemas.gen.ts
+++ b/frontend/src/api/generated/schemas.gen.ts
@@ -229,6 +229,126 @@ export const $LoginRequest = {
     title: 'LoginRequest'
 } as const;
 
+export const $MenuBase = {
+    properties: {
+        title: {
+            type: 'string',
+            minLength: 1,
+            title: 'Title'
+        },
+        query: {
+            additionalProperties: {
+                anyOf: [
+                    {
+                        type: 'string'
+                    },
+                    {
+                        type: 'integer'
+                    }
+                ]
+            },
+            type: 'object',
+            title: 'Query'
+        },
+        order: {
+            type: 'integer',
+            minimum: 0,
+            title: 'Order'
+        }
+    },
+    type: 'object',
+    required: ['title', 'query', 'order'],
+    title: 'MenuBase'
+} as const;
+
+export const $MenuResponse = {
+    properties: {
+        title: {
+            type: 'string',
+            minLength: 1,
+            title: 'Title'
+        },
+        query: {
+            additionalProperties: {
+                anyOf: [
+                    {
+                        type: 'string'
+                    },
+                    {
+                        type: 'integer'
+                    }
+                ]
+            },
+            type: 'object',
+            title: 'Query'
+        },
+        order: {
+            type: 'integer',
+            minimum: 0,
+            title: 'Order'
+        },
+        id: {
+            type: 'integer',
+            title: 'Id'
+        }
+    },
+    type: 'object',
+    required: ['title', 'query', 'order', 'id'],
+    title: 'MenuResponse'
+} as const;
+
+export const $MenuUpdateRequest = {
+    properties: {
+        title: {
+            anyOf: [
+                {
+                    type: 'string',
+                    minLength: 1
+                },
+                {
+                    type: 'null'
+                }
+            ],
+            title: 'Title'
+        },
+        query: {
+            anyOf: [
+                {
+                    additionalProperties: {
+                        anyOf: [
+                            {
+                                type: 'string'
+                            },
+                            {
+                                type: 'integer'
+                            }
+                        ]
+                    },
+                    type: 'object'
+                },
+                {
+                    type: 'null'
+                }
+            ],
+            title: 'Query'
+        },
+        order: {
+            anyOf: [
+                {
+                    type: 'integer',
+                    minimum: 0
+                },
+                {
+                    type: 'null'
+                }
+            ],
+            title: 'Order'
+        }
+    },
+    type: 'object',
+    title: 'MenuUpdateRequest'
+} as const;
+
 export const $PieceBase = {
     properties: {
         name: {
diff --git a/frontend/src/api/generated/services.gen.ts b/frontend/src/api/generated/services.gen.ts
index cb77600..70f1079 100644
--- a/frontend/src/api/generated/services.gen.ts
+++ b/frontend/src/api/generated/services.gen.ts
@@ -3,7 +3,7 @@
 import type { CancelablePromise } from './core/CancelablePromise';
 import { OpenAPI } from './core/OpenAPI';
 import { request as __request } from './core/request';
-import type { MainPageSuggestionData, MainPageSuggestionResponse, GamesGetGameData, GamesGetGameResponse, GamesRemoveGameData, GamesRemoveGameResponse, GamesListGamesData, GamesListGamesResponse, GamesCreateGameData, GamesCreateGameResponse, GamesGameThumbnailData, GamesGameThumbnailResponse, PiecesGetPieceData, PiecesGetPieceResponse, PiecesRemovePieceData, PiecesRemovePieceResponse, PiecesListPiecesData, PiecesListPiecesResponse, PiecesCreatePieceData, PiecesCreatePieceResponse, GamesHintData, GamesHintResponse, AuthenticationLoginData, AuthenticationLoginResponse, AuthenticationLogoutResponse, UsersUsersCurrentUserResponse, UsersUsersPatchCurrentUserData, UsersUsersPatchCurrentUserResponse, UsersUsersUserData, UsersUsersUserResponse, UsersUsersPatchUserData, UsersUsersPatchUserResponse, UsersUsersDeleteUserData, UsersUsersDeleteUserResponse } from './types.gen';
+import type { MainPageSuggestionData, MainPageSuggestionResponse, GamesGetGameData, GamesGetGameResponse, GamesRemoveGameData, GamesRemoveGameResponse, GamesListGamesData, GamesListGamesResponse, GamesCreateGameData, GamesCreateGameResponse, GamesGameThumbnailData, GamesGameThumbnailResponse, MainListMenuResponse, MainCreateMenuData, MainCreateMenuResponse, MainUpdateMenuData, MainUpdateMenuResponse, MainDeleteMenuData, MainDeleteMenuResponse, PiecesGetPieceData, PiecesGetPieceResponse, PiecesRemovePieceData, PiecesRemovePieceResponse, PiecesListPiecesData, PiecesListPiecesResponse, PiecesCreatePieceData, PiecesCreatePieceResponse, GamesHintData, GamesHintResponse, AuthenticationLoginData, AuthenticationLoginResponse, AuthenticationLogoutResponse, UsersUsersCurrentUserResponse, UsersUsersPatchCurrentUserData, UsersUsersPatchCurrentUserResponse, UsersUsersUserData, UsersUsersUserResponse, UsersUsersPatchUserData, UsersUsersPatchUserResponse, UsersUsersDeleteUserData, UsersUsersDeleteUserResponse } from './types.gen';
 
 /**
  * Suggestion
@@ -121,6 +121,72 @@ export const gamesGameThumbnail = (data: GamesGameThumbnailData): CancelableProm
     }
 }); };
 
+/**
+ * List Menu
+ * @returns MenuResponse Successful Response
+ * @throws ApiError
+ */
+export const mainListMenu = (): CancelablePromise<MainListMenuResponse> => { return __request(OpenAPI, {
+    method: 'GET',
+    url: '/api/v1/main/menu/'
+}); };
+
+/**
+ * Create Menu
+ * @param data The data for the request.
+ * @param data.requestBody
+ * @returns MenuResponse Successful Response
+ * @throws ApiError
+ */
+export const mainCreateMenu = (data: MainCreateMenuData): CancelablePromise<MainCreateMenuResponse> => { return __request(OpenAPI, {
+    method: 'POST',
+    url: '/api/v1/main/menu/',
+    body: data.requestBody,
+    mediaType: 'application/json',
+    errors: {
+        422: 'Validation Error'
+    }
+}); };
+
+/**
+ * Update Menu
+ * @param data The data for the request.
+ * @param data.menuId
+ * @param data.requestBody
+ * @returns MenuResponse Successful Response
+ * @throws ApiError
+ */
+export const mainUpdateMenu = (data: MainUpdateMenuData): CancelablePromise<MainUpdateMenuResponse> => { return __request(OpenAPI, {
+    method: 'PATCH',
+    url: '/api/v1/main/menu/{menu_id}/',
+    path: {
+        menu_id: data.menuId
+    },
+    body: data.requestBody,
+    mediaType: 'application/json',
+    errors: {
+        422: 'Validation Error'
+    }
+}); };
+
+/**
+ * Delete Menu
+ * @param data The data for the request.
+ * @param data.menuId
+ * @returns void Successful Response
+ * @throws ApiError
+ */
+export const mainDeleteMenu = (data: MainDeleteMenuData): CancelablePromise<MainDeleteMenuResponse> => { return __request(OpenAPI, {
+    method: 'DELETE',
+    url: '/api/v1/main/menu/{menu_id}/',
+    path: {
+        menu_id: data.menuId
+    },
+    errors: {
+        422: 'Validation Error'
+    }
+}); };
+
 /**
  * Get Piece
  * @param data The data for the request.
diff --git a/frontend/src/api/generated/types.gen.ts b/frontend/src/api/generated/types.gen.ts
index d7106e5..2114aaa 100644
--- a/frontend/src/api/generated/types.gen.ts
+++ b/frontend/src/api/generated/types.gen.ts
@@ -60,6 +60,31 @@ export type LoginRequest = {
     password: string;
 };
 
+export type MenuBase = {
+    title: string;
+    query: {
+        [key: string]: (string | number);
+    };
+    order: number;
+};
+
+export type MenuResponse = {
+    title: string;
+    query: {
+        [key: string]: (string | number);
+    };
+    order: number;
+    id: number;
+};
+
+export type MenuUpdateRequest = {
+    title?: string | null;
+    query?: {
+    [key: string]: (string | number);
+} | null;
+    order?: number | null;
+};
+
 export type PieceBase = {
     name: string;
     points: Array<[
@@ -162,6 +187,27 @@ export type GamesGameThumbnailData = {
 
 export type GamesGameThumbnailResponse = unknown;
 
+export type MainListMenuResponse = Array<MenuResponse>;
+
+export type MainCreateMenuData = {
+    requestBody: MenuBase;
+};
+
+export type MainCreateMenuResponse = MenuResponse;
+
+export type MainUpdateMenuData = {
+    menuId: number;
+    requestBody: MenuUpdateRequest;
+};
+
+export type MainUpdateMenuResponse = MenuResponse;
+
+export type MainDeleteMenuData = {
+    menuId: number;
+};
+
+export type MainDeleteMenuResponse = void;
+
 export type PiecesGetPieceData = {
     pieceId: number;
 };
@@ -319,6 +365,57 @@ export type $OpenApiTs = {
             };
         };
     };
+    '/api/v1/main/menu/': {
+        get: {
+            res: {
+                /**
+                 * Successful Response
+                 */
+                200: Array<MenuResponse>;
+            };
+        };
+        post: {
+            req: MainCreateMenuData;
+            res: {
+                /**
+                 * Successful Response
+                 */
+                201: MenuResponse;
+                /**
+                 * Validation Error
+                 */
+                422: HTTPValidationError;
+            };
+        };
+    };
+    '/api/v1/main/menu/{menu_id}/': {
+        patch: {
+            req: MainUpdateMenuData;
+            res: {
+                /**
+                 * Successful Response
+                 */
+                200: MenuResponse;
+                /**
+                 * Validation Error
+                 */
+                422: HTTPValidationError;
+            };
+        };
+        delete: {
+            req: MainDeleteMenuData;
+            res: {
+                /**
+                 * Successful Response
+                 */
+                204: void;
+                /**
+                 * Validation Error
+                 */
+                422: HTTPValidationError;
+            };
+        };
+    };
     '/api/v1/pieces/piece_id/': {
         get: {
             req: PiecesGetPieceData;

From eac82970989958f33c3fbc85739188f400871827 Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sat, 24 Aug 2024 21:56:42 +0300
Subject: [PATCH 16/17] Add header component with dynamic menus

---
 frontend/src/App.vue                  | 46 ++-----------------
 frontend/src/components/HeaderBox.vue | 65 +++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 43 deletions(-)
 create mode 100644 frontend/src/components/HeaderBox.vue

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index b97d939..101ff61 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,56 +1,16 @@
 <script setup>
-
+  import HeaderBox from "@/components/HeaderBox.vue"
 </script>
 
 <style src="vue3-tour/dist/vue3-tour.css">
 </style>
 
 <style scoped>
-header{
-  display: flex;
-  align-items: center;
-  justify-content: left;
-}
-nav {
-  background-color: hsla(160, 100%, 37%, 1);
-  color: white;
-  padding: 1rem;
-  width: 100%;
-}
-nav ul {
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-  display: flex;
-  justify-content: space-around;
-}
-nav ul li a {
-  color: white;
-  text-decoration: none;
-  font-size: 1.1rem;
-  transition: color 0.3s ease;
-}
-nav ul li a:hover {
-  color: #ffd700;
-}
-nav ul li a.active {
-  color: #ffd700;
-  font-weight: bold;
-}
+
 </style>
 
 <template>
-  <header>
-    <h1>
-      <RouterLink to="/" class="logo">Плитки</RouterLink>
-    </h1>
-    <nav>
-      <ul>
-        <li><RouterLink :to="{name: 'main', query: {height: 5, width: 5}}">5x5</RouterLink></li>
-        <li><RouterLink :to="{name: 'main', query: {height: 8, width: 5}}">8x5</RouterLink></li> 
-      </ul>
-    </nav>
-  </header>
+  <HeaderBox />
   <main>
     <RouterView />
   </main>
diff --git a/frontend/src/components/HeaderBox.vue b/frontend/src/components/HeaderBox.vue
new file mode 100644
index 0000000..08ffc52
--- /dev/null
+++ b/frontend/src/components/HeaderBox.vue
@@ -0,0 +1,65 @@
+<script setup>
+    import { onMounted, ref } from 'vue';
+    import { mainListMenu } from '@/api/generated';
+
+    const menus = ref(null)
+
+    async function fetchMenu(){
+        menus.value = null
+        try {
+            menus.value = await mainListMenu()
+        } catch (err){
+            console.log("fetching menus caused the error: ", err.toString())
+        }
+    }
+    onMounted(() => fetchMenu())
+</script>
+
+<style scoped>
+    header{
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    }
+    nav {
+    background-color: hsla(160, 100%, 37%, 1);
+    color: white;
+    padding: 1rem;
+    width: 100%;
+    }
+    nav ul {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    justify-content: space-around;
+    }
+    nav ul li a {
+    color: white;
+    text-decoration: none;
+    font-size: 1.1rem;
+    transition: color 0.3s ease;
+    }
+    nav ul li a:hover {
+    color: #ffd700;
+    }
+    nav ul li a.active {
+    color: #ffd700;
+    font-weight: bold;
+    }
+</style>
+
+<template>
+  <header>
+    <h1>
+      <RouterLink to="/" class="logo">Плитки</RouterLink>
+    </h1>
+    <nav v-if="menus">
+      <ul>
+        <li v-for="menu of menus" :key="menu.id">
+            <RouterLink :to="{name: 'main', query: menu.query}">{{ menu.title }}</RouterLink>
+        </li> 
+      </ul>
+    </nav>
+  </header>
+</template>
\ No newline at end of file

From 89647d67082d874d7cb6bae08cd7af21bedb12dc Mon Sep 17 00:00:00 2001
From: FinemechanicPub <93194456+FinemechanicPub@users.noreply.github.com>
Date: Sun, 25 Aug 2024 01:37:16 +0300
Subject: [PATCH 17/17] Raise autogenerate game limit to 500

---
 backend/manage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/manage.py b/backend/manage.py
index fdf13c4..d01c24a 100644
--- a/backend/manage.py
+++ b/backend/manage.py
@@ -101,7 +101,7 @@ def create():
 @click.argument("height", type=click.INT)
 @click.argument("width", type=click.INT)
 @click.argument("piece_size", type=click.INT)
-@click.argument("limit", type=click.INT, default=100)
+@click.argument("limit", type=click.INT, default=500)
 def create_games(
     height: int,
     width: int,