Configuration changes and version update

lerna.json

@@ -1,5 +1,5 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "useWorkspaces": true,
- "version": "0.0.0"
+ "version": "0.2.11"
 }

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@mollify/cli",
- "version": "0.0.1",
+ "version": "0.2.11",
  "description": "",
  "main": "bin/index.js",
  "bin": {
@@ -36,7 +36,7 @@
  "ts-node-dev": "^2.0.0"
  },
  "dependencies": {
- "@mollify/types": "^0.0.1",
+ "@mollify/types": "^0.2.11",
  "cli-progress": "^3.12.0",
  "commander": "^10.0.0",
  "enquirer": "^2.3.6",

packages/cli/src/actions/entity/create.ts

@@ -1,13 +1,14 @@
 import path from 'path';
 import fs from 'fs-extra';
-import { copyTemplate, slugger } from '../../utilities';
+import { copyTemplate } from '../../utilities';
 import { EntityBase } from '@mollify/types';
+import { createEntitySlug } from './slug/create';
 
 export async function createEntity(
  entityMeta: EntityBase,
  location = process.cwd()
 ) {
- const slug = slugger(entityMeta.title);
+ const slug = createEntitySlug(entityMeta.title);
 
  // Ensure type exists
  if (!entityMeta.type) {

packages/cli/src/actions/entity/index.ts

@@ -2,10 +2,12 @@ import { createEntity } from './create';
 import { moveEntity } from './move';
 import { removeEntity } from './remove';
 import { listEntities } from './list';
+import slug from './slug';
 
 export default {
  create: createEntity,
  move: moveEntity,
  remove: removeEntity,
- list: listEntities
+ list: listEntities,
+ slug
 };

packages/cli/src/utilities/slugger.ts → packages/cli/src/actions/entity/slug/create.ts

@@ -1,6 +1,6 @@
 import slugify from "slugify"
 
-export function slugger(input: string) {
+export function createEntitySlug(input: string) {
  return slugify(input, {
  replacement: '-', // replace spaces with replacement character, defaults to `-`
  remove: undefined, // remove characters that match regex, defaults to `undefined`

packages/cli/src/actions/entity/slug/get.ts

@@ -0,0 +1,17 @@
+import path from 'path';
+
+export function getEntitySlug(address: string): string {
+ const fullPath = path.resolve(address);
+ const pageFileName = '+page.md';
+
+ if (!fullPath.endsWith(pageFileName)) {
+ throw new Error(
+ `Entity file does not have the expected file name: ${fullPath} [${pageFileName}]`
+ );
+ }
+
+ const entityFolder = path.dirname(fullPath);
+ const slug = path.basename(entityFolder);
+
+ return slug;
+}

packages/cli/src/actions/entity/slug/index.ts

@@ -0,0 +1,7 @@
+import { createEntitySlug } from "./create";
+import { getEntitySlug } from "./get";
+
+export default {
+ create: createEntitySlug,
+ get: getEntitySlug
+}

packages/cli/src/actions/markdown/migrate.ts

@@ -5,9 +5,9 @@ import matter from 'gray-matter';
 import { prompt } from 'enquirer';
 import { EntityBase, EntityMeta, EntityType } from '@mollify/types';
 import { ENTITY_FILE } from '../../constants';
-import { slugger } from '../../utilities';
 import cliProgress from 'cli-progress';
 import { table, log, error } from 'console';
+import entity from '../entity';
 
 let cancelMigration = false; // create a flag
 
@@ -57,7 +57,7 @@ export async function migrateMarkdownFile(file: string) {
  try {
  const fileContent = await fs.readFile(file, 'utf8');
  const { data: existingFrontmatter, content } = matter(fileContent);
- let slug = slugger(path.parse(file).name);
+ let slug = entity.slug.create(path.parse(file).name);
  slug = slug === 'index' ? '' : slug;
 
  const userInput = await getUserInput(existingFrontmatter);

packages/cli/src/actions/symlink/ensure.ts

@@ -6,7 +6,7 @@ const [LMS] = PACKAGE_INVENTORY;
 
 export async function ensureSymlink(
  origin = path.join(process.cwd(), SYMLINK_DIR),
- destination = path.join(process.cwd(), 'node_modules', LMS, 'src/routes'),
+ destination = path.join(process.cwd(), 'node_modules', LMS, 'src/routes/content'),
 ) {
  try {
  log(`Ensuring symlink from ${origin} to ${destination}`)

packages/cli/src/commands/create/index.ts

@@ -30,13 +30,20 @@ const createCommand: yargs.CommandModule = {
  describe: 'Tags for the entity',
  type: 'array',
  default: [],
+ })
+ .option('force', {
+ alias: 'f',
+ describe: 'Force creation of the entity',
+ type: 'boolean',
+ default: false,
  }),
  handler: async (argv) => {
  const {
  location: locationInput,
  type: typeInput,
  title: titleInput,
  tags: tagsInput,
+ force: forceInput,
  } = argv;
 
  const entitySpec = await prompts.entity.define({
@@ -51,9 +58,11 @@ const createCommand: yargs.CommandModule = {
  tags: entitySpec.tags?.join(', '),
  });
 
- if (!(await prompts.consent())) {
- console.log('Aborting');
- process.exit(0);
+ if (!forceInput) {
+ if (!(await prompts.consent())) {
+ console.log('Aborting');
+ process.exit(0);
+ }
  }
 
  await entity.create(

packages/cli/src/utilities/index.ts

@@ -1,4 +1,3 @@
 export * from "./template";
 export * from "./countChildFiles";
-export * from "./slugger";
 export * from "./checkInstallation"

packages/docs/package.json

@@ -1,12 +1,15 @@
 {
  "name": "@mollify/docs",
- "version": "1.0.0",
+ "version": "0.2.11",
  "description": "",
  "main": "index.js",
+ "license": "GPL",
+ "publishConfig": {
+ "access": "public"
+ },
  "scripts": {
  "test": "echo \"Error: no test specified\" && exit 1"
  },
  "keywords": [],
- "author": "",
- "license": "GPL"
+ "author": ""
 }

packages/flow/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@mollify/flow",
- "version": "0.0.1",
+ "version": "0.2.11",
  "license": "GPL",
  "scripts": {
  "dev": "vite dev",
@@ -30,7 +30,7 @@
  "svelte": "^3.54.0"
  },
  "devDependencies": {
- "@mollify/types": "^0.0.1",
+ "@mollify/types": "^0.2.11",
  "@playwright/test": "^1.28.1",
  "@sveltejs/adapter-auto": "^2.0.0",
  "@sveltejs/kit": "^1.5.0",

packages/lms/.gitignore

@@ -8,3 +8,4 @@ node_modules
 !.env.example
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+/src/routes/content

packages/lms/package.json

@@ -1,7 +1,6 @@
 {
  "name": "@mollify/lms",
- "version": "0.0.1",
- "private": true,
+ "version": "0.2.11",
  "license": "GPL",
  "scripts": {
  "dev": "vite dev",
@@ -14,9 +13,13 @@
  "lint": "prettier --plugin-search-dir . --check . && eslint .",
  "format": "prettier --plugin-search-dir . --write ."
  },
- "devDependencies": {
- "@mollify/tts": "^0.0.1",
- "@mollify/types": "^0.0.1",
+ "type": "module",
+ "dependencies": {
+ "@floating-ui/dom": "^1.2.8",
+ "@mollify/cli": "^0.2.11",
+ "@mollify/molly": "^0.2.11",
+ "@mollify/tts": "^0.2.11",
+ "@mollify/types": "^0.2.11",
  "@playwright/test": "^1.28.1",
  "@skeletonlabs/skeleton": "^1.5.1",
  "@sveltejs/adapter-auto": "^2.0.0",
@@ -30,34 +33,27 @@
  "eslint": "^8.28.0",
  "eslint-config-prettier": "^8.5.0",
  "eslint-plugin-svelte3": "^4.0.0",
+ "fuse.js": "^6.6.2",
+ "graphql": "^16.6.0",
  "gray-matter": "^4.0.3",
+ "js-yaml": "^4.1.0",
  "mdsvex": "^0.10.6",
  "postcss": "^8.4.23",
  "postcss-load-config": "^4.0.1",
  "prettier": "^2.8.0",
  "prettier-plugin-svelte": "^2.8.1",
  "remark-emoji-callout": "^1.0.0",
+ "remark-gfm": "^3.0.1",
  "sass": "^1.62.0",
  "svelte": "^3.54.0",
  "svelte-check": "^3.0.1",
  "svelte-preprocess": "^5.0.3",
  "tailwindcss": "^3.3.1",
  "tslib": "^2.4.1",
  "typescript": "^5.0.0",
+ "unist-builder": "^3.0.1",
+ "unist-util-visit": "^4.1.2",
  "vite": "^4.2.0",
  "vitest": "^0.25.3"
- },
- "type": "module",
- "dependencies": {
- "@floating-ui/dom": "^1.2.8",
- "@mollify/cli": "^0.0.1",
- "@mollify/molly": "^0.0.1",
- "@mollify/tts": "^0.0.1",
- "fuse.js": "^6.6.2",
- "graphql": "^16.6.0",
- "js-yaml": "^4.1.0",
- "remark-gfm": "^3.0.1",
- "unist-builder": "^3.0.1",
- "unist-util-visit": "^4.1.2"
  }
 }

packages/lms/src/lib/components/cards/Card.svelte

@@ -1,12 +1,7 @@
 <script lang="ts">
- let resultType = {
- browserPath: typeof String,
- title: typeof String,
- type: typeof String,
- tags: [] as string[]
- };
+ import type { EntityMeta } from "@mollify/types";
 
- export let result: typeof resultType;
+ export let result: EntityMeta;
 </script>
 
 <a class="card p-4 variant-ghost-surface no-underline dark:text-slate-100" href={result.browserPath}>

packages/lms/src/lib/components/content/Main.svelte

@@ -2,8 +2,8 @@
  import ProgrammeNav from '../navigation/ProgrammeNav.svelte';
 </script>
 
-<main class="p-5 w-full">
- <div class="prose max-w-none sm:w-3/4" id="prose-container">
+<main class="p-5 w-full relative">
+ <div class="prose max-w-none" id="prose-container">
  <ProgrammeNav>
  <slot />
  </ProgrammeNav>

packages/lms/src/lib/components/footer/Footer.svelte

@@ -1,5 +1,5 @@
 <script lang="ts"></script>
 
-<footer class="flex gap-1">
+<footer class="flex gap-1 bg-surface-100-800-token">
  <slot />
 </footer>

packages/lms/src/lib/components/header/Logo.svelte

@@ -1 +1,31 @@
-<a href="/"><h1 class="h1 text-primary-500 hidden sm:block">M</h1></a>
+<a href="/"
+ ><svg
+ width="100%"
+ height="100%"
+ viewBox="0 0 52 88"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xml:space="preserve"
+ style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"
+ ><g transform="matrix(1,0,0,1,0,-6)"
+ ><path
+ d="M0,6L0,62L26,94L42.093,75.015L35.17,69.306L26,80L8.858,59L9,21L45,64L52,64L52,6L27,6L27,14L44,14L44,49L8,6L0,6Z"
+ style="fill:currentColor;fill-rule:nonzero;"
+ /></g
+ ></svg
+ ></a
+>
+
+<style>
+ a {
+ padding-right: 1rem;
+ width: 4rem;
+ display: flex;
+ justify-content: center;
+ }
+
+ svg {
+ max-width: 1.5rem;
+ }
+</style>

packages/lms/src/lib/components/header/Reader.svelte

@@ -77,7 +77,7 @@
  const userFeedback: ToastSettings = {
  message: 'Creating Audio File...',
  background: 'variant-filled-warning',
- autohide: false
+ autohide: true,
  };
  toastStore.trigger(userFeedback);
  }
@@ -91,14 +91,14 @@
  const userFeedback: ToastSettings = {
  message: data.error,
  background: 'variant-filled-error',
- autohide: false
+ autohide: true,
  };
  toastStore.trigger(userFeedback);
  } else {
  const userFeedback: ToastSettings = {
  message: 'Success! Audio file created.',
  background: 'variant-filled-success',
- autohide: false
+ autohide: true,
  };
  hasAudio = true;
  toastStore.trigger(userFeedback);
@@ -132,7 +132,7 @@
  >
  {/if}
  {#if !hasAudio && isContent}
- <button on:click={regenerateAudio}>Create Audio</button>
+ <button on:click={regenerateAudio} class="my-5 btn hover:bg-primary-hover-token p-1">Create Audio</button>
  {/if}
  <button on:click={playAudio} class="my-5 btn hover:bg-primary-hover-token p-1">Scream For Help!</button>
  <audio bind:this={scream}>
@@ -148,6 +148,13 @@
  </div>
  {/if}
  {#if audioSrc}
- <audio src={audioSrc} controls class="w-full h-full" />
+ <audio src={audioSrc} controls class="w-full" />
  {/if}
 </div>
+
+<style>
+ audio {
+ height: 1.8rem;
+ margin-right: 1rem;
+ }
+</style>