+ +
+
  • +
    + +
    +
    + +
    +
    • + +
  • +
    + +
    +
    + +
    +
    • + +
  • +
    + +
    +
    + +
    +
    • +
    + + + + +

    Slide 1

    +     + +

    Slide 2

    +     + +

    Slide 3

    +     + +

    Slide 4

    +     + +

    Slide 5

    +     + +

    Slide 6

    +     + +

    Slide 7

    +     +     +     +
    @@ -86,36 +142,3 @@ -
    -
  • -
    - -
    -
    - -
    -
    • -
  • -
    - -
    -
    • - -
  • -
    - -
    -
    - -
    -
    • - -
  • -
    - -
    -
    - -
    -
    • -
    \ No newline at end of file diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 6b30cf9ce..2b0d1f1b6 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -232,15 +232,8 @@ /* Advance search */ .advance-search{ padding: 20px 20px; - padding-bottom: 10px; - width: 368px; - background-color: white; - position: absolute; - top: 100px; - left: 22px; - border-radius: 10px; - box-shadow: 0 4px 9px 0 rgba(0, 0, 0, 0.3); - margin-top: 20px; + padding-top: 14px; + .icon{ color: #797979; width: 45px; diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 5a6b7dbb6..1b7c67a0e 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -6,6 +6,7 @@ import { SearchCategory } from "src/app/models/search-category"; import { SearchDocument } from "src/app/models/search-document"; import { formatDate } from '@angular/common'; import { CloudData, CloudOptions } from 'angular-tag-cloud-module'; +import { SenderPage } from 'src/app/pages/search/sender/sender.page'; @Component({ selector: 'app-search', @@ -42,7 +43,15 @@ export class SearchPage implements OnInit { {text: 'Weight-10-link', weight: 10, link: 'https://google.com', tooltip: 'display a tooltip'}, // ... ]; - + + // See http://idangero.us/swiper/api/ for valid options. + slideOpts = { + slidesPerView: 3, + initialSlide: 0, + speed: 400, + height: '100px' + } + constructor(private modalController: ModalController, private search: SearchService) { @@ -128,4 +137,17 @@ export class SearchPage implements OnInit { } + async openAdvanceSearchSelection() { + + const modal = await this.modalController.create({ + component: SenderPage, + cssClass: 'sender', + componentProps: { + } + }); + + return await modal.present(); + + } + } diff --git a/src/app/pages/search/sender/sender-routing.module.ts b/src/app/pages/search/sender/sender-routing.module.ts new file mode 100644 index 000000000..07ce353dd --- /dev/null +++ b/src/app/pages/search/sender/sender-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { SenderPage } from './sender.page'; + +const routes: Routes = [ + { + path: '', + component: SenderPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class SenderPageRoutingModule {} diff --git a/src/app/pages/search/sender/sender.module.ts b/src/app/pages/search/sender/sender.module.ts new file mode 100644 index 000000000..d20c632b0 --- /dev/null +++ b/src/app/pages/search/sender/sender.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { SenderPageRoutingModule } from './sender-routing.module'; + +import { SenderPage } from './sender.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SenderPageRoutingModule + ], + declarations: [SenderPage] +}) +export class SenderPageModule {} diff --git a/src/app/pages/search/sender/sender.page.html b/src/app/pages/search/sender/sender.page.html new file mode 100644 index 000000000..66e06fa57 --- /dev/null +++ b/src/app/pages/search/sender/sender.page.html @@ -0,0 +1,9 @@ + + + Remetentes + + + + + + diff --git a/src/app/pages/search/sender/sender.page.scss b/src/app/pages/search/sender/sender.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/search/sender/sender.page.spec.ts b/src/app/pages/search/sender/sender.page.spec.ts new file mode 100644 index 000000000..763d17dc8 --- /dev/null +++ b/src/app/pages/search/sender/sender.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { SenderPage } from './sender.page'; + +describe('SenderPage', () => { + let component: SenderPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SenderPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(SenderPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/search/sender/sender.page.ts b/src/app/pages/search/sender/sender.page.ts new file mode 100644 index 000000000..39048617f --- /dev/null +++ b/src/app/pages/search/sender/sender.page.ts @@ -0,0 +1,21 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-sender', + templateUrl: './sender.page.html', + styleUrls: + ['./sender.page.scss'], +}) +export class SenderPage implements OnInit { + + constructor(private modalController:ModalController) { } + + ngOnInit() { + } + + close(){ + this.modalController.dismiss(); + } + +} diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index a983f75e9..2476cf83b 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -24,6 +24,4 @@ export class HeaderPage implements OnInit { return await modal.present(); } - - }