wiring up some core/event binding stuff. rename pages -> boards. i love the pages idea, but its a bit premature. we should get the new ui out and THEN rearchitect everything ffs.

Author: orthecreedence

src/App.svelte

@@ -11,6 +11,7 @@
     import darkmode from './models/darkmode';
     import { procerr } from './util/error';
     import Emitter from './util/event';
+    import log from './util/log';
     import { init as i18n_init, loc } from './util/i18n';
     import * as shortcuts from './util/shortcuts';
     import { onMount } from 'svelte';
@@ -71,6 +72,9 @@
             }
         };
         core.events.on('connected', check_connected);
+        core.events.on('error', (ev) => {
+            log.error(`core error`, ev.err);
+        });
         check_connected();
     });
 </script>

src/components/util/Loading.svelte

@@ -6,7 +6,7 @@
 
     export let logs = [];
 
-    const dot = `<img class="w-6 h-6 mx-1" src="${logo}" alt="${loc('logo')}">`;
+    const dot = `<img class="w-8 h-8 md:w-12 md:h-12 mx-1" src="${logo}" alt="${loc('logo')}">`;
     let dots = dot;
     let i = 0;
     let dot_interval = setInterval(() => {

src/core-adapters/mock.js

@@ -1,18 +1,9 @@
 import * as core from '../models/turtl/core';
+import delay from '../util/delay';
 import Emitter from '../util/event';
 import log from '../util/log';
 
 const CoreAdapter = ((events) => {
-    function event(data, error) {
-        setTimeout(() => {
-            const res_event = {
-                d: data,
-                e: error,
-            };
-            events.emit('message', JSON.stringify(res_event));
-        });
-    }
-
     const state = {
         user: {
             id: '01626b759c146c6f6b696da1b7e38fd92ff72c531689872a9da4e1b4cb7697b0636b15616a0f0017',
@@ -69,7 +60,7 @@ const CoreAdapter = ((events) => {
             color: '#408080',
             body: 'eyJXT1cgTVVIQyBTRUNVRVIiKQ==',
         }],
-        pages: [{
+        boards: [{
             id: '013e4c7a04286c8cf3cf96d4d489d14095b5937cbde319f57adabbc0ab24f3209bb63a3de800a9ce',
             space_id: '01626b759c146c6f634b027b1b69e1242d40d53e312b3b4ac7710f55be81f289b549446ef6778bee',
             user_id: '01626b759c146c6f6b696da1b7e38fd92ff72c531689872a9da4e1b4cb7697b0636b15616a0f0017',
@@ -78,17 +69,17 @@ const CoreAdapter = ((events) => {
         invites: [],
     };
 
-    function event(eventdata, error) {
+    function event(name, eventdata) {
         const res_msg = {
-            d: JSON.parse(JSON.stringify(eventdata)),
-            e: !!error,
+            e: name,
+            d: typeof(eventdata) === 'undefined' ? eventdata : JSON.parse(JSON.stringify(eventdata)),
         };
         log.debug('CoreAdapter::mock::event() -- event: ', res_msg);
 
         events.emit('message', JSON.stringify(res_msg));
     }
 
-    function send(msg) {
+    async function send(msg) {
         const parsed = JSON.parse(msg);
         const [msg_id, cmd, ...args] = parsed;
         if(!cmd) {
@@ -119,6 +110,10 @@ const CoreAdapter = ((events) => {
                 }
                 break;
             case 'profile:load':
+                await delay(1000);
+                event('profile:loaded');
+                await delay(2000);
+                event('profile:indexed');
                 response = state;
                 break;
             case 'sync:start':
@@ -143,10 +138,8 @@ const CoreAdapter = ((events) => {
         events.emit('connected', true);
     });
 
-    return {
-        ...events,
-        send,
-    };
+    events.send = send;
+    return events;
 });
 
 core.init(CoreAdapter(Emitter()));

src/locales/en_us.js

@@ -11,6 +11,7 @@ export const translation = {
     excellent: 'Excellent',
     good: 'Good',
     great: 'Great',
+    indexing_notes: 'Indexing notes',
     loading_profile: 'Loading profile',
     login: 'Login',
     login_existing: 'Login to an existing account',

src/main.js

@@ -2,11 +2,11 @@ import "./css/app.scss";
 import App from "./App.svelte";
 import user from './models/turtl/user';
 import spaces from './models/turtl/spaces';
-import pages from './models/turtl/pages';
+import boards from './models/turtl/boards';
 import invites from './models/turtl/invites';
 
 // give us a window into the app
-window.turtl = { user, spaces, pages, invites };
+window.turtl = { user, spaces, boards, invites };
 
 const app = new App({
     target: document.getElementById("app"),

src/models/turtl/boards.js

@@ -0,0 +1,6 @@
+import { writable } from 'svelte/store';
+
+const boards = writable([]);
+
+export default boards;
+

src/models/turtl/core.js

@@ -52,7 +52,7 @@ export async function init(core_adapter, options) {
                 events.emit('error', {core: true, err: 'missing_handler', id});
             }
         } else {
-            log.info(`core::event`);
+            log.info(`core::event`, msg.e);
             events.emit('event', msg.e, msg.d);
         }
     });
@@ -79,7 +79,8 @@ export async function invoke(call, ...args) {
         }
         message_map[id] = {resolve, reject};
         log.info(`core::send(${call}) -- msg ${msg_id}`);
-        adapter.send(JSON.stringify([id.toString(), call, ...args]));
+        adapter.send(JSON.stringify([id.toString(), call, ...args]))
+            .catch((err) => reject(err));
     });
 }
 

src/models/turtl/pages.js

@@ -2,14 +2,14 @@ import { invoke } from './core';
 import { config } from './config';
 import user from './user';
 import spaces from './spaces';
-import pages from './pages';
+import boards from './boards';
 import invites from './invites';
 
 export async function load_profile() {
     await invoke('sync:start');
     const profile = await invoke('profile:load');
     spaces.set(profile.spaces);
-    pages.set(profile.pages);
+    boards.set(profile.boards);
     invites.set(profile.invites);
 }
 

src/models/turtl/profile.js

@@ -5,6 +5,7 @@
     import spaces from '../models/turtl/spaces';
     import { procerr } from '../util/error';
     import { loc } from '../util/i18n';
+    import * as core from '../models/turtl/core';
 
     set_meta(loc('loading_profile'));
 
@@ -14,7 +15,12 @@
     async function load() {
         loading = true;
         push_log(loc('loading_profile'));
+        const unbind = core.events.on('event', (ev) => {
+            (ev === 'profile:loaded') && push_log(loc('indexing_notes'));
+        });
         await load_profile();
+        unbind();
+        loading = false;
     }
     load();
 </script>