diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9539c19ee..5048c8574 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { RouteReuseStrategy } from '@angular/router'; import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; -import { SplashScreen } from '@ionic-native/splash-screen/ngx'; +// import { SplashScreen } from '@ionic-native/splash-screen/ngx'; import { StatusBar } from '@ionic-native/status-bar/ngx'; import { AppRoutingModule } from './app-routing.module'; @@ -48,7 +48,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; ], providers: [ StatusBar, - SplashScreen, + //SplashScreen, HttpClientModule, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, InAppBrowser, diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index 7cf4c9104..4c74c50ee 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -1,7 +1,7 @@ ion-tab-bar{ - --background: #f9f9f9; - --color: #061b52; + --background: #f9f9f9; + --color: #061b52; } // Badge @@ -37,7 +37,8 @@ ion-badge {/* */ @media only screen and (min-width: 1024px) { + ion-tabs.tab .bottoms{ - // display: none; + display: none; } } \ No newline at end of file diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 39cf44815..4885f4a6d 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -3,12 +3,6 @@ import { EventsService } from '../services/events.service'; import { Event } from '../models/event.model'; import { ProcessesService } from '../services/processes.service'; import { ModalController } from '@ionic/angular'; -import { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page'; -import { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page'; -import { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page' -import { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page' -/* import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page'; */ - /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */ import { Router } from '@angular/router'; diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 830ff6424..918a80754 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -211,7 +211,7 @@ export class AgendaPage implements OnInit { onCurrentChanged = (ev: Date) => { // timeline change date - this.timelineDate = new Date(ev).toLocaleString(); + this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy'); this.viewDate = new Date(ev); // calendar change date this.eventSelectedDate = new Date(ev); diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 679df1102..3f899f293 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -1,27 +1,69 @@ - - - - - - -
+ + + +
+
+ +
+ +
+ + +
+
+ +
+
+ + +
+ +
+ + Ínicio +
+ +
+ + Agenda +
+ +
+ + Gabinete +
+ +
+ + Ações +
+ + +
+ + Chat +
+ +
+ +
+
- - - - - +
- - - - +
+
+ + +
\ No newline at end of file diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index d18475831..39788852d 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -1,21 +1,19 @@ @import '~src/function.scss'; .div-top-header{ - margin: 0 auto; + margin: 0 em(20px); background-color: #0782c9; - overflow: auto; padding-top: em(15px); border: 0!important; .div-search{ - font-size: 45px; - margin: 0 0 0 10px + ion-icon{ + font-size: 45px; + } } .div-logo{ background: transparent; width: em(140px); - margin: 0px auto; - margin-top: 5px; justify-content: center; display: flex; } @@ -25,8 +23,22 @@ } .div-profile{ font-size: 45px; - margin-right: 10px; justify-content: flex-end; display: flex; } +} + +.desktop{ + display: none; +} + +@media only screen and (min-width: 1024px) { + + .mobile{ + display: none !important; + } + .desktop{ + display: block; + } + } \ No newline at end of file diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 826838b78..dd798e36e 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { SearchPage } from 'src/app/pages/search/search.page'; +import { Router } from '@angular/router'; @Component({ selector: 'app-header', @@ -11,7 +12,8 @@ export class HeaderPage implements OnInit { profile: string = 'mdgpr'; - constructor(private modalController: ModalController) { + constructor(private modalController: ModalController, + private router: Router) { window['header'] = (profile:string) => { this.profile = profile; @@ -32,4 +34,7 @@ export class HeaderPage implements OnInit { return await modal.present(); } + changeRoute(path){ + this.router.navigateByUrl(path) + } } diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html index 925ce35bb..ff30b2c02 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.html +++ b/src/app/shared/headers/header-no-search/header-no-search.page.html @@ -1,24 +1,67 @@ - - - - - - - +
+ +
+ +
+ + +
+
+ + +
+ +
+ + Ínicio +
+ +
+ + Agenda +
+ +
+ + Gabinete +
+ +
+ + Ações +
+ + +
+ + Chat +
+ +
+ +
+ - - - - - -
+ +
- - +
+
+ + +
- + \ No newline at end of file diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.scss b/src/app/shared/headers/header-no-search/header-no-search.page.scss index d18475831..3950348c0 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.scss +++ b/src/app/shared/headers/header-no-search/header-no-search.page.scss @@ -1,21 +1,15 @@ @import '~src/function.scss'; .div-top-header{ - margin: 0 auto; + margin: 0 em(20px); background-color: #0782c9; - overflow: auto; padding-top: em(15px); border: 0!important; - .div-search{ - font-size: 45px; - margin: 0 0 0 10px - } + .div-logo{ background: transparent; width: em(140px); - margin: 0px auto; - margin-top: 5px; justify-content: center; display: flex; } @@ -25,8 +19,22 @@ } .div-profile{ font-size: 45px; - margin-right: 10px; justify-content: flex-end; display: flex; } +} + +.desktop{ + display: none; +} + +@media only screen and (min-width: 1024px) { + + .mobile{ + display: none !important; + } + .desktop{ + display: block; + } + } \ No newline at end of file diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.ts b/src/app/shared/headers/header-no-search/header-no-search.page.ts index 162df8e82..f174c81f8 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.ts +++ b/src/app/shared/headers/header-no-search/header-no-search.page.ts @@ -3,6 +3,7 @@ import { AnimationController, ModalController } from '@ionic/angular'; import { SearchPage } from 'src/app/pages/search/search.page'; import { MenuController } from '@ionic/angular'; import { ProfileComponent } from './profile/profile.component'; +import { Router } from '@angular/router'; @Component({ selector: 'app-header-no-search', templateUrl: './header-no-search.page.html', @@ -12,7 +13,8 @@ export class HeaderNoSearchPage implements OnInit { constructor(private modalController: ModalController, private menu: MenuController, - private animationController: AnimationController,) { } + private animationController: AnimationController, + private router: Router) { } ngOnInit() { } @@ -53,4 +55,8 @@ export class HeaderNoSearchPage implements OnInit { }); return await modal.present(); } + + changeRoute(path){ + this.router.navigateByUrl(path) + } } diff --git a/src/assets/images/icons-nav-a-es-inactive.svg b/src/assets/images/icons-nav-a-es-inactive.svg new file mode 100644 index 000000000..433734b86 --- /dev/null +++ b/src/assets/images/icons-nav-a-es-inactive.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-agenda-inactive.svg b/src/assets/images/icons-nav-agenda-inactive.svg new file mode 100644 index 000000000..2fffe282b --- /dev/null +++ b/src/assets/images/icons-nav-agenda-inactive.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-home-active.svg b/src/assets/images/icons-nav-home-active.svg new file mode 100644 index 000000000..911ccbab7 --- /dev/null +++ b/src/assets/images/icons-nav-home-active.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-home-dk.svg b/src/assets/images/icons-nav-home-dk.svg new file mode 100644 index 000000000..790329458 --- /dev/null +++ b/src/assets/images/icons-nav-home-dk.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/style/main.scss b/src/style/main.scss index 0e36d9540..c6e3af376 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -246,6 +246,9 @@ .height-100{ height: 100%; } +.height-fit-content{ + height: fit-content; +} .width-50{ width: 50%; @@ -257,3 +260,65 @@ } +.flex-0{ + flex: 0; +} + +// system spacing + + + + + +@for $i from 0 through 10 { + + $size: $i * 5; + + $properties: + "margin" "m", + "padding" "p"; + + @each $property, $short in $properties { + // all directions + .#{$short}a-#{$size} { + #{$property}-left: #{$size}px !important; + #{$property}-right: #{$size}px !important; + #{$property}-top: #{$size}px !important; + #{$property}-bottom: #{$size}px !important; + } + // top + .#{$short}t-#{$size} { + #{$property}-top: #{$size}px !important + } + // bottom + .#{$short}b-#{$size} { + #{$property}-bottom: #{$size}px !important + } + // left + .#{$short}l-#{$size} { + #{$property}-left: #{$size}px!important + } + // right + .#{$short}r-#{$size} { + #{$property}-right: #{$size}px!important + } + // left and right + .#{$short}x-#{$size} { + #{$property}-left: #{$size}px!important; + #{$property}-right: #{$size}px!important; + } + // top and bottom + .#{$short}y-#{$size} { + #{$property}-top: #{$size}px !important; + #{$property}-bottom: #{$size}px !important; + } + + } + } + + + @for $i from 0 through 50 { + .font-#{$i} { + font-size: #{$i}px ; + } + } \ No newline at end of file diff --git a/src/style/readme.md b/src/style/readme.md index eae46b5fc..dbb49687d 100644 --- a/src/style/readme.md +++ b/src/style/readme.md @@ -134,4 +134,47 @@
  • .float-left
  • .float-right
    • -
\ No newline at end of file + + + + + + +## Spacing +
+ +

The helper classes apply margin or padding to an element ranging from 0 to 5. Each size increment was designed to align with common Material Design spacings. These classes can be applied using the following format {property}{direction}-{size}.

+ +

The property applies the type of spacing:

+ +
    +
  • m - applies margin
    • +
  • p - applies padding
    • +
+
+ +

The direction designates the side the property applies to:

+ +
    +
  • t - applies the spacing for *-top
    • +
  • b - applies the spacing for *-bottom
    • +
  • l - applies the spacing for *-left
    • +
  • r - applies the spacing for *-right
    • +
  • x - applies the spacing for both *-left and *-right
    • +
  • y - applies the spacing for both *-top and *-bottom
    • +
  • a - applies the spacing for the property in all directions
    • +
+
+

The size controls the increment of the property:

+ + +Example: + +```html + \ No newline at end of file