@live-change/frontend-template 0.1.5 → 0.8.2

package/Dockerfile

@@ -0,0 +1,52 @@
+FROM --platform=amd64 debian:buster
+
+# SYSTEM
+RUN echo no cache 3
+RUN apt-get -qq update
+RUN apt-get install -qq -y wget curl apt-utils git openssh-server locales gnupg2 make cmake gcc g++ unzip nano \
+    alpine-pico fish rsync
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment
+RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+RUN echo "LANG=en_US.UTF-8" > /etc/locale.conf
+RUN locale-gen en_US.UTF-8
+
+# NODE
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
+RUN apt-get install -y nodejs
+
+#NPM, PM2
+RUN npm install cross-env yarn -g
+
+# APP
+RUN mkdir -p /app
+WORKDIR /app
+COPY package-deps.json package.json
+RUN --mount=type=secret,id=npmrc,target=/root/.npmrc yarn install
+
+RUN mkdir -p /app/docker
+COPY docker/restore-backup-with-service.sh /app/docker/restore-backup-with-service.sh
+COPY docker/restore-backup.sh /app/docker/restore-backup.sh
+COPY /front front
+COPY /server server
+COPY package.json package.json
+
+ARG VERSION='unknown'
+
+ENV VERSION=$VERSION
+
+RUN echo "VERSION=$VERSION" >> /etc/environment
+
+RUN npm run build
+
+# START
+EXPOSE 8001
+EXPOSE 8007
+COPY docker/start-service.sh /start-service.sh
+COPY docker/app.initd.sh /etc/init.d/app
+
+#CMD /start-service.sh
+CMD node server/start.js ssrServer --withApi --withServices --updateServices --enableSessions --createDb

package/docker/app.initd.sh

@@ -0,0 +1,73 @@
+#!/bin/bash -e
+
+# Quick start-stop-daemon example, derived from Debian /etc/init.d/ssh
+
+NAME=app
+DIR=/app
+PIDFILE=/var/run/$NAME.pid
+DAEMON=/usr/bin/node
+DAEMON_ARGS="server/start.js server ssrServer --withApi --withServices --updateServices --enableSessions --createDb"
+STOP_SIGNAL=INT
+USER=root
+LOG=/var/log/$NAME.log
+
+export NODE_ENV=production
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+common_opts="--quiet --chuid $USER --pidfile $PIDFILE"
+
+do_start(){
+    start-stop-daemon --start $common_opts --chdir $DIR --make-pidfile --background --startas \
+        /bin/bash -- -c "exec $DAEMON $DAEMON_ARGS > $LOG 2>&1"
+}
+
+do_stop(){
+    opt=${@:-}
+    start-stop-daemon --stop $common_opts --signal $STOP_SIGNAL --oknodo $opt --remove-pidfile
+}
+
+do_status(){
+    start-stop-daemon --status $common_opts && exit_status=$? || exit_status=$?
+    echo asdf $exit_status
+    case "$exit_status" in
+        0)
+            echo "Program '$NAME' is running."
+            ;;
+        1)
+            echo "Program '$NAME' is not running and the pid file exists."
+            ;;
+        3)
+            echo "Program '$NAME' is not running."
+            ;;
+        4)
+            echo "Unable to determine program '$NAME' status."
+            ;;
+    esac
+}
+
+case "$1" in
+  status)
+        do_status
+        ;;
+  start)
+        echo -n "Starting daemon: "$NAME
+        do_start
+        echo "."
+        ;;
+  stop)
+        echo -n "Stopping daemon: "$NAME
+        do_stop
+        echo "."
+        ;;
+  restart)
+        echo -n "Restarting daemon: "$NAME
+        do_stop --retry 30
+        do_start
+        echo "."
+        ;;
+  *)
+        echo "Usage: "$1" {status|start|stop|restart}"
+        exit 1
+esac
+
+exit 0

