@nymphjs/tilmeld-setup 1.0.0-beta.2 → 1.0.0-beta.20

package/CHANGELOG.md

@@ -3,6 +3,95 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.20](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.19...v1.0.0-beta.20) (2023-04-30)
+
+### Features
+
+- let the user revoke all current auth tokens ([63af3b9](https://github.com/sciactive/nymphjs/commit/63af3b9a31c6c221ab40c2c8a69231675f4634a2))
+
+# [1.0.0-beta.19](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.18...v1.0.0-beta.19) (2023-04-29)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.18](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.17...v1.0.0-beta.18) (2023-04-27)
+
+### Bug Fixes
+
+- small type issues ([b91579c](https://github.com/sciactive/nymphjs/commit/b91579c9c1e96500d903332648f5a93c9a7e7d9b))
+
+### Features
+
+- add enforceTilmeld function ([130faf1](https://github.com/sciactive/nymphjs/commit/130faf151dcdfbfacd6814833868907dca037d24))
+- add the ability to switch to a user without their password ([ca4466a](https://github.com/sciactive/nymphjs/commit/ca4466af1704d68905ac087350a8cf151c1072d9))
+
+# [1.0.0-beta.17](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.16...v1.0.0-beta.17) (2023-04-24)
+
+### Features
+
+- add spa router to user admin app ([25bb344](https://github.com/sciactive/nymphjs/commit/25bb344f4d358eeb2254df98782f1cba229b5f50))
+
+# [1.0.0-beta.16](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.15...v1.0.0-beta.16) (2023-03-31)
+
+### Features
+
+- add ability to tell tilmeld to log in a specific user during authentication ([922e145](https://github.com/sciactive/nymphjs/commit/922e1452adae44bed2aa9655be16e19796acb39b))
+
+# [1.0.0-beta.15](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.14...v1.0.0-beta.15) (2023-03-23)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.14](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.13...v1.0.0-beta.14) (2023-03-17)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.13](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.12...v1.0.0-beta.13) (2023-03-16)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.12](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.11...v1.0.0-beta.12) (2023-03-04)
+
+### Bug Fixes
+
+- make sure all default exports are also named exports ([06da9a6](https://github.com/sciactive/nymphjs/commit/06da9a61d444860f70b7f5b95b824547d9880500))
+
+# [1.0.0-beta.11](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.10...v1.0.0-beta.11) (2023-02-27)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.10](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.9...v1.0.0-beta.10) (2023-01-19)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.9](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.8...v1.0.0-beta.9) (2023-01-09)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.8](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2023-01-09)
+
+### Features
+
+- make entities in nymph client instance specific too ([1029f06](https://github.com/sciactive/nymphjs/commit/1029f061a1ad193e4a8a2dab0186b9a4b517f646))
+
+# [1.0.0-beta.7](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2023-01-05)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.6](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.5...v1.0.0-beta.6) (2023-01-05)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.5](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2022-11-24)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.4](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2022-11-23)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.3](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2022-11-21)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
 # [1.0.0-beta.2](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2022-11-21)
 
 **Note:** Version bump only for package @nymphjs/tilmeld-setup

package/README.md

@@ -53,7 +53,8 @@ const app = express();
 
 // Use the REST server.
 app.use('/rest', createServer(nymph));
-// Use the Tilmeld Setup App, passing in the Nymph Client Config.
+
+// Create Tilmeld setup app.
 app.use(
   '/user',
   setup(

package/app/src/App.svelte

@@ -33,16 +33,6 @@
           <path fill="currentColor" d={mdiMastodon} />
         </Icon>
       </IconButton>
-      <IconButton
-        href="https://twitter.com/SciActive"
-        target="_blank"
-        rel="noreferrer"
-        title="SciActive on Twitter"
-      >
-        <Icon component={Svg} viewBox="0 0 24 24">
-          <path fill="currentColor" d={mdiTwitter} />
-        </Icon>
-      </IconButton>
       <div>
         <IconButton
           title="Account"
@@ -74,7 +64,7 @@
       : 'hide-initial-small'}"
   >
     <Content>
-      <List>
+      <List tag="div">
         {#if tilmeldAdmin}
           {#each sections as section (section.name)}
             {#if 'separator' in section}
@@ -82,13 +72,12 @@
             {:else}
               <Item
                 bind:this={section.component}
-                nonInteractive={!('route' in section)}
-                on:click={() => {
-                  if ('route' in section) {
-                    active = section.route ?? Intro;
-                  }
-                }}
-                activated={active === section.route}
+                tag="a"
+                nonInteractive={!('href' in section)}
+                href={'href' in section ? `#${section.href}` : undefined}
+                activated={section.absolute
+                  ? $location === section.href
+                  : $location.startsWith(section.href ?? '!')}
                 style={section.indent
                   ? 'margin-left: ' + section.indent * 25 + 'px;'
                   : ''}
@@ -98,11 +87,11 @@
             {/if}
           {/each}
         {:else if user == null}
-          <Item on:click={() => (drawerOpen = false)} activated>
+          <Item tag="span" on:click={() => (drawerOpen = false)} activated>
             <Text class="mdc-theme--on-secondary">Login</Text>
           </Item>
         {:else}
-          <Item on:click={() => (drawerOpen = false)} activated>
+          <Item tag="span" on:click={() => (drawerOpen = false)} activated>
             <Text class="mdc-theme--on-secondary">Forbidden</Text>
           </Item>
         {/if}
@@ -117,13 +106,17 @@
     <main class="tilmeld-main-content" bind:this={mainContent}>
       {#if tilmeldAdmin}
         {#if clientConfig}
-          <svelte:component this={active} />
+          <Router {routes} />
         {:else}
           Loading...
         {/if}
       {:else if user == null}
         <section style="display: flex; justify-content: center;">
-          <Login {User} {clientConfig} />
+          <Login
+            {User}
+            {clientConfig}
+            showExistingUserToggle={allowRegistration}
+          />
         </section>
       {:else}
         <section>You don't have permission to access this app.</section>
@@ -135,10 +128,14 @@
 
 <script lang="ts">
   import { onMount, SvelteComponent } from 'svelte';
-  import type { ClientConfig, CurrentUserData } from '@nymphjs/tilmeld-client';
-  import { User } from '@nymphjs/tilmeld-client';
+  import Router, { location } from 'svelte-spa-router';
+  import type {
+    User as UserClass,
+    ClientConfig,
+    CurrentUserData,
+  } from '@nymphjs/tilmeld-client';
   import { Login, Account } from '@nymphjs/tilmeld-components';
-  import { mdiGithub, mdiMastodon, mdiTwitter } from '@mdi/js';
+  import { mdiGithub, mdiMastodon } from '@mdi/js';
   import TopAppBar, { Row, Section, Title } from '@smui/top-app-bar';
   import Drawer, { Content, Scrim, AppContent } from '@smui/drawer';
   import IconButton from '@smui/icon-button';
@@ -146,28 +143,33 @@
   import Menu from '@smui/menu';
   import { Icon, Svg } from '@smui/common';
 
-  import Intro from './Intro.svelte';
-  import Users from './Users.svelte';
-  import Groups from './Groups.svelte';
-  import type { SvelteComponentDev } from 'svelte/internal';
+  import { User } from './nymph';
+  import Intro from './routes/Intro.svelte';
+  import Users from './routes/Users.svelte';
+  import UserEdit from './routes/UserEdit.svelte';
+  import Groups from './routes/Groups.svelte';
+  import GroupEdit from './routes/GroupEdit.svelte';
+  import NotFound from './routes/NotFound.svelte';
 
   const DEFAULT_AVATAR = 'https://secure.gravatar.com/avatar/?d=mm&s=40';
+  const allowRegistration = (window as any).allowRegistration;
 
   let mainContent: HTMLElement;
   let miniWindow = false;
   let drawerOpen = false;
   let accountMenu: any;
-  let active: typeof SvelteComponentDev = Intro;
   let clientConfig: ClientConfig;
-  let user: (User & CurrentUserData) | undefined = undefined;
+  let user: (UserClass & CurrentUserData) | undefined = undefined;
   let userAvatar: string = DEFAULT_AVATAR;
   let tilmeldAdmin: boolean | undefined = undefined;
   let accountOpen = false;
 
-  $: if (active && mainContent) {
-    drawerOpen = false;
-    mainContent.scrollTop = 0;
-  }
+  location.subscribe(() => {
+    if (mainContent) {
+      drawerOpen = false;
+      mainContent.scrollTop = 0;
+    }
+  });
 
   $: if (user) {
     user.$gatekeeper('tilmeld/admin').then((value) => (tilmeldAdmin = value));
@@ -177,18 +179,29 @@
     userAvatar = DEFAULT_AVATAR;
   }
 
+  const routes = {
+    '/': Intro,
+    '/users/edit/:guid': UserEdit,
+    '/users/:query?': Users,
+    '/groups/edit/:guid': GroupEdit,
+    '/groups/:query?': Groups,
+    '*': NotFound,
+  };
+
   const sections: (
     | {
         name: string;
         indent: number;
-        route?: typeof SvelteComponentDev;
+        href?: string;
+        absolute?: boolean;
         component?: SvelteComponent;
       }
     | { name: string; separator: true }
   )[] = [
     {
       name: 'Introduction',
-      route: Intro,
+      href: '/',
+      absolute: true,
       indent: 0,
     },
     {
@@ -197,17 +210,17 @@
     },
     {
       name: 'Users',
-      route: Users,
+      href: '/users/',
       indent: 0,
     },
     {
       name: 'Groups',
-      route: Groups,
+      href: '/groups/',
       indent: 0,
     },
   ];
 
-  const onLogin = (currentUser: User & CurrentUserData) => {
+  const onLogin = (currentUser: UserClass & CurrentUserData) => {
     user = currentUser;
   };
   const onLogout = () => {

package/app/{nymph.ts → src/nymph.ts}

@@ -1,17 +1,21 @@
 import type { NymphOptions } from '@nymphjs/client';
 import { Entity, Nymph } from '@nymphjs/client';
-import { User, Group } from '@nymphjs/tilmeld-client';
+import {
+  User as UserClass,
+  Group as GroupClass,
+} from '@nymphjs/tilmeld-client';
 
 const nymph = new Nymph(
   (window as unknown as { nymphOptions: NymphOptions }).nymphOptions
 );
-nymph.addEntityClass(User);
-nymph.addEntityClass(Group);
-
-export default nymph;
+const User = nymph.addEntityClass(UserClass);
+const Group = nymph.addEntityClass(GroupClass);
+User.init(nymph);
 
 // Helps with admin and debugging.
 (window as any).Entity = Entity;
 (window as any).User = User;
 (window as any).Group = Group;
 (window as any).nymph = nymph;
+
+export { nymph, User, Group };