Merge pull request #174 from e-picsa/ch-redesign

Re-design for the options tool
e-picsa · Sep 15, 2023 · 3e14c9e · 3e14c9e
2 parents 8c74e0e + 9f40609
commit 3e14c9e
Show file tree

Hide file tree

Showing 47 changed files with 1,633 additions and 742 deletions.
diff --git a/apps/picsa-apps/extension-app/src/app/pages/home/home.page.ts b/apps/picsa-apps/extension-app/src/app/pages/home/home.page.ts
@@ -102,17 +102,17 @@ export class HomePage implements OnDestroy, AfterViewInit {
 
   ngOnDestroy(): void {
     this.componentsService.patchHeader({ endContent: undefined });
-    this.userEventSubscription.unsubscribe();
+    // this.userEventSubscription.unsubscribe();
   }
 
   ngAfterViewInit() {
     this.componentsService.patchHeader({
       endContent: new DomPortal(this.headerContent),
     });
-    this.userEventSubscription = this.communicationService.userEvent$.subscribe(() => {
-      // Trigger the guided tour when the prompt event occurs
-      this.startTour();
-    });
+    // this.userEventSubscription = this.communicationService.userEvent$.subscribe(() => {
+    //   // Trigger the guided tour when the prompt event occurs
+    //   this.startTour();
+    // });
   }
 
   public startTour() {

diff --git a/apps/picsa-tools/budget-tool/src/styles.scss b/apps/picsa-tools/budget-tool/src/styles.scss
@@ -14,29 +14,6 @@
 @import './styles/typography.scss';
 @import './styles/layout.scss';
 
-// instead of using bottom use top with calc to avoid jumping
-$footer-height: 5em;
-.sticky-footer {
-  position: fixed;
-  height: $footer-height;
-  top: calc(100vh - #{$footer-height});
-  left: 0;
-  width: 100%;
-  background: white;
-  display: flex;
-  align-items: center;
-}
-
-button.footer-button.mat-mdc-button-base {
-  width: 60%;
-  left: 20%;
-  height: calc(#{$footer-height} - 10px) !important;
-  .mdc-button__label {
-    font-size: 1.5rem;
-    line-height: 3rem;
-  }
-}
-
 // used if want to use mat-stepper with fixed header and scrolling content
 .scrolling-stepper {
   flex: 1;

diff --git a/apps/picsa-tools/option-tool/src/app/components/components.module.ts b/apps/picsa-tools/option-tool/src/app/components/components.module.ts
@@ -8,10 +8,12 @@ import { PicsaTranslateModule } from '@picsa/shared/modules';
 
 // Local components
 import { EditorComponent } from './editor/editor.component';
-import { GenderIconComponent } from './gender-icon/gender-icon.component';
+import { GenderInputComponent } from './editor/inputs/gender/gender-input';
+import { InvestmentInputComponent } from './editor/inputs/investment/investment-input';
+import { PerformanceInputComponent } from './editor/inputs/performance/performance-input';
 import { OptionMaterialModule } from './material.module';
 
-const Components = [EditorComponent, GenderIconComponent];
+const Components = [EditorComponent, GenderInputComponent, InvestmentInputComponent, PerformanceInputComponent];
 
 @NgModule({
   imports: [