merge ig pub and our js pages

FHIR · Oct 3, 2024 · 694230e · 694230e
1 parent 939aec3
commit 694230e
Show file tree

Hide file tree

Showing 15 changed files with 208 additions and 106 deletions.
diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -73,6 +73,9 @@ menu:
   Overview: index.html
   View Definition: StructureDefinition-ViewDefinition.html
   Artifacts: artifacts.html
+  Playground: extra/playground.html
+  Tests: extra/tests.html
+  Implementations: extra/impls.html
   Contributing: contributing.html
 
 # ╭───────────────────────────Less Common Implementation Guide Properties──────────────────────────╮

diff --git a/test_report/public/implementations.json b/test_report/public/implementations.json
@@ -3,7 +3,7 @@
     "name": "Ref.Impl",
     "url": "https://github.com/FHIR/sql-on-fhir-v2",
     "description": "Official reference implementation in JavaScript",
-    "testResultsUrl": "https://fhir.github.io/sql-on-fhir-v2/test-results.json"
+    "testResultsUrl": "https://sql-on-fhir.org/extra/test-results.json"
   },
   {
     "name": "Aidbox",

diff --git a/test_report/public/impls.html b/test_report/public/impls.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+	      <meta charset='utf-8'>
+	      <meta name='viewport' content='width=device-width,initial-scale=1'>
+
+	      <title>SOF tests</title>
+
+	      <link rel='icon' type='image/png' href='favicon.png'>
+	      <link rel='stylesheet' href='global.css'>
+	      <link rel='stylesheet' href='build/bundle.css'>
+
+	      <script defer src='build/implsb.js'></script>
+    </head>
+
+    <body>
+    </body>
+</html>
diff --git a/test_report/public/playground.html b/test_report/public/playground.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+	      <meta charset='utf-8'>
+	      <meta name='viewport' content='width=device-width,initial-scale=1'>
+
+	      <title>SOF tests</title>
+
+	      <link rel='icon' type='image/png' href='favicon.png'>
+	      <link rel='stylesheet' href='global.css'>
+	      <link rel='stylesheet' href='build/bundle.css'>
+
+	      <script defer src='build/playgroundb.js'></script>
+    </head>
+
+    <body>
+    </body>
+</html>
diff --git a/test_report/public/tests.html b/test_report/public/tests.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+	      <meta charset='utf-8'>
+	      <meta name='viewport' content='width=device-width,initial-scale=1'>
+
+	      <title>SOF tests</title>
+
+	      <link rel='icon' type='image/png' href='favicon.png'>
+	      <link rel='stylesheet' href='global.css'>
+	      <link rel='stylesheet' href='build/bundle.css'>
+
+	      <script defer src='build/testsb.js'></script>
+    </head>
+
+    <body>
+    </body>
+</html>
diff --git a/test_report/rollup.config.js b/test_report/rollup.config.js
@@ -10,72 +10,98 @@ import sveltePreprocess from 'svelte-preprocess';
 const production = !process.env.ROLLUP_WATCH;
 
 function serve() {
-	let server;
+  let server;
 
-	function toExit() {
-		if (server) server.kill(0);
-	}
+  function toExit() {
+    if (server) server.kill(0);
+  }
 
-	return {
-		writeBundle() {
-			if (server) return;
-			server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
-				stdio: ['ignore', 'inherit', 'inherit'],
-				shell: true
-			});
+  return {
+    writeBundle() {
+      if (server) return;
+      server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+        stdio: ['ignore', 'inherit', 'inherit'],
+        shell: true
+      });
 
-			process.on('SIGTERM', toExit);
-			process.on('exit', toExit);
-		}
-	};
+      process.on('SIGTERM', toExit);
+      process.on('exit', toExit);
+    }
+  };
 }
 
