jwt implemented

This commit is contained in:
Eudes Inácio
2023-11-29 12:17:52 +01:00
parent 7bd1370c0b
commit f4a998584d
41 changed files with 1204 additions and 693 deletions
@@ -27,20 +27,20 @@
</div>
</div>
<div *ngIf="filecontent" class="ion-item-container-no-border mb-20">
<div *ngIf="seletedContent.length > 0" class="ion-item-container-no-border mb-20">
<ion-label class="attached-title pb-10">Fotografia Anexada</ion-label>
<div class="d-flex justify-content-between">
<div class="d-flex">
<ion-thumbnail *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" lot="start">
<ion-img *ngIf="checkFileType.checkFileType(seleted.fileType) == 'image'" [(ngModel)]="capturedImage"
name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.base64"
<ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'" [(ngModel)]="capturedImage"
name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.FileBase64"
(click)="imageSize(capturedImage)"></ion-img>
<video *ngIf="checkFileType.checkFileType(seleted.fileType) == 'video'" width="70" height="70"
<video *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video'" width="70" height="70"
controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline">
<source type="video/mp4" [src]="'data:video/mp4;base64,' + capturedVideo">
<source type="video/mp4" [src]="'data:video/mp4;base64,' + seleted.FileBase64">
</video>
</ion-thumbnail>
@@ -64,20 +64,20 @@
</div>
<div class="picture d-flex pb-5 hide-desktop"
*ngIf="publication && !( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' ) && !capturedImage">
<div class="post-img" *ngIf="publication.FileBase64">
<img src="{{publication.FileBase64}}" alt="image">
<!-- <div class="picture d-flex pb-5 hide-desktop"
*ngIf="publication && !( publication.Files[0].FileBase64 == 'data:image/jpg;base64,null' || publication.Files[0].FileBase64 == '' )">
<div class="post-img" *ngIf="publication.Files[0].FileBase64 ">
<img src="{{publication.Files[0].FileBase64 }}" alt="image">
</div>
<div class="d-flex flex-column pl-10" *ngIf="publication.FileBase64">
<div class="d-flex flex-column pl-10" *ngIf="publication.Files[0].FileBase64 ">
<div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
<!-- <div class="size">75 Kb</div> -->
<div class="size">75 Kb</div>
</div>
<div class="flex-grow-1 d-flex align-center justify-end font-25" *ngIf="publication.FileBase64"
<div class="flex-grow-1 d-flex align-center justify-end font-25" *ngIf="publication.Files[0].FileBase64 "
(click)="deletePublicationImage()">
<ion-icon name="close"></ion-icon>
</div>
</div>
</div> -->
<div class="ion-item-container-no-border">
<ion-label (click)="chossePhotoOrVideo()">
File diff suppressed because one or more lines are too long
@@ -23,19 +23,29 @@
</div>
<div class="post-item overflow-y-auto">
<div (click)="play()" *ngIf="publication.FileBase64.length > 30" class="post-img">
<!-- <img src="{{publication.FileBase64}}" alt="image" > -->
<video controls>
<source type="video/mp4" src="{{publication.FileBase64}}">
</video>
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
<swiper-container [modules]="swiperModules" [pagination]="{clickable: true, dynamicBullets: true }">
<swiper-slide *ngFor="let files of publication.Files let k = index">
<div (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)">
<img *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'image'" class="post-img"
src="{{'data:image/jpg;base64,' + files.FileBase64}}">
<video *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata"
webkit-playsinline="webkit-playsinline">
<source src="{{'data:video/mp4;base64,' + files.FileBase64}}" type="video/mp4">
</video>
</div>
</swiper-slide>
</swiper-container>
<!-- <div *ngIf="publication.FileBase64.length < 30" class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
</div> -->
<div class="post-description px-20">
<pre class="text font-14-rem">{{publication.Message}}</pre>
</div>
</div>
</div>
<div *ngIf="publication.Title == ''" class="d-flex flex-column">
@@ -76,4 +76,4 @@ ion-toolbar {
.font-14-rem {
font-size: rem(14) !important;
}
}
@@ -11,6 +11,7 @@ import { RouteService } from 'src/app/services/route.service';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
import { checkFileTypeService } from 'src/app/services/checkFileType.service';
@@ -37,7 +38,8 @@ export class PublicationDetailPage implements OnInit {
public ThemeService: ThemeService,
public p:PermissionService,
private httpErrorHandle: HttpErrorHandle,
public publicationFolderService: PublicationFolderService
public publicationFolderService: PublicationFolderService,
public checkFileType: checkFileTypeService
) {
}
@@ -65,7 +67,7 @@ export class PublicationDetailPage implements OnInit {
Message: '',
/* image: null, */
DatePublication: null,
FileBase64: '',
Files: [],
OriginalFileName: '',
FileExtension: '',
};
@@ -85,7 +87,7 @@ export class PublicationDetailPage implements OnInit {
this.showLoader = true;
this.publications.GetPublicationById(this.DocumentId).subscribe(res => {
this.publications.GetPublicationWithArrayOfFilesById(this.DocumentId).subscribe(res => {
/* this.publication = res; */
this.publication = {
@@ -95,7 +97,7 @@ export class PublicationDetailPage implements OnInit {
Title:res.Title,
Message: res.Message,
DatePublication: res.DatePublication,
FileBase64: "data:video/mp4;base64," +res.FileBase64,
Files: res.Files,
OriginalFileName: res.OriginalFileName,
FileExtension: res.FileExtension,
}
@@ -43,18 +43,27 @@
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
<ion-card-content>
<div *ngIf="publication.FileExtension != 'mp4'" (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-img" >
<img [lazyLoad]="publication.FileBase64">
<swiper-container [modules]="swiperModules" [pagination]="{clickable: true, dynamicBullets: true }">
<swiper-slide *ngFor="let files of publication.Files let k = index">
<div (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)">
<img *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'image'" class="post-img"
[lazyLoad]="'data:image/jpg;base64,' + files.FileBase64">
</div>
<video *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata"
webkit-playsinline="webkit-playsinline">
<source src="{{'data:video/mp4;base64,' + files.FileBase64}}" type="video/mp4">
</video>
<div *ngIf="publication.FileExtension == 'mp4'" (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-video" >
<video controls="controls" preload="metadata" webkit-playsinline="webkit-playsinline">
<source src="{{publication.FileBase64}}" type="video/mp4">
</video>
</div>
</div>
</swiper-slide>
</swiper-container>
<!-- <div *ngIf="publication.FileExtension == 'mp4'"
(click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-video">
</div> -->
<div class="post-content">
<div class="post-title-time">
<div class="post-title font-15-em">
@@ -1,196 +1,293 @@
@import '~src/function.scss';
@import "~src/function.scss";
:host{
:host {
background: transparent;
padding: 0!important;
padding: 0 !important;
}
ion-content{
--background: transparent;
--border-radius: 30px;
}
ion-toolbar{
--border-width: 0 !important;
--border-style: none;
--padding-top: 0px !important;
--padding-start: 0px !important;
--padding-right: 0px !important;
--padding-end: 0px !important;
}
.div-top-header{
width: 400px;
margin: 0 auto;
background-color: #0782c9;
padding-top: 15px;
border: 0!important;
}
.div-search{
font-size: rem(45);
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: rem(45);
float: right;
margin-right: 10px;
}
.main-header{
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
background-color: #fff;
overflow:hidden;
padding: 25px 20px 0px 20px;
color:#000;
}
.main-content{
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
padding: 15px 20px 0 20px;
}
.content-top{
background: #f3f2f2;
height: 20px;
margin: 0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
transform: translate3d(0, 1px, 0);
ion-content {
--background: transparent;
--border-radius: 30px;
}
.content-container{
width: 100%;
margin:0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background: #ffffff;
height: 100%;
box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6);
padding: 25px 0px 0 0px;
overflow: auto;
}
.title-content{
margin: 0px auto;
overflow: auto;
padding: 0 !important;
}
.back-icon{
float: left;
font-size: rem(35);
}
.div-title{
/* padding: 0!important; */
float: left;
margin: 2.5px 0 0 5px;
color: #000 !important;
}
.title{
color: #000 !important;
}
.actions-icon{
float: right;
}
.actions-icon ion-icon{
margin-left: 10px;
float: right;
}
.item-content-date{
color: #797979;
}
.item-content-detail{
color: #000000;
}
.post-item{
width: 100%;
overflow: auto;
margin: 0 auto;
border-radius: 0px;
padding: 0!important;
}
.post-img{
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
align-items: center;
background: black;
}
.post-video{
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
background: black;
}
video{
max-width: -webkit-fill-available;
}
.post-img img{
height: 100%;
max-height: 420px;
}
.post-content{
margin: 0 auto;
margin-bottom: 35px;
}
.post-title-time{
width: 100%;
overflow: auto;
margin-top: 10px;
}
.post-title{
width: 60%;
float: left;
color: #0d89d1;
}
.post-data{
width: 40%;
float: left;
color: #797979;
text-align: right;
ion-toolbar {
--border-width: 0 !important;
--border-style: none;
--padding-top: 0px !important;
--padding-start: 0px !important;
--padding-right: 0px !important;
--padding-end: 0px !important;
}
.post-description{
color: #000;
}
.div-top-header {
width: 400px;
margin: 0 auto;
background-color: #0782c9;
padding-top: 15px;
border: 0 !important;
}
.div-search {
font-size: rem(45);
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: rem(45);
float: right;
margin-right: 10px;
}
.main-header {
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
background-color: #fff;
overflow: hidden;
padding: 25px 20px 0px 20px;
color: #000;
}
.main-content {
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
padding: 15px 20px 0 20px;
}
.content-top {
background: #f3f2f2;
height: 20px;
margin: 0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
transform: translate3d(0, 1px, 0);
}
.content-container {
width: 100%;
margin: 0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background: #ffffff;
height: 100%;
box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6);
padding: 25px 0px 0 0px;
overflow: auto;
}
.title-content {
margin: 0px auto;
overflow: auto;
padding: 0 !important;
}
.back-icon {
float: left;
font-size: rem(35);
}
.div-title {
/* padding: 0!important; */
float: left;
margin: 2.5px 0 0 5px;
color: #000 !important;
}
.title {
color: #000 !important;
}
.actions-icon {
float: right;
}
.actions-icon ion-icon {
margin-left: 10px;
float: right;
}
.item-content-date {
color: #797979;
}
.item-content-detail {
color: #000000;
}
.post-item {
width: 100%;
overflow: auto;
margin: 0 auto;
border-radius: 0px;
padding: 0 !important;
}
.post-img {
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
align-items: center;
background: black;
}
.post-video {
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
background: black;
}
video {
max-width: -webkit-fill-available;
}
.post-img img {
height: 100%;
max-height: 420px;
}
.post-content {
margin: 0 auto;
margin-bottom: 35px;
}
.post-title-time {
width: 100%;
overflow: auto;
margin-top: 10px;
}
.post-title {
width: 60%;
float: left;
color: #0d89d1;
}
.post-data {
width: 40%;
float: left;
color: #797979;
text-align: right;
}
.post-description {
color: #000;
}
.font-13-em {
font-size: 0.8125em !important;
}
.numbertext {
color: #f2f2f2;
font-size: 12px;
padding: 8px 12px;
position: absolute;
top: 0;
}
.prev,
.next {
cursor: pointer;
position: absolute;
top: 50%;
width: auto;
margin-top: -22px;
padding: 16px;
color: white;
font-weight: bold;
font-size: 18px;
transition: 0.6s ease;
border-radius: 0 3px 3px 0;
user-select: none;
}
/* Position the "next button" to the right */
.next {
right: 0;
border-radius: 3px 0 0 3px;
}
/* On hover, add a black background color with a little bit see-through */
.prev:hover,
.next:hover {
background-color: rgba(0, 0, 0, 0.8);
}
.dot {
cursor: pointer;
height: 15px;
width: 15px;
margin: 0 2px;
background-color: #bbb;
border-radius: 50%;
display: inline-block;
transition: background-color 0.6s ease;
}
.active,
.dot:hover {
background-color: #717171;
}
swiper-container {
width: 100%;
height: 100%;
}
swiper-slide {
text-align: center;
font-size: 18px;
background: #ffff;
display: flex;
justify-content: center;
align-items: center;
}
swiper-slide img {
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
align-items: center;
background: black;
}
swiper-slide video {
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
background: black;
}
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { ModalController } from '@ionic/angular';
import { ModalController,IonicSlides } from '@ionic/angular';
import { Publication } from 'src/app/models/publication';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationPipe } from 'src/app/pipes/publication.pipe';
@@ -15,6 +15,7 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { Storage } from '@ionic/storage';
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
import { CapacitorVideoPlayer } from 'capacitor-video-player';
import { checkFileTypeService } from 'src/app/services/checkFileType.service';
@Component({
@@ -31,13 +32,23 @@ export class ViewPublicationsPage implements OnInit {
folderId: string;
id: string;
error: any;
arrayOfFile: any = [];
publicationPipe = new PublicationPipe()
publicationDitails: any;
getpublication = [];
private videoplayer: any;
private videoUrl: any;
slideOpts = {
initialSlide: 0,
speed: 400,
loop: true,
pagination : {
el: '.swiper-pagination',
clickable: true
}
};
swiperModules = [IonicSlides];
constructor(
private modalController: ModalController,
@@ -50,7 +61,8 @@ export class ViewPublicationsPage implements OnInit {
public p: PermissionService,
private httpErroHandle: HttpErrorHandle,
private storage: Storage,
public publicationFolderService: PublicationFolderService,) {
public publicationFolderService: PublicationFolderService,
public checkFileType: checkFileTypeService) {
this.createPublicationList()
@@ -68,7 +80,7 @@ export class ViewPublicationsPage implements OnInit {
}
ngOnInit() {
this.videoplayer = CapacitorVideoPlayer;
if (typeof (this.folderId) == 'object') {
this.folderId = this.folderId['ProcessId']
@@ -209,7 +221,8 @@ export class ViewPublicationsPage implements OnInit {
async loadPublication(publicationId, folderId) {
let Publication = await this.publications.GetPublicationWithArrayOfFilesById(publicationId).toPromise();
console.log('Publications with array of file: ', Publication)
console.log('Publications with array of file: ', Publication.Files)
this.arrayOfFile = Publication.Files
let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
const findIndex = this.publicationFindIndex(publicationId, folderId)