feat: WIP otter training - feedback on page

fpaul-1A · Oct 10, 2024 · f0555cc · f0555cc
1 parent 051ad6e
commit f0555cc
Show file tree

Hide file tree

Showing 22 changed files with 149 additions and 140 deletions.
diff --git a/apps/showcase/project.json b/apps/showcase/project.json
@@ -398,7 +398,8 @@
       ],
       "options": {
         "script": "prepare-training"
-      }
+      },
+      "dependsOn": ["^build", "^build-cli"]
     },
     "copy-training-assets": {
       "cache": true,

diff --git a/apps/showcase/src/app/app.module.ts b/apps/showcase/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 import { DatePickerHebrewInputPresComponent, ScrollBackTopPresComponent, SidenavPresComponent } from '../components/utilities';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import {MonacoEditorModule} from 'ngx-monaco-editor-v2';
 
 
 const runtimeChecks: Partial<RuntimeChecks> = {

diff --git a/apps/showcase/src/assets/sdk-training/shared/monorepo-with-app b/apps/showcase/src/assets/sdk-training/shared/monorepo-with-app
diff --git a/...case/src/assets/sdk-training/program.json → ...ase/src/assets/trainings/sdk/program.json b/...case/src/assets/sdk-training/program.json → ...ase/src/assets/trainings/sdk/program.json
@@ -16,14 +16,14 @@
     "htmlContentUrl": "./steps/plugins/instructions.html"
   },
   {
-    "title": "Integrate your component in Angular",
+    "title": "Integrate your SDK in Angular",
     "htmlContentUrl": "./steps/angular-integration/instructions.html",
     "filesConfiguration": {
       "name": "angular-integration",
       "startingFile": "apps/tutorial-app/src/app/app.component.ts",
       "urls": {
         ".": "./shared/monorepo-template.json",
-        "./libs/sdk/src": "@o3r/training-sdk/folder-structure.json"
+        "./libs/sdk/src": "@o3r/training-sdk/structure/src.json"
       },
       "mode": "interactive",
       "commands": ["npm install --legacy-peer-deps --ignore-scripts --force", "npm run ng run sdk:build", "npm run ng run tutorial-app:serve"]
@@ -36,7 +36,7 @@
       "name": "sdk-specification",
       "startingFile": "open-api.yaml",
       "solutionUrls": {
-        ".": "@o3r/training-sdk/openapi-structure.json"
+        ".": "@o3r/training-sdk/structure/spec.json"
       },
       "mode": "readonly",
       "commands": []
@@ -49,8 +49,8 @@
       "name": "generate-sdk",
       "startingFile": "src/api/dummy/dummy-api.ts",
       "solutionUrls": {
-        "src": "@o3r/training-sdk/folder-structure.json",
-        ".": "@o3r/training-sdk/openapi-structure.json"
+        "src": "@o3r/training-sdk/structure/src.json",
+        ".": "@o3r/training-sdk/structure/spec.json"
       },
       "mode": "readonly",
       "commands": []
@@ -63,11 +63,11 @@
       "name": "generate-date-sdk",
       "startingFile": "open-api.yaml",
       "urls": {
-        ".": "@o3r/training-sdk/openapi-structure.json"
+        ".": "@o3r/training-sdk/structure/spec.json"
       },
       "solutionUrls": {
-        ".": "@o3r/training-sdk/openapi-structure.json",
-        "./src": "@o3r/training-sdk/folder-structure.json"
+        ".": "@o3r/training-sdk/structure/spec.json",
+        "./src": "@o3r/training-sdk/structure/src.json"
       },
       "mode": "readonly",
       "commands": []
@@ -80,7 +80,7 @@
       "name": "utils-date",
       "startingFile": "apps/app/src/app/app.component.ts",
       "urls": {
-        ".": "./shared/empty.json",
+        ".": "./shared/monorepo-with-app.json",
         "./apps/app/src/app": "./steps/date/exercise.json"
       },
       "solutionUrls": {

diff --git a/...src/assets/sdk-training/shared/empty.json → ...rc/assets/trainings/sdk/shared/empty.json b/...src/assets/sdk-training/shared/empty.json → ...rc/assets/trainings/sdk/shared/empty.json
diff --git a/...dk-training/shared/monorepo-template.json → ...ainings/sdk/shared/monorepo-template.json b/...dk-training/shared/monorepo-template.json → ...ainings/sdk/shared/monorepo-template.json
diff --git a/apps/showcase/src/assets/trainings/sdk/shared/monorepo-with-app.json b/apps/showcase/src/assets/trainings/sdk/shared/monorepo-with-app.json
diff --git a/...eps/angular-integration/instructions.html → ...eps/angular-integration/instructions.html b/...eps/angular-integration/instructions.html → ...eps/angular-integration/instructions.html
diff --git a/...eps/date-sdk-generation/instructions.html → ...eps/date-sdk-generation/instructions.html b/...eps/date-sdk-generation/instructions.html → ...eps/date-sdk-generation/instructions.html
diff --git a/...ng/steps/date/exercise/app.component.html → ...dk/steps/date/exercise/app.component.html b/...ng/steps/date/exercise/app.component.html → ...dk/steps/date/exercise/app.component.html
diff --git a/...ng/steps/date/exercise/app.component.scss → ...dk/steps/date/exercise/app.component.scss b/...ng/steps/date/exercise/app.component.scss → ...dk/steps/date/exercise/app.component.scss
diff --git a/...ning/steps/date/exercise/app.component.ts → .../sdk/steps/date/exercise/app.component.ts b/...ning/steps/date/exercise/app.component.ts → .../sdk/steps/date/exercise/app.component.ts
diff --git a/...sdk-training/steps/date/instructions.html → ...rainings/sdk/steps/date/instructions.html b/...sdk-training/steps/date/instructions.html → ...rainings/sdk/steps/date/instructions.html
diff --git a/...ning/steps/date/solution/app.component.ts → .../sdk/steps/date/solution/app.component.ts b/...ning/steps/date/solution/app.component.ts → .../sdk/steps/date/solution/app.component.ts
diff --git a/...ning/steps/introduction/instructions.html → .../sdk/steps/introduction/instructions.html b/...ning/steps/introduction/instructions.html → .../sdk/steps/introduction/instructions.html
diff --git a/...g/steps/model-extension/instructions.html → ...k/steps/model-extension/instructions.html b/...g/steps/model-extension/instructions.html → ...k/steps/model-extension/instructions.html
diff --git a/...-training/steps/plugins/instructions.html → ...nings/sdk/steps/plugins/instructions.html b/...-training/steps/plugins/instructions.html → ...nings/sdk/steps/plugins/instructions.html
diff --git a/...ng/steps/sdk-generation/instructions.html → ...dk/steps/sdk-generation/instructions.html b/...ng/steps/sdk-generation/instructions.html → ...dk/steps/sdk-generation/instructions.html
diff --git a/...raining/steps/sdk-specs/instructions.html → ...ngs/sdk/steps/sdk-specs/instructions.html b/...raining/steps/sdk-specs/instructions.html → ...ngs/sdk/steps/sdk-specs/instructions.html
diff --git a/...ng/steps/typescript-sdk/instructions.html → ...dk/steps/typescript-sdk/instructions.html b/...ng/steps/typescript-sdk/instructions.html → ...dk/steps/typescript-sdk/instructions.html
diff --git a/...-training/steps/welcome/instructions.html → ...nings/sdk/steps/welcome/instructions.html b/...-training/steps/welcome/instructions.html → ...nings/sdk/steps/welcome/instructions.html
diff --git a/packages/@o3r/training-sdk/package.json b/packages/@o3r/training-sdk/package.json
@@ -42,8 +42,8 @@
     "lint": "eslint \"**/*[jt]s\" --cache",
     "start": "tsc-watch -b tsconfigs/esm2020 --noClear --onFirstSuccess \\\"yarn run files:pack --watch\\\"",
     "extract": "yarn run extract-src && yarn run extract-openapi",
-    "extract-src": "o3r-extract-folder-structure --files \"src\" && cpy ./folder-structure.json dist",
-    "extract-openapi": "o3r-extract-folder-structure --files \"./open-api.yaml\" -o openapi-structure.json && cpy ./openapi-structure.json dist",
+    "extract-src": "o3r-extract-folder-structure --files \"src\" -o dist/structure/src.json",
+    "extract-openapi": "o3r-extract-folder-structure --files \"./open-api.yaml\" -o dist/structure/spec.json",
     "build": "yarn run build:cjs && yarn run build:esm2015 && yarn run build:esm2020 && yarn run files:pack && yarn run extract",
     "build:cjs": "swc src -d dist/cjs -C module.type=commonjs -q --strip-leading-paths",
     "build:esm2015": "swc src -d dist/esm2015 -C module.type=es6 -q --strip-leading-paths",