package/docker/build-and-upload.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+DIR="$( dirname -- "$( readlink -f -- "$0"; )"; )"
+pushd "$DIR/.."
+
+  source ./docker/parse-args-and-config.sh
+
+  POD_NAME="${POD_NAME="$DEPLOYMENT-$PROJECT_NAME"}"
+  echo POD_NAME=$POD_NAME
+
+  echo Compiling
+
+  npm run build
+
+  echo Uploading
+
+  rsync -av --progress --stats --delete -e 'docker/k8s-rsync-helper.sh' \
+     front server package.json package-lock.json \
+     $POD_NAME:/app
+
+  echo Updating deps
+  kubectl exec $POD_NAME -- yarn install
+
+  echo Restarting
+
+  kubectl exec $POD_NAME -- /etc/init.d/app restart
+
+  echo Done
+
+popd

package/docker/build-docker-and-upload.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -e
+
+DIR="$( dirname -- "$( readlink -f -- "$0"; )"; )"
+
+pushd "$DIR/.."
+
+  source ./docker/parse-args-and-config.sh
+
+  echo "Building ${NAME}:${VERSION}-${DEPLOYMENT}"
+
+  set -ex
+
+  ./docker/onlyDependencies.js > package-deps.json
+
+  docker build \
+    -t ${NAME}:${VERSION}-${DEPLOYMENT}\
+    -t ${NAME}:${DEPLOYMENT}\
+    -t ${REPO}/${NAME}:${VERSION}-${DEPLOYMENT}\
+    -t ${REPO}/${NAME}:${DEPLOYMENT}\
+    --secret id=npmrc,src=$HOME/.npmrc\
+    --build-arg VERSION=${VERSION}-${DEPLOYMENT}\
+    --build-arg BASE_HREF=${BASE_HREF}\
+    .
+
+  docker push ${REPO}/${NAME}:${VERSION}-${DEPLOYMENT}
+  docker push ${REPO}/${NAME}:${DEPLOYMENT}
+
+  set +x
+
+  echo "Done building ${NAME}:${VERSION}-${DEPLOYMENT}"
+
+popd

package/docker/commit-new-version.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+DIR="$( dirname -- "$( readlink -f -- "$0"; )"; )"
+pushd "$DIR/.."
+
+  source ./scripts/parse-args-and-config.sh
+
+  set +ex
+
+  git commit -a
+  npm version patch
+  git push
+  ./docker/build-docker-and-upload.sh $DEPLOYMENT
+
+  set -e
+
+popd

package/docker/k8s-rsync-helper.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+pod=$1
+shift
+kubectl exec -i $pod -- "$@"

package/docker/onlyDependencies.js

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+const fs = require("fs/promises")
+
+;(async () => {
+
+  const packageData = JSON.parse(await fs.readFile(process.argv[2] || "package.json"))
+
+  const { dependencies, devDependencies } = packageData
+
+  console.log(JSON.stringify({
+    dependencies,
+    devDependencies
+  }, null, 2))
+
+})()

package/docker/parse-args-and-config.sh

@@ -0,0 +1,19 @@
+REPO=docker.chaosu.pl
+
+VERSION=`echo "console.log(require('./package.json').version)" | node`
+NAME=`echo "console.log(require('./package.json').name.split('/').pop())" | node`
+
+DEPLOYMENT=${1:-dev}
+echo "DEPLOYMENT=${DEPLOYMENT}"
+
+#BASE_HREF="https://$DEPLOYMENT.example.com/"
+
+#if [ "$DEPLOYMENT" == "master" ]; then
+  BASE_HREF='https://www.example.com/'
+#fi
+
+PROJECT_NAME=${NAME}
+
+if [ "$DEPLOYMENT" == "master" ]; then
+  echo ok
+fi

package/docker/restore-backup-with-service.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+BACKUP_PATH=${1:-../backup.tar.gz}
+
+DIR="$( dirname -- "$( readlink -f -- "$0"; )"; )"
+pushd "$DIR/.."
+
+  /etc/init.d/app stop
+  sleep 1
+  ./docker/restore-backup.sh $BACKUP_PATH
+  sleep 1
+  /etc/init.d/app start
+
+popd

