Modified search, agenda, dg, and event view

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]

src/app/pages/agenda/agenda.page.html

@@ -1,9 +1,28 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>agenda</ion-title>
+    <ion-title>Agenda</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content>
+  <ion-toolbar *ngIf="!ios">
+    <ion-segment [(ngModel)]="segment">
+      <ion-segment-button value="combinada">
+        Combinada
+      </ion-segment-button>
+      <ion-segment-button value="oficial">
+        Oficial
+      </ion-segment-button>
+      <ion-segment-button value="pessoal">
+        Pessoal
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
 
+
+  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+    <ion-fab-button>
+      <ion-icon name="create"></ion-icon>
+    </ion-fab-button>
+  </ion-fab>
 </ion-content>

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); */
   }
 
 }

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]

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 {}

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -1,9 +1,65 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>gabinete-digital</ion-title>
+    <ion-title>Gabinete Digital</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content>
-
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment">
+      <ion-segment-button value="expediente">
+        Expediente
+      </ion-segment-button>
+      <ion-segment-button value="pendentes">
+        Pendentes
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+  <div [ngSwitch]="segment">
+    <ion-list *ngSwitchCase="'expediente'">
+      <ion-item-group>
+        <ion-item-sliding>
+          <ion-item lines="none">
+            <div class="div-content">
+              <ion-item lines="none">
+                <ion-icon slot="end" name="document-outline"></ion-icon>
+                 <h3>Reunião de Conselho de Ministros</h3>
+              </ion-item>
+              <p><span class="span-left">MINEC, MINFIN</span><span class="span-right">13 JAN</span></p>
+            </div>
+          </ion-item>
+        </ion-item-sliding>
+      </ion-item-group>
+    </ion-list>
+    <ion-list *ngSwitchCase="'pendentes'">
+      <ion-item-group>
+        <ion-item-sliding>
+          <ion-item lines="none">
+            <div class="div-content">
+              <ion-item lines="none">
+                <ion-icon slot="end" name="document-outline"></ion-icon>
+                 <h3>Avaliação de execução dos projectos públicos</h3>
+              </ion-item>
+              <p><span class="span-left">MINEC, MINFIN</span><span class="span-right">05 JAN</span></p>
+            </div>
+          </ion-item>
+        </ion-item-sliding>
+      </ion-item-group>
+    </ion-list>
+  </div>
+  <!-- <p>Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+    Jaqueta corta-vento, dupla face, um lado estampado de camuflado exclusivo Element, do outro preto, ambos com estampa no peito esquerdo de quem veste, bolsos laterais e etiquetas personalizadas Element. Características Principais: Material: 100% Poliéster Garantia conta defeito de fabricação.
+  </p> -->
+  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+    <ion-fab-button>
+      <ion-icon name="create"></ion-icon>
+    </ion-fab-button>
+  </ion-fab>
 </ion-content>

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;
+}

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";
   }
 
 }

src/app/pages/login/login.page.html

@@ -18,10 +18,6 @@
           </ion-item>
         
         <ion-button expand="block" shape="round" color="primary" (click)="simpleLogin()">Entrar</ion-button>
-
-        <ion-item lines="none">
-            <a routerLink="/signup">Criar conta</a>
-          </ion-item>
     </ion-list>
   </form>
 </div>

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");
+
+    
     }
 
   }

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 {}

src/app/pages/search/search.page.html

@@ -1,9 +1,15 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>search</ion-title>
+    <ion-title>Pesquisa</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content>
-
+  <ion-form>
+    <div class="div-search">
+      <ion-input class="search-input" type="search" placeholder="FMI"></ion-input>
+      <ion-icon class="icon-search" slot="end" name="search"></ion-icon>
+    </div>
+    
+  </ion-form>
 </ion-content>

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;
+}

src/app/pages/signup/signup.module.ts

@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-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';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    SignupPageRoutingModule
-  ],
-  declarations: [SignupPage]
-})
-export class SignupPageModule {}

src/app/pages/signup/signup.page.html

@@ -1,25 +0,0 @@
-<ion-content>
-    <div class="wrapper">
-        <app-logo></app-logo>
-        <h2 class="center">Criar conta</h2>
-      <form>
-        <ion-list>
-          <ion-item>
-            <ion-label position="stacked">Username</ion-label>
-            <ion-input type="text"></ion-input>
-          </ion-item>
-          <ion-item>
-              <ion-label position="stacked">Username</ion-label>
-              <ion-input type="text"></ion-input>
-            </ion-item>
-
-            <ion-button expand="block" shape="round" color="primary" (click)="submitForm()">Submeter</ion-button>
-
-            <ion-item lines="none">
-                <p>Já tenho uma conta, <a routerLink="/login">Login</a></p>
-              </ion-item>
-
-        </ion-list>
-      </form>
-    </div>
-</ion-content>

src/app/pages/signup/signup.page.ts

@@ -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']);
-
-  }
-
-}

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 {}

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 {}

src/app/pages/view-event/view-event.page.html

@@ -0,0 +1,12 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-item slot="start" lines="none">
+      <ion-icon name="chevron-back-circle-outline"></ion-icon>
+    </ion-item>
+    <ion-title>Novo Evento</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <app-event></app-event>
+</ion-content>

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<SignupPage>;
+describe('ViewEventPage', () => {
+  let component: ViewEventPage;
+  let fixture: ComponentFixture<ViewEventPage>;
 
   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();
   }));

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() {
+  }
+
+}