Merge branch 'dev' into rel-4.3

abpio · May 20, 2021 · e0a84f5 · e0a84f5
2 parents 153550f + a17323f
commit e0a84f5
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 3 deletions.
diff --git a/.github/workflows/image-compression.yml b/.github/workflows/image-compression.yml
@@ -0,0 +1,21 @@
+name: Compress Images
+on:
+  pull_request:
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+jobs:
+  build:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Compress Images
+        uses: calibreapp/image-actions@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/en/docs-nav.json b/en/docs-nav.json
@@ -2,7 +2,21 @@
   "items": [
     {
       "text": "Getting Started",
-      "path": "getting-started.md"
+      "path": "getting-started.md",
+      "items": [
+        {
+          "text": "1: Setup development environment",
+          "path": "getting-started-setup-environment.md"
+        },
+        {
+          "text": "2: Creating a new solution",
+          "path": "getting-started-create-solution.md"
+        },
+        {
+          "text": "3: Running the solution",
+          "path": "getting-started-running-solution.md"
+        }
+      ]
     },
     {
       "text": "Tutorials",
@@ -125,6 +139,10 @@
               "text": "Database Migrations",
               "path": "startup-templates/microservice/database-migrations.md"
             },
+            {
+              "text": "Tye Integration",
+              "path": "startup-templates/microservice/microservice-tye-integration.md"
+            },
             {
               "text": "Guides",
               "items": [
@@ -147,6 +165,10 @@
             {
               "text": "Solution structure",
               "path": "startup-templates/module/solution-structure.md"
+            },
+            {
+              "text": "Creating a new ABP solution via ABP Suite",
+              "path": "abp-suite/create-module-solution.md"
             }
           ]
         }
@@ -177,6 +199,10 @@
           "text": "Chat",
           "path": "modules/chat.md"
         },
+        {
+          "text": "CMS Kit Pro",
+          "path": "modules/cms-kit.md"
+        },
         {
           "text": "File Management",
           "path": "modules/file-management.md"
@@ -308,7 +334,22 @@
         },
         {
           "text": "Migration Guides",
-          "path": "migration-guides/index.md"
+          "path": "migration-guides/index.md",
+          "items": [
+            {
+              "text": "Blazor",
+              "items": [
+                {
+                  "text": "3.2 to 3.3",
+                  "path": "migration-guides/blazor-ui-3_3.md"
+                }
+              ]
+            },
+            {
+              "text": "4.x to 4.3",
+              "path": "migration-guides/v4_3.md"
+            }
+          ]
         }
       ]
     },
@@ -322,8 +363,26 @@
         {
           "text": "ABP Framework vs ABP Commercial",
           "path": "abp-framework-vs-abp-commercial.md"
+        },
+        {
+          "text": "ABP Commercial vs ASP.NET Zero",
+          "path": "aspnet-zero-vs-abp-commercial.md"
+        },
+        {
+          "text": "How to?",
+          "path": "how-to/index.md",
+          "items": [
+            {
+              "text": "Implementing Passwordless Authentication",
+              "path": "how-to/implementing-passwordless-authentication.md"
+            }
+          ]
+        },
+        {
+          "text": "Why ABP.IO Platform?",
+          "path": "why-abp-io-platform.md"
         }
       ]
     }
   ]
-}
+}