npm - @learnpack/learnpack - Versions diffs - 5.0.306 → 5.0.308 - Mend

@learnpack/learnpack 5.0.306 → 5.0.308

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.

Files changed (25) hide show

package/lib/commands/publish.js +6 -2
package/lib/commands/serve.js +105 -30
package/lib/creatorDist/assets/{index-CTQfJYti.js → index-B37w_ZhT.js} +9248 -9158
package/lib/creatorDist/assets/{index-DTjdV1LF.css → index-D4SYZg0r.css} +3 -0
package/lib/creatorDist/index.html +2 -2
package/lib/utils/api.d.ts +4 -1
package/lib/utils/api.js +3 -3
package/package.json +1 -1
package/src/commands/publish.ts +20 -22
package/src/commands/serve.ts +152 -56
package/src/creator/src/App.tsx +49 -10
package/src/creator/src/components/LanguageDetectionModal.tsx +46 -0
package/src/creator/src/components/ParamsChecker.tsx +11 -3
package/src/creator/src/locales/en.json +11 -0
package/src/creator/src/locales/es.json +11 -0
package/src/creator/src/utils/lib.ts +172 -171
package/src/creatorDist/assets/{index-CTQfJYti.js → index-B37w_ZhT.js} +9248 -9158
package/src/creatorDist/assets/{index-DTjdV1LF.css → index-D4SYZg0r.css} +3 -0
package/src/creatorDist/index.html +2 -2
package/src/ui/_app/app.css +1 -1
package/src/ui/_app/app.js +2829 -2801
package/src/ui/_app/learnpack.svg +7 -7
package/src/ui/_app/sw.js +59 -59
package/src/ui/app.tar.gz +0 -0
package/src/utils/api.ts +38 -42

package/lib/creatorDist/assets/{index-DTjdV1LF.css → index-D4SYZg0r.css} RENAMED Viewed

@@ -472,6 +472,9 @@
   .mx-2 {
     margin-inline: calc(var(--spacing) * 2);
   }
+  .mx-4 {
+    margin-inline: calc(var(--spacing) * 4);
+  }
   .mx-auto {
     margin-inline: auto;
   }

package/lib/creatorDist/index.html CHANGED Viewed

@@ -10,8 +10,8 @@
     />
     <title>Learnpack Creator: Craft tutorials in seconds!</title>
-    <script type="module" crossorigin src="/creator/assets/index-CTQfJYti.js"></script>
-    <link rel="stylesheet" crossorigin href="/creator/assets/index-DTjdV1LF.css">
+    <script type="module" crossorigin src="/creator/assets/index-B37w_ZhT.js"></script>
+    <link rel="stylesheet" crossorigin href="/creator/assets/index-D4SYZg0r.css">
   </head>
   <body>
     <div id="root"></div>

package/lib/utils/api.d.ts CHANGED Viewed

@@ -59,7 +59,10 @@ declare const _default: {
     }>;
     updateAsset: (token: string, assetSlug: string, asset: Partial<TAssetMissing>) => Promise<any>;
     getCategories: (token: string) => Promise<any>;
-    updateRigoAssetID: (token: string, slug: string, asset_id: number) => Promise<any>;
+    updateRigoPackage: (token: string, slug: string, updates: {
+        asset_id?: number;
+        new_slug?: string;
+    }) => Promise<any>;
     createRigoPackage: (token: string, slug: string, config: any) => Promise<any>;
     getCurrentTechnologies: () => TTechnology[];
     updateTechnologiesPeriodically: typeof updateTechnologiesPeriodically;

package/lib/utils/api.js CHANGED Viewed

@@ -420,11 +420,11 @@ const getCategories = async (token) => {
         throw error;
     }
 };
