From 308985cebb493ad38a532d925477517bf0b16dad Mon Sep 17 00:00:00 2001
From: "S. Amir Mohammad Najafi" <njfamirm@gmail.com>
Date: Mon, 16 Jan 2023 00:07:59 +0330
Subject: [PATCH 1/6] feat(soffit-pwa): publish container

---
 .github/workflows/publish-alwatr-container.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/publish-alwatr-container.yml b/.github/workflows/publish-alwatr-container.yml
index 7f7430099..8ee31cd00 100644
--- a/.github/workflows/publish-alwatr-container.yml
+++ b/.github/workflows/publish-alwatr-container.yml
@@ -70,6 +70,11 @@ jobs:
             dockerfile: cloud/container/alwatr-pwa.dockerfile
             description: Alwatr Flight Finder PWA.
 
+          - image: soffit-pwa
+            source: uniquely/soffit-pwa
+            dockerfile: cloud/container/alwatr-pwa.dockerfile
+            description: Alwatr Soffit PWA.
+
     permissions:
       contents: read
       packages: write

From b0ad0256e97ebbcbff71d415b3fd586a95434261 Mon Sep 17 00:00:00 2001
From: "S. Amir Mohammad Najafi" <njfamirm@gmail.com>
Date: Mon, 16 Jan 2023 00:11:51 +0330
Subject: [PATCH 2/6] feat(soffit-pwa): deployment

---
 .../workflows/publish-alwatr-container.yml    |  4 +--
 cloud/classic/soffit-pwa/compose.yml          | 30 +++++++++++++++++++
 cloud/classic/soffit-pwa/deploy.sh            |  3 ++
 cloud/classic/soffit-pwa/env/example.env      |  4 +++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 cloud/classic/soffit-pwa/compose.yml
 create mode 100755 cloud/classic/soffit-pwa/deploy.sh
 create mode 100644 cloud/classic/soffit-pwa/env/example.env

diff --git a/.github/workflows/publish-alwatr-container.yml b/.github/workflows/publish-alwatr-container.yml
index 8ee31cd00..c33bbf9f2 100644
--- a/.github/workflows/publish-alwatr-container.yml
+++ b/.github/workflows/publish-alwatr-container.yml
@@ -70,8 +70,8 @@ jobs:
             dockerfile: cloud/container/alwatr-pwa.dockerfile
             description: Alwatr Flight Finder PWA.
 
-          - image: soffit-pwa
-            source: uniquely/soffit-pwa
+          - image: soffit-site-pwa
+            source: uniquely/soffit-site-pwa
             dockerfile: cloud/container/alwatr-pwa.dockerfile
             description: Alwatr Soffit PWA.
 
diff --git a/cloud/classic/soffit-pwa/compose.yml b/cloud/classic/soffit-pwa/compose.yml
new file mode 100644
index 000000000..bd860ec68
--- /dev/null
+++ b/cloud/classic/soffit-pwa/compose.yml
@@ -0,0 +1,30 @@
+networks:
+  internal:
+  alwatr-public-network:
+    name: alwatr-public-network
+    external: true
+
+services:
+  pwa:
+    image: ghcr.io/alimd/soffit-site-pwa:${PWA_VERSION:-next}
+
+    cpu_shares: 1024
+    mem_limit: 256m
+
+    # restart: unless-stopped
+
+    networks:
+      alwatr-public-network:
+
+    logging:
+      driver: json-file
+      options:
+        max-size: '10m'
+        max-file: '2'
+
+    labels:
+      traefik.enable: true
+      traefik.port: 80
+      traefik.frontend.rule: Host:${PWA_DOMAIN}
+      traefik.frontend.entryPoints: http, https
+      traefik.frontend.redirect.entryPoint: https
diff --git a/cloud/classic/soffit-pwa/deploy.sh b/cloud/classic/soffit-pwa/deploy.sh
new file mode 100755
index 000000000..85d38bd96
--- /dev/null
+++ b/cloud/classic/soffit-pwa/deploy.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source ../lib/deploy.sh
diff --git a/cloud/classic/soffit-pwa/env/example.env b/cloud/classic/soffit-pwa/env/example.env
new file mode 100644
index 000000000..6c9e8e951
--- /dev/null
+++ b/cloud/classic/soffit-pwa/env/example.env
@@ -0,0 +1,4 @@
+U2FsdGVkX198KleekrEbSTd7dyu0yjWOf+BI/MsIpo3O2d9092C0b0n+Zp9hMwkW
+NdtkadMF7TxqATbhWwxXvgED+u3Bao2VKmCprbPHpwBq9xm/wDzwthvxcV7G1RIU
+ndtUjIx+ADOLAVmRnxMYYnT4hEHHKx3BlvExlYezJ8reezIYTvq11ySYdAPOO1Rz
+nSJkStvPW1yuodpQ8gTyyp5rnbSl8E9Z/n3prNegh4lB/RLP/fU/BsVOs3Idhb+q

