diff --git a/src/app/components/generative-activity/generative-activity.component.html b/src/app/components/generative-activity/generative-activity.component.html new file mode 100644 index 0000000..aaadba3 --- /dev/null +++ b/src/app/components/generative-activity/generative-activity.component.html @@ -0,0 +1,55 @@ + + + + Select Activity + + + +
+ + {{item.title}} + +
+
+ Next +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/components/generative-activity/generative-activity.component.scss b/src/app/components/generative-activity/generative-activity.component.scss new file mode 100644 index 0000000..a5b511d --- /dev/null +++ b/src/app/components/generative-activity/generative-activity.component.scss @@ -0,0 +1,92 @@ +.connect-card{ + margin: 0px; + background: rgb(240,248,255); + background: linear-gradient(90deg, rgba(240,248,255,1) 0%, rgba(255,240,248,1) 35%, rgba(255,240,248,1) 100%); +} +.connect-invite{ + margin: 0px; + background: rgb(240,248,255); + background: linear-gradient(90deg, rgba(240,248,255,1) 0%, rgba(255,240,248,1) 35%, rgba(255,240,248,1) 100%); +} +.select_box{ + padding: 0px; + border-color: 10px; + background-color: white; + color: #0e4977; +} +.bg_white { + //display: flex; + //align-items: flex-start; + background-color: white; + padding: 5px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-bottom: 20px; + + .list { + display: flex; + align-items: center; + width: 100%; + + .back_image { + height: 95px; + width: 95px; + border-radius: 10px; + } + + .banner_image { + min-width: 90px; + } + + .detail { + width: 100%; + margin-left: 10px; + + .bg_text { + color: var(--ion-color-primary); + background-color: rgba(246, 246, 248, 0.9); + font-size: 12px; + padding: 2px 5px; + border-radius: 5px; + //width: 80px; + text-align: center; + height: 38px; + width: 100%; + overflow: hidden; + + .ovf { + overflow: hidden; + } + } + + .name { + font-family: 'bold'; + margin-top: 5px; + padding: 5px; + } + + .price { + margin-top: 3px; + color: var(--ion-color-primary); + font-family: 'semi-bold'; + } + + .row { + display: flex; + align-items: center; + margin-top: 3px; + + ion-icon { + font-size: 18px; + } + + .small { + margin-left: 8px; + color: grey; + font-size: 14px; + } + } + } + + } +} \ No newline at end of file diff --git a/src/app/components/generative-activity/generative-activity.component.spec.ts b/src/app/components/generative-activity/generative-activity.component.spec.ts new file mode 100644 index 0000000..a0d966c --- /dev/null +++ b/src/app/components/generative-activity/generative-activity.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { GenerativeActivityComponent } from './generative-activity.component'; + +describe('GenerativeActivityComponent', () => { + let component: GenerativeActivityComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ GenerativeActivityComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(GenerativeActivityComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/generative-activity/generative-activity.component.ts b/src/app/components/generative-activity/generative-activity.component.ts new file mode 100644 index 0000000..7fa81ef --- /dev/null +++ b/src/app/components/generative-activity/generative-activity.component.ts @@ -0,0 +1,29 @@ +import {Component, OnInit, ViewChild} from '@angular/core'; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; +import {SocketToolsService} from "../../services/socket-tools.service"; + +@Component({ + selector: 'app-generative-activity', + templateUrl: './generative-activity.component.html', + styleUrls: ['./generative-activity.component.scss'], +}) +export class GenerativeActivityComponent implements OnInit { +generativeOptions:any=[]; +@ViewChild('select_gen') select_gen; +isDisabled:boolean=true; + + constructor( + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService, + public socketToolsService:SocketToolsService + ) { + this.generativeOptions = this.sessionDataProviderService.generative_types; + } + + ngOnInit() {} + genChange(){ + this.isDisabled = this.select_gen == ''; + } + +} diff --git a/src/app/pages/home/home.module.ts b/src/app/pages/home/home.module.ts index 306fde8..59d4b26 100644 --- a/src/app/pages/home/home.module.ts +++ b/src/app/pages/home/home.module.ts @@ -23,7 +23,9 @@ import {DashToptoolComponent} from "../../components/dash-toptool/dash-toptool.c import {JobownerDashComponent} from "../../components/jobowner-dash/jobowner-dash.component"; import {WorkersDashComponent} from "../../components/workers-dash/workers-dash.component"; import {FamilyhomeComponent} from "../../components/familyhome/familyhome.component"; -import { FamilyConnectComponent } from "../../components/family-connect/family-connect.component"; +import {FamilyConnectComponent} from "../../components/family-connect/family-connect.component"; +import {GenerativeActivityComponent} from "../../components/generative-activity/generative-activity.component"; + // @NgModule({ // schemas: [CUSTOM_ELEMENTS_SCHEMA] // }) @@ -46,7 +48,8 @@ import { FamilyConnectComponent } from "../../components/family-connect/family-c JobownerDashComponent, WorkersDashComponent, FamilyhomeComponent, - FamilyConnectComponent + FamilyConnectComponent, + GenerativeActivityComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 6c667a4..d94bbda 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -57,6 +57,7 @@
+ diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts index ae7d890..5fcd030 100644 --- a/src/app/store/session-data-provider.service.ts +++ b/src/app/store/session-data-provider.service.ts @@ -88,7 +88,7 @@ export class SessionDataProviderService { family_action:string=""; account_pref:string="PREF04"; refer_link:string=""; - + generative_types:any=[]; session_contructed:boolean = false; @@ -189,6 +189,7 @@ export class SessionDataProviderService { this.session_contructed=false; try { console.log(loginResult); + this.generative_types = loginResult.generative_types; this.account_type = loginResult.account_type; this.firstname = loginResult.firstname; this.lastname = loginResult.lastname;