diff --git a/config.xml b/config.xml index 96e8bcd10..1206355a6 100644 --- a/config.xml +++ b/config.xml @@ -91,6 +91,11 @@ + + + + + diff --git a/resources/ios/icon/icon-108@2x.png b/resources/ios/icon/icon-108@2x.png new file mode 100644 index 000000000..13759969b Binary files /dev/null and b/resources/ios/icon/icon-108@2x.png differ diff --git a/resources/ios/splash/Default-1792h~iphone.png b/resources/ios/splash/Default-1792h~iphone.png new file mode 100644 index 000000000..359246b4f Binary files /dev/null and b/resources/ios/splash/Default-1792h~iphone.png differ diff --git a/resources/ios/splash/Default-2688h~iphone.png b/resources/ios/splash/Default-2688h~iphone.png new file mode 100644 index 000000000..161134be3 Binary files /dev/null and b/resources/ios/splash/Default-2688h~iphone.png differ diff --git a/resources/ios/splash/Default-Landscape-1792h~iphone.png b/resources/ios/splash/Default-Landscape-1792h~iphone.png new file mode 100644 index 000000000..58394bf06 Binary files /dev/null and b/resources/ios/splash/Default-Landscape-1792h~iphone.png differ diff --git a/resources/ios/splash/Default-Landscape-2688h~iphone.png b/resources/ios/splash/Default-Landscape-2688h~iphone.png new file mode 100644 index 000000000..36828a6d5 Binary files /dev/null and b/resources/ios/splash/Default-Landscape-2688h~iphone.png differ diff --git a/src/app/index/index-routing.module.ts b/src/app/index/index-routing.module.ts index 99d25d9a0..ac32c6fd4 100644 --- a/src/app/index/index-routing.module.ts +++ b/src/app/index/index-routing.module.ts @@ -7,12 +7,12 @@ const routes: Routes = [ path: '', component: IndexPage, children: [ - { + /*{ path: '', loadChildren: ()=> import('../pages/welcome/welcome.module').then(m => m.WelcomePageModule) - }, + }, */ { - path: 'login', + path: '', loadChildren: ()=> import('../pages/login/login.module').then(m => m.LoginPageModule) }, ] diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html index f90729965..95a17bca5 100644 --- a/src/app/pages/cal-modal/cal-modal.page.html +++ b/src/app/pages/cal-modal/cal-modal.page.html @@ -25,32 +25,32 @@ Localização - + Intervenientes - + Oficial - + Pessoal - + Selecione o tipo de evento - Reunião - Viagem - Conferência - Encontro + Reunião + Viagem + Conferência + Encontro @@ -68,10 +68,10 @@ Selecione a frequência do evento - Único - Diário - Semanal - Mensal + Único + Diário + Semanal + Mensal
diff --git a/src/app/pages/cal-modal/cal-modal.page.ts b/src/app/pages/cal-modal/cal-modal.page.ts index 779b4304f..d198fcd8e 100644 --- a/src/app/pages/cal-modal/cal-modal.page.ts +++ b/src/app/pages/cal-modal/cal-modal.page.ts @@ -18,6 +18,11 @@ export class CalModalPage implements AfterViewInit { event = { title: '', desc: '', + place: '', + people: '', + group: '', + type: '', + frequency: '', startTime: null, endTime: null, allDay: true diff --git a/src/app/pages/feed/feed.page.html b/src/app/pages/feed/feed.page.html index 166282e99..1ab1e78d9 100644 --- a/src/app/pages/feed/feed.page.html +++ b/src/app/pages/feed/feed.page.html @@ -19,7 +19,8 @@

Bom dia Excelência
Presidente da República

-

Segunda-feira, 03 de Agosto

+

{{customDate}}

+
diff --git a/src/app/pages/feed/feed.page.ts b/src/app/pages/feed/feed.page.ts index 0367636f8..7fd90a2df 100644 --- a/src/app/pages/feed/feed.page.ts +++ b/src/app/pages/feed/feed.page.ts @@ -7,6 +7,25 @@ import { Component, OnInit } from '@angular/core'; }) export class FeedPage implements OnInit { + /* Get current system date */ + today = new Date(); + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + customDate = this.days[this.today.getDay()]+ ", " + + this.today.getDate() +" de " + + ( this.months[this.today.getMonth()]); + /* Setting appropriate greeting according to the time */ + grettings = ["Bom dia", "Boa tarde", "Boa noite"]; + /* hora + Dia 06 - 12:00 + Tarde 12:01 - 18:00 + Noite 18:00 - 06:00 + */ + timeDate = this.today.getHours() + ":" + this.today.getMinutes(); + showGreeting(){ + if(this.today.getHours() >= 11 && this.today.getMinutes() >=) + } + segment:string; constructor() { } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 2b1327ec6..3b14e9319 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -237,8 +237,8 @@ padding: 150px 20px 0 20px; overflow: auto; } -.cal-modal{ +/* .cal-modal{ --height: 80%; --border-radius: 10px; padding: 25px; -} \ No newline at end of file +} */ \ No newline at end of file