@learnpack/learnpack 5.0.29 → 5.0.31

package/src/commands/breakToken.ts

@@ -1,36 +1,36 @@
-import { flags } from "@oclif/command"
-import BaseCommand from "../utils/BaseCommand"
-// eslint-disable-next-line
-import * as fs from "fs-extra"
-import Console from "../utils/console"
-
-import SessionManager from "../managers/session"
-import { createFileOnDesktop, getContentIndex } from "../utils/creatorUtilities"
-
-class BreakTokenCommand extends BaseCommand {
-  static description = "Break the token"
-
-  static flags = {
-    ...BaseCommand.flags,
-    grading: flags.help({ char: "h" }),
-  }
-
-  async run() {
-    const { flags } = this.parse(BreakTokenCommand)
-
-    // await SessionManager.breakToken()
-    await createFileOnDesktop()
-    Console.info(
-      "File created on desktop, please make the necessary changes and continue when ready"
-    )
-
-    // Wait for user to press enter
-    process.stdin.once("data", () => {
-      Console.info("File content:")
-      Console.info(getContentIndex())
-      process.exit(0)
-    })
-  }
-}
-
-export default BreakTokenCommand
+import { flags } from "@oclif/command"
+import BaseCommand from "../utils/BaseCommand"
+// eslint-disable-next-line
+import * as fs from "fs-extra"
+import Console from "../utils/console"
+
+import SessionManager from "../managers/session"
+import { createFileOnDesktop, getContentIndex } from "../utils/creatorUtilities"
+
+class BreakTokenCommand extends BaseCommand {
+  static description = "Break the token"
+
+  static flags = {
+    ...BaseCommand.flags,
+    grading: flags.help({ char: "h" }),
+  }
+
+  async run() {
+    const { flags } = this.parse(BreakTokenCommand)
+
+    // await SessionManager.breakToken()
+    await createFileOnDesktop()
+    Console.info(
+      "File created on desktop, please make the necessary changes and continue when ready"
+    )
+
+    // Wait for user to press enter
+    process.stdin.once("data", () => {
+      Console.info("File content:")
+      Console.info(getContentIndex())
+      process.exit(0)
+    })
+  }
+}
+
+export default BreakTokenCommand

package/src/commands/init.ts

