lincd-cli 0.2.41 → 0.2.43

package/.husky/post-merge

@@ -0,0 +1,4 @@
+#!/bin/zsh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

package/.prettierignore

@@ -0,0 +1,4 @@
+node_modules
+*.scss.json
+defaults
+package.json

package/.prettierrc.json

@@ -0,0 +1,24 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "bracketSpacing": false,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine": "auto",
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "printWidth": 200
+      }
+    },
+    {
+      "files": "*.jsonld",
+      "options": {
+        "parser": "json"
+      }
+    }
+  ]
+}

package/defaults/app-static/capacitor.config.ts

@@ -3,9 +3,9 @@ import { CapacitorConfig } from '@capacitor/cli';
 const config: CapacitorConfig = {
   appId: 'com.mydomain.FILL_IN_YOUR_OWN',
   appName: 'FILL_IN_YOUR_OWN',
-  webDir: 'frontend/web',
+  webDir: 'web',
   server: {
-    allowNavigation: ['DOMAIN', 'APP_DOMAIN'],
+    allowNavigation: ['yourdomain.com', 'sub.yourdomain.com'],
   },
   bundledWebRuntime: false,
   //Add or remove plugins that you need. Here is a starter list
@@ -13,85 +13,35 @@ const config: CapacitorConfig = {
     CapacitorHttp: {
       enabled: true,
     },
-    FirebaseMessaging: {
-      presentationOptions: ['badge', 'sound', 'alert'],
-    },
-    GoogleAuth: {
-      scopes: ['profile', 'email'],
-      //self created production web client
-      clientId: '734627482469-37q563qta2jt6bmhksemmvco8si0pmai.apps.googleusercontent.com',
-      //For these lines use the auto generated web client "Web client  (auto created by Google Service)"
-      serverClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
-      androidClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
-      iosClientId: '580968717451-aoj80o3e8qfjlmbrgabf916mfk4t3ntr.apps.googleusercontent.com',
-      forceCodeForRefreshToken: true,
-    },
-    SplashScreen: {
-      launchShowDuration: 400,
-      launchAutoHide: true,
-      // launchFadeOutDuration: 500,
-      backgroundColor: '#F7E5FF',
-      androidSplashResourceName: 'splash',
-      // androidScaleType: 'CENTER',
-      showSpinner: false,
-      // androidSpinnerStyle: 'large',
-      // iosSpinnerStyle: 'small',
-      // spinnerColor: '#999999',
-      splashFullScreen: true,
-      splashImmersive: true,
-      // layoutName: 'launch_screen',
-      // useDialog: true,
-    },
-  },
-};
-
-export default config;
-
-import {CapacitorConfig} from '@capacitor/cli';
-
-const config: CapacitorConfig = {
-  appId: 'com.spiritualplaymates.app',
-  appName: 'Spiritual Playmates',
-  webDir: 'frontend/web',
-  server: {
-    allowNavigation: ['spiritualplaymates.com', 'app.spiritualplaymates.com', 'http://reborn-pro.local:4000'],
-  },
-  cordova: {},
-  plugins: {
-    FirebaseMessaging: {
-      presentationOptions: ['badge', 'sound', 'alert'],
-    },
-    GoogleAuth: {
-      scopes: ['profile', 'email'],
-      //self created production web client
-      clientId: '734627482469-37q563qta2jt6bmhksemmvco8si0pmai.apps.googleusercontent.com',
-      serverClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
-      //auto generated web client
-      //clientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com ',
-      androidClientId: '580968717451-68kpj51ulab8q7drbd3sr7imodai81lp.apps.googleusercontent.com',
-
-      iosClientId: '580968717451-aoj80o3e8qfjlmbrgabf916mfk4t3ntr.apps.googleusercontent.com',
-      forceCodeForRefreshToken: true,
-    },
-    CapacitorHttp: {
-      enabled: true,
-    },
-    SplashScreen: {
-      launchShowDuration: 400,
-      launchAutoHide: true,
-      // launchFadeOutDuration: 500,
-      backgroundColor: '#F7E5FF',
-      androidSplashResourceName: 'splash',
-      // androidScaleType: 'CENTER',
-      showSpinner: false,
-      // androidSpinnerStyle: 'large',
-      // iosSpinnerStyle: 'small',
-      // spinnerColor: '#999999',
-      splashFullScreen: true,
-      splashImmersive: true,
-      // layoutName: 'launch_screen',
-      // useDialog: true,
-    },
+    // FirebaseMessaging: {
+    //   presentationOptions: ['badge', 'sound', 'alert'],
+    // },
+    // GoogleAuth: {
+    //   scopes: ['profile', 'email'],
+    //   //self created production web client
+    //   clientId: '...',
+    //   //For these lines use the auto generated web client "Web client  (auto created by Google Service)"
+    //   serverClientId: '....',
+    //   androidClientId: '...',
+    //   iosClientId: '...',
+    //   forceCodeForRefreshToken: true,
+    // },
+    // SplashScreen: {
+    //   launchShowDuration: 400,
+    //   launchAutoHide: true,
+    //   backgroundColor: '#F7E5FF',
+    //   androidSplashResourceName: 'splash',
+    //   showSpinner: false,
+    //   splashFullScreen: true,
+    //   splashImmersive: true,
+    //   // launchFadeOutDuration: 500,
+    //   // androidScaleType: 'CENTER',
+    //   // androidSpinnerStyle: 'large',
+    //   // iosSpinnerStyle: 'small',
+    //   // spinnerColor: '#999999',
+    //   // layoutName: 'launch_screen',
+    //   // useDialog: true,
+    // },
   },
 };
 

