Skip to content

Commit 932222e

Browse files
SchettlerKoehlerSchettlerKoehler
authored
Merge branch 'main' into remove-adaptTemplatesCobiGen
2 parents f316ad4 + da7fa28 commit 932222e

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎cobigen-setup/index.asciidoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ devonfw IDE has been installed for you.
2525
2626
[step]
2727
--
28-
nextKatacodaStep("CobiGen Setup", [{ "file": "files/cobiGenSetup.md" }])
28+
displayContent("CobiGen Setup", [{ "file": "files/cobiGenSetup.md" }])
2929
--
3030
3131
In next step, you will learn about CobiGen CLI commands.
@@ -38,7 +38,7 @@ In this step, you will learn CobiGen commands.
3838
3939
[step]
4040
--
41-
nextKatacodaStep("CobiGen CLI Commands and Options", [{ "file": "files/commandsAndOptions.md" }])
41+
displayContent("CobiGen CLI Commands and Options", [{ "file": "files/commandsAndOptions.md" }])
4242
--
4343
4444
In next step, you will learn about how to integrate CobiGen with Eclipse.
@@ -57,7 +57,7 @@ Note: CobiGen comes preinstalled with devonfw IDE.
5757
menu bar → Help → Install new Software
5858
[step]
5959
--
60-
nextKatacodaStep("Integrate Eclipse with CobiGen", [{"image": "images/01-install-new-software.png"}])
60+
displayContent("Integrate Eclipse with CobiGen", [{"image": "images/01-install-new-software.png"}])
6161
--
6262