From 18b8d15725574b064fe2cb88c4fbd18baed116c9 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Thu, 19 Jan 2023 01:45:43 +0330
Subject: [PATCH 3/6] refactor(soffit-pwa): rename from site

---
 .github/workflows/publish-alwatr-container.yml      |   4 ++--
 cloud/classic/soffit-pwa/compose.yml                |   2 +-
 tsconfig.json                                       |   2 +-
 uniquely/{soffit-site-pwa => soffit-pwa}/README.md  |   0
 .../{soffit-site-pwa => soffit-pwa}/esbuild.mjs     |   0
 .../{soffit-site-pwa => soffit-pwa}/package.json    |   4 ++--
 .../res/image/favicon.ico                           | Bin
 .../res/image/icon-180.png                          | Bin
 .../res/image/icon-192-maskable.png                 | Bin
 .../res/image/icon-192.png                          | Bin
 .../res/image/icon-512-maskable.png                 | Bin
 .../res/image/icon-512.png                          | Bin
 .../res/image/soffit.png                            | Bin
 .../{soffit-site-pwa => soffit-pwa}/res/index.html  |   0
 .../res/l10n/en-US.json                             |   0
 .../res/l10n/fa-IR.json                             |   0
 .../res/manifest.json                               |   0
 .../{soffit-site-pwa => soffit-pwa}/res/robots.txt  |   0
 .../src/alwatr-pwa.ts                               |   0
 .../src/page-home.ts                                |   0
 .../{soffit-site-pwa => soffit-pwa}/tsconfig.json   |   0
 .../web-dev-server.config.js                        |   0
 .../workbox.config.js                               |   0
 23 files changed, 6 insertions(+), 6 deletions(-)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/README.md (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/esbuild.mjs (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/package.json (94%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/favicon.ico (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/icon-180.png (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/icon-192-maskable.png (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/icon-192.png (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/icon-512-maskable.png (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/icon-512.png (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/image/soffit.png (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/index.html (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/l10n/en-US.json (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/l10n/fa-IR.json (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/manifest.json (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/res/robots.txt (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/src/alwatr-pwa.ts (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/src/page-home.ts (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/tsconfig.json (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/web-dev-server.config.js (100%)
 rename uniquely/{soffit-site-pwa => soffit-pwa}/workbox.config.js (100%)

diff --git a/.github/workflows/publish-alwatr-container.yml b/.github/workflows/publish-alwatr-container.yml
index c33bbf9f2..8ee31cd00 100644
--- a/.github/workflows/publish-alwatr-container.yml
+++ b/.github/workflows/publish-alwatr-container.yml
@@ -70,8 +70,8 @@ jobs:
             dockerfile: cloud/container/alwatr-pwa.dockerfile
             description: Alwatr Flight Finder PWA.
 
-          - image: soffit-site-pwa
-            source: uniquely/soffit-site-pwa
+          - image: soffit-pwa
+            source: uniquely/soffit-pwa
             dockerfile: cloud/container/alwatr-pwa.dockerfile
             description: Alwatr Soffit PWA.
 
diff --git a/cloud/classic/soffit-pwa/compose.yml b/cloud/classic/soffit-pwa/compose.yml
index bd860ec68..d8101e4a1 100644
--- a/cloud/classic/soffit-pwa/compose.yml
+++ b/cloud/classic/soffit-pwa/compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   pwa:
-    image: ghcr.io/alimd/soffit-site-pwa:${PWA_VERSION:-next}
+    image: ghcr.io/alimd/soffit-pwa:${PWA_VERSION:-next}
 
     cpu_shares: 1024
     mem_limit: 256m
diff --git a/tsconfig.json b/tsconfig.json
index 53e641398..3d171563e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -41,7 +41,7 @@
     // uniquely
     {"path": "./uniquely/flight-finder-api"},
     {"path": "./uniquely/flight-finder-pwa"},
-    {"path": "./uniquely/soffit-site-pwa"},
+    {"path": "./uniquely/soffit-pwa"},
     {"path": "./ui/demo-pwa"},
 
     // labs
diff --git a/uniquely/soffit-site-pwa/README.md b/uniquely/soffit-pwa/README.md
similarity index 100%
rename from uniquely/soffit-site-pwa/README.md
rename to uniquely/soffit-pwa/README.md
diff --git a/uniquely/soffit-site-pwa/esbuild.mjs b/uniquely/soffit-pwa/esbuild.mjs
similarity index 100%
rename from uniquely/soffit-site-pwa/esbuild.mjs
rename to uniquely/soffit-pwa/esbuild.mjs
diff --git a/uniquely/soffit-site-pwa/package.json b/uniquely/soffit-pwa/package.json
similarity index 94%
rename from uniquely/soffit-site-pwa/package.json
rename to uniquely/soffit-pwa/package.json
index b22964292..65dfa584d 100644
--- a/uniquely/soffit-site-pwa/package.json
+++ b/uniquely/soffit-pwa/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@alwatr/soffit-site-pwa",
+  "name": "@alwatr/soffit-pwa",
   "version": "0.27.0",
   "description": "A good ceiling is vital. But a SOFFIT ceiling can be an inspiration.",
   "type": "module",
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "ui/soffit-site-pwa"
+    "directory": "ui/soffit-pwa"
   },
   "scripts": {
     "b": "yarn build --debug",
diff --git a/uniquely/soffit-site-pwa/res/image/favicon.ico b/uniquely/soffit-pwa/res/image/favicon.ico
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/favicon.ico
rename to uniquely/soffit-pwa/res/image/favicon.ico
diff --git a/uniquely/soffit-site-pwa/res/image/icon-180.png b/uniquely/soffit-pwa/res/image/icon-180.png
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/icon-180.png
rename to uniquely/soffit-pwa/res/image/icon-180.png
diff --git a/uniquely/soffit-site-pwa/res/image/icon-192-maskable.png b/uniquely/soffit-pwa/res/image/icon-192-maskable.png
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/icon-192-maskable.png
rename to uniquely/soffit-pwa/res/image/icon-192-maskable.png
diff --git a/uniquely/soffit-site-pwa/res/image/icon-192.png b/uniquely/soffit-pwa/res/image/icon-192.png
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/icon-192.png
rename to uniquely/soffit-pwa/res/image/icon-192.png
diff --git a/uniquely/soffit-site-pwa/res/image/icon-512-maskable.png b/uniquely/soffit-pwa/res/image/icon-512-maskable.png
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/icon-512-maskable.png
rename to uniquely/soffit-pwa/res/image/icon-512-maskable.png
diff --git a/uniquely/soffit-site-pwa/res/image/icon-512.png b/uniquely/soffit-pwa/res/image/icon-512.png
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/icon-512.png
rename to uniquely/soffit-pwa/res/image/icon-512.png
diff --git a/uniquely/soffit-site-pwa/res/image/soffit.png b/uniquely/soffit-pwa/res/image/soffit.png
similarity index 100%
rename from uniquely/soffit-site-pwa/res/image/soffit.png
rename to uniquely/soffit-pwa/res/image/soffit.png
diff --git a/uniquely/soffit-site-pwa/res/index.html b/uniquely/soffit-pwa/res/index.html
similarity index 100%
rename from uniquely/soffit-site-pwa/res/index.html
rename to uniquely/soffit-pwa/res/index.html
diff --git a/uniquely/soffit-site-pwa/res/l10n/en-US.json b/uniquely/soffit-pwa/res/l10n/en-US.json
similarity index 100%
rename from uniquely/soffit-site-pwa/res/l10n/en-US.json
rename to uniquely/soffit-pwa/res/l10n/en-US.json
diff --git a/uniquely/soffit-site-pwa/res/l10n/fa-IR.json b/uniquely/soffit-pwa/res/l10n/fa-IR.json
similarity index 100%
rename from uniquely/soffit-site-pwa/res/l10n/fa-IR.json
rename to uniquely/soffit-pwa/res/l10n/fa-IR.json
diff --git a/uniquely/soffit-site-pwa/res/manifest.json b/uniquely/soffit-pwa/res/manifest.json
similarity index 100%
rename from uniquely/soffit-site-pwa/res/manifest.json
rename to uniquely/soffit-pwa/res/manifest.json
diff --git a/uniquely/soffit-site-pwa/res/robots.txt b/uniquely/soffit-pwa/res/robots.txt
similarity index 100%
rename from uniquely/soffit-site-pwa/res/robots.txt
rename to uniquely/soffit-pwa/res/robots.txt
diff --git a/uniquely/soffit-site-pwa/src/alwatr-pwa.ts b/uniquely/soffit-pwa/src/alwatr-pwa.ts
similarity index 100%
rename from uniquely/soffit-site-pwa/src/alwatr-pwa.ts
rename to uniquely/soffit-pwa/src/alwatr-pwa.ts
diff --git a/uniquely/soffit-site-pwa/src/page-home.ts b/uniquely/soffit-pwa/src/page-home.ts
similarity index 100%
rename from uniquely/soffit-site-pwa/src/page-home.ts
rename to uniquely/soffit-pwa/src/page-home.ts
diff --git a/uniquely/soffit-site-pwa/tsconfig.json b/uniquely/soffit-pwa/tsconfig.json
similarity index 100%
rename from uniquely/soffit-site-pwa/tsconfig.json
rename to uniquely/soffit-pwa/tsconfig.json
diff --git a/uniquely/soffit-site-pwa/web-dev-server.config.js b/uniquely/soffit-pwa/web-dev-server.config.js
similarity index 100%
rename from uniquely/soffit-site-pwa/web-dev-server.config.js
rename to uniquely/soffit-pwa/web-dev-server.config.js
diff --git a/uniquely/soffit-site-pwa/workbox.config.js b/uniquely/soffit-pwa/workbox.config.js
similarity index 100%
rename from uniquely/soffit-site-pwa/workbox.config.js
rename to uniquely/soffit-pwa/workbox.config.js

From 7b6ad65b72579e39183da5f5359991bdd35ddd8b Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Thu, 19 Jan 2023 02:14:18 +0330
Subject: [PATCH 4/6] fix(ff/deploy): restart on error

---
 cloud/classic/flight-finder/compose.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloud/classic/flight-finder/compose.yml b/cloud/classic/flight-finder/compose.yml
index 5b64a6140..255f726d1 100644
--- a/cloud/classic/flight-finder/compose.yml
+++ b/cloud/classic/flight-finder/compose.yml
@@ -13,7 +13,7 @@ services:
 
     stop_grace_period: 30s
 
-    # restart: unless-stopped
+    restart: unless-stopped
 
     networks:
       internal:
@@ -44,7 +44,7 @@ services:
     cpu_shares: 512
     mem_limit: 256m
 
-    # restart: unless-stopped
+    restart: unless-stopped
 
     networks:
       internal:
@@ -77,7 +77,7 @@ services:
     cpu_shares: 512
     mem_limit: 256m
 
-    # restart: unless-stopped
+    restart: unless-stopped
 
     networks:
       internal:
@@ -108,7 +108,7 @@ services:
     cpu_shares: 1024
     mem_limit: 256m
 
-    # restart: unless-stopped
+    restart: unless-stopped
 
     networks:
       internal:
@@ -144,7 +144,7 @@ services:
     cpu_shares: 1024
     mem_limit: 256m
 
-    # restart: unless-stopped
+    restart: unless-stopped
 
     networks:
       alwatr-public-network:

From f64e4e8214d55cc8a55ef48284164c1b8e4af131 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Thu, 19 Jan 2023 02:14:37 +0330
Subject: [PATCH 5/6] fix(soffit-pwa): deploy

---
 .github/workflows/publish-alwatr-container.yml | 2 +-
 cloud/classic/soffit-pwa/compose.yml           | 2 +-
 cloud/classic/soffit-pwa/env/example.env       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-alwatr-container.yml b/.github/workflows/publish-alwatr-container.yml
index 8ee31cd00..79a8ef914 100644
--- a/.github/workflows/publish-alwatr-container.yml
+++ b/.github/workflows/publish-alwatr-container.yml
@@ -73,7 +73,7 @@ jobs:
           - image: soffit-pwa
             source: uniquely/soffit-pwa
             dockerfile: cloud/container/alwatr-pwa.dockerfile
-            description: Alwatr Soffit PWA.
+            description: Soffit PWA.
 
     permissions:
       contents: read
diff --git a/cloud/classic/soffit-pwa/compose.yml b/cloud/classic/soffit-pwa/compose.yml
index d8101e4a1..1cffb11ed 100644
--- a/cloud/classic/soffit-pwa/compose.yml
+++ b/cloud/classic/soffit-pwa/compose.yml
@@ -11,7 +11,7 @@ services:
     cpu_shares: 1024
     mem_limit: 256m
 
-    # restart: unless-stopped
+    restart: unless-stopped
 
     networks:
       alwatr-public-network:
diff --git a/cloud/classic/soffit-pwa/env/example.env b/cloud/classic/soffit-pwa/env/example.env
index 6c9e8e951..a92c16fb0 100644
--- a/cloud/classic/soffit-pwa/env/example.env
+++ b/cloud/classic/soffit-pwa/env/example.env
@@ -1,4 +1,4 @@
-U2FsdGVkX198KleekrEbSTd7dyu0yjWOf+BI/MsIpo3O2d9092C0b0n+Zp9hMwkW
-NdtkadMF7TxqATbhWwxXvgED+u3Bao2VKmCprbPHpwBq9xm/wDzwthvxcV7G1RIU
-ndtUjIx+ADOLAVmRnxMYYnT4hEHHKx3BlvExlYezJ8reezIYTvq11ySYdAPOO1Rz
-nSJkStvPW1yuodpQ8gTyyp5rnbSl8E9Z/n3prNegh4lB/RLP/fU/BsVOs3Idhb+q
+U2FsdGVkX1/XLv/cJZgBXKSOMQEV/GgZ4TxQbEhx4SOiY0y6KHFM+4RrW4UUOehh
+yFisx7apY3qUiwAw8GpOzOQQZ4ciVt61ZewMK973ujmQnNgdDRN78AXaeIbujhtQ
+p63YL5HLF6feDqLUW3VUo/AEgTuSDw6xrC10OIDbfmEsUQaoyL6gGOub5Atz60UG
+DsGIL4FfFcP2TgysU+CCaLV89/Ut7/TpD992R+0eaNM=

From 6fc6ea08103d6c4de62f0aba5e5791a20561d484 Mon Sep 17 00:00:00 2001
From: Ali Mihandoost <ali.mihandoost@gmail.com>
Date: Thu, 19 Jan 2023 02:18:24 +0330
Subject: [PATCH 6/6] fix(form-registration): service name

---
 .github/workflows/publish-alwatr-container.yml                | 4 ++--
 cloud/classic/soffit-form/compose.yml                         | 2 +-
 services/{form-registering => form-registration}/README.md    | 0
 services/{form-registering => form-registration}/demo.http    | 0
 services/{form-registering => form-registration}/package.json | 4 ++--
 .../{form-registering => form-registration}/src/config.ts     | 0
 services/{form-registering => form-registration}/src/index.ts | 0
 .../src/lib/nano-server.ts                                    | 0
 .../src/lib/storage.ts                                        | 0
 .../{form-registering => form-registration}/src/route/home.ts | 0
 .../{form-registering => form-registration}/src/route/put.ts  | 0
 .../src/route/storage.ts                                      | 0
 .../{form-registering => form-registration}/tsconfig.json     | 0
 tsconfig.json                                                 | 2 +-
 14 files changed, 6 insertions(+), 6 deletions(-)
 rename services/{form-registering => form-registration}/README.md (100%)
 rename services/{form-registering => form-registration}/demo.http (100%)
 rename services/{form-registering => form-registration}/package.json (96%)
 rename services/{form-registering => form-registration}/src/config.ts (100%)
 rename services/{form-registering => form-registration}/src/index.ts (100%)
 rename services/{form-registering => form-registration}/src/lib/nano-server.ts (100%)
 rename services/{form-registering => form-registration}/src/lib/storage.ts (100%)
 rename services/{form-registering => form-registration}/src/route/home.ts (100%)
 rename services/{form-registering => form-registration}/src/route/put.ts (100%)
 rename services/{form-registering => form-registration}/src/route/storage.ts (100%)
 rename services/{form-registering => form-registration}/tsconfig.json (100%)

diff --git a/.github/workflows/publish-alwatr-container.yml b/.github/workflows/publish-alwatr-container.yml
index 79a8ef914..c278990cf 100644
--- a/.github/workflows/publish-alwatr-container.yml
+++ b/.github/workflows/publish-alwatr-container.yml
@@ -44,8 +44,8 @@ jobs:
             dockerfile: cloud/container/alwatr-services.dockerfile
             description: Alwatr Flight Crawler Nanoservice, Distributed simple and fast flight crawler nanoservice.
 
-          - image: form-registering
-            source: services/form-registering
+          - image: form-registration
+            source: services/form-registration
             dockerfile: cloud/container/alwatr-services.dockerfile
             description: Alwatr Form Registration API Nanoservice, Distributed simple and fast nanoservice for registering form information.
 
diff --git a/cloud/classic/soffit-form/compose.yml b/cloud/classic/soffit-form/compose.yml
index c20188e2c..dd27c4526 100644
--- a/cloud/classic/soffit-form/compose.yml
+++ b/cloud/classic/soffit-form/compose.yml
@@ -39,7 +39,7 @@ services:
         max-file: '2'
 
   api:
-    image: ghcr.io/alimd/form-registering:${API_VERSION:-next}
+    image: ghcr.io/alimd/form-registration:${API_VERSION:-next}
 
     cpu_shares: 1024
     mem_limit: 256m
diff --git a/services/form-registering/README.md b/services/form-registration/README.md
similarity index 100%
rename from services/form-registering/README.md
rename to services/form-registration/README.md
diff --git a/services/form-registering/demo.http b/services/form-registration/demo.http
similarity index 100%
rename from services/form-registering/demo.http
rename to services/form-registration/demo.http
diff --git a/services/form-registering/package.json b/services/form-registration/package.json
similarity index 96%
rename from services/form-registering/package.json
rename to services/form-registration/package.json
index 0c4df02c8..b9088ec9f 100644
--- a/services/form-registering/package.json
+++ b/services/form-registration/package.json
@@ -25,9 +25,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/AliMD/alwatr",
-    "directory": "services/form"
+    "directory": "services/form-registration"
   },
-  "homepage": "https://github.com/AliMD/alwatr/tree/main/services/form#readme",
+  "homepage": "https://github.com/AliMD/alwatr/tree/main/services/form-registration#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
   },
diff --git a/services/form-registering/src/config.ts b/services/form-registration/src/config.ts
similarity index 100%
rename from services/form-registering/src/config.ts
rename to services/form-registration/src/config.ts
diff --git a/services/form-registering/src/index.ts b/services/form-registration/src/index.ts
similarity index 100%
rename from services/form-registering/src/index.ts
rename to services/form-registration/src/index.ts
diff --git a/services/form-registering/src/lib/nano-server.ts b/services/form-registration/src/lib/nano-server.ts
similarity index 100%
rename from services/form-registering/src/lib/nano-server.ts
rename to services/form-registration/src/lib/nano-server.ts
diff --git a/services/form-registering/src/lib/storage.ts b/services/form-registration/src/lib/storage.ts
similarity index 100%
rename from services/form-registering/src/lib/storage.ts
rename to services/form-registration/src/lib/storage.ts
diff --git a/services/form-registering/src/route/home.ts b/services/form-registration/src/route/home.ts
similarity index 100%
rename from services/form-registering/src/route/home.ts
rename to services/form-registration/src/route/home.ts
diff --git a/services/form-registering/src/route/put.ts b/services/form-registration/src/route/put.ts
similarity index 100%
rename from services/form-registering/src/route/put.ts
rename to services/form-registration/src/route/put.ts
diff --git a/services/form-registering/src/route/storage.ts b/services/form-registration/src/route/storage.ts
similarity index 100%
rename from services/form-registering/src/route/storage.ts
rename to services/form-registration/src/route/storage.ts
diff --git a/services/form-registering/tsconfig.json b/services/form-registration/tsconfig.json
similarity index 100%
rename from services/form-registering/tsconfig.json
rename to services/form-registration/tsconfig.json
diff --git a/tsconfig.json b/tsconfig.json
index 3d171563e..754bc356f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,7 +36,7 @@
     {"path": "./services/flight-crawler"},
     {"path": "./services/storage-server"},
     {"path": "./services/comment"},
-    {"path": "./services/form-registering"},
+    {"path": "./services/form-registration"},
 
     // uniquely
     {"path": "./uniquely/flight-finder-api"},