package/defaults/app-static/src/index-static.tsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import {BrowserRouter} from 'react-router-dom';
+import App from './App';
+import {BackendAPIStore} from 'lincd-server/lib/shapes/BackendAPIStore';
+import {Storage} from 'lincd/lib/utils/Storage';
+import {AppContextProvider} from 'lincd-server-utils/lib/components/AppContext';
+
+const root = ReactDOM.createRoot(
+  // document
+  // document.body
+  document.getElementById('root') as HTMLElement
+);
+//store all quads in a file on the backend named 'main'
+// export const store = new BackendFileStore('main');
+export const store = new BackendAPIStore();
+Storage.setDefaultStore(store);
+
+
+root.render(
+  <React.StrictMode>
+    <BrowserRouter>
+      <AppContextProvider isNativeApp={true}>
+        <App />
+      </AppContextProvider>
+    </BrowserRouter>
+  </React.StrictMode>
+);

package/defaults/app-with-backend/.run/start.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="start" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

package/defaults/app-with-backend/package.json

@@ -59,6 +59,7 @@
     "@babel/register": "^7.22.5",
     "chalk": "4.1.2",
     "lincd": "^0.5.22",
+    "lincd-auth": "^0.1.19",
     "lincd-jsonld": "^0.1.21",
     "lincd-server": "^0.1.39",
     "lincd-server-utils": "^0.1.7",

package/defaults/app-with-backend/src/layout/Header.tsx