6363
====
@@ -66,7 +66,7 @@ Here you can select the updates.
6666
6767
[step]
6868
--
69-
nextKatacodaStep("Select Update Site", [{"image": "images/02-select-update-site.png"}, { "file": "files/eclipseIntegration.md" }])
69+
displayContent("Select Update Site", [{"image": "images/02-select-update-site.png"}, { "file": "files/eclipseIntegration.md" }])
7070
--
7171
7272
* Checkout (clone) your project’s templates folder or use the current templates released with CobiGen (https://github.com/devonfw/cobigen/tree/master/cobigen-templates) and then choose
@@ -76,15 +76,15 @@ Import -> General -> Existing Projects into Workspace to import the templates in
7676

7777
[step]
7878
--
79-
nextKatacodaStep("CobiGen Usage - Simple Mode", [{ "file": "files/simpleModeUsage.md" }, {"image": "images/03-simple-mode-usage.png"}])
79+
displayContent("CobiGen Usage - Simple Mode", [{ "file": "files/simpleModeUsage.md" }, {"image": "images/03-simple-mode-usage.png"}])
8080
--
8181

8282
[step]
8383
--
84-
nextKatacodaStep("CobiGen Usage - Batch Mode", [{ "file": "files/batchModeUsage.md" }, {"image": "images/04-batch-mode-usage.png"}])
84+
displayContent("CobiGen Usage - Batch Mode", [{ "file": "files/batchModeUsage.md" }, {"image": "images/04-batch-mode-usage.png"}])
8585
--
8686

8787
[step]
8888
--
89-
nextKatacodaStep(" ", [{ "file": "files/healthCheckTroubleshooting-Conclusion.md" }])
89+
displayContent(" ", [{ "file": "files/healthCheckTroubleshooting-Conclusion.md" }])
9090
--

‎create-your-own-tutorial/index.asciidoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This will create a copy of the repository in your own GitHub account. You will f
2626
2727
[step]
2828
--
29-
nextKatacodaStep("Fork the tutorials repository", [{"image": "images/fork.jpg"}, {"content": "\nOpen the forked repository in your GitHub account and copy the repository URL as shown in image below.\n"}, {"image": "images/clone_code.jpg"}])
29+
displayContent("Fork the tutorials repository", [{"image": "images/fork.jpg"}, {"content": "\nOpen the forked repository in your GitHub account and copy the repository URL as shown in image below.\n"}, {"image": "images/clone_code.jpg"}])
3030
--
3131
====
3232

@@ -43,7 +43,7 @@ cloneRepository("", "https://github.com/devonfw-tutorials/tutorials.git")
4343
====
4444
[step]
4545
--
46-
nextKatacodaStep("Create a new branch", [{ "file": "files/createNewBranch.md" }])
46+
displayContent("Create a new branch", [{ "file": "files/createNewBranch.md" }])
4747
--
4848
Now you can start to create the tutorial. This will be shown in the next steps.
4949
====
@@ -60,7 +60,7 @@ createFile("tutorials/myTutorial/index.asciidoc")
6060

6161
[step]
6262
--
63-
nextKatacodaStep("Create a pull request", [{ "file": "files/createPullRequest1.md" }, {"image": "images/pull_request.jpg"}, {"content": "\nYou might have to click on 'compare across forks'.\n"}, {"image": "images/compare.jpg"}, { "file": "files/createPullRequest2.md" }])
63+
displayContent("Create a pull request", [{ "file": "files/createPullRequest1.md" }, {"image": "images/pull_request.jpg"}, {"content": "\nYou might have to click on 'compare across forks'.\n"}, {"image": "images/compare.jpg"}, { "file": "files/createPullRequest2.md" }])
6464
--
6565

6666
The syntax in which the tutorial is written can be found at https://github.com/devonfw-tutorials/tutorials/wiki/Development.
@@ -99,15 +99,15 @@ This is the syntax without additional text after the step. There is an alternati
9999

100100
[step]
101101
--
102-
nextKatacodaStep("Alternative syntax", [{ "file": "files/alternativeSyntax.md" }])
102+
displayContent("Alternative syntax", [{ "file": "files/alternativeSyntax.md" }])
103103
--
104104

105105
[step]
106106
--
107-
nextKatacodaStep("Push tutorial", [{ "file": "files/pushTutorial.md" }])
107+
displayContent("Push tutorial", [{ "file": "files/pushTutorial.md" }])
108108
--
109109

110110
[step]
111111
--
112-
nextKatacodaStep("Local testing", [{ "file": "files/localTesting.md" }])
112+
displayContent("Local testing", [{ "file": "files/localTesting.md" }])
113113
--

‎devon4j-app/index.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ If you want to know more about modules and project structure refer [here](https:
4747
====
4848
[step]
4949
--
50-
nextKatacodaStep("devon4j multilayer architecture", [{ "image": "images/devon4j_proj_structure1.jpg" }])
50+
displayContent("devon4j multilayer architecture", [{ "image": "images/devon4j_proj_structure1.jpg" }])
5151
--
5252
5353
As shown in above image,devon4j application follows [multilayered architecture](https://en.wikipedia.org/wiki/Multitier_architecture).

‎devon4j-architecture/index.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Once project is cloned switch to next tab of IDE. In IDE explorer you will be ab
3737
### devon4j application structure
3838
[step]
3939
--
40-
nextKatacodaStep("devon4j application architecture", [{ "image": "images/jtqj_app_structure.jpg" }])
40+
displayContent("devon4j application architecture", [{ "image": "images/jtqj_app_structure.jpg" }])
4141
--
4242
4343
As shown above, jump-the-queue contains 3 modules i.e api, core and server.
@@ -60,7 +60,7 @@ devon4j application follows [multilayered architecture](https://en.wikipedia.org
6060
6161
[step]
6262
--
63-
nextKatacodaStep("devon4j application layers", [{ "image": "images/jtqj_detailed_app_structure.jpg" }])
63+
displayContent("devon4j application layers", [{ "image": "images/jtqj_detailed_app_structure.jpg" }])
6464
--
6565
6666
Above image display detailed structure of devon4j application. As shown above jump-the-queue application contains different components like queuemanagement, visitormanagement etc
@@ -83,7 +83,7 @@ For example, in jtqj-api->queuemangement->dataaccess->core contains entities, sp
8383

8484
[step]
8585
--
86-
nextKatacodaStep("Understand devon4j application architecture", [{ "file": "devon4j-app-arch.md" }])
86+
displayContent("Understand devon4j application architecture", [{ "file": "devon4j-app-arch.md" }])
8787
--
8888

8989
====

‎devon4ng-architecture/index.asciidoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,35 +27,35 @@ addSetupScript("files/cloneProject.sh", "files/cloneProject.ps1")
2727

2828
[step]
2929
--
30-
nextKatacodaStep("Overview", [{ "file": "files/overview.md" }])
30+
displayContent("Overview", [{ "file": "files/overview.md" }])
3131
--
3232

3333
[step]
3434
--
35-
nextKatacodaStep("Architectural Layers", [{ "image": "images/architecture-layers.png" }, { "file": "files/layers.md" }])
35+
displayContent("Architectural Layers", [{ "image": "images/architecture-layers.png" }, { "file": "files/layers.md" }])
3636
--
3737

3838
[step]
3939
--
4040
openFile("devon4ng-application-template/src/app/sampledata/sampledata.module.ts")
41-
nextKatacodaStep("Architectural Layers explained", [{ "file": "files/layers-explained.md" }])
41+
displayContent("Architectural Layers explained", [{ "file": "files/layers-explained.md" }])
4242
openFile("devon4ng-application-template/src/app/sampledata/services/sampledata.service.ts")
4343
--
4444

4545
[step]
4646
--
47-
nextKatacodaStep("Modules", [{ "image": "images/architecture-modules.png" }, { "file": "files/modules.md" }])
47+
displayContent("Modules", [{ "image": "images/architecture-modules.png" }, { "file": "files/modules.md" }])
4848
--
4949

5050
[step]
5151
--
52-
nextKatacodaStep("Core module", [{ "file": "files/core-shared-modules.md" }])
52+
displayContent("Core module", [{ "file": "files/core-shared-modules.md" }])
5353
openFile("devon4ng-application-template/src/app/core/core.module.ts")
5454
--
5555

5656
[step]
5757
--
58-
nextKatacodaStep("Shared module", [{ "file": "files/core-shared-modules2.md" }])
58+
displayContent("Shared module", [{ "file": "files/core-shared-modules2.md" }])
5959
openFile("devon4ng-application-template/src/app/layout/layout.module.ts")
6060
--
6161

0 commit comments

Comments
 (0)