package/docker/restore-backup.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+BACKUP_PATH=${1:-../backup.tar.gz}
+DB_NAME=${DB_NAME:-laszczewski-pl}
+
+DIR="$( dirname -- "$( readlink -f -- "$0"; )"; )"
+pushd "$DIR/.."
+
+  rm -rf backup
+  mkdir -p backup
+  pushd backup
+    tar -zxf $BACKUP_PATH
+    ../node_modules/.bin/lcdbc --serverUrl $DB_URL --verbose request database.deleteDatabase $DB_NAME
+    echo uploading data to database...
+    ../node_modules/.bin/lcdbc --serverUrl $DB_URL --verbose exec --targetDb $DB_NAME db.json
+    echo data uploaded
+    rm -rf ../storage/*
+    mv storage/* ../storage
+    echo backup restored
+  popd
+
+popd

package/docker/start-service.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+touch /var/log/app.log
+/etc/init.d/app start
+tail -f /var/log/app.log

package/docker/upload-backup-and-restore.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+POD_NAME=$1
+BACKUP_PATH=${2:-../backup.tar.gz}
+
+DIR="$( dirname -- "$( readlink -f -- "$0"; )"; )"
+pushd "$DIR/.."
+
+  kubectl cp $BACKUP_PATH $POD_NAME:/app/backup.tar.gz
+  kubectl exec -it $POD_NAME -- /app/docker/restore-backup-with-service.sh /app/backup.tar.gz
+
+popd

package/front/index.html

@@ -4,8 +4,10 @@
     <!--head-->
   </head>
   <body>
+    <!--body-tags-open-->
     <div id="app"><!--app-html--></div>
     <!--app-data-->
+    <!--body-tags-->
     <script type="module" src="/src/entry-client.js"></script>
   </body>
 </html>

package/front/locales/en.js

@@ -0,0 +1,36 @@
+import messages from "./en.json"
+export { messages }
+
+export const numberFormats ={
+  "ipi": {
+    "style": "currency",
+      "currency": "ipi",
+      "notation": "standard"
+  },
+  "btc": {
+    "style": "currency",
+    "currency": "btc",
+    "notation": "standard"
+  },
+  "usd": {
+    "style": "currency",
+      "currency": "USD",
+      "notation": "standard"
+  }
+}
+
+export const datetimeFormats = {
+  "short": {
+    "year": "numeric", "month": "short", "day": "numeric"
+  },
+  "shortTime": {
+    "dateStyle": "short", "timeStyle": "short", "hour12": false
+  },
+  "shortestTime": {
+    "month": "numeric", "day": "numeric", "hour": "numeric", "minute": "numeric", "hour12": false
+  },
+  "long": {
+    "year": "numeric", "month": "short", "day": "numeric",
+      "weekday": "short", "hour": "numeric", "minute": "numeric"
+  }
+}

package/front/locales/en.json

@@ -0,0 +1,7 @@
+{
+  "app": {
+    "updateAvailable": "Update available!",
+    "newVersions": "New version of wallet available!",
+    "reload": "Reload"
+  }
+}

package/front/src/App.vue

@@ -2,6 +2,7 @@
   <view-root>
     <template #navbar>
       <NavBar />
+      <UpdateBanner />
     </template>
   </view-root>
 </template>
@@ -10,16 +11,27 @@
   import 'primevue/resources/themes/saga-green/theme.css'
   import "@fortawesome/fontawesome-free/css/all.min.css"
 
-  import { ViewRoot, NavBar } from "@live-change/frontend-base"
+  import { ViewRoot, NavBar, UpdateBanner } from "@live-change/frontend-base"
 
-  import { useMeta } from 'vue-meta'
-  const { meta } = useMeta({
-    title: 'Title',
+  import { computed } from 'vue'
+  import { useHead } from '@vueuse/head'
+
+  import { useI18n } from 'vue-i18n'
+  const i18n = useI18n()
+
+  useHead(computed(() => ({
+    title: ENV_BRAND_NAME,
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport',
+        content: "user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1," +
+            " width=device-width, viewport-fit=cover" }
+    ],
     htmlAttrs: {
-      lang: 'en',
+      lang: i18n.locale.value,
       amp: true
-    }
-  })
+    },
+  })))
 
   import { watch } from 'vue'
   import { client as useClient, useApi } from '@live-change/vue3-ssr'
@@ -34,4 +46,10 @@
   api.validators.email = emailValidator
   api.validators.password = passwordValidator
 
+  import { defaultHighlightStyle } from "@codemirror/language"
+  import { StyleModule } from "style-mod"
+  if(typeof window != 'undefined') {
+    StyleModule.mount(window.document, defaultHighlightStyle.module)
+  }
+
 </script>

package/front/src/Index.vue

@@ -1,8 +1,15 @@
 <template>
-  <h1>Hello world!</h1>
+  <div>
+    <h1>Hello world!</h1>
+    <p>{{ currentTime }}</p>
+  </div>
 </template>
 
 <script setup>
+  import { currentTime } from "@live-change/frontend-base";
+  import { useTimestamp } from "@vueuse/core";
+
+  const now = useTimestamp({ interval: 500 })
 
 </script>
 

package/front/src/config.js

@@ -1,13 +1,25 @@
 import deepmerge from 'deepmerge';
 
-import contentEn from "../locales/en.json"
+import * as exchangeEn from "../locales/en.js"
 import { locales as autoFormLocales } from "@live-change/frontend-auto-form"
 
 export default {
-  i18nMessages: {
-    en: deepmerge.all([
-      contentEn,
-      autoFormLocales.en
-    ])
+  i18n: {
+    messages: {
+      en: deepmerge.all([
+        autoFormLocales.en,
+        exchangeEn.messages
+      ])
+    },
+    numberFormats: {
+      en: deepmerge.all([
+        exchangeEn.numberFormats
+      ])
+    },
+    datetimeFormats: {
+      en: deepmerge.all([
+        exchangeEn.datetimeFormats
+      ])
+    }
   }
 }

package/front/src/entry-client.js

@@ -3,4 +3,4 @@ import App from './App.vue'
 import { createRouter } from './router'
 import config from './config.js'
 
-clientEntry(App, createRouter)
+clientEntry(App, createRouter, config)

package/front/src/router.js

@@ -12,7 +12,7 @@ import { dbAdminRoutes } from "@live-change/db-admin"
 import { userRoutes } from "@live-change/user-frontend"
 import { catchAllPagesRoute, contentEditRoutes, pagesSitemap } from "@live-change/content-frontend"
 
-export function wysiwygRoutes(config = {}) {
+export function routes(config = {}) {
   const { prefix = '/', route = (r) => r } = config
   return [
     ...userRoutes({ ...config, prefix: prefix + 'user/' }),

package/front/vite.config.js

@@ -1,4 +1,7 @@
 import { defineConfig } from 'vite'
+import Pages from 'vite-plugin-pages'
+
+let version = process.env.VERSION ?? 'unknown'
 
 import baseViteConfig from '@live-change/frontend-base/vite-config.js'
 
@@ -7,11 +10,30 @@ export default defineConfig(async ({ command, mode }) => {
   return {
     ...baseConfig,
 
+    define: {
+      ...baseConfig.define,
+      ENV_VERSION: JSON.stringify(version),
+      ENV_BRAND_NAME: JSON.stringify("Example"),
+      ENV_BRAND_DOMAIN: JSON.stringify("example.com"),
+    },
+
+    plugins: [
+      ...baseConfig.plugins,
+      Pages({
+        dirs: [
+          // basic
+          { dir: 'src/pages', baseRoute: '' },
+          // blog
+          // { dir: 'src/blog', baseRoute: 'blog' },
+        ],
+        extensions: ['vue', 'md'],
+      }),
+    ],
+
     resolve: {
+      ...baseConfig.resolve,
       alias: [
         ...baseConfig.resolve.alias,
-/*        { find: 'vue', replacement: 'vue/dist/vue.esm-bundler.js' },
-        { find: 'vue/server-renderer', replacement: 'vue/server-renderer' },*/
       ]
     }
   }