@@ -9,8 +9,13 @@ export function Header() {
     <header className={style.header}>
       <h1>${name}</h1>
       <nav className={style.menu}>
-        {Object.keys(ROUTES).map(key => {
-          return <Link key={key} to={ROUTES[key].path}>{ROUTES[key].label || key}</Link>
+        {Object.keys(ROUTES).map((key) => {
+          if (ROUTES[key].excludeFromMenu) return null;
+          return (
+            <Link key={key} to={ROUTES[key].path}>
+              {ROUTES[key].label || key}
+            </Link>
+          );
         })}
       </nav>
     </header>

package/defaults/app-with-backend/src/pages/PageNotFound.tsx

@@ -0,0 +1,11 @@
+import {DefaultLayout} from '../layout/DefaultLayout';
+
+export default function PageNotFound() {
+  return (
+    <DefaultLayout>
+      <div>
+        <h2>Page not found</h2>
+      </div>
+    </DefaultLayout>
+  );
+}

package/defaults/app-with-backend/src/pages/Signin.tsx

@@ -0,0 +1,12 @@
+import {DefaultLayout} from '../layout/DefaultLayout';
+
+export default function Signin() {
+  return (
+    <DefaultLayout>
+      <div>
+        <h2>Sign In</h2>
+        See lincd.org for different ways to sign in.
+      </div>
+    </DefaultLayout>
+  );
+}

package/defaults/app-with-backend/src/routes.tsx

@@ -1,21 +1,36 @@
 import React, {lazy, Suspense} from 'react';
 import {Route, Routes} from 'react-router-dom';
 import {Spinner} from './components/Spinner';
+import {RequireAuth} from 'lincd-auth/lib/components/RequireAuth';
+import PageNotFound from './pages/PageNotFound';
 
 //In React 18 you can use 'lazy' to import pages only when you need them.
 //This will cause webpack to create multiple bundles, and the right bundles are automatically loaded
-
-export const ROUTES = {
+interface RouteObj {
+  path: string;
+  component?: React.LazyExoticComponent<() => JSX.Element>;
+  render?: () => JSX.Element;
+  requireAuth?: boolean;
+  excludeFromMenu?: boolean;
+  label?: string;
+}
+export const ROUTES: {[key: string]: RouteObj} = {
   index: {
     path: '/',
     component: lazy(() => import('./pages/Home' /* webpackPrefetch: true */)),
-    requireAuth: true,
-    label:"Home",
+    label: 'Home',
   },
   page1: {
     path: '/page1',
     component: lazy(() => import('./pages/Page1' /* webpackPrefetch: true */)),
-    label:"Page 1",
+    label: 'Protected page',
+    requireAuth: true,
+  },
+  signin: {
+    path: '/signin',
+    component: lazy(() => import('./pages/Signin' /* webpackPrefetch: true */)),
+    label: 'Sign In',
+    excludeFromMenu: true,
   },
 };
 
@@ -25,18 +40,33 @@ export default function AppRoutes() {
       {Object.keys(ROUTES).map((routeName) => {
         const route = ROUTES[routeName];
         const Component = route.component;
+
+        //if a route is marked as requireAuth, wrap it in the RequireAuth component and pass the signinRoute
+        const AuthGuard = route.requireAuth ? RequireAuth : React.Fragment;
+        const authProps = route.requireAuth
+          ? {signinRoute: ROUTES.signin.path}
+          : {};
+
+        // define a render function that determines what to render based on the component and route.render
+        const renderRoute = () =>
+          // if a Component is defined, render it using JSX syntax (<Component />)
+          // if not, check if a route.render function is defined and call that render function if available.
+          // if neither Component nor route.render is defined, return null
+          Component ? <Component /> : route.render ? route.render() : null;
+
         return (
           <Route
             key={route.path}
             path={route.path}
             element={
-              <Suspense fallback={<Spinner />}>
-                <Component />
-              </Suspense>
+              <AuthGuard {...authProps}>
+                <Suspense fallback={<Spinner />}>{renderRoute()}</Suspense>
+              </AuthGuard>
             }
           />
         );
       })}
+      <Route path="*" element={<PageNotFound />} />
     </Routes>
   );
 }

package/defaults/capacitor/scripts/fix-namespace.js

@@ -0,0 +1,41 @@
+fs = require('fs');
+
+let file = 'android/capacitor-cordova-android-plugins/build.gradle';
+
+//check if file exists
+if (!fs.existsSync(file)) {
+  console.log('File does not exist.', file);
+} else {
+  //read contents of "android/capacitor-cordova-android-plugins/build.gradle"
+  let contents = fs.readFileSync(file, 'utf8');
+
+  if (!contents.includes('namespace')) {
+    //insert text on line 19
+    contents = contents.replace(
+      /android \{/,
+      `android {
+    namespace 'capacitor.android.plugins'`,
+    );
+
+    //write back to file
+    fs.writeFileSync(file, contents, 'utf8');
+
+    console.log('Added namespace to ' + file);
+  } else {
+    console.log('Namespace already present in ' + file);
+  }
+}
+
+let file2 = 'ios/App/Pods/Pods.xcodeproj/project.pbxproj';
+if (!fs.existsSync(file2)) {
+  console.log('File does not exist.', file2);
+} else {
+  let contents2 = fs.readFileSync(file2, 'utf8');
+  if (contents2.includes('IPHONEOS_DEPLOYMENT_TARGET = 12.0')) {
+    contents2 = contents2.replace(/IPHONEOS_DEPLOYMENT_TARGET \= 12\.0/g, `IPHONEOS_DEPLOYMENT_TARGET = 13.0`);
+    fs.writeFileSync(file2, contents2, 'utf8');
+    console.log('Fixed IOS target version for codetrix google oauth plugin');
+  } else {
+    console.log("Didn't need to fix IOS target version");
+  }
+}