@learnpack/learnpack 5.0.217 → 5.0.231
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +31 -26
- package/lib/commands/publish.d.ts +1 -1
- package/lib/commands/publish.js +17 -9
- package/lib/commands/serve.js +64 -30
- package/lib/creatorDist/assets/{index-CZrxF_55.js → index-BjBYI-9r.js} +4705 -4667
- package/lib/creatorDist/index.html +1 -1
- package/lib/utils/api.d.ts +7 -0
- package/lib/utils/api.js +54 -1
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
- package/src/commands/publish.ts +20 -8
- package/src/commands/serve.ts +73 -29
- package/src/creator/src/App.tsx +51 -9
- package/src/creator/src/components/syllabus/SyllabusEditor.tsx +35 -20
- package/src/creator/src/utils/lib.ts +5 -0
- package/src/creator/src/utils/store.ts +10 -0
- package/src/creatorDist/assets/{index-CZrxF_55.js → index-BjBYI-9r.js} +4705 -4667
- package/src/creatorDist/index.html +1 -1
- package/src/ui/_app/app.js +366 -366
- package/src/ui/app.tar.gz +0 -0
- package/src/utils/api.ts +80 -10
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
/>
|
|
11
11
|
|
|
12
12
|
<title>Learnpack Creator: Craft tutorials in seconds!</title>
|
|
13
|
-
<script type="module" crossorigin src="/creator/assets/index-
|
|
13
|
+
<script type="module" crossorigin src="/creator/assets/index-BjBYI-9r.js"></script>
|
|
14
14
|
<link rel="stylesheet" crossorigin href="/creator/assets/index-DmpsXknz.css">
|
|
15
15
|
</head>
|
|
16
16
|
<body>
|
package/lib/utils/api.d.ts
CHANGED
|
@@ -28,6 +28,12 @@ export declare const doesAssetExists: (token: string, assetSlug: string) => Prom
|
|
|
28
28
|
exists: boolean;
|
|
29
29
|
academyId?: number;
|
|
30
30
|
}>;
|
|
31
|
+
type TTechnology = {
|
|
32
|
+
slug: string;
|
|
33
|
+
lang: string;
|
|
34
|
+
};
|
|
35
|
+
export declare const fetchTechnologies: () => Promise<any[]>;
|
|
36
|
+
export declare const getCurrentTechnologies: () => TTechnology[];
|
|
31
37
|
declare const _default: {
|
|
32
38
|
login: (identification: string, password: string) => Promise<any>;
|
|
33
39
|
publish: (config: any) => Promise<any>;
|
|
@@ -51,5 +57,6 @@ declare const _default: {
|
|
|
51
57
|
getCategories: (token: string) => Promise<any>;
|
|
52
58
|
updateRigoAssetID: (token: string, slug: string, asset_id: number) => Promise<any>;
|
|
53
59
|
createRigoPackage: (token: string, slug: string, config: any) => Promise<any>;
|
|
60
|
+
getCurrentTechnologies: () => TTechnology[];
|
|
54
61
|
};
|
|
55
62
|
export default _default;
|
package/lib/utils/api.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.doesAssetExists = exports.createAsset = exports.validateToken = exports.listUserAcademies = exports.getConsumable = exports.countConsumables = exports.RIGOBOT_HOST = void 0;
|
|
3
|
+
exports.getCurrentTechnologies = exports.fetchTechnologies = exports.doesAssetExists = exports.createAsset = exports.validateToken = exports.listUserAcademies = exports.getConsumable = exports.countConsumables = exports.RIGOBOT_HOST = void 0;
|
|
4
4
|
const console_1 = require("../utils/console");
|
|
5
5
|
const storage = require("node-persist");
|
|
6
6
|
const cli_ux_1 = require("cli-ux");
|
|
7
7
|
const axios_1 = require("axios");
|
|
8
|
+
const dotenv = require("dotenv");
|
|
9
|
+
dotenv.config();
|
|
8
10
|
const HOST = "https://breathecode.herokuapp.com";
|
|
9
11
|
exports.RIGOBOT_HOST = "https://rigobot.herokuapp.com";
|
|
10
12
|
// export const RIGOBOT_HOST = "https://rigobot-test-cca7d841c9d8.herokuapp.com"
|
|
@@ -442,6 +444,56 @@ const createRigoPackage = async (token, slug, config) => {
|
|
|
442
444
|
throw error;
|
|
443
445
|
}
|
|
444
446
|
};
|
|
447
|
+
let technologiesCache = [];
|
|
448
|
+
const fetchTechnologies = async () => {
|
|
449
|
+
const BREATHECODE_PERMANENT_TOKEN = process.env.BREATHECODE_PERMANENT_TOKEN;
|
|
450
|
+
const LANGS = ["en", "es", "us"];
|
|
451
|
+
if (!BREATHECODE_PERMANENT_TOKEN) {
|
|
452
|
+
throw new Error("BREATHECODE_PERMANENT_TOKEN is not defined in environment variables");
|
|
453
|
+
}
|
|
454
|
+
const headers = {
|
|
455
|
+
Authorization: `Token ${BREATHECODE_PERMANENT_TOKEN}`,
|
|
456
|
+
};
|
|
457
|
+
const results = await Promise.all(LANGS.map(lang => axios_1.default
|
|
458
|
+
.get(`${HOST}/v1/registry/technology?lang=${lang}`, { headers })
|
|
459
|
+
.then(res => {
|
|
460
|
+
return res.data;
|
|
461
|
+
})
|
|
462
|
+
.then(data => data.map((item) => ({
|
|
463
|
+
slug: item.slug,
|
|
464
|
+
lang: lang,
|
|
465
|
+
})))));
|
|
466
|
+
const allItems = results.flat();
|
|
467
|
+
// Remove duplicates by slug+lang combination
|
|
468
|
+
const unique = [];
|
|
469
|
+
const seen = new Set();
|
|
470
|
+
for (const item of allItems) {
|
|
471
|
+
const key = `${item.slug}:${item.lang}`;
|
|
472
|
+
if (!seen.has(key)) {
|
|
473
|
+
seen.add(key);
|
|
474
|
+
unique.push(item);
|
|
475
|
+
}
|
|
476
|
+
}
|
|
477
|
+
return unique;
|
|
478
|
+
};
|
|
479
|
+
exports.fetchTechnologies = fetchTechnologies;
|
|
480
|
+
// Function to update the cache and schedule the next update
|
|
481
|
+
async function updateTechnologiesPeriodically() {
|
|
482
|
+
try {
|
|
483
|
+
technologiesCache = await (0, exports.fetchTechnologies)();
|
|
484
|
+
// Uncomment for debugging:
|
|
485
|
+
// console.log('Technologies list updated:', technologiesCache);
|
|
486
|
+
}
|
|
487
|
+
catch (error) {
|
|
488
|
+
console.error("Error updating technologies list:", error);
|
|
489
|
+
}
|
|
490
|
+
finally {
|
|
491
|
+
setTimeout(updateTechnologiesPeriodically, 24 * 60 * 60 * 1000);
|
|
492
|
+
}
|
|
493
|
+
}
|
|
494
|
+
updateTechnologiesPeriodically();
|
|
495
|
+
const getCurrentTechnologies = () => technologiesCache;
|
|
496
|
+
exports.getCurrentTechnologies = getCurrentTechnologies;
|
|
445
497
|
exports.default = {
|
|
446
498
|
login,
|
|
447
499
|
publish,
|
|
@@ -459,4 +511,5 @@ exports.default = {
|
|
|
459
511
|
getCategories,
|
|
460
512
|
updateRigoAssetID,
|
|
461
513
|
createRigoPackage,
|
|
514
|
+
getCurrentTechnologies: exports.getCurrentTechnologies,
|
|
462
515
|
};
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.0.
|
|
1
|
+
{"version":"5.0.231","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n 1. The configuration object has slug, repository and description. (Error)\n 2. The command learnpack clean has been run. (Error)\n 3. If a markdown or test file doesn't have any content. (Error)\n 4. The links are accessing to valid servers. (Error)\n 5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n 6. The external images are working (If they are pointing to a valid server). (Error)\n 7. The exercises directory names are valid. (Error)\n 8. If an exercise doesn't have a README file. (Error)\n 9. The exercises array (Of the config file) has content. (Error)\n 10. The exercses have the same translations. (Warning)\n 11. The .gitignore file exists. (Warning)\n 12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"strict":{"name":"strict","type":"boolean","char":"s","description":"strict mode","allowNo":false}},"args":[]},"breakToken":{"id":"breakToken","description":"Break the token","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"yes":{"name":"yes","type":"boolean","char":"y","description":"Skip all prompts and initialize an empty project","allowNo":false},"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"yes":{"name":"yes","type":"boolean","char":"y","description":"Skip all prompts and initialize an empty project","allowNo":false},"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Builds the project by copying necessary files and directories into a zip file","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"strict":{"name":"strict","type":"boolean","char":"s","description":"strict mode","allowNo":false},"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"serve":{"id":"serve","description":"Runs a small server to build tutorials","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"yes":{"name":"yes","type":"boolean","char":"y","description":"Skip all prompts and initialize an empty project","allowNo":false},"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"yes":{"name":"yes","type":"boolean","char":"y","description":"Skip all prompts and initialize an empty project","allowNo":false},"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[preview, extension]","options":["extension","preview"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"yes":{"name":"yes","type":"boolean","char":"y","description":"Skip all prompts and initialize an empty project","allowNo":false}},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]},"translate":{"id":"translate","description":"List all the lessons, the user is able of select many of them to translate to the given languages","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"yes":{"name":"yes","type":"boolean","char":"y","description":"Skip all prompts and initialize an empty project","allowNo":false}},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@learnpack/learnpack",
|
|
3
3
|
"description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
|
|
4
|
-
"version": "5.0.
|
|
4
|
+
"version": "5.0.231",
|
|
5
5
|
"author": "Alejandro Sanchez @alesanchezr",
|
|
6
6
|
"contributors": [
|
|
7
7
|
{
|
|
@@ -154,10 +154,10 @@
|
|
|
154
154
|
]
|
|
155
155
|
},
|
|
156
156
|
"scripts": {
|
|
157
|
-
"copy-assets": "npx cpy src/creatorDist/**/* lib/creatorDist --parents",
|
|
157
|
+
"copy-assets": "npx cpy src/creatorDist/**/* lib/creatorDist --parents --verbose",
|
|
158
158
|
"tsc": "tsc -b",
|
|
159
159
|
"postpack": "rm -f oclif.manifest.json && eslint . --ext .ts --config .eslintrc",
|
|
160
|
-
"prepack": "rm -rf lib && tsc -b && npm run copy-assets
|
|
160
|
+
"prepack": "rm -rf lib && tsc -b && npm run copy-assets",
|
|
161
161
|
"pre": "node ./test/precommit/index.ts",
|
|
162
162
|
"test": "NODE_ENV=test nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
|
|
163
163
|
"version": "oclif-dev readme && git add README.md",
|
package/src/commands/publish.ts
CHANGED
|
@@ -25,8 +25,20 @@ const uploadZipEndpont = RIGOBOT_HOST + "/v1/learnpack/upload"
|
|
|
25
25
|
export const handleAssetCreation = async (
|
|
26
26
|
sessionPayload: { token: string; rigobotToken: string },
|
|
27
27
|
learnJson: any,
|
|
28
|
+
selectedLang: string,
|
|
28
29
|
learnpackDeployUrl: string
|
|
29
30
|
) => {
|
|
31
|
+
const categories: Record<string, number> = {
|
|
32
|
+
us: 91,
|
|
33
|
+
es: 92,
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
let category = categories[selectedLang]
|
|
37
|
+
|
|
38
|
+
if (!category) {
|
|
39
|
+
category = 91
|
|
40
|
+
}
|
|
41
|
+
|
|
30
42
|
try {
|
|
31
43
|
const user = await api.validateToken(sessionPayload.token)
|
|
32
44
|
|
|
@@ -39,13 +51,13 @@ export const handleAssetCreation = async (
|
|
|
39
51
|
Console.info("Asset does not exist in this academy, creating it")
|
|
40
52
|
const asset = await api.createAsset(sessionPayload.token, {
|
|
41
53
|
slug: learnJson.slug,
|
|
42
|
-
title: learnJson.title
|
|
43
|
-
lang:
|
|
44
|
-
description: learnJson.description
|
|
54
|
+
title: learnJson.title[selectedLang],
|
|
55
|
+
lang: selectedLang,
|
|
56
|
+
description: learnJson.description[selectedLang],
|
|
45
57
|
learnpack_deploy_url: learnpackDeployUrl,
|
|
46
|
-
technologies:
|
|
58
|
+
technologies: learnJson.technologies,
|
|
47
59
|
url: learnpackDeployUrl,
|
|
48
|
-
category:
|
|
60
|
+
category: category,
|
|
49
61
|
owner: user.id,
|
|
50
62
|
author: user.id,
|
|
51
63
|
preview: learnJson.preview,
|
|
@@ -63,8 +75,8 @@ export const handleAssetCreation = async (
|
|
|
63
75
|
learnJson.slug,
|
|
64
76
|
{
|
|
65
77
|
learnpack_deploy_url: learnpackDeployUrl,
|
|
66
|
-
title: learnJson.title
|
|
67
|
-
description: learnJson.description
|
|
78
|
+
title: learnJson.title[selectedLang],
|
|
79
|
+
description: learnJson.description[selectedLang],
|
|
68
80
|
}
|
|
69
81
|
)
|
|
70
82
|
await api.updateRigoAssetID(
|
|
@@ -423,7 +435,7 @@ class BuildCommand extends SessionCommand {
|
|
|
423
435
|
fs.unlinkSync(zipFilePath)
|
|
424
436
|
this.removeDirectory(buildDir)
|
|
425
437
|
|
|
426
|
-
await handleAssetCreation(sessionPayload, learnJson, res.data.url)
|
|
438
|
+
await handleAssetCreation(sessionPayload, learnJson, "us", res.data.url)
|
|
427
439
|
} catch (error) {
|
|
428
440
|
if (axios.isAxiosError(error)) {
|
|
429
441
|
if (error.response && error.response.status === 403) {
|
package/src/commands/serve.ts
CHANGED
|
@@ -102,7 +102,7 @@ const uploadFileToBucket = async (
|
|
|
102
102
|
path: string
|
|
103
103
|
) => {
|
|
104
104
|
const fileRef = bucket.file(path)
|
|
105
|
-
await fileRef.save(file)
|
|
105
|
+
await fileRef.save(Buffer.from(file, "utf8"))
|
|
106
106
|
}
|
|
107
107
|
|
|
108
108
|
const uploadImageToBucket = async (
|
|
@@ -231,6 +231,8 @@ async function startExerciseGeneration(
|
|
|
231
231
|
|
|
232
232
|
const webhookUrl = `${process.env.HOST}/webhooks/${courseSlug}/exercise-processor/${exercise.id}/${rigoToken}`
|
|
233
233
|
|
|
234
|
+
console.log("WEBHOOK URL", webhookUrl)
|
|
235
|
+
|
|
234
236
|
await readmeCreator(
|
|
235
237
|
rigoToken,
|
|
236
238
|
{
|
|
@@ -1123,33 +1125,40 @@ export default class ServeCommand extends SessionCommand {
|
|
|
1123
1125
|
}
|
|
1124
1126
|
})
|
|
1125
1127
|
|
|
1126
|
-
app.get("/test/:slug", (req, res) => {
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
|
|
1147
|
-
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1128
|
+
// app.get("/test/:slug", (req, res) => {
|
|
1129
|
+
// emitToCourse(req.params.slug, "course-creation", {
|
|
1130
|
+
// lesson: "000-welcome-to-bird-domestication",
|
|
1131
|
+
// status: "generating",
|
|
1132
|
+
// log: "Hello",
|
|
1133
|
+
// })
|
|
1134
|
+
// emitToCourse(req.params.slug, "course-creation", {
|
|
1135
|
+
// lesson: "000-welcome-to-bird-domestication",
|
|
1136
|
+
// status: "generating",
|
|
1137
|
+
// log: "Hello",
|
|
1138
|
+
// })
|
|
1139
|
+
// emitToCourse(req.params.slug, "course-creation", {
|
|
1140
|
+
// lesson: "000-welcome-to-bird-domestication",
|
|
1141
|
+
// status: "generating",
|
|
1142
|
+
// log: "Hello broder",
|
|
1143
|
+
// })
|
|
1144
|
+
// emitToCourse(req.params.slug, "course-creation", {
|
|
1145
|
+
// lesson: "000-welcome-to-bird-domestication",
|
|
1146
|
+
// status: "done",
|
|
1147
|
+
// log: "Hello broder",
|
|
1148
|
+
// })
|
|
1149
|
+
// emitToCourse(req.params.slug, "course-creation", {
|
|
1150
|
+
// lesson: "other",
|
|
1151
|
+
// status: "generating",
|
|
1152
|
+
// log: "Hello",
|
|
1153
|
+
// })
|
|
1154
|
+
// res.send({ message: "Course creation started" })
|
|
1155
|
+
// })
|
|
1156
|
+
|
|
1157
|
+
app.get("/technologies", async (req, res) => {
|
|
1158
|
+
console.log("GET /technologies")
|
|
1159
|
+
|
|
1160
|
+
const technologies = await api.getCurrentTechnologies()
|
|
1161
|
+
res.json(technologies)
|
|
1153
1162
|
})
|
|
1154
1163
|
|
|
1155
1164
|
app.get("/assets/:file", (req, res) => {
|
|
@@ -1280,6 +1289,41 @@ export default class ServeCommand extends SessionCommand {
|
|
|
1280
1289
|
})
|
|
1281
1290
|
})
|
|
1282
1291
|
|
|
1292
|
+
// app.post(
|
|
1293
|
+
// "/check-latex/:courseSlug/:exerciseSlug/:lang",
|
|
1294
|
+
// async (req, res) => {
|
|
1295
|
+
// const { courseSlug, exerciseSlug, lang } = req.params
|
|
1296
|
+
|
|
1297
|
+
// const rigoToken = req.header("x-rigo-token")
|
|
1298
|
+
|
|
1299
|
+
// if (!rigoToken) {
|
|
1300
|
+
// return res.status(400).json({ error: "Missing tokens" })
|
|
1301
|
+
// }
|
|
1302
|
+
|
|
1303
|
+
// const exercise = await bucket.file(
|
|
1304
|
+
// `courses/${courseSlug}/exercises/${exerciseSlug}/README.${lang}.md`
|
|
1305
|
+
// )
|
|
1306
|
+
// const [content] = await exercise.download()
|
|
1307
|
+
// const headers = {
|
|
1308
|
+
// Authorization: `Token ${rigoToken}`,
|
|
1309
|
+
// }
|
|
1310
|
+
// const response = await axios.get(
|
|
1311
|
+
// `${RIGOBOT_HOST}/v1/prompting/completion/60865/`,
|
|
1312
|
+
// {
|
|
1313
|
+
// headers,
|
|
1314
|
+
// }
|
|
1315
|
+
// )
|
|
1316
|
+
|
|
1317
|
+
// console.log(response.data.parsed.content, "RESPONSE from Rigobot")
|
|
1318
|
+
|
|
1319
|
+
// res.json({
|
|
1320
|
+
// message: "Exercise downloaded",
|
|
1321
|
+
// completion: response.data,
|
|
1322
|
+
// exercise: content.toString(),
|
|
1323
|
+
// })
|
|
1324
|
+
// }
|
|
1325
|
+
// )
|
|
1326
|
+
|
|
1283
1327
|
app.get("/courses/:courseSlug/syllabus", async (req, res) => {
|
|
1284
1328
|
try {
|
|
1285
1329
|
console.log("GET /courses/:courseSlug/syllabus")
|
|
@@ -1524,11 +1568,11 @@ export default class ServeCommand extends SessionCommand {
|
|
|
1524
1568
|
await handleAssetCreation(
|
|
1525
1569
|
{ token: bcToken, rigobotToken: rigoToken },
|
|
1526
1570
|
fullConfig.config,
|
|
1571
|
+
selectedLang,
|
|
1527
1572
|
rigoRes.data.url
|
|
1528
1573
|
)
|
|
1529
1574
|
|
|
1530
1575
|
rimraf.sync(tmpRoot)
|
|
1531
|
-
console.log("RIGO RES", rigoRes.data)
|
|
1532
1576
|
|
|
1533
1577
|
return res.json({ url: rigoRes.data.url })
|
|
1534
1578
|
})
|
package/src/creator/src/App.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
loginWithToken,
|
|
14
14
|
parseLesson,
|
|
15
15
|
fixTitleLength,
|
|
16
|
+
getTechnologies,
|
|
16
17
|
} from "./utils/lib"
|
|
17
18
|
|
|
18
19
|
import { Uploader } from "./components/Uploader"
|
|
@@ -42,11 +43,15 @@ function App() {
|
|
|
42
43
|
resetFormState,
|
|
43
44
|
cleanAll,
|
|
44
45
|
setMessages,
|
|
46
|
+
technologies,
|
|
47
|
+
setTechnologies,
|
|
45
48
|
} = useStore(
|
|
46
49
|
useShallow((state) => ({
|
|
47
50
|
formState: state.formState,
|
|
48
51
|
setFormState: state.setFormState,
|
|
49
52
|
setAuth: state.setAuth,
|
|
53
|
+
technologies: state.technologies,
|
|
54
|
+
setTechnologies: state.setTechnologies,
|
|
50
55
|
push: state.push,
|
|
51
56
|
history: state.history,
|
|
52
57
|
cleanHistory: state.cleanHistory,
|
|
@@ -67,7 +72,8 @@ function App() {
|
|
|
67
72
|
|
|
68
73
|
useEffect(() => {
|
|
69
74
|
verifyToken()
|
|
70
|
-
|
|
75
|
+
checkQueryParams()
|
|
76
|
+
checkTechs()
|
|
71
77
|
}, [])
|
|
72
78
|
|
|
73
79
|
const verifyToken = async () => {
|
|
@@ -84,13 +90,21 @@ function App() {
|
|
|
84
90
|
}
|
|
85
91
|
}
|
|
86
92
|
|
|
87
|
-
const
|
|
88
|
-
const {
|
|
93
|
+
const checkQueryParams = () => {
|
|
94
|
+
const {
|
|
95
|
+
description,
|
|
96
|
+
duration,
|
|
97
|
+
plan,
|
|
98
|
+
purpose,
|
|
99
|
+
language,
|
|
100
|
+
new: newParam,
|
|
101
|
+
} = checkParams([
|
|
89
102
|
"description",
|
|
90
103
|
"duration",
|
|
91
104
|
"plan",
|
|
92
105
|
"purpose",
|
|
93
106
|
"language",
|
|
107
|
+
"new",
|
|
94
108
|
])
|
|
95
109
|
if (description) {
|
|
96
110
|
console.log("description", description)
|
|
@@ -130,12 +144,19 @@ function App() {
|
|
|
130
144
|
currentStep: "hasContentIndex",
|
|
131
145
|
})
|
|
132
146
|
}
|
|
147
|
+
|
|
148
|
+
if (newParam && newParam.toLowerCase().trim() === "true") {
|
|
149
|
+
cleanAll()
|
|
150
|
+
}
|
|
133
151
|
}
|
|
134
152
|
|
|
135
153
|
const handleCreateTutorial = async () => {
|
|
136
154
|
try {
|
|
137
|
-
|
|
138
|
-
if (
|
|
155
|
+
let isAuthenticated = false
|
|
156
|
+
if (auth.publicToken) {
|
|
157
|
+
isAuthenticated = await isValidRigoToken(auth.publicToken)
|
|
158
|
+
}
|
|
159
|
+
if (!isAuthenticated && auth.rigoToken) {
|
|
139
160
|
setAuth({
|
|
140
161
|
...auth,
|
|
141
162
|
rigoToken: "",
|
|
@@ -145,14 +166,24 @@ function App() {
|
|
|
145
166
|
})
|
|
146
167
|
}
|
|
147
168
|
|
|
169
|
+
let techs = technologies.filter((t) => t.lang === formState.language)
|
|
170
|
+
|
|
171
|
+
if (techs.length === 0) {
|
|
172
|
+
techs = technologies.filter((t) => t.lang === "us")
|
|
173
|
+
}
|
|
174
|
+
|
|
148
175
|
const res = await publicInteractiveCreation(
|
|
149
176
|
{
|
|
150
|
-
courseInfo: `${JSON.stringify(
|
|
177
|
+
courseInfo: `${JSON.stringify(
|
|
178
|
+
formState
|
|
179
|
+
)}. The following technologies are available, choose up to 3 from the following list: <techs>${techs
|
|
180
|
+
.map((t) => t.slug)
|
|
181
|
+
.join(", ")}</techs>`,
|
|
151
182
|
prevInteractions: "USER: " + formState.description,
|
|
152
183
|
},
|
|
153
|
-
auth.rigoToken &&
|
|
184
|
+
auth.rigoToken && isAuthenticated ? auth.rigoToken : auth.publicToken,
|
|
154
185
|
formState.purpose || "learnpack-lesson-writer",
|
|
155
|
-
auth.rigoToken &&
|
|
186
|
+
auth.rigoToken && isAuthenticated ? false : true
|
|
156
187
|
)
|
|
157
188
|
const lessons = res.parsed.listOfSteps.map((lesson: any) => {
|
|
158
189
|
return parseLesson(lesson, [])
|
|
@@ -165,7 +196,10 @@ function App() {
|
|
|
165
196
|
title: fixTitleLength(res.parsed.title),
|
|
166
197
|
description: res.parsed.description,
|
|
167
198
|
language: res.parsed.languageCode || formState.language || "en",
|
|
168
|
-
technologies:
|
|
199
|
+
technologies:
|
|
200
|
+
res.parsed.technologies.length > 0
|
|
201
|
+
? res.parsed.technologies
|
|
202
|
+
: ["education", "quizzes"],
|
|
169
203
|
},
|
|
170
204
|
})
|
|
171
205
|
|
|
@@ -206,6 +240,14 @@ function App() {
|
|
|
206
240
|
}
|
|
207
241
|
}
|
|
208
242
|
|
|
243
|
+
const checkTechs = async () => {
|
|
244
|
+
if (technologies.length === 0) {
|
|
245
|
+
const technologies = await getTechnologies()
|
|
246
|
+
console.log("TECHNOLOGIES", technologies)
|
|
247
|
+
setTechnologies(technologies)
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
|
|
209
251
|
const buildSteps = () => {
|
|
210
252
|
const steps = [
|
|
211
253
|
{
|
|
@@ -34,19 +34,28 @@ const SyllabusEditor: React.FC = () => {
|
|
|
34
34
|
const navigate = useNavigate()
|
|
35
35
|
const { i18n } = useTranslation()
|
|
36
36
|
|
|
37
|
-
const {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
37
|
+
const {
|
|
38
|
+
history,
|
|
39
|
+
auth,
|
|
40
|
+
setAuth,
|
|
41
|
+
push,
|
|
42
|
+
cleanAll,
|
|
43
|
+
messages,
|
|
44
|
+
setMessages,
|
|
45
|
+
technologies,
|
|
46
|
+
} = useStore(
|
|
47
|
+
useShallow((state) => ({
|
|
48
|
+
history: state.history,
|
|
49
|
+
auth: state.auth,
|
|
50
|
+
setAuth: state.setAuth,
|
|
51
|
+
push: state.push,
|
|
52
|
+
cleanAll: state.cleanAll,
|
|
53
|
+
messages: state.messages,
|
|
54
|
+
// formState: state.formState,
|
|
55
|
+
setMessages: state.setMessages,
|
|
56
|
+
technologies: state.technologies,
|
|
57
|
+
}))
|
|
58
|
+
)
|
|
50
59
|
|
|
51
60
|
const [isGenerating, setIsGenerating] = useState(false)
|
|
52
61
|
const [showLoginModal, setShowLoginModal] = useState(false)
|
|
@@ -120,9 +129,12 @@ const SyllabusEditor: React.FC = () => {
|
|
|
120
129
|
{ type: "user", content: prompt },
|
|
121
130
|
{ type: "assistant", content: "" },
|
|
122
131
|
])
|
|
132
|
+
let isAuthenticated = false
|
|
133
|
+
if (auth.rigoToken) {
|
|
134
|
+
isAuthenticated = await isValidRigoToken(auth.rigoToken)
|
|
135
|
+
}
|
|
123
136
|
|
|
124
|
-
|
|
125
|
-
if (!isValid) {
|
|
137
|
+
if (!isAuthenticated && auth.rigoToken) {
|
|
126
138
|
setAuth({
|
|
127
139
|
...auth,
|
|
128
140
|
rigoToken: "",
|
|
@@ -134,19 +146,22 @@ const SyllabusEditor: React.FC = () => {
|
|
|
134
146
|
|
|
135
147
|
const res = await publicInteractiveCreation(
|
|
136
148
|
{
|
|
137
|
-
courseInfo:
|
|
149
|
+
courseInfo:
|
|
150
|
+
JSON.stringify(syllabus.courseInfo) +
|
|
151
|
+
`\nThe following technologies are available, choose up to 3 from the following list: <techs>${technologies
|
|
152
|
+
.filter((t) => t.lang === syllabus.courseInfo.language)
|
|
153
|
+
.map((t) => t.slug)
|
|
154
|
+
.join(", ")}</techs>`,
|
|
138
155
|
prevInteractions:
|
|
139
156
|
messages
|
|
140
157
|
.map((message) => `${message.type}: ${message.content}`)
|
|
141
158
|
.join("\n") + `\nUSER: ${prompt}`,
|
|
142
159
|
},
|
|
143
|
-
auth.rigoToken &&
|
|
160
|
+
auth.rigoToken && isAuthenticated ? auth.rigoToken : auth.publicToken,
|
|
144
161
|
syllabus?.courseInfo?.purpose || "learnpack-lesson-writer",
|
|
145
|
-
auth.rigoToken &&
|
|
162
|
+
auth.rigoToken && isAuthenticated ? false : true
|
|
146
163
|
)
|
|
147
164
|
|
|
148
|
-
console.log(res, "RES from rigobot")
|
|
149
|
-
|
|
150
165
|
const lessons: Lesson[] = res.parsed.listOfSteps.map((step: any) =>
|
|
151
166
|
parseLesson(step, syllabus.lessons)
|
|
152
167
|
)
|
|
@@ -441,3 +441,8 @@ export const fixTitleLength = (title: string) => {
|
|
|
441
441
|
fixed = fixed.replace(/^[^a-zA-Z0-9]+|[^a-zA-Z0-9]+$/g, "")
|
|
442
442
|
return fixed
|
|
443
443
|
}
|
|
444
|
+
|
|
445
|
+
export const getTechnologies = async () => {
|
|
446
|
+
const response = await axios.get(`/technologies`)
|
|
447
|
+
return response.data
|
|
448
|
+
}
|
|
@@ -36,6 +36,11 @@ type Consumables = {
|
|
|
36
36
|
[key: string]: number
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
+
type TTechnology = {
|
|
40
|
+
slug: string
|
|
41
|
+
lang: string
|
|
42
|
+
}
|
|
43
|
+
|
|
39
44
|
type Store = {
|
|
40
45
|
auth: Auth
|
|
41
46
|
formState: FormState
|
|
@@ -51,6 +56,8 @@ type Store = {
|
|
|
51
56
|
setMessages: (messages: TMessage[]) => void
|
|
52
57
|
cleanHistory: () => void
|
|
53
58
|
history: Syllabus[]
|
|
59
|
+
technologies: TTechnology[]
|
|
60
|
+
setTechnologies: (technologies: TTechnology[]) => void
|
|
54
61
|
undo: () => void
|
|
55
62
|
push: (syllabus: Syllabus) => void
|
|
56
63
|
cleanAll: () => void
|
|
@@ -93,6 +100,8 @@ const useStore = create<Store>()(
|
|
|
93
100
|
],
|
|
94
101
|
},
|
|
95
102
|
messages: [],
|
|
103
|
+
technologies: [],
|
|
104
|
+
setTechnologies: (technologies: TTechnology[]) => set({ technologies }),
|
|
96
105
|
setMessages: (messages: TMessage[]) => set({ messages }),
|
|
97
106
|
setFormState: (formState: Partial<FormState>) =>
|
|
98
107
|
set((state) => ({ formState: { ...state.formState, ...formState } })),
|
|
@@ -145,6 +154,7 @@ const useStore = create<Store>()(
|
|
|
145
154
|
uploadedFiles: [],
|
|
146
155
|
messages: [],
|
|
147
156
|
history: [],
|
|
157
|
+
technologies: [],
|
|
148
158
|
formState: {
|
|
149
159
|
description: "",
|
|
150
160
|
duration: 0,
|