Merge branch 'master' into preview

elemanhillary · Jun 7, 2022 · 631f3aa · 631f3aa
2 parents 4edc0bb + af300d7
commit 631f3aa
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 25 deletions.
diff --git a/app/components-react/highlighter/ClipTrimmer.tsx b/app/components-react/highlighter/ClipTrimmer.tsx
@@ -110,7 +110,7 @@ export default function ClipTrimmer(props: { clip: IClip }) {
     } else {
       isScrubbing.current = false;
       const timelineWidth = timelineRef.current!.offsetWidth - 40;
-      const timelineOffset = timelineRef.current!.getBoundingClientRect().left;
+      const timelineOffset = timelineRef.current!.getBoundingClientRect().left + 20;
       playAt(((e.clientX - timelineOffset) / timelineWidth) * props.clip.duration!);
     }
   }

diff --git a/app/components-react/pages/layout-editor/AddTabModal.tsx b/app/components-react/pages/layout-editor/AddTabModal.tsx
@@ -53,7 +53,7 @@ export default function AddTabModal() {
   }
 
   return (
-    <ModalLayout footer={<Footer />} wrapperStyle={{ width: '410px', height: '350px' }}>
+    <ModalLayout footer={<Footer />} wrapperStyle={{ width: '390px', height: '270px' }}>
       <Form>
         <CardInput
           value={icon}
@@ -69,7 +69,7 @@ export default function AddTabModal() {
           label={$t('Name')}
           value={name}
           onChange={setName}
-          style={{ marginTop: '8px' }}
+          style={{ marginTop: '10px', marginLeft: '-80px', marginRight: '3px' }}
           uncontrolled={false}
         />
       </Form>

diff --git a/app/components-react/pages/onboarding/Onboarding.tsx b/app/components-react/pages/onboarding/Onboarding.tsx
@@ -7,7 +7,7 @@ import cx from 'classnames';
 import { $t } from 'services/i18n';
 import * as stepComponents from './steps';
 import Utils from 'services/utils';
-import {IOnboardingStep, ONBOARDING_STEPS} from 'services/onboarding';
+import { IOnboardingStep, ONBOARDING_STEPS } from 'services/onboarding';
 import Scrollable from 'components-react/shared/Scrollable';
 
 export default function Onboarding() {
@@ -51,9 +51,7 @@ export default function Onboarding() {
 }
 
 function TopBar() {
-  const { stepIndex, preboardingOffset, singletonStep, steps } = useModule(
-    OnboardingModule,
-  );
+  const { stepIndex, preboardingOffset, singletonStep, steps } = useModule(OnboardingModule);
 
   if (stepIndex < preboardingOffset || singletonStep) {
     return <div />;

diff --git a/app/components-react/pages/onboarding/ThemeSelector.m.less b/app/components-react/pages/onboarding/ThemeSelector.m.less
@@ -103,10 +103,3 @@
 .preview.active {
   border: 1px solid var(--teal);
 }
-
-.progress-bar {
-  position: relative;
-  display: block !important;
-  width: 80% !important;
-  margin: 20% auto;
-}
diff --git a/app/components-react/pages/onboarding/ThemeSelector.tsx b/app/components-react/pages/onboarding/ThemeSelector.tsx
@@ -120,9 +120,9 @@ export function ThemeSelector() {
             )}
           </div>
         ) : (
-          <div className={styles.progressBar}>
-            <p>{$t('Installing theme...')}</p>
+          <div style={{ margin: 'auto', marginTop: 24, width: '80%' }}>
             <AutoProgressBar percent={progress} timeTarget={60 * 1000} />
+            <p>{$t('Installing theme...')}</p>
           </div>
         )}
       </div>

diff --git a/app/services/onboarding.ts b/app/services/onboarding.ts
@@ -177,9 +177,9 @@ class OnboardingViews extends ViewHandler<IOnboardingServiceState> {
       steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Optimize]);
     }
 
-    if (userViews.isLoggedIn && !userViews.isPrime) {
-      steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]);
-    }
+    // if (userViews.isLoggedIn && !userViews.isPrime) {
+    //   steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]);
+    // }
 
     return steps;
   }

diff --git a/test/regular/obs-importer.ts b/test/regular/obs-importer.ts
@@ -59,7 +59,7 @@ test('OBS Importer', async t => {
 
   await waitForDisplayed('h1=Optimize');
   await (await t.context.app.client.$('button=Skip')).click();
-  await (await t.context.app.client.$('div=Choose Free')).click();
+  // await (await t.context.app.client.$('div=Choose Free')).click();
 
   await waitForDisplayed('[data-name=SceneSelector]');
 

diff --git a/test/regular/onboarding.ts b/test/regular/onboarding.ts
@@ -46,12 +46,12 @@ test('Go through the onboarding and autoconfig', async t => {
   t.true(await (await app.client.$('button=Start')).isExisting());
   await (await app.client.$('button=Start')).click();
 
-  await (await t.context.app.client.$('div=Choose Free')).waitForDisplayed({ timeout: 60000 });
+  // await (await t.context.app.client.$('div=Choose Free')).waitForDisplayed({ timeout: 60000 });
   // Skip purchasing prime
-  if (await (await t.context.app.client.$('div=Choose Free')).isExisting()) {
-    await (await t.context.app.client.$('div=Choose Free')).click();
-    await sleep(1000);
-  }
+  // if (await (await t.context.app.client.$('div=Choose Free')).isExisting()) {
+  //   await (await t.context.app.client.$('div=Choose Free')).click();
+  //   await sleep(1000);
+  // }
 
   await (await app.client.$('h2=Sources')).waitForDisplayed({ timeout: 60000 });
   // success?