package/package.json

@@ -1,86 +1,97 @@
 {
   "name": "@live-change/frontend-template",
-  "version": "0.1.5",
+  "version": "0.8.2",
   "scripts": {
-    "memDev": "lcli memDev --enableSessions --initScript ./init.js --dbAccess",
-    "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
-    "localDev": "lcli localDev --enableSessions",
-    "dev": "lcli dev --enableSessions",
-    "ssrDev": "lcli ssrDev --enableSessions",
-    "serveAllMem": "cross-env NODE_ENV=production lcli ssrServer --withApi --withServices --updateServices --enableSessions --withDb --dbBackend mem --createDb",
-    "serveAll": "cross-env NODE_ENV=production lcli ssrServer --withApi --withServices --updateServices --enableSessions",
-    "serve": "cross-env NODE_ENV=production lcli ssrServer --enableSessions",
-    "apiServer": "lcli apiServer --enableSessions",
-    "devApiServer": "lcli devApiServer --enableSessions",
-    "memApiServer": "lcli memApiServer --enableSessions",
+    "memDev": "node server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
+    "localDevInit": "rm tmp.db; node server/start.js localDev --enableSessions --initScript ./init.js",
+    "localDev": "node server/start.js localDev --enableSessions",
+    "dev": "node server/start.js dev --enableSessions",
+    "ssrDev": "node server/start.js ssrDev --enableSessions",
+    "serveAllMem": "cross-env NODE_ENV=production node server/start.js ssrServer --withApi --withServices --updateServices --enableSessions --withDb --dbBackend mem --createDb",
+    "serveAll": "cross-env NODE_ENV=production node server/start.js ssrServer --withApi --withServices --updateServices --enableSessions",
+    "serve": "cross-env NODE_ENV=production node server/start.js ssrServer --enableSessions",
+    "memDev:spa": "node server/start.js memDev --enableSessions --initScript ./init.js --dbAccess --spa",
+    "localDevInit:spa": "rm tmp.db; node server/start.js localDev --enableSessions --initScript ./init.js --spa",
+    "localDev:spa": "node server/start.js localDev --enableSessions --spa",
+    "dev:spa": "node server/start.js dev --enableSessions --spa",
+    "ssrDev:spa": "node server/start.js ssrDev --enableSessions --spa",
+    "serveAllMem:spa": "cross-env NODE_ENV=production node server/start.js server --withApi --withServices --updateServices --enableSessions --withDb --dbBackend mem --createDb --spa",
+    "serveAll:spa": "cross-env NODE_ENV=production node server/start.js server --withApi --withServices --updateServices --enableSessions --spa",
+    "serve:spa": "cross-env NODE_ENV=production node server/start.js server --enableSessions --spa",
+    "apiServer": "node server/start.js apiServer --enableSessions",
+    "devApiServer": "node server/start.js devApiServer --enableSessions",
+    "memApiServer": "node server/start.js memApiServer --enableSessions",
     "build": "cd front; yarn build:client && yarn build:server",
     "build:client": "cd front; vite build --ssrManifest --outDir dist/client",
     "build:server": "cd front; vite build --ssr src/entry-server.js --outDir dist/server",
+    "build:spa": "cd front; vite build --outDir dist/spa",
     "generate": "vite build --ssrManifest --outDir dist/static && yarn build:server && node prerender",
     "debug": "node --inspect-brk server"
   },
+  "type": "module",
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.1.1",
-    "@live-change/cli": "0.7.8",
-    "@live-change/framework": "0.7.8",
-    "@live-change/dao": "0.5.8",
-    "@live-change/dao-vue3": "0.5.8",
-    "@live-change/dao-websocket": "0.5.8",
-    "@live-change/vue3-components": "0.2.16",
-    "@live-change/vue3-ssr": "0.2.16",
-    "@live-change/email-service": "0.3.10",
-    "@live-change/access-control-service": "0.3.10",
-    "@live-change/password-authentication-service": "0.3.10",
-    "@live-change/secret-code-service": "0.3.10",
-    "@live-change/secret-link-service": "0.3.10",
-    "@live-change/session-service": "0.3.10",
-    "@live-change/user-service": "0.3.10",
-    "@live-change/user-identification-service": "0.3.10",
-    "@live-change/prosemirror-service": "0.3.10",
-    "@live-change/url-service": "0.3.10",
-    "@live-change/content-service": "0.3.10",
-    "@live-change/blog-service": "0.3.10",
-    "@live-change/frontend-base": "0.2.24",
-    "@live-change/frontend-auto-form": "0.2.24",
-    "@live-change/user-frontend": "0.2.24",
-    "@live-change/image-frontend": "0.2.24",
-    "@live-change/upload-frontend": "0.2.24",
-    "@live-change/access-control-frontend": "0.2.24",
-    "@live-change/wysiwyg-frontend": "0.2.24",
-    "@live-change/content-frontend": "0.2.24",
-    "@live-change/blog-frontend": "0.2.24",
-    "@live-change/url-frontend": "0.2.24",
-    "@live-change/frontend-utils": "^0.2.24",
-    "@vueuse/core": "^9.1.0",
+    "@codemirror/language": "6.10.1",
+    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@live-change/access-control-frontend": "0.4.5",
+    "@live-change/access-control-service": "^0.8.2",
+    "@live-change/backup-server": "0.4.4",
+    "@live-change/blog-frontend": "0.4.5",
+    "@live-change/blog-service": "^0.8.2",
+    "@live-change/cli": "^0.8.2",
+    "@live-change/content-frontend": "0.4.5",
+    "@live-change/content-service": "^0.8.2",
+    "@live-change/dao": "0.6.0",
+    "@live-change/dao-vue3": "^0.8.2",
+    "@live-change/dao-websocket": "^0.8.2",
+    "@live-change/db-client": "^0.8.2",
+    "@live-change/email-service": "^0.8.2",
+    "@live-change/framework": "^0.8.2",
+    "@live-change/frontend-auto-form": "0.4.5",
+    "@live-change/frontend-base": "0.4.5",
+    "@live-change/image-frontend": "0.4.5",
+    "@live-change/password-authentication-service": "^0.8.2",
+    "@live-change/prosemirror-service": "^0.8.2",
+    "@live-change/secret-code-service": "^0.8.2",
+    "@live-change/secret-link-service": "^0.8.2",
+    "@live-change/session-service": "^0.8.2",
+    "@live-change/upload-frontend": "0.4.5",
+    "@live-change/url-frontend": "0.4.5",
+    "@live-change/url-service": "^0.8.2",
+    "@live-change/user-frontend": "0.4.5",
+    "@live-change/user-identification-service": "^0.8.2",
+    "@live-change/user-service": "^0.8.2",
+    "@live-change/vue3-components": "^0.8.2",
+    "@live-change/vue3-ssr": "^0.8.2",
+    "@live-change/wysiwyg-frontend": "0.4.5",
+    "@vueuse/core": "^10.7.2",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.4",
     "cross-env": "^7.0.3",
     "get-port-sync": "1.0.1",
     "pica": "^9.0.1",
-    "pretty-bytes": "^6.0.0",
-    "primeflex": "^3.2.1",
-    "primeicons": "^5.0.0",
-    "primevue": "^3.15.0",
+    "pretty-bytes": "^6.1.1",
+    "primeflex": "^3.3.1",
+    "primeicons": "^6.0.1",
+    "primevue": "^3.48.1",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-visualizer": "5.6.0",
-    "serialize-javascript": "^6.0.0",
+    "rollup-plugin-visualizer": "5.12.0",
+    "serialize-javascript": "^6.0.2",
     "serve-static": "^1.15.0",
-    "v-shared-element": "3.1.0",
-    "vue-meta": "^3.0.0-alpha.9",
-    "vue-router": "^4.1.3",
-    "vue3-scroll-border": "0.1.2"
+    "v-shared-element": "3.1.1",
+    "vue-router": "^4.2.5",
+    "vue3-scroll-border": "0.1.6"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "0.7.8",
-    "@wdio/selenium-standalone-service": "^7.20.8",
-    "codeceptjs": "^3.3.4",
-    "generate-password": "1.7.0",
-    "playwright": "^1.24.2",
+    "@live-change/codeceptjs-helper": "^0.8.2",
+    "codeceptjs": "^3.5.12",
+    "generate-password": "1.7.1",
+    "playwright": "^1.41.2",
     "random-profile-generator": "^2.3.0",
-    "txtgen": "^3.0.2",
-    "webdriverio": "^7.20.9"
+    "txtgen": "^3.0.6",
+    "webdriverio": "^8.31.1"
   },
   "author": "",
   "license": "ISC",