@@ -20,6 +20,7 @@ import {
   readmeCreator,
   createPreviewReadme,
   reduceReadme,
+  isValidRigoToken,
 } from "../utils/rigoActions"
 import { getConsumable } from "../utils/api"
 import {
@@ -41,6 +42,17 @@ const durationByKind: Record<string, number> = {
   read: 1,
 }
 
+const whichTargetAudience = async () => {
+  const res = await prompts([
+    {
+      type: "text",
+      name: "targetAudience",
+      message: "What is the target audience for this tutorial?",
+    },
+  ])
+  return res.targetAudience
+}
+
 const initializeInteractiveCreation = async (
   rigoToken: string,
   courseInfo: string
@@ -151,11 +163,19 @@ const handleAILogic = async (tutorialDir: string, packageInfo: PackageInfo) => {
 
   let sessionPayload = await SessionManager.getPayload()
 
-  if (
-    !sessionPayload ||
-    !sessionPayload.rigobot ||
-    (sessionPayload.token && !(await api.validateToken(sessionPayload.token)))
-  ) {
+  const sessionExists = sessionPayload && sessionPayload.rigobot
+
+  const isValidToken =
+    sessionExists && sessionPayload.rigobot.key ?
+      await isValidRigoToken(sessionPayload.rigobot.key) :
+      false
+
+  const isValidBreathecodeToken =
+    sessionExists && sessionPayload.token ?
+      await api.validateToken(sessionPayload.token) :
+      false
+
+  if (!sessionExists || !isValidBreathecodeToken || !isValidToken) {
     Console.info(
       "Almost there! First you need to login with 4Geeks.com to use AI Generation tool for creators. You can create a new account here: https://4geeks.com/creators"
     )
@@ -188,16 +208,22 @@ const handleAILogic = async (tutorialDir: string, packageInfo: PackageInfo) => {
 
   Console.success("🎉 Let's begin this learning journey!")
 
+  const targetAudience = await whichTargetAudience()
   const contentIndex = await appendContentIndex()
 
   let packageContext = `
   \n
-  Title: ${packageInfo.title.us}
-  Description: ${packageInfo.description.us}
+  Title: "${packageInfo.title.us}"
+  Description: "${packageInfo.description.us}"
+  Target Audience: "${targetAudience}"
 
   ${
     contentIndex ?
-      `Content Index submitted by the user, use this to guide your creation: ${contentIndex}` :
+      `Content Index submitted by the user, use this to guide your creation. Keep in mind that your tutorial should contain these topics: 
+      ---
+      ${contentIndex}
+      ---
+      ` :
       ""
   }
 
@@ -211,9 +237,9 @@ const handleAILogic = async (tutorialDir: string, packageInfo: PackageInfo) => {
   packageInfo.difficulty = difficulty
 
   packageContext = `
-  Title: ${title}
-  Description: ${description}
-
+  Title: "${title}"
+  Description: "${description}"
+  Target Audience: "${targetAudience}"
   List of exercises: ${steps.join(", ")}
   `
   const exercisesDir = path.join(tutorialDir, "exercises")
@@ -344,16 +370,21 @@ const getChoices = async (empty: boolean) => {
     {
       type: "select",
       name: "grading",
-      message: "Is the auto-grading going to be isolated or incremental?",
+      message: "How are you going to grade students or yourself?",
       choices: [
         {
-          title: "Incremental: Build on top of each other like a tutorial",
-          value: "incremental",
+          title:
+            "No grading: No feedback or testing whatsoever, similar to a an interactive book.",
+          value: null,
         },
-        { title: "Isolated: Small separated exercises", value: "isolated" },
         {
-          title: "No grading: No feedback or testing whatsoever",
-          value: null,
+          title: "Isolated: Each step is a new separate exercise",
+          value: "isolated",
+        },
+        {
+          title:
+            "Step by step: Each step builds on top of each other like an incremental tutorial",
+          value: "incremental",
         },
       ],
     },

package/src/commands/logout.ts

@@ -1,43 +1,38 @@
-// import  {Command, flags} from '@oclif/command'
-// import { prompt } from "enquirer"
-// import fetch from 'node-fetch'
-import SessionCommand from "../utils/SessionCommand"
-import SessionManager from "../managers/session"
-// import Console from '../utils/console'
-// import { replace } from 'node-emoji'
-// import { validURL } from "../utils/validators"
-// const BaseCommand from '../utils/BaseCommand');
-
-class LogoutCommand extends SessionCommand {
-  static description = `Describe the command here
-  ...
-  Extra documentation goes here
-  `
-
-  static flags: any = {
-    // name: flags.string({char: 'n', description: 'name to print'}),
-  }
-
-  static args = [
-    {
-      name: "package", // name of arg to show in help and reference with args[name]
-      required: false, // make the arg required with `required: true`
-      description:
-        "The unique string that identifies this package on learnpack", // help description
-      hidden: false, // hide this arg from help
-    },
-  ]
-
-  async init() {
-    const { flags } = this.parse(LogoutCommand)
-    await this.initSession(flags)
-  }
-
-  async run() {
-    // const {flags, args} = this.parse(LogoutCommand)
-
-    SessionManager.destroy()
-  }
-}
-
-export default LogoutCommand
+import SessionCommand from "../utils/SessionCommand"
+import SessionManager from "../managers/session"
+import Console from "../utils/console"
+
+class LogoutCommand extends SessionCommand {
+  static description = `Describe the command here
+  ...
+  Extra documentation goes here
+  `
+
+  static flags: any = {
+    // name: flags.string({char: 'n', description: 'name to print'}),
+  }
+
+  static args = [
+    {
+      name: "package", // name of arg to show in help and reference with args[name]
+      required: false, // make the arg required with `required: true`
+      description:
+        "The unique string that identifies this package on learnpack", // help description
+      hidden: false, // hide this arg from help
+    },
+  ]
+
+  async init() {
+    const { flags } = this.parse(LogoutCommand)
+    // await this.initSession(flags)
+    Console.debug("Logout command")
+  }
+
+  async run() {
+    // const {flags, args} = this.parse(LogoutCommand)
+
+    SessionManager.destroy()
+  }
+}
+
+export default LogoutCommand