@axium/server 0.28.1 → 0.28.3

package/dist/database.d.ts

@@ -487,7 +487,9 @@ export declare function getSchemaFiles(): Generator<[string, SchemaFile]>;
  */
 export declare function getFullSchema(opt?: {
     exclude?: string[];
-}): SchemaDecl;
+}): SchemaDecl & {
+    versions: Record<string, number>;
+};
 export declare const UpgradesInfo: z.ZodObject<{
     current: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodInt>>;
     upgrades: z.ZodDefault<z.ZodArray<z.ZodObject<{

package/dist/database.js

@@ -326,11 +326,13 @@ export function* getSchemaFiles() {
  * Get the active schema
  */
 export function getFullSchema(opt = {}) {
-    const fullSchema = { tables: {}, indexes: [] };
+    const fullSchema = { tables: {}, indexes: [], versions: {} };
     for (const [pluginName, file] of getSchemaFiles()) {
         if (opt.exclude?.includes(pluginName))
             continue;
+        file.latest ??= file.versions.length - 1;
         let currentSchema = { tables: {}, indexes: [] };
+        fullSchema.versions[pluginName] = file.latest;
         for (const [version, schema] of file.versions.entries()) {
             if (schema.delta)
                 applyDeltaToSchema(currentSchema, schema);

package/dist/main.js

@@ -55,7 +55,7 @@ import { apps } from '@axium/core';
 import { AuditFilter, severityNames } from '@axium/core/audit';
 import { formatDateRange } from '@axium/core/format';
 import { io, outputDaemonStatus, pluginText } from '@axium/core/node';
-import { _findPlugin, plugins } from '@axium/core/plugins';
+import { _findPlugin, plugins, runIntegrations } from '@axium/core/plugins';
 import { Argument, Option, program } from 'commander';
 import { access } from 'node:fs/promises';
 import { join, resolve } from 'node:path/posix';
@@ -80,7 +80,8 @@ async function rlConfirm(question = 'Is this ok') {
         io.exit('Aborted.');
 }
 async function dbInitTables() {
-    const schema = db.getFullSchema({ exclude: Object.keys(db.getUpgradeInfo().current) });
+    const info = db.getUpgradeInfo();
+    const schema = db.getFullSchema({ exclude: Object.keys(info.current) });
     const delta = db.computeDelta({ tables: {}, indexes: [] }, schema);
     if (db.deltaIsEmpty(delta))
         return;
@@ -88,6 +89,8 @@ async function dbInitTables() {
         console.log(text);
     await rlConfirm();
     await db.applyDelta(delta);
+    Object.assign(info.current, schema.versions);
+    db.setUpgradeInfo(info);
 }
 function configReplacer(opt) {
     return (key, value) => {
@@ -113,6 +116,7 @@ try {
     await config.loadDefaults(safe);
     if (configFromCLI)
         await config.load(configFromCLI, { safe });
+    await runIntegrations();
     program
         .version($pkg.version)
         .name('axium')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.28.1",
+	"version": "0.28.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",

package/routes/admin/+layout.svelte

@@ -6,9 +6,10 @@
 </script>
 
 <div id="admin-container">
-	<div class="sidebar">
+	<div id="admin-sidebar">
 		{#each data.tabs as { href, name, icon: i, active }}
-			<a {href} class={['item', 'icon-text', active && 'active']}><Icon {i} /> {capitalize(name)}</a>
+			<a {href} class={['item', 'icon-text', active && 'active']}><Icon {i} /> <span class="sidebar-text">{capitalize(name)}</span></a
+			>
 		{/each}
 	</div>
 
@@ -24,13 +25,16 @@
 		height: 100%;
 	}
 
-	.sidebar {
+	#admin-sidebar {
 		grid-column: 1;
 		width: 100%;
 		display: inline-flex;
 		flex-direction: column;
 		gap: 0.5em;
-		padding-left: 1em;
+		background-color: var(--bg-alt);
+		padding: 1em;
+		padding-left: 0;
+		border-radius: 0 1em 1em 0;
 	}
 
 	.item {
@@ -39,12 +43,12 @@
 	}
 
 	.item:hover {
-		background-color: var(--bg-accent);
+		background-color: var(--bg-strong);
 		cursor: pointer;
 	}
 
 	.item.active {
-		background-color: var(--bg-accent);
+		background-color: var(--bg-strong);
 	}
 
 	#admin-content {
@@ -53,4 +57,37 @@
 		overflow-x: hidden;
 		overflow-y: scroll;
 	}
+
+	@media (width < 700px) {
+		#admin-container {
+			grid-template-columns: 1fr;
+		}
+
+		#admin-content {
+			padding-bottom: 4em;
+		}
+
+		#admin-sidebar {
+			position: fixed;
+			grid-column: unset;
+			inset: auto 0 0;
+			border-radius: 1em;
+			display: flex;
+			flex-direction: row;
+			justify-content: space-around;
+			gap: 1em;
+			padding: 0.5em;
+		}
+
+		.sidebar-text {
+			display: none;
+		}
+
+		.item {
+			flex: 1 1 0;
+			border-radius: 1em;
+			padding: 1em;
+			justify-content: center;
+		}
+	}
 </style>

package/routes/admin/+page.svelte

@@ -10,7 +10,7 @@
 
 <h2>Administration</h2>
 
-<p>Axium Server version {data.version}</p>
+<p>Axium Server <span class="version">{data.version}</span></p>
 
 <h3><a href="/admin/users">Users</a></h3>
 

package/routes/admin/plugins/+page.svelte

@@ -9,44 +9,41 @@
 <h2>Plugins</h2>
 
 {#each data.plugins as plugin}
-	<h3>{plugin.name}<span class="version">{plugin.version}</span></h3>
-	<p>
-		<strong>Loaded from</strong>
-		{#if plugin.path.endsWith('/package.json')}
-			<span class="path plugin-path">{plugin.path.slice(0, -13)}</span>
-		{:else}
-			<span class="path">{plugin.path}</span>
-		{/if}
-		{#if plugin._loadedBy}
-			by
-			<a class="path" href="/admin/config#{plugin._loadedBy}">{plugin._loadedBy}</a>
-		{/if}
-	</p>
-	<p><strong>Author:</strong> {plugin.author}</p>
-	<p class="apps">
-		<strong>Provided apps:</strong>
-		{#if plugin.apps?.length}
-			{#each plugin.apps as app, i}
-				<a href="/{app.id}">{app.name}</a>{i != plugin.apps.length - 1 ? ', ' : ''}
-			{/each}
-		{:else}<i>None</i>{/if}
-	</p>
-	<p>{plugin.description}</p>
+	<div class="plugin">
+		<h3>{plugin.name}<span class="version">{plugin.version}</span></h3>
+		<p>
+			<strong>Loaded from</strong>
+			{#if plugin.path.endsWith('/package.json')}
+				<span class="path plugin-path">{plugin.path.slice(0, -13)}</span>
+			{:else}
+				<span class="path">{plugin.path}</span>
+			{/if}
+			{#if plugin._loadedBy}
+				by
+				<a class="path" href="/admin/config#{plugin._loadedBy}">{plugin._loadedBy}</a>
+			{/if}
+		</p>
+		<p><strong>Author:</strong> {plugin.author}</p>
+		<p class="apps">
+			<strong>Provided apps:</strong>
+			{#if plugin.apps?.length}
+				{#each plugin.apps as app, i}
+					<a href="/{app.id}">{app.name}</a>{i != plugin.apps.length - 1 ? ', ' : ''}
+				{/each}
+			{:else}<i>None</i>{/if}
+		</p>
+		<p>{plugin.description}</p>
+	</div>
 {:else}
 	<i>No plugins loaded.</i>
 {/each}
 
 <style>
-	.version {
-		font-family: monospace;
-		font-size: 0.9em;
-		color: #aaa;
-		margin-left: 1em;
-	}
-
-	.version::before {
-		content: 'v';
-		color: #888;
+	.plugin {
+		border-radius: 1em;
+		padding: 1em;
+		background-color: var(--bg-menu);
+		margin-bottom: 1em;
 	}
 
 	.path {