-  "description": ""
+  "description": "",
+  "gitHead": "53b8efc8ec7f5c1c4af33077d8fb4a8a5580f1d9"
 }

package/server/{services.config.js → app.config.js}

@@ -1,69 +1,86 @@
+import App from "@live-change/framework"
+const app = App.app()
+
 const contactTypes = ['email']
 
-module.exports = {
+import securityConfig from './security.config.js'
+import documentTypePage from './page.documentType.js'
+
+app.config = {
   services: [
     {
       name: 'session',
-      path: '@live-change/session-service',
       createSessionOnUpdate: true
     },
     {
       name: 'user',
-      path: '@live-change/user-service'
     },
     {
       name: 'email',
-      path: '@live-change/email-service'
     },
     {
       name: 'passwordAuthentication',
-      path: '@live-change/password-authentication-service',
       contactTypes,
       signInWithoutPassword: true
     },
     {
       name: 'userIdentification',
-      path: '@live-change/user-identification-service'
     },
     {
       name: 'identicon',
-      path: '@live-change/identicon-service'
     },
     {
       name: 'accessControl',
-      path: '@live-change/access-control-service',
       createSessionOnUpdate: true,
       contactTypes,
     },
     {
       name: 'security',
-      path: '@live-change/security-service',
-      ...require('./security.config.js')
+      ...securityConfig,
     },
     {
       name: 'notification',
-      path: '@live-change/notification-service',
       contactTypes,
       notificationTypes: ['example_TestNotification']
     },
     {
       name: 'upload',
-      path: '@live-change/upload-service'
     },
     {
       name: 'image',
-      path: '@live-change/image-service'
     },
     {
       name: 'secretCode',
-      path: '@live-change/secret-code-service'
     },
     {
       name: 'secretLink',
-      path: '@live-change/secret-link-service'
-    }
-
-    /// TODO: add cms when ready
-
+    },
+    {
+      name: 'messageAuthentication',
+      contactTypes,
+      signUp: true,
+      signIn: true,
+      connect: true
+    },
+    {
+      name: 'url',
+    },
+    {
+      name: 'prosemirror',
+      documentTypes: {
+        page: documentTypePage,
+        /*rich: require('./rich.documentType.js'),*/
+      },
+      testLatency: 2000
+    },
+    {
+      name: 'content',
+    },
+    {
+      name: 'backup',
+      port: 8007
+    },
   ]
 }
