peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update agenda

Browse Source
This commit is contained in:
Peter Maquiran
2021-03-02 19:00:55 +01:00
parent 005e82033b a0f06af6bf
commit ccc7191c66
12 changed files with 155 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.scss
+1 -1
View File
@@ -36,7 +36,7 @@ ion-badge {/* */
}
@media only screen and (min-width: 1024px) {
@media only screen and (min-width: 1366px) {
ion-tabs.tab .bottoms{
display: none;
src/app/pages/agenda/agenda.page.ts
+2 -2
View File
@@ -458,7 +458,7 @@ export class AgendaPage implements OnInit {
});
});
// this.timelineFilter(this.timelineFilterState);
this.timelineFilter(this.timelineFilterState);
this.myCal.update();
this.myCal.loadEvents();
@@ -491,7 +491,7 @@ export class AgendaPage implements OnInit {
});
// this.timelineFilter(this.timelineFilterState);
this.timelineFilter(this.timelineFilterState);
this.myCal.update();
this.myCal.loadEvents();
src/app/shared/header-pr/header-pr.page.scss
+46 -27
View File
@@ -1,28 +1,47 @@
.div-top-header{
width: 400px;
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
padding-top: 15px;
border: 0!important;
@import '~src/function.scss';
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: 140px;
margin: 5px 0 0px 71px;
float: left;
}
.div-logo img{
width: 100%;
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
}
.div-top-header{
margin: 0 em(20px);
background-color: #0782c9;
padding-top: em(15px);
border: 0!important;
}
.div-logo{
background: transparent;
width: em(140px);
justify-content: center;
display: flex;
}
.div-logo img{
width: 100%;
margin: 0px auto;
}
.div-profile{
font-size: 45px;
justify-content: flex-end;
display: flex;
}
.desktop{
display: none;
}
@media only screen and (min-width: 1366px) {
.mobile{
display: none !important;
}
.desktop{
display: block;
}
}
.tab{
height: 65px;
}
.active{
border-top: 7px solid white;
}
src/app/shared/header-pr/header-pr.page.ts
+4
View File
@@ -12,4 +12,8 @@ export class HeaderPrPage implements OnInit {
ngOnInit() {
}
locationPathname(): string {
return window.location.pathname
}
}
src/app/shared/header/header.page.html
+17 -16
View File
@@ -3,18 +3,19 @@
<div class="mobile d-flex div-top-header justify-space-between">
<div (click)="openSearch()" class="div-search">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
<ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
</div>
<div class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile" (click)="openProfile()">
<ion-icon *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
<div class="desktop div-top-header">
<div class="desktop mx-20">
<div class="d-flex justify-space-between align-center">
<div tab="events" class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
@@ -22,42 +23,42 @@
<div class="d-flex flex-1 pr-20 pl-50">
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/events')">
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
<ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
<span>Ínicio</span>
</div>
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/agenda')" >
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/agenda')" [class.active]="locationPathname() == '/home/agenda'">
<ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
<span>Agenda</span>
</div>
<div class="mr-20 d-flex align-center" (click)="changeRoute('/home/gabinete-digital')">
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
<ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
<span>Gabinete</span>
</div>
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/publications')">
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/publications')" [class.active]="locationPathname() == '/home/publications'">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Ações</span>
</div>
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/chat')">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
<ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
<span>Chat</span>
</div>
</div>
<div class="d-flex">
<div (click)="openSearch()" class="div-search mr-10">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
<div (click)="openSearch()" class="mr-10">
<ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
</div>
<div class="div-profile" (click)="openProfile()">
<ion-icon *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<div class="div-profile justify-end d-flex" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</div>
src/app/shared/header/header.page.scss
+21 -22
View File
@@ -5,34 +5,25 @@
background-color: #0782c9;
padding-top: em(15px);
border: 0!important;
.div-search{
ion-icon{
font-size: 45px;
}
}
.div-logo{
background: transparent;
width: em(140px);
justify-content: center;
display: flex;
}
.div-logo img{
width: 100%;
margin: 0px auto;
}
.div-profile{
font-size: 45px;
justify-content: flex-end;
display: flex;
}
}
.div-logo{
background: transparent;
width: em(140px);
justify-content: center;
display: flex;
}
.div-logo img{
width: 100%;
margin: 0px auto;
}
.desktop{
display: none;
}
@media only screen and (min-width: 1024px) {
@media only screen and (min-width: 1366px) {
.mobile{
display: none !important;
@@ -41,4 +32,12 @@
display: block;
}
}
.tab{
height: 65px;
}
.active{
border-top: 7px solid white;
}
src/app/shared/header/header.page.ts
+7
View File
@@ -26,6 +26,10 @@ export class HeaderPage implements OnInit {
ngOnInit() {
}
locationPathname(): string {
return window.location.pathname
}
async openSearch() {
const modal = await this.modalController.create({
component: SearchPage,
@@ -41,6 +45,7 @@ export class HeaderPage implements OnInit {
}
async openProfile() {
const enterAnimation = (baseEl: any) => {
@@ -77,4 +82,6 @@ export class HeaderPage implements OnInit {
});
return await modal.present();
}
}
src/app/shared/headers/header-no-search/header-no-search.page.html
+9 -8
View File
@@ -8,12 +8,13 @@
<div class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile" (click)="openProfile()">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" src='assets/images/icons-profile.svg'></ion-icon>
</div>
</div>
<div class="desktop div-top-header">
<div class="desktop mx-20">
<div class="d-flex justify-space-between align-center">
<div tab="events" class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
@@ -21,29 +22,29 @@
<div class="d-flex flex-1 pr-20 pl-50">
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/events')">
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/events')" [class.active]="locationPathname() == '/home/events'">
<ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
<span>Ínicio</span>
</div>
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/agenda')" >
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/agenda')" [class.active]="locationPathname() == '/home/agenda'">
<ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
<span>Agenda</span>
</div>
<div class="mr-20 div-search d-flex align-center" (click)="changeRoute('/home/gabinete-digital')">
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/gabinete-digital')" [class.active]="locationPathname() == '/home/gabinete-digital'">
<ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
<span>Gabinete</span>
</div>
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/publications')">
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/publications')" [class.active]="locationPathname() == '/home/publications'">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Ações</span>
</div>
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/chat')">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
<ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
<span>Chat</span>
</div>
src/app/shared/headers/header-no-search/header-no-search.page.scss
+24 -17
View File
@@ -5,30 +5,29 @@
background-color: #0782c9;
padding-top: em(15px);
border: 0!important;
}
.div-logo{
background: transparent;
width: em(140px);
justify-content: center;
display: flex;
}
.div-logo img{
width: 100%;
margin: 0px auto;
}
.div-profile{
font-size: 45px;
justify-content: flex-end;
display: flex;
}
.div-logo{
background: transparent;
width: em(140px);
justify-content: center;
display: flex;
}
.div-logo img{
width: 100%;
margin: 0px auto;
}
.div-profile{
font-size: 45px;
justify-content: flex-end;
display: flex;
}
.desktop{
display: none;
}
@media only screen and (min-width: 1024px) {
@media only screen and (min-width: 1366px) {
.mobile{
display: none !important;
@@ -37,4 +36,12 @@
display: block;
}
}
.tab{
height: 65px;
}
.active{
border-top: 7px solid white;
}
src/app/shared/headers/header-no-search/header-no-search.page.ts
+4
View File
@@ -59,4 +59,8 @@ export class HeaderNoSearchPage implements OnInit {
changeRoute(path){
this.router.navigateByUrl(path)
}
locationPathname(): string {
return window.location.pathname
}
}
src/assets/images/icons-nav-grupos-inactive-dk-white.svg
+4
View File
@@ -0,0 +1,4 @@
<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M22.34 26.1C23.744 26.1 25.09 25.892 26.333 25.51C26.999 25.304 30.585 27.268 31.186 26.969C31.793 26.667 29.416 24.102 29.943 23.716C32.333 21.966 33.84 19.404 33.84 16.55C33.84 11.276 28.691 7 22.34 7C15.989 7 10.84 11.276 10.84 16.55C10.84 21.825 15.989 26.1 22.34 26.1Z" stroke="white" stroke-width="2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.84 32.37C14.863 32.37 13.927 32.224 13.062 31.956C12.599 31.813 10.104 33.188 9.686 32.978C9.264 32.768 10.918 30.972 10.551 30.701C8.889 29.476 7.84 27.683 7.84 25.685C7.84 24.133 8.473 22.705 9.535 21.57C10.999 20.006 13.279 19 15.84 19C20.258 19 23.84 21.993 23.84 25.685C23.84 26.722 23.558 27.703 23.054 28.579C21.763 30.822 19.018 32.37 15.84 32.37Z" stroke="white" stroke-width="2"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 905 B

src/assets/images/icons-nav-grupos-inactive-dk.svg
+16
View File
@@ -0,0 +1,16 @@
<svg xmlns="http://www.w3.org/2000/svg" width="41" height="40" viewBox="0 0 41 40">
<g fill="none" fill-rule="evenodd">
<g stroke="#797979" stroke-width="2">
<g>
<g>
<g>
<g>
<path d="M21.5 26.1c1.404 0 2.75-.208 3.993-.59.666-.206 4.252 1.758 4.853 1.459.607-.302-1.77-2.867-1.243-3.253C31.493 21.966 33 19.404 33 16.55 33 11.276 27.851 7 21.5 7S10 11.276 10 16.55c0 5.275 5.149 9.55 11.5 9.55z" transform="translate(-911 -708) translate(0 708) translate(56) translate(839.84) translate(16)"/>
<path d="M15 32.37c.977 0 1.913-.146 2.778-.414.463-.143 2.958 1.232 3.376 1.022.422-.21-1.232-2.006-.865-2.277C21.951 29.476 23 27.683 23 25.685c0-1.552-.633-2.98-1.695-4.115C19.841 20.006 17.561 19 15 19c-4.418 0-8 2.993-8 6.685 0 1.037.282 2.018.786 2.894C9.077 30.822 11.822 32.37 15 32.37z" transform="translate(-911 -708) translate(0 708) translate(56) translate(839.84) translate(16) matrix(-1 0 0 1 30 0)"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB