diff --git a/package-lock.json b/package-lock.json index 8239b39e5..269e1005c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -576,9 +576,9 @@ "dev": true }, "onetime": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz", - "integrity": "sha512-ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "dev": true, "requires": { "mimic-fn": "^2.1.0" @@ -2660,6 +2660,14 @@ } } }, + "@logisticinfotech/ionic4-datepicker": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@logisticinfotech/ionic4-datepicker/-/ionic4-datepicker-1.4.4.tgz", + "integrity": "sha512-2L22qs3B4kc2a6Dmjv/P3A/MS4ChbAjV+6umfOX3Pt/i3+P7mMHhGDWgFMZVrL14na7uoHewkY1v0CBvC2MW1w==", + "requires": { + "tslib": "^1.9.0" + } + }, "@ngtools/webpack": { "version": "9.1.12", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.12.tgz", @@ -4059,6 +4067,24 @@ "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==", "dev": true }, + "capacitor-datepicker": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/capacitor-datepicker/-/capacitor-datepicker-0.0.2.tgz", + "integrity": "sha512-6iZ3sxZs/thn05z8Qn0G9sJYtPC2w70O8D6yF4d1/02zhVEv2iWmpDKa+0w8Xk6l91qMNumyWwUV4gMWLte1xg==", + "requires": { + "@capacitor/core": "^2.4.0" + }, + "dependencies": { + "@capacitor/core": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-2.4.0.tgz", + "integrity": "sha512-zL+3yKjLNkU6QwIB/Fp9rg+qDLsO44/ibrIgaZZRXcDCwScwanjXCgco/jXQl3jGFcZzanm59wKhMcJr9xQH0Q==", + "requires": { + "tslib": "^1.9.0" + } + } + } + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -8965,6 +8991,11 @@ "minimist": "^1.2.5" } }, + "moment": { + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", + "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", diff --git a/package.json b/package.json index 60e60e220..33826903d 100644 --- a/package.json +++ b/package.json @@ -24,13 +24,16 @@ "@ionic-native/splash-screen": "^5.0.0", "@ionic-native/status-bar": "^5.0.0", "@ionic/angular": "^5.0.0", + "@logisticinfotech/ionic4-datepicker": "^1.4.4", + "capacitor-datepicker": "0.0.2", + "moment": "^2.27.0", "rxjs": "~6.5.1", "tslib": "^1.10.0", "zone.js": "~0.10.2" }, "devDependencies": { "@angular-devkit/build-angular": "~0.901.5", - "@angular/cli": "~9.1.5", + "@angular/cli": "9.1.12", "@angular/compiler": "~9.1.6", "@angular/compiler-cli": "~9.1.6", "@angular/language-service": "~9.1.6", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index db33d75bc..3aa0382b3 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -10,6 +10,11 @@ const routes: Routes = [ path: '', loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) }, +/* { + path: 'view-event', + loadChildren: () => import('./pages/view-event/view-event.module').then( m => m.ViewEventPageModule) + }, */ + ]; @NgModule({ imports: [ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 93c003365..660f0e67f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { RouteReuseStrategy } from '@angular/router'; @@ -20,6 +20,7 @@ import { HttpClientModule } from '@angular/common/http'; HttpClientModule, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy } ], - bootstrap: [AppComponent] + bootstrap: [AppComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class AppModule {} diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index e46cfa698..e98d1369b 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -8,6 +8,9 @@ import { Component } from '@angular/core'; import { SlidesComponent } from './slides/slides.component'; import { StartComponent } from './start/start.component'; import { LogoComponent } from './logo/logo.component'; +import { CustomHeaderComponent } from './custom-header/custom-header.component'; +import { EventComponent } from './event/event.component'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; @@ -15,19 +18,27 @@ import { LogoComponent } from './logo/logo.component'; declarations: [ SlidesComponent, StartComponent, - LogoComponent + LogoComponent, + CustomHeaderComponent, + EventComponent + ], exports: [ /* Exportar para o acesso de outros componentes e páginas na aplicação*/ SlidesComponent, StartComponent, LogoComponent, + CustomHeaderComponent, + EventComponent, Component ], imports: [ CommonModule, FormsModule, IonicModule + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA ] }) export class ComponentsModule { } diff --git a/src/app/components/custom-header/custom-header.component.html b/src/app/components/custom-header/custom-header.component.html new file mode 100644 index 000000000..cf91392ad --- /dev/null +++ b/src/app/components/custom-header/custom-header.component.html @@ -0,0 +1,18 @@ + + + + + + + + Presidente da República + GABINETE DIGITAL + + + + + Bom dia Excelência Presidente da República + Segunda-feira, 03 de Agosto + + + diff --git a/src/app/components/custom-header/custom-header.component.scss b/src/app/components/custom-header/custom-header.component.scss new file mode 100644 index 000000000..ceedf10ba --- /dev/null +++ b/src/app/components/custom-header/custom-header.component.scss @@ -0,0 +1,34 @@ +.header-medium{ + font-size: 12pt; + font-family: roboto; + + } + .p-small{ + font-size: 9pt; + margin-top: 10px; + color:#000; + } + .ion-text-header-top{ + text-align: center; + padding-top: 20px; + } + .div-img{ + width: 100%; + } + .div-im img{ + width: 100%; + height: 100%; + } + .header-xsmall{ + font-family: Arial, Helvetica, sans-serif; + font-size: 8.5pt; + font-weight: bold; + padding-bottom: 3.5px; + margin-bottom: 3.5px; + border-bottom: 1px solid #ccc; + } + .header-large{ + font-family: Arial, Helvetica, sans-serif; + font-size: 10.5pt; + font-weight: bold; + } \ No newline at end of file diff --git a/src/app/components/custom-header/custom-header.component.spec.ts b/src/app/components/custom-header/custom-header.component.spec.ts new file mode 100644 index 000000000..baf6ec9ec --- /dev/null +++ b/src/app/components/custom-header/custom-header.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { CustomHeaderComponent } from './custom-header.component'; + +describe('CustomHeaderComponent', () => { + let component: CustomHeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CustomHeaderComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(CustomHeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/custom-header/custom-header.component.ts b/src/app/components/custom-header/custom-header.component.ts new file mode 100644 index 000000000..ec3ca8fe1 --- /dev/null +++ b/src/app/components/custom-header/custom-header.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-custom-header', + templateUrl: './custom-header.component.html', + styleUrls: ['./custom-header.component.scss'], +}) +export class CustomHeaderComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/components/custom-header/custom-header.module.ts b/src/app/components/custom-header/custom-header.module.ts new file mode 100644 index 000000000..f1a35020a --- /dev/null +++ b/src/app/components/custom-header/custom-header.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule + ], + declarations: [CustomHeaderModule] +}) +export class CustomHeaderModule {} diff --git a/src/app/components/event/event.component.html b/src/app/components/event/event.component.html new file mode 100644 index 000000000..75abab593 --- /dev/null +++ b/src/app/components/event/event.component.html @@ -0,0 +1,84 @@ + + + Assunto + + + + Descrição + + + + Localização + + + + Intervenientes + + + + + + Oficial + + + + + Pessoal + + + + + + Selecione o tipo de evento + + Reunião + Viagem + Conferência + Encontro + + + + Selecione a frequência do evento + + Único + Diário + Semanal + Mensal + + + + Data Início + + + + Data Fim + + + + + + + Anexos + + Adicionar + + + + + Lei do orçamento geral do Estado Eliminar + + + +Salvar + diff --git a/src/app/components/event/event.component.scss b/src/app/components/event/event.component.scss new file mode 100644 index 000000000..07da34317 --- /dev/null +++ b/src/app/components/event/event.component.scss @@ -0,0 +1,22 @@ +.radio-button{ + width: 50%; + /* border: 1px solid red; */ + float: left; +} +.attach-div{ + margin-top: 20px; + /* border: 1px solid red; */ + height: 200px; +} + +.attach-label{ + /* border: 1px solid red; */ + margin-left: 20px; + font-weight: bold; +} +.event-form{ + border: 1px solid rgb(243, 238, 238); + margin: 10px; + padding: 5px; + border-radius: 5px; +} \ No newline at end of file diff --git a/src/app/components/event/event.component.spec.ts b/src/app/components/event/event.component.spec.ts new file mode 100644 index 000000000..636ca8471 --- /dev/null +++ b/src/app/components/event/event.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EventComponent } from './event.component'; + +describe('EventComponent', () => { + let component: EventComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EventComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EventComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/event/event.component.ts b/src/app/components/event/event.component.ts new file mode 100644 index 000000000..c8356af02 --- /dev/null +++ b/src/app/components/event/event.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-event', + templateUrl: './event.component.html', + styleUrls: ['./event.component.scss'], +}) +export class EventComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/pages/signup/signup.module.ts b/src/app/components/event/event.module.ts similarity index 56% rename from src/app/pages/signup/signup.module.ts rename to src/app/components/event/event.module.ts index 295034bd2..c3563321c 100644 --- a/src/app/pages/signup/signup.module.ts +++ b/src/app/components/event/event.module.ts @@ -3,18 +3,15 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; - -import { SignupPageRoutingModule } from './signup-routing.module'; - -import { SignupPage } from './signup.page'; +import { ComponentsModule } from '../components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - SignupPageRoutingModule + ComponentsModule ], - declarations: [SignupPage] + declarations: [EventModule] }) -export class SignupPageModule {} +export class EventModule {} \ No newline at end of file diff --git a/src/app/components/slides/slides.component.scss b/src/app/components/slides/slides.component.scss index a185dfa91..823af9dc3 100644 --- a/src/app/components/slides/slides.component.scss +++ b/src/app/components/slides/slides.component.scss @@ -1,4 +1,5 @@ ion-slides{ + height: 90%; padding: 160px 20px; /* h2{ font-size: 26px; diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 6d71af653..34981549d 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -28,6 +28,11 @@ const routes: Routes = [ path: 'gabinete-digital', loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule) }, + /* PROVISORIO */ + { + path: 'view-event', + loadChildren: ()=> import('../pages/view-event/view-event.module').then(m => m.ViewEventPageModule) + }, ] }/* , { diff --git a/src/app/index/index-routing.module.ts b/src/app/index/index-routing.module.ts index 6c624dc49..99d25d9a0 100644 --- a/src/app/index/index-routing.module.ts +++ b/src/app/index/index-routing.module.ts @@ -15,10 +15,6 @@ const routes: Routes = [ path: 'login', loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule) }, - { - path: 'signup', - loadChildren: ()=> import('../pages/signup/signup.module').then(m => m.SignupPageModule) - }, ] } ]; diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index b4c4b8667..ec542f10c 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { AgendaPageRoutingModule } from './agenda-routing.module'; import { AgendaPage } from './agenda.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, AgendaPageRoutingModule ], declarations: [AgendaPage] diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 447de9750..1d784ece6 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -1,9 +1,28 @@ - agenda + Agenda + + + + Combinada + + + Oficial + + + Pessoal + + + + + + + + + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d1d6e4b75..fa9e1eefc 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -6,10 +6,18 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./agenda.page.scss'], }) export class AgendaPage implements OnInit { + /* myDate: String = new Date().toISOString(); */ + /* currentdate = new Date(); */ + + segment:string; constructor() { } ngOnInit() { + //Inicializar segment + this.segment = "combinada"; + /* console.log(this.myDate); */ + /* console.log(this.currentdate.getFullYear); */ } } diff --git a/src/app/pages/feed/feed.module.ts b/src/app/pages/feed/feed.module.ts index 4e6e9997c..bfb59d121 100644 --- a/src/app/pages/feed/feed.module.ts +++ b/src/app/pages/feed/feed.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { FeedPageRoutingModule } from './feed-routing.module'; import { FeedPage } from './feed.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, FeedPageRoutingModule ], declarations: [FeedPage] diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index e2ae2a410..a5e5d615d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -7,14 +7,17 @@ import { IonicModule } from '@ionic/angular'; import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.module'; import { GabineteDigitalPage } from './gabinete-digital.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, GabineteDigitalPageRoutingModule ], - declarations: [GabineteDigitalPage] + declarations: [GabineteDigitalPage], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class GabineteDigitalPageModule {} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index afc1d72bf..2048e70a8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,9 +1,65 @@ - gabinete-digital + Gabinete Digital - + + + + Expediente + + + Pendentes + + + + + + + + + + + + Reunião de Conselho de Ministros + + MINEC, MINFIN13 JAN + + + + + + + + + + + + + Avaliação de execução dos projectos públicos + + MINEC, MINFIN05 JAN + + + + + + + + + + + + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index e69de29bb..4004879cb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -0,0 +1,57 @@ +/* CONTENT */ +.item-list-small{ + font-size: 11px; + overflow: auto; + } + .ion-item-class{ + padding: 0; + + } + .label-text{ + width: 100%; + padding: 0; + margin: 0; + } +//DIV + .div-content h3{ + margin: 0; + padding: 0; + font-size: 15px; + width: 100%; + } + .div-icon{ + width: 10%; + font-size: 20px; + float: left; + color: #808080; + } + .div-icon ion-icon{ + display: block; + margin: 0 auto; + + } +.div-content{ + width: 100%; + float: left; + border-left: 2px solid orange; + padding: 0 0 0 5px; + } + .div-content p{ + font-size: 10.5pt; + color: rgb(94, 92, 92); + padding: 0; + margin: 0; + } + .span-left{ + /* border: 1px solid red; */ + float: left; + font-size: 10px; + padding-left: 18px; + } + .span-right{ + /* border: 1px solid blue; */ + text-align: right; + float: right; + font-size: 10px; + padding-right: 18px; +} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d4af38788..daf7ce482 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -7,9 +7,13 @@ import { Component, OnInit } from '@angular/core'; }) export class GabineteDigitalPage implements OnInit { + segment:string; + constructor() { } ngOnInit() { + //Inicializar segment + this.segment = "expediente"; } } diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 229ca251e..811842613 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -18,10 +18,6 @@ Entrar - - - Criar conta - diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index f6f384a07..5701c55a7 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { AuthService } from 'src/app/services/auth.service'; import { StorageService } from 'src/app/services/storage.service'; import { AuthConnstants } from 'src/app/config/auth-constants'; +import { ToastController } from '@ionic/angular'; @Component({ selector: 'app-login', @@ -18,7 +19,12 @@ export class LoginPage implements OnInit { domainName: '' } - constructor(private router: Router, private authService: AuthService, private storageService: StorageService) { } + constructor( + private router: Router, + private authService: AuthService, + private storageService: StorageService, + toastController: ToastController + ) { } ngOnInit() { } @@ -83,6 +89,8 @@ export class LoginPage implements OnInit { } else{ console.log("Preencha todos campos"); + + } } diff --git a/src/app/pages/search/search.module.ts b/src/app/pages/search/search.module.ts index 59ea703a0..eb31ade87 100644 --- a/src/app/pages/search/search.module.ts +++ b/src/app/pages/search/search.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -7,14 +7,17 @@ import { IonicModule } from '@ionic/angular'; import { SearchPageRoutingModule } from './search-routing.module'; import { SearchPage } from './search.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, SearchPageRoutingModule ], - declarations: [SearchPage] + declarations: [SearchPage], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class SearchPageModule {} diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index cd6c13a4a..5742ae085 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -1,9 +1,15 @@ - search + Pesquisa - + + + + + + + diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index e69de29bb..e2c1ca1a4 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -0,0 +1,18 @@ +.div-search{ + width: 94%; + margin: 3%; + border: 0.5px solid #333; + padding: 0 5px 0 5px; + overflow: auto; + +} +.search-input{ + width: 90%; + float: left; +} +.icon-search{ + width: 8%; + padding: 8px 3px 5px 2px; + font-size: 25px; + float: right; +} \ No newline at end of file diff --git a/src/app/pages/signup/signup.page.html b/src/app/pages/signup/signup.page.html deleted file mode 100644 index d4082ed5e..000000000 --- a/src/app/pages/signup/signup.page.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - Criar conta - - - - Username - - - - Username - - - - Submeter - - - Já tenho uma conta, Login - - - - - - diff --git a/src/app/pages/signup/signup.page.ts b/src/app/pages/signup/signup.page.ts deleted file mode 100644 index 34010153c..000000000 --- a/src/app/pages/signup/signup.page.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; - -@Component({ - selector: 'app-signup', - templateUrl: './signup.page.html', - styleUrls: ['./signup.page.scss'], -}) -export class SignupPage implements OnInit { - - constructor(private router: Router) { } - - ngOnInit() { - } - - submitForm(){ - this.router.navigate(['/login']); - - } - -} diff --git a/src/app/pages/signup/signup-routing.module.ts b/src/app/pages/view-event/view-event-routing.module.ts similarity index 65% rename from src/app/pages/signup/signup-routing.module.ts rename to src/app/pages/view-event/view-event-routing.module.ts index d1ee57861..37a7a0172 100644 --- a/src/app/pages/signup/signup-routing.module.ts +++ b/src/app/pages/view-event/view-event-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { SignupPage } from './signup.page'; +import { ViewEventPage } from './view-event.page'; const routes: Routes = [ { path: '', - component: SignupPage + component: ViewEventPage } ]; @@ -14,4 +14,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class SignupPageRoutingModule {} +export class ViewEventPageRoutingModule {} diff --git a/src/app/pages/view-event/view-event.module.ts b/src/app/pages/view-event/view-event.module.ts new file mode 100644 index 000000000..7823eee10 --- /dev/null +++ b/src/app/pages/view-event/view-event.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ViewEventPageRoutingModule } from './view-event-routing.module'; + +import { ViewEventPage } from './view-event.page'; +import { ComponentsModule } from 'src/app/components/components.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ComponentsModule, + ViewEventPageRoutingModule + ], + declarations: [ViewEventPage] +}) +export class ViewEventPageModule {} diff --git a/src/app/pages/view-event/view-event.page.html b/src/app/pages/view-event/view-event.page.html new file mode 100644 index 000000000..69cf8143b --- /dev/null +++ b/src/app/pages/view-event/view-event.page.html @@ -0,0 +1,12 @@ + + + + + + Novo Evento + + + + + + diff --git a/src/app/pages/signup/signup.page.scss b/src/app/pages/view-event/view-event.page.scss similarity index 100% rename from src/app/pages/signup/signup.page.scss rename to src/app/pages/view-event/view-event.page.scss diff --git a/src/app/pages/signup/signup.page.spec.ts b/src/app/pages/view-event/view-event.page.spec.ts similarity index 61% rename from src/app/pages/signup/signup.page.spec.ts rename to src/app/pages/view-event/view-event.page.spec.ts index 1b0c3b114..d13628ede 100644 --- a/src/app/pages/signup/signup.page.spec.ts +++ b/src/app/pages/view-event/view-event.page.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { SignupPage } from './signup.page'; +import { ViewEventPage } from './view-event.page'; -describe('SignupPage', () => { - let component: SignupPage; - let fixture: ComponentFixture; +describe('ViewEventPage', () => { + let component: ViewEventPage; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ SignupPage ], + declarations: [ ViewEventPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(SignupPage); + fixture = TestBed.createComponent(ViewEventPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/pages/view-event/view-event.page.ts b/src/app/pages/view-event/view-event.page.ts new file mode 100644 index 000000000..613e27819 --- /dev/null +++ b/src/app/pages/view-event/view-event.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-view-event', + templateUrl: './view-event.page.html', + styleUrls: ['./view-event.page.scss'], +}) +export class ViewEventPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/typings/cordova-typings.d.ts b/typings/cordova-typings.d.ts index 108537a0e..bc8b36fb0 100644 --- a/typings/cordova-typings.d.ts +++ b/typings/cordova-typings.d.ts @@ -1,3 +1,5 @@ /// -/// \ No newline at end of file +/// +/// +/// \ No newline at end of file
Segunda-feira, 03 de Agosto
MINEC, MINFIN13 JAN
MINEC, MINFIN05 JAN
Já tenho uma conta, Login