Merge pull request #1 from eyra/remove-interface-components

Removed all side-interface components

src/framework/processing/worker_engine.ts

@@ -1,5 +1,5 @@
 import { CommandHandler, ProcessingEngine } from '../types/modules'
-import { CommandSystemDonate, CommandUIRender, isCommand, Response } from '../types/commands'
+import { CommandSystemDonate, isCommand, Response } from '../types/commands'
 
 export default class WorkerProcessingEngine implements ProcessingEngine {
   sessionId: String
@@ -60,9 +60,8 @@ export default class WorkerProcessingEngine implements ProcessingEngine {
     console.log('[WorkerProcessingEngine] started')
 
     const waitForInitialization: Promise<void> = this.waitForInitialization()
-    const waitForSplashScreen: Promise<void> = this.waitForSplashScreen()
 
-    Promise.all([waitForInitialization, waitForSplashScreen]).then(
+    waitForInitialization.then(
       () => { this.firstRunCycle() },
       () => {}
     )
@@ -75,23 +74,6 @@ export default class WorkerProcessingEngine implements ProcessingEngine {
     })
   }
 
-  async waitForSplashScreen (): Promise<void> {
-    return await new Promise<void>((resolve) => {
-      this.resolveContinue = resolve
-      this.renderSplashScreen()
-    })
-  }
-
-  renderSplashScreen (): void {
-    const command: CommandUIRender = { __type__: 'CommandUIRender', page: { __type__: 'PropsUIPageSplashScreen' } }
-    if (isCommand(command)) {
-      this.commandHandler.onCommand(command).then(
-        (_response) => this.resolveContinue(),
-        () => {}
-      )
-    }
-  }
-
   firstRunCycle (): void {
     this.worker.postMessage({ eventType: 'firstRunCycle', sessionId: this.sessionId })
   }

src/framework/types/pages.ts

@@ -9,7 +9,6 @@ export type PropsUIPage =
 
 export function isPropsUIPage (arg: any): arg is PropsUIPage {
   return (
-    isPropsUIPageSplashScreen(arg) ||
     isPropsUIPageDonation(arg) ||
     isPropsUIPageEnd(arg)
   )
@@ -18,9 +17,6 @@ export function isPropsUIPage (arg: any): arg is PropsUIPage {
 export interface PropsUIPageSplashScreen {
   __type__: 'PropsUIPageSplashScreen'
 }
-export function isPropsUIPageSplashScreen (arg: any): arg is PropsUIPageSplashScreen {
-  return isInstanceOf<PropsUIPageSplashScreen>(arg, 'PropsUIPageSplashScreen', [])
-}
 
 export interface PropsUIPageDonation {
   __type__: 'PropsUIPageDonation'

src/framework/visualisation/react/factory.tsx

@@ -1,9 +1,8 @@
 
 import { EndPage } from './ui/pages/end_page'
-import { isPropsUIPageEnd, isPropsUIPageDonation, PropsUIPage, isPropsUIPageSplashScreen } from '../../types/pages'
+import { isPropsUIPageEnd, isPropsUIPageDonation, PropsUIPage } from '../../types/pages'
 import { DonationPage } from './ui/pages/donation_page'
 import { Payload } from '../../types/commands'
-import { SplashScreen } from './ui/pages/splash_screen'
 
 export interface ReactFactoryContext {
   locale: string
@@ -12,9 +11,6 @@ export interface ReactFactoryContext {
 
 export default class ReactFactory {
   createPage (page: PropsUIPage, context: ReactFactoryContext): JSX.Element {
-    if (isPropsUIPageSplashScreen(page)) {
-      return <SplashScreen {...page} {...context} />
-    }
     if (isPropsUIPageEnd(page)) {
       return <EndPage {...page} {...context} />
     }

src/framework/visualisation/react/ui/pages/donation_page.tsx

@@ -6,24 +6,18 @@ import { Translatable } from '../../../../types/elements'
 import { PropsUIPageDonation } from '../../../../types/pages'
 import { isPropsUIPromptConfirm, isPropsUIPromptConsentForm, isPropsUIPromptFileInput, isPropsUIPromptRadioInput } from '../../../../types/prompts'
 import { ReactFactoryContext } from '../../factory'
-import { ForwardButton } from '../elements/button'
 import { Title1 } from '../elements/text'
 import { Confirm } from '../prompts/confirm'
 import { ConsentForm } from '../prompts/consent_form'
 import { FileInput } from '../prompts/file_input'
 import { RadioInput } from '../prompts/radio_input'
-import { Footer } from './templates/footer'
-import { Sidebar } from './templates/sidebar'
-import LogoSvg from '../../../../../assets/images/logo.svg'
 import { Page } from './templates/page'
-import { Progress } from '../elements/progress'
-import { Instructions } from '../elements/instructions'
 
 type Props = Weak<PropsUIPageDonation> & ReactFactoryContext
 
 export const DonationPage = (props: Props): JSX.Element => {
-  const { title, forwardButton } = prepareCopy(props)
-  const { platform, locale, resolve } = props
+  const { title } = prepareCopy(props)
+  const { locale } = props
 
   function renderBody (props: Props): JSX.Element {
     const context = { locale: locale, resolve: props.resolve }
@@ -43,31 +37,6 @@ export const DonationPage = (props: Props): JSX.Element => {
     throw new TypeError('Unknown body type')
   }
 
-  function handleSkip (): void {
-    resolve?.({ __type__: 'PayloadFalse', value: false })
-  }
-
-  const footer: JSX.Element = (
-    <Footer
-      middle={<Progress percentage={props.footer.progressPercentage} />}
-      right={
-        <div className='flex flex-row'>
-          <div className='flex-grow' />
-          <ForwardButton label={forwardButton} onClick={handleSkip} />
-        </div>
-      }
-    />
-  )
-
-  const sidebar: JSX.Element = (
-    <Sidebar
-      logo={LogoSvg}
-      content={
-        <Instructions platform={platform} locale={locale} />
-      }
-    />
-  )
-
   const body: JSX.Element = (
     <>
       <Title1 text={title} />
@@ -78,8 +47,6 @@ export const DonationPage = (props: Props): JSX.Element => {
   return (
     <Page
       body={body}
-      sidebar={sidebar}
-      footer={footer}
     />
   )
 }

src/framework/visualisation/react/ui/pages/end_page.tsx

@@ -1,9 +1,6 @@
 import { Weak } from '../../../../helpers'
 import { PropsUIPageEnd } from '../../../../types/pages'
 import { ReactFactoryContext } from '../../factory'
-import { Footer } from './templates/footer'
-import { Sidebar } from './templates/sidebar'
-import LogoSvg from '../../../../../assets/images/logo.svg'
 import { Page } from './templates/page'
 import TextBundle from '../../../../text_bundle'
 import { Translator } from '../../../../translator'
@@ -14,10 +11,6 @@ type Props = Weak<PropsUIPageEnd> & ReactFactoryContext
 export const EndPage = (props: Props): JSX.Element => {
   const { title, text } = prepareCopy(props)
 
-  const footer: JSX.Element = <Footer />
-
-  const sidebar: JSX.Element = <Sidebar logo={LogoSvg} />
-
   const body: JSX.Element = (
     <>
       <Title1 text={title} />
@@ -28,8 +21,6 @@ export const EndPage = (props: Props): JSX.Element => {
   return (
     <Page
       body={body}
-      sidebar={sidebar}
-      footer={footer}
     />
   )
 }

src/framework/visualisation/react/ui/pages/templates/page.tsx

@@ -1,24 +1,11 @@
 interface PageProps {
   body: JSX.Element
-  sidebar: JSX.Element
-  footer: JSX.Element
 }
 
 export const Page = (props: PageProps): JSX.Element => {
   return (
-    <div className='flex flex-col w-full h-full gap-4'>
-      <div className='flex flex-row w-full gap-10 pt-20 pr-14'>
-        <div className='flex-1 pl-14'>
-          {props.body}
-        </div>
-        <div className='w-sidebar flex-shrink-0'>
-          {props.sidebar}
-        </div>
-      </div>
-      <div className='flex-grow' />
-      <div className='h-footer flex-shrink-0'>
-        {props.footer}
-      </div>
+    <div className='w-full h-full'>
+      {props.body}
     </div>
   )
 }