-export default {
-	input: 'src/main.js',
-	output: {
-		sourcemap: true,
-		format: 'iife',
-		name: 'app',
-		file: 'public/build/bundle.js',
-    globals: {}
-	},
-	plugins: [
-	    json(),
-		svelte({
-			preprocess: sveltePreprocess({ postcss: true }),
-			compilerOptions: {
-				// enable run-time checks when not in production
-				dev: !production
-			}
-		}),
-		// we'll extract any component CSS out into
-		// a separate file - better for performance
-		css({ output: 'bundle.css' }),
+let plugins = [
+      json(),
+      svelte({
+        preprocess: sveltePreprocess({ postcss: true }),
+        compilerOptions: {
+          // enable run-time checks when not in production
+          dev: !production
+        }
+      }),
+      // we'll extract any component CSS out into
+      // a separate file - better for performance
+      css({ output: 'bundle.css' }),
 
-		// If you have external dependencies installed from
-		// npm, you'll most likely need these plugins. In
-		// some cases you'll need additional configuration -
-		// consult the documentation for details:
-		// https://github.com/rollup/plugins/tree/master/packages/commonjs
-		resolve({
-			browser: true,
-			dedupe: ['svelte']
-		}),
-		commonjs(),
+      // If you have external dependencies installed from
+      // npm, you'll most likely need these plugins. In
+      // some cases you'll need additional configuration -
+      // consult the documentation for details:
+      // https://github.com/rollup/plugins/tree/master/packages/commonjs
+      resolve({
+        browser: true,
+        dedupe: ['svelte']
+      }),
+      commonjs(),
 
-		// In dev mode, call `npm run start` once
-		// the bundle has been generated
-		!production && serve(),
+      // In dev mode, call `npm run start` once
+      // the bundle has been generated
+      !production && serve(),
 
-		// Watch the `public` directory and refresh the
-		// browser on changes when not in production
-		!production && livereload('public'),
+      // Watch the `public` directory and refresh the
+      // browser on changes when not in production
+      !production && livereload('public'),
 
-		// If we're building for production (npm run build
-		// instead of npm run dev), minify
-		production && terser()
-	],
-	watch: {
-		clearScreen: false
-	}
-};
+      // If we're building for production (npm run build
+      // instead of npm run dev), minify
+      production && terser()
+];
+
+export default [
+  {
+    input: 'src/implse.js',
+    output: {
+      sourcemap: true,
+      format: 'iife',
+      name: 'app',
+      file: 'public/build/implsb.js',
+      globals: {}
+    },
+    plugins: plugins,
+    watch: { clearScreen: false }
+  },
+  {
+    input: 'src/testse.js',
+    output: {
+      sourcemap: true,
+      format: 'iife',
+      name: 'app',
+      file: 'public/build/testsb.js',
+      globals: {}
+    },
+    plugins: plugins,
+    watch: { clearScreen: false }
+  },
+  {
+    input: 'src/playgrounde.js',
+    output: {
+      sourcemap: true,
+      format: 'iife',
+      name: 'app',
+      file: 'public/build/playgroundb.js',
+      globals: {}
+    },
+    plugins: plugins,
+    watch: { clearScreen: false }
+  }
+];
diff --git a/test_report/src/App.svelte b/test_report/src/App.svelte
diff --git a/test_report/src/ImplsApp.svelte b/test_report/src/ImplsApp.svelte
@@ -0,0 +1,9 @@
+<script>
+ import Nav  from './Nav.svelte';
+ import Impls  from './Impls.svelte';
+
+</script>
+
+<Nav/>
+<Impls/>
+
diff --git a/test_report/src/Nav.svelte b/test_report/src/Nav.svelte
@@ -0,0 +1,23 @@
+<script>
+ import Tailwindcss from './Tailwindcss.svelte';
+
+ let prefix = "/extra"
+
+ let items  = [
+     {title: "Overview", href: "/index.html"},
+     {title: "View Definition", href: "/StructureDefinition-ViewDefinition.html"},
+     {title: "Artifacts", href: "/artifacts.html"},
+     {title: "Playground", href: prefix + "/playground.html"},
+     {title: "Tests", href: prefix + "/tests.html"},
+     {title: "Implementations", href: prefix + "/impls.html"},
+     {title: "Contributing", href: "/contributing.html"}
+ ]
+
+</script>
+
+<Tailwindcss />
+<div class="flex space-x-4 px-4 py-1 border-b items-center text-white" style="background-color: #525ebb;">
+    {#each items as item}
+        <a href="{item.href}" class="px-2 hover:text-white hover:bg-gray-150">{item.title}</a>
+    {/each}
+</div>
diff --git a/test_report/src/PlaygroundApp.svelte b/test_report/src/PlaygroundApp.svelte
@@ -0,0 +1,8 @@
+<script>
+ import Nav  from './Nav.svelte';
+ import Playground  from './Playground.svelte';
+
+</script>
+
+<Nav/>
+<Playground/>
diff --git a/test_report/src/Tests.svelte b/test_report/src/Tests.svelte
@@ -1,8 +1,6 @@
 <script>
  import { onMount } from "svelte";
 
- export let name;
-
  export let menu = [];
  export let impls = [];
  export let current = {};

diff --git a/test_report/src/TestsApp.svelte b/test_report/src/TestsApp.svelte
@@ -0,0 +1,7 @@
+<script>
+ import Tests  from './Tests.svelte';
+ import Nav  from './Nav.svelte';
+</script>
+
+<Nav/>
+<Tests/>
diff --git a/test_report/src/main.js → test_report/src/implse.js b/test_report/src/main.js → test_report/src/implse.js
@@ -1,4 +1,4 @@
-import App from './App.svelte';
+import App from './ImplsApp.svelte';
 
 const app = new App({
 	target: document.body,

diff --git a/test_report/src/playgrounde.js b/test_report/src/playgrounde.js
@@ -0,0 +1,8 @@
+import App from './PlaygroundApp.svelte';
+
+const app = new App({
+	target: document.body,
+	props: {}
+});
+
+export default app;
diff --git a/test_report/src/testse.js b/test_report/src/testse.js
@@ -0,0 +1,8 @@
+import App from './TestsApp.svelte';
+
+const app = new App({
+	target: document.body,
+	props: {}
+});
+
+export default app;