+
+export default app.config

package/server/init.js

@@ -1,8 +1,8 @@
-const {createUser} = require("@live-change/user-frontend/server/init-functions.js");
-const App = require('@live-change/framework')
+import { createUser } from "@live-change/user-frontend/server/init-functions.js"
+import App from '@live-change/framework'
 const app = App.app()
 
-module.exports = async function(services) {
+export default async function(services) {
 
   const testUser = await createUser(services,
     'Test User', 'test@test.com', 'Testy123', 'u1', ['writer'])

package/server/page.documentType.js

@@ -0,0 +1,103 @@
+export default {
+  "marks": {
+    "bold": {},
+    "italic": {},
+    "underline": {},
+    "strike": {}
+  },
+  "nodes": {
+    "paragraph": {
+      "content": "inline*",
+      "group": "block"
+    },
+    "horizontalRule": {
+      "group": "block"
+    },
+    "heading": {
+      "content": "inline*",
+      "group": "block",
+      "defining": true,
+      "attrs": {
+        "level": {
+          "default": 1
+        }
+      }
+    },
+    "blockquote": {
+      "content": "block+",
+      "group": "block",
+      "defining": true
+    },
+    "codeBlock": {
+      "content": "text*",
+      "marks": "",
+      "group": "block",
+      "code": true,
+      "defining": true,
+      "attrs": {
+        "language": {
+          "default": null
+        }
+      }
+    },
+    "bulletList": {
+      "content": "listItem+",
+      "group": "block list"
+    },
+    "orderedList": {
+      "content": "listItem+",
+      "group": "block list",
+      "attrs": {
+        "start": {
+          "default": 1
+        }
+      }
+    },
+    "listItem": {
+      "content": "paragraph block*",
+      "defining": true
+    },
+    "image": {
+      "content": "",
+      "marks": "",
+      "group": "block",
+      "inline": false,
+      "atom": true,
+      "selectable": true,
+      "draggable": true,
+      "attrs": {
+        "image": {
+          "default": null
+        }
+      }
+    },
+    "doc": {
+      "content": "block+"
+    },
+    "text": {
+      "group": "inline"
+    },
+    "hardBreak": {
+      "group": "inline",
+      "inline": true,
+      "selectable": false
+    },
+    "component": {
+      "content": "block*",
+      "marks": "",
+      "group": "block",
+      "inline": false,
+      "selectable": true,
+      "draggable": true,
+      "attrs": {
+        "is": {
+          "default": "card"
+        },
+        "attrs": {
+          "default": {}
+        }
+      }
+    }
+  },
+  "topNode": "doc"
+}

package/server/security.config.js

@@ -1,4 +1,4 @@
-const lcp = require("@live-change/pattern")
+import lcp from "@live-change/pattern"
 
 const clientKeys = (client) => [
   { key: 'user', value: client.user },
@@ -46,7 +46,7 @@ const counters = [
   }
 ]
 
-module.exports = {
+export default {
   clientKeys,
   patterns,
   counters

package/server/services.list.js

@@ -0,0 +1,43 @@
+import session from '@live-change/session-service'
+import user from '@live-change/user-service'
+import email from '@live-change/email-service'
+import passwordAuthentication from '@live-change/password-authentication-service'
+import userIdentification from '@live-change/user-identification-service'
+import identicon from '@live-change/identicon-service'
+import accessControl from '@live-change/access-control-service'
+import acceessControl from '@live-change/access-control-service'
+import security from '@live-change/security-service'
+import notification from '@live-change/notification-service'
+import upload from '@live-change/upload-service'
+import image from '@live-change/image-service'
+import secretCode from '@live-change/secret-code-service'
+import secretLink from '@live-change/secret-link-service'
+import messageAuthentication from '@live-change/message-authentication-service'
+import url from '@live-change/url-service'
+import prosemirror from '@live-change/prosemirror-service'
+import content from '@live-change/content-service'
+import backup from '@live-change/backup-server'
+import init from './init.js'
+
+export {
+  session,
+  user,
+  email,
+  passwordAuthentication,
+  userIdentification,
+  identicon,
+  accessControl,
+  acceessControl,
+  security,
+  notification,
+  upload,
+  image,
+  secretCode,
+  secretLink,
+  messageAuthentication,
+  url,
+  prosemirror,
+  content,
+  backup,
+  init
+}

package/server/start.js

@@ -0,0 +1,11 @@
+import appConfig from './app.config.js'
+
+import * as services from './services.list.js'
+for(const serviceConfig of appConfig.services) {
+  serviceConfig.module = services[serviceConfig.name]
+}
+appConfig.init = services['init']
+
+import { starter } from '@live-change/cli'
+
+starter(appConfig)

package/locales/en.json

@@ -1,3 +0,0 @@
-{
-
-}