-const updateRigoAssetID = async (token, slug, asset_id) => {
+const updateRigoPackage = async (token, slug, updates) => {
     const cleanToken = token.replace(/[\n\r]/g, "");
     const url = `${exports.RIGOBOT_HOST}/v1/learnpack/package/${slug}/`;
     try {
-        const response = await axios_1.default.put(url, { asset_id }, {
+        const response = await axios_1.default.put(url, updates, {
             headers: {
                 Authorization: "Token " + cleanToken,
             },
@@ -516,7 +516,7 @@ exports.default = {
     doesAssetExists: exports.doesAssetExists,
     updateAsset,
     getCategories,
-    updateRigoAssetID,
+    updateRigoPackage,
     createRigoPackage,
     getCurrentTechnologies: exports.getCurrentTechnologies,
     updateTechnologiesPeriodically,

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
-  "version": "5.0.306",
+  "version": "5.0.308",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {

package/src/commands/publish.ts CHANGED Viewed

@@ -8,7 +8,7 @@ import * as fs from "fs"
 import * as path from "path"
 import * as archiver from "archiver"
 import axios from "axios"
-import FormData = require("form-data");
+import FormData = require("form-data")
 import Console from "../utils/console"
 import {
   decompress,
@@ -60,11 +60,9 @@ export const handleAssetCreation = async (
         readme_raw: b64IndexReadme,
         all_translations,
       })
-      await api.updateRigoAssetID(
-        sessionPayload.token,
-        learnJson.slug,
-        asset.id
-      )
+      await api.updateRigoPackage(sessionPayload.token, learnJson.slug, {
+        asset_id: asset.id,
+      })
       Console.info("Asset created with id", asset.id)
       return asset
     }
@@ -77,10 +75,12 @@ export const handleAssetCreation = async (
       description: learnJson.description[selectedLang],
       all_translations,
     })
-    await api.updateRigoAssetID(
+    await api.updateRigoPackage(
       sessionPayload.rigobotToken.trim(),
       learnJson.slug,
-      asset.id
+      {
+        asset_id: asset.id,
+      }
     )
     Console.info("Asset updated with id", asset.id)
     return asset
@@ -117,19 +117,19 @@ const runAudit = (strict: boolean) => {
 }
 type Academy = {
-  id: number;
-  name: string;
-  slug?: string;
-  timezone?: string;
-};
+  id: number
+  name: string
+  slug?: string
+  timezone?: string
+}
 type Category = {
-  id: number;
-  slug: string;
-  title: string;
-  lang: string;
-  academy: Academy;
-};
+  id: number
+  slug: string
+  title: string
+  lang: string
+  academy: Academy
+}
 function getCategoriesByAcademy(
   categories: Category[],
@@ -292,9 +292,7 @@ class BuildCommand extends SessionCommand {
     if (configObject) {
       const { config } = configObject
-      const appAlreadyExists = checkIfDirectoryExists(
-        `${config?.dirPath}/_app`
-      )
+      const appAlreadyExists = checkIfDirectoryExists(`${config?.dirPath}/_app`)
       if (!appAlreadyExists) {
         // download app and decompress

package/src/commands/serve.ts CHANGED Viewed

@@ -20,7 +20,6 @@ import * as archiver from "archiver"
 import * as mkdirp from "mkdirp"
 import { convert } from "html-to-text"
 import * as rimraf from "rimraf"
-import { v4 as uuidv4 } from "uuid"
 import SessionCommand from "../utils/SessionCommand"
 import { Bucket, Storage } from "@google-cloud/storage"
 import { downloadEditor, decompress } from "../managers/file"
@@ -44,7 +43,6 @@ import * as dotenv from "dotenv"
 // import { v4 as uuidv4 } from "uuid"
 import {
-  extractImagesFromMarkdown,
   getFilenameFromUrl,
   getReadmeExtension,
 } from "../utils/creatorUtilities"
@@ -52,11 +50,8 @@ import {
 import axios from "axios"
 import * as FormData from "form-data"
 import api, { RIGOBOT_HOST, RIGOBOT_REALTIME_HOST } from "../utils/api"
-import {
-  createUploadMiddleware,
-  minutesToISO8601Duration,
-} from "../utils/misc"
-import { buildConfig, ConfigResponse } from "../utils/configBuilder"
+import { createUploadMiddleware, minutesToISO8601Duration } from "../utils/misc"
+import { buildConfig } from "../utils/configBuilder"
 import { checkReadability, slugify } from "../utils/creatorUtilities"
 import { checkAndFixSidebarPure } from "../utils/sidebarGenerator"
 import { handleAssetCreation } from "./publish"
@@ -67,20 +62,6 @@ const frontMatter = require("front-matter")
 dotenv.config()
-// Asegúrate de tener uuid instalado
-// npm install uuid
-function findLast<T>(
-  array: T[],
-  predicate: (item: T) => boolean
-): T | undefined {
-  for (let i = array.length - 1; i >= 0; i--) {
-    if (predicate(array[i])) return array[i]
-  }
-  return undefined
-}
 export const createLearnJson = (courseInfo: FormState) => {
   // console.log("courseInfo to create learn json", courseInfo)
@@ -687,7 +668,6 @@ const fixPreviewUrl = (slug: string, previewUrl: string) => {
   }
   const expectedUrl = `https://${slug}.learn-pack.com/preview.png`
-  console.log("Preview url fixed!", expectedUrl)
   return expectedUrl
 }
@@ -713,13 +693,11 @@ export default class ServeCommand extends SessionCommand {
   async init() {
     const { flags } = this.parse(ServeCommand)
-    console.log("Initializing serve command")
   }
   async run() {
     const crendsEnv = process.env.GCP_CREDENTIALS_JSON
     if (!crendsEnv) {
-      console.log("GCP_CREDENTIALS_JSON is not set")
       process.exit(1)
     }
@@ -737,10 +715,12 @@ export default class ServeCommand extends SessionCommand {
     const host = process.env.HOST
     if (!host) {
-      console.log("HOST is not set")
+      console.log(
+        "ERROR: HOST is not set, please set the HOST environment variable"
+      )
       process.exit(1)
     } else {
-      console.log("HOST is set to", host)
+      console.log("INFO: HOST is set to", host)
     }
     // async function listFilesWithPrefix(prefix: string) {
@@ -807,7 +787,7 @@ export default class ServeCommand extends SessionCommand {
       })
       stream.on("finish", () => {
-        console.log(`✅ Uploaded to: ${file.name}`)
+        console.log(`INFO: Uploaded to: ${file.name}`)
         res.send("File uploaded successfully")
       })
@@ -817,7 +797,7 @@ export default class ServeCommand extends SessionCommand {
     const upload = createUploadMiddleware()
     app.post("/upload-image-file", upload.single("file"), async (req, res) => {
-      console.log("UPLOADING IMAGE FILE")
+      console.log("INFO: Uploading image file")
       const destination = (req.body as { destination?: string }).destination
@@ -842,7 +822,7 @@ export default class ServeCommand extends SessionCommand {
           contentType: req.file.mimetype,
         })
-        console.log(`✅ Image uploaded to ${file.name}`)
+        console.log(`INFO: Image uploaded to ${file.name}`)
         res.json({ message: "Image uploaded successfully", path: file.name })
       } catch (error) {
         console.error("❌ upload-image-file error:", error)
@@ -1075,9 +1055,7 @@ export default class ServeCommand extends SessionCommand {
                         fileObj.solution,
                         solutionFilePath
                       )
-                      console.log(
-                        `✅ Saved solution file: ${solutionFilePath}`
-                      )
+                      console.log(`✅ Saved solution file: ${solutionFilePath}`)
                     } else {
                       // If no extension, just add .solution.hide
                       const solutionFileName = `${fileObj.name}.solution.hide`
@@ -1088,9 +1066,7 @@ export default class ServeCommand extends SessionCommand {
                         fileObj.solution,
                         solutionFilePath
                       )
-                      console.log(
-                        `✅ Saved solution file: ${solutionFilePath}`
-                      )
+                      console.log(`✅ Saved solution file: ${solutionFilePath}`)
                     }
                   }
                 } catch (parseError) {
@@ -1976,10 +1952,6 @@ export default class ServeCommand extends SessionCommand {
       try {
         const { config, exercises } = await buildConfig(bucket, courseSlug)
-        console.log("CONFIG", config)
-        console.log("EXERCISES", exercises)
         res.set("X-Creator-Web", "true")
         res.set("Access-Control-Expose-Headers", "X-Creator-Web")
@@ -2221,11 +2193,11 @@ export default class ServeCommand extends SessionCommand {
             new_languages: neededLanguagesList.join(","),
           })
-          const translateTitle = JSON.parse(result.parsed.title)
-          const translateDescription = JSON.parse(result.parsed.description)
+          const translatedTitle = JSON.parse(result.parsed.title)
+          const translatedDescription = JSON.parse(result.parsed.description)
-          courseJson.title = translateTitle
-          courseJson.description = translateDescription
+          courseJson.title = translatedTitle
+          courseJson.description = translatedDescription
           await uploadFileToBucket(
             bucket,
@@ -2593,10 +2565,12 @@ export default class ServeCommand extends SessionCommand {
             .json({ error: "Authentication failed, missing tokens" })
         }
-        const { config, exercises }: ConfigResponse = await buildConfig(
-          bucket,
-          slug
+        const configFile = await bucket.file(
+          `courses/${slug}/.learn/config.json`
         )
+        const [configContent] = await configFile.download()
+        const configJson = JSON.parse(configContent.toString())
+        const { config, exercises } = configJson
         const prefix = `courses/${slug}/`
         const tmpRoot = path.join(os.tmpdir(), `learnpack-${slug}`)
@@ -2838,9 +2812,7 @@ export default class ServeCommand extends SessionCommand {
         })
       } catch (error: any) {
         console.error("❌ /actions/fetch error:", error.message || error)
-        res
-          .status(500)
-          .json({ error: error.message || "Failed to fetch link" })
+        res.status(500).json({ error: error.message || "Failed to fetch link" })
       }
     })
     app.delete("/packages/:slug", async (req, res) => {
@@ -2881,6 +2853,135 @@ export default class ServeCommand extends SessionCommand {
       }
     })
+    app.post("/actions/change-slug", async (req, res) => {
+      const { currentSlug, newSlug } = req.body
+      const rigoToken = req.header("x-rigo-token")
+      if (!rigoToken) {
+        return res.status(400).json({
+          error: "Rigo token is required. x-rigo-token header is missing",
+        })
+      }
+      if (!currentSlug || !newSlug) {
+        return res.status(400).json({
+          error: "Both currentSlug and newSlug are required",
+        })
+      }
+      if (currentSlug === newSlug) {
+        return res.status(200).json({
+          message: "Slug unchanged",
+          newSlug: currentSlug,
+        })
+      }
+      try {
+        // Check if new slug is available via RigoBot
+        const isAvailable = await isValidRigoToken(rigoToken)
+        if (!isAvailable) {
+          return res.status(401).json({ error: "Invalid Rigo token" })
+        }
+        // Check slug availability
+        const slugCheckUrl = `${RIGOBOT_HOST}/v1/learnpack/check-slug-availability?slug=${encodeURIComponent(
+          newSlug
+        )}`
+        const slugResponse = await axios.get(slugCheckUrl)
+        if (!slugResponse.data.available) {
+          return res.status(409).json({
+            error: "Slug is not available",
+            available: false,
+          })
+        }
+        // Get all files with current slug prefix
+        const currentPrefix = `courses/${currentSlug}/`
+        const [files] = await bucket.getFiles({ prefix: currentPrefix })
+        if (files.length === 0) {
+          return res.status(404).json({
+            error: "No files found for current slug",
+          })
+        }
+        // Copy all files to new slug location
+        const newPrefix = `courses/${newSlug}/`
+        for (const file of files) {
+          const newFileName = file.name.replace(currentPrefix, newPrefix)
+          // eslint-disable-next-line no-await-in-loop
+          await file.copy(newFileName)
+        }
+        // Update learn.json with new slug
+        const learnJsonFile = bucket.file(`${newPrefix}learn.json`)
+        const [learnJsonContent] = await learnJsonFile.download()
+        const learnJson = JSON.parse(learnJsonContent.toString())
+        learnJson.slug = newSlug
+        await uploadFileToBucket(
+          bucket,
+          JSON.stringify(learnJson),
+          `${newPrefix}learn.json`
+        )
+        // Update initialSyllabus.json with new slug
+        const syllabusFile = bucket.file(
+          `${newPrefix}.learn/initialSyllabus.json`
+        )
+        const [syllabusContent] = await syllabusFile.download()
+        const syllabus = JSON.parse(syllabusContent.toString())
+        syllabus.courseInfo.slug = newSlug
+        await uploadFileToBucket(
+          bucket,
+          JSON.stringify(syllabus),
+          `${newPrefix}.learn/initialSyllabus.json`
+        )
+        // Update config.json with new slug
+        const configFile = bucket.file(`${newPrefix}.learn/config.json`)
+        const [configContent] = await configFile.download()
+        const config = JSON.parse(configContent.toString())
+        config.config.slug = newSlug
+        await uploadFileToBucket(
+          bucket,
+          JSON.stringify(config),
+          `${newPrefix}.learn/config.json`
+        )
+        // Update Rigobot package slug
+        const updateUrl = `${RIGOBOT_HOST}/v1/learnpack/package/${currentSlug}/`
+        await axios.put(
+          updateUrl,
+          { new_slug: newSlug },
+          {
+            headers: {
+              Authorization: "Token " + rigoToken.trim(),
+            },
+          }
+        )
+        // Delete old files
+        await Promise.all(files.map(file => file.delete()))
+        console.log(
+          `✅ Successfully changed slug from ${currentSlug} to ${newSlug}`
+        )
+        return res.json({
+          message: "Slug changed successfully",
+          newSlug: newSlug,
+        })
+      } catch (error) {
+        console.error("❌ Error changing slug:", error)
+        return res.status(500).json({
+          error: "Failed to change slug",
+          details: (error as Error).message,
+        })
+      }
+    })
     app.get("/proxy", async (req, res) => {
       const { url } = req.query
@@ -3020,10 +3121,7 @@ export default class ServeCommand extends SessionCommand {
               !metadata.rights ||
               !metadata.lang
             ) {
-              console.log(
-                "Missing required metadata for EPUB export",
-                metadata
-              )
+              console.log("Missing required metadata for EPUB export", metadata)
               return res.status(400).json({
                 error: "Missing required metadata for EPUB export",
                 required: ["creator", "publisher", "title", "rights", "lang"],
@@ -3068,9 +3166,7 @@ export default class ServeCommand extends SessionCommand {
         })
       } catch (error: any) {
         console.error("Export error:", error)
-        res
-          .status(500)
-          .json({ error: "Export failed", details: error.message })
+        res.status(500).json({ error: "Export failed", details: error.message })
       }
     })

package/src/creator/src/App.tsx CHANGED Viewed

@@ -31,6 +31,7 @@ import NotificationListener from "./components/NotificationListener"
 import { slugify } from "./utils/creatorUtils"
 import TurnstileModal from "./components/TurnstileModal"
 import { TMessage } from "./components/Message"
+import LanguageDetectionModal from "./components/LanguageDetectionModal"
 function App() {
   const navigate = useNavigate()
@@ -72,6 +73,8 @@ function App() {
   const [notificationId, setNotificationId] = useState<string>("")
   const [showTurnstileModal, setShowTurnstileModal] = useState(false)
+  const [showLanguageDetectionModal, setShowLanguageDetectionModal] = useState(false)
+  const [detectedLanguage, setDetectedLanguage] = useState<string>("")
   useEffect(() => {
     if (formState.isCompleted) {
@@ -130,27 +133,45 @@ function App() {
     if (duration && !isNaN(parseInt(duration))) {
       if (["15", "30", "60"].includes(duration)) {
         const durationInt = parseInt(duration)
-        console.log("duration", durationInt)
         setFormState({
           duration: durationInt,
         })
       } else {
-        console.log("Invalid duration received in params", duration)
+        console.error("Invalid duration received in params", duration)
       }
     }
     if (plan) {
       setPlanToRedirect(plan)
     } else {
       console.debug("No plan received in params")
     }
+    // Language detection logic
+    let finalLanguage = language
-    if (language && language.length === 2) {
+    // Change if query param is provided
+    if (finalLanguage && finalLanguage.length === 2) {
+      console.log("LANGUAGE", finalLanguage)
       setFormState({
-        language: language,
+        language: finalLanguage,
       })
+      if (i18n.language !== finalLanguage) {
+        i18n.changeLanguage(finalLanguage)
+      }
     }
+    // If no language is provided, detect the language of the description
+    if (!finalLanguage && description) {
+      const detectedLang = detectLanguage(description)
+      if (detectedLang && detectedLang !== i18n.language) {
+        finalLanguage = detectedLang
+        setDetectedLanguage(detectedLang)
+        setShowLanguageDetectionModal(true)
+      }
+    }
     if (purpose && purpose.length > 0 && possiblePurposes.includes(purpose)) {
       setFormState({
         purpose: purpose,
@@ -233,8 +254,6 @@ function App() {
         formState.purpose || "learnpack-lesson-writer",
         tokenType === "rigo" ? false : true
       )
-      console.log("RES", res)
       setNotificationId(res.notificationId)
     } catch (error) {
       console.error(error, "ERROR CREATING TUTORIAL")
@@ -254,6 +273,18 @@ function App() {
     }
   }
+  const handleLanguageSwitch = () => {
+    setFormState({
+      language: detectedLanguage,
+    })
+    i18n.changeLanguage(detectedLanguage)
+    setShowLanguageDetectionModal(false)
+  }
+  const handleLanguageStay = () => {
+    setShowLanguageDetectionModal(false)
+  }
   const buildSteps = () => {
     const steps = [
       {
@@ -263,9 +294,11 @@ function App() {
         required: true,
         validator: (value: string) => {
           const lang = detectLanguage(value)
+          console.log("Description validator language detection:", { lang, currentLang: i18n.language, value })
-          if (lang) {
-            i18n.changeLanguage(lang)
+          if (lang && lang !== "en" && lang !== i18n.language) {
+            setDetectedLanguage(lang)
+            setShowLanguageDetectionModal(true)
           }
           return value.length > 0
@@ -451,6 +484,13 @@ function App() {
   return (
     <>
       <ParamsChecker />
+      {showLanguageDetectionModal && (
+        <LanguageDetectionModal
+          detectedLanguage={detectedLanguage}
+          onSwitch={handleLanguageSwitch}
+          onStay={handleLanguageStay}
+        />
+      )}
       {showTurnstileModal && (
         <TurnstileModal
           onClose={() => {
@@ -477,7 +517,6 @@ function App() {
           {notificationId && (
             <NotificationListener
               onNotification={(res) => {
-                console.log("Async response", res)
                 const lessons = res.parsed.listOfSteps.map((lesson: any) => {
                   return parseLesson(lesson, [])
                 })

package/src/creator/src/components/LanguageDetectionModal.tsx ADDED Viewed

@@ -0,0 +1,46 @@
+import { useTranslation } from "react-i18next"
+interface LanguageDetectionModalProps {
+  detectedLanguage: string
+  onSwitch: () => void
+  onStay: () => void
+}
+export default function LanguageDetectionModal({
+  detectedLanguage,
+  onSwitch,
+  onStay,
+}: LanguageDetectionModalProps) {
+  const { t, i18n } = useTranslation()
+  return (
+    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-1000">
+      <div className="bg-white p-6 rounded-xl shadow-md max-w-md w-full mx-4">
+        <h2 className="text-xl font-semibold text-center mb-4">
+          {t("languageDetection.title")}
+        </h2>
+        <p className="text-gray-600 text-center mb-6">
+          {t("languageDetection.message", {
+            language: t(`languageDetection.languages.${detectedLanguage.toLowerCase()}`)
+          })}
+        </p>
+        <div className="flex flex-col sm:flex-row gap-3">
+          <button
+            onClick={onSwitch}
+            className="flex-1 bg-blue-600 text-white py-2 px-4 rounded-md font-semibold hover:bg-blue-700 transition-colors"
+          >
+            {t("languageDetection.switchTo", {
+              language: t(`languageDetection.languages.${detectedLanguage.toLowerCase()}`)
+            })}
+          </button>
+          <button
+            onClick={onStay}
+            className="flex-1 bg-gray-200 text-gray-800 py-2 px-4 rounded-md font-semibold hover:bg-gray-300 transition-colors"
+          >
+            {t(`languageDetection.stayIn${i18n.language.toLowerCase()}`)}
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}