From bcf2cfe690675d7676f7a0afb3843b572370005a Mon Sep 17 00:00:00 2001 From: dixyushi Date: Thu, 6 May 2021 13:19:54 +0530 Subject: [PATCH 1/5] fixed review comments in Jump The Queue Tutorial --- JumpTheQueue/index.asciidoc | 19 ++++++++++++++++--- tutorials | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) create mode 160000 tutorials diff --git a/JumpTheQueue/index.asciidoc b/JumpTheQueue/index.asciidoc index 93b6c400..bfabe382 100644 --- a/JumpTheQueue/index.asciidoc +++ b/JumpTheQueue/index.asciidoc @@ -6,7 +6,8 @@ Jump The Queue is a small application based on the devonfw framework, which you * User should have Java, Angular development experience ## Learning goals -After completing this tutorial, you will have learned about a devonfw sample application Jump-The-Queue and its architecture. +* How to create devonfw sample application Jump-The-Queue +* The Architecture of the application. More information about Jump The Queue on https://github.com/devonfw/jump-the-queue ==== @@ -15,10 +16,13 @@ More information about Jump The Queue on https://github.com/devonfw/jump-the-que -- restoreDevonfwIde(["java", "mvn", "node", "ng", "npm"]) -- + +Note: Setup script can take some time for setup. + First, clone the Jump-The-Queue Repository. [step] -- -cloneRepository("", "https://github.com/devonfw/jump-the-queue.git") +cloneRepository("Clone Jump The Repository", "https://github.com/devonfw/jump-the-queue.git") -- ==== @@ -28,10 +32,13 @@ cloneRepository("", "https://github.com/devonfw/jump-the-queue.git") buildJava("jump-the-queue/java/jtqj", true) runServerJava("jump-the-queue/java/jtqj/server", { "startupTime": 40, "port": 8081, "path": "jumpthequeue" }) -- +This will take some time + Now the Java Server should be running. ==== -In the next steps we want build and run the Angular Frontend Server. For that you need to install the dependencies first. +Install dependencies before you build and run frontend server. + [step] -- npmInstall("jump-the-queue/angular") @@ -40,6 +47,7 @@ npmInstall("jump-the-queue/angular") ==== Now build and run the Angular Server. The following two steps are only needed in this tutorial. Normally you can simply execute "ng serve", open the https://localhost:4200/ and start using the app. + In the next step you need to change the Base URL for the REST Services. [step] == Serve the Frontend Server @@ -48,5 +56,10 @@ changeFile("jump-the-queue/angular/src/environments/environment.ts", {"content": runClientNg("jump-the-queue/angular", { "startupTime": 200, "port": 4200, "path": "" }) -- Now the Angular Frontend Server should be running. + +== Conclusion +You have successfully created a Jump the Queue application. You can now proceed with development of another sample application. + +For more information related to Jump The Queue sample application visit on https://github.com/devonfw/jump-the-queue/wiki . ==== diff --git a/tutorials b/tutorials new file mode 160000 index 00000000..06ec58c5 --- /dev/null +++ b/tutorials @@ -0,0 +1 @@ +Subproject commit 06ec58c560371e22b9c9871f2455797ac237298b From 141524f7c2bbf9335b3d9e30e06a808ea2d91f2c Mon Sep 17 00:00:00 2001 From: dixyushi Date: Thu, 6 May 2021 16:45:00 +0530 Subject: [PATCH 2/5] restructured the tutorial --- JumpTheQueue/files/conclusion.md | 3 +++ JumpTheQueue/index.asciidoc | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 JumpTheQueue/files/conclusion.md diff --git a/JumpTheQueue/files/conclusion.md b/JumpTheQueue/files/conclusion.md new file mode 100644 index 00000000..cc40ed4b --- /dev/null +++ b/JumpTheQueue/files/conclusion.md @@ -0,0 +1,3 @@ +You have successfully created a Jump the Queue application. You can now proceed with development of another sample application. + +For more information related to Jump The Queue sample application visit on https://github.com/devonfw/jump-the-queue/wiki \ No newline at end of file diff --git a/JumpTheQueue/index.asciidoc b/JumpTheQueue/index.asciidoc index bfabe382..e3b962cb 100644 --- a/JumpTheQueue/index.asciidoc +++ b/JumpTheQueue/index.asciidoc @@ -56,10 +56,8 @@ changeFile("jump-the-queue/angular/src/environments/environment.ts", {"content": runClientNg("jump-the-queue/angular", { "startupTime": 200, "port": 4200, "path": "" }) -- Now the Angular Frontend Server should be running. - -== Conclusion -You have successfully created a Jump the Queue application. You can now proceed with development of another sample application. - -For more information related to Jump The Queue sample application visit on https://github.com/devonfw/jump-the-queue/wiki . ==== - +[step] +-- +nextKatacodaStep("Conclusion", [{ "file": "files/conclusion.md" }]) +-- From ae8d496d8453c8865a8b424723a6bb9869290d61 Mon Sep 17 00:00:00 2001 From: dixyushi Date: Thu, 6 May 2021 18:07:00 +0530 Subject: [PATCH 3/5] restructured the tutorial --- JumpTheQueue/files/conclusion.md | 3 --- JumpTheQueue/index.asciidoc | 17 +++++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 JumpTheQueue/files/conclusion.md diff --git a/JumpTheQueue/files/conclusion.md b/JumpTheQueue/files/conclusion.md deleted file mode 100644 index cc40ed4b..00000000 --- a/JumpTheQueue/files/conclusion.md +++ /dev/null @@ -1,3 +0,0 @@ -You have successfully created a Jump the Queue application. You can now proceed with development of another sample application. - -For more information related to Jump The Queue sample application visit on https://github.com/devonfw/jump-the-queue/wiki \ No newline at end of file diff --git a/JumpTheQueue/index.asciidoc b/JumpTheQueue/index.asciidoc index e3b962cb..045838b2 100644 --- a/JumpTheQueue/index.asciidoc +++ b/JumpTheQueue/index.asciidoc @@ -22,7 +22,7 @@ Note: Setup script can take some time for setup. First, clone the Jump-The-Queue Repository. [step] -- -cloneRepository("Clone Jump The Repository", "https://github.com/devonfw/jump-the-queue.git") +cloneRepository("", "https://github.com/devonfw/jump-the-queue.git") -- ==== @@ -46,7 +46,9 @@ npmInstall("jump-the-queue/angular") ==== Now build and run the Angular Server. -The following two steps are only needed in this tutorial. Normally you can simply execute "ng serve", open the https://localhost:4200/ and start using the app. +The following two steps are only needed in this tutorial. + +Normally you can simply execute "ng serve", open the https://localhost:4200/ and start using the app. In the next step you need to change the Base URL for the REST Services. [step] @@ -57,7 +59,10 @@ runClientNg("jump-the-queue/angular", { "startupTime": 200, "port": 4200, "path" -- Now the Angular Frontend Server should be running. ==== -[step] --- -nextKatacodaStep("Conclusion", [{ "file": "files/conclusion.md" }]) --- + +==== +## Conclusion +You have successfully created a Jump the Queue application. You can now proceed with development of another sample application. + +For more information related to Jump The Queue sample application visit on https://github.com/devonfw/jump-the-queue/wiki +==== \ No newline at end of file From bdfeb87c2c32d56ff42e4afe00c304ef4419fbec Mon Sep 17 00:00:00 2001 From: dixyushi Date: Fri, 7 May 2021 10:33:44 +0530 Subject: [PATCH 4/5] restructured tutorial --- JumpTheQueue/index.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/JumpTheQueue/index.asciidoc b/JumpTheQueue/index.asciidoc index 045838b2..aebb8cab 100644 --- a/JumpTheQueue/index.asciidoc +++ b/JumpTheQueue/index.asciidoc @@ -32,7 +32,6 @@ cloneRepository("", "https://github.com/devonfw/jump-the-queue.git") buildJava("jump-the-queue/java/jtqj", true) runServerJava("jump-the-queue/java/jtqj/server", { "startupTime": 40, "port": 8081, "path": "jumpthequeue" }) -- -This will take some time Now the Java Server should be running. ==== From fef7386923f954fff1341773aa52fa238f82b2cf Mon Sep 17 00:00:00 2001 From: dixyushi Date: Fri, 13 Aug 2021 12:33:25 +0530 Subject: [PATCH 5/5] remove unwanted submodule --- tutorials | 1 - 1 file changed, 1 deletion(-) delete mode 160000 tutorials diff --git a/tutorials b/tutorials deleted file mode 160000 index 06ec58c5..00000000 --- a/tutorials +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 06ec58c560371e22b9c9871f2455797ac237298b