mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Compare commits
3 Commits
0598a11d2e
...
fe2f74e2fa
| Author | SHA1 | Date | |
|---|---|---|---|
| fe2f74e2fa | |||
| b9c3164127 | |||
| 1429cc89c4 |
+23
-12
@@ -1,15 +1,26 @@
|
|||||||
FROM node:14 as build
|
# ---------- Build Stage ----------
|
||||||
|
FROM node:16-alpine AS build
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY ./package*.json /app/
|
|
||||||
RUN npm config set unsafe-perm true
|
# Install Ionic CLI (optional but safe)
|
||||||
RUN npm install -g ionic
|
RUN npm install -g @ionic/cli@6 @angular/cli@12
|
||||||
RUN npm config set legacy-peer-deps true
|
|
||||||
RUN npm i -D typescript@4.3.5
|
COPY package*.json ./
|
||||||
RUN npm install --save --legacy-peer-deps
|
RUN npm install
|
||||||
COPY ./ /app/
|
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Build production app
|
||||||
RUN ionic build --prod
|
RUN ionic build --prod
|
||||||
|
|
||||||
FROM nginx:latest
|
# ---------- Run Stage ----------
|
||||||
COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
|
FROM nginx:alpine
|
||||||
RUN rm -rf /usr/share/nginx/html/*
|
|
||||||
COPY /www/ /usr/share/nginx/html/
|
# Copy build output to nginx
|
||||||
|
COPY --from=build /app/www /usr/share/nginx/html
|
||||||
|
|
||||||
|
# Expose port
|
||||||
|
EXPOSE 80
|
||||||
|
|
||||||
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
Generated
-20
@@ -163,7 +163,6 @@
|
|||||||
"hammerjs": "^2.0.8",
|
"hammerjs": "^2.0.8",
|
||||||
"howler": "^2.2.3",
|
"howler": "^2.2.3",
|
||||||
"http-server": "^14.1.1",
|
"http-server": "^14.1.1",
|
||||||
"husky": "^8.0.3",
|
|
||||||
"ionic-angular": "^3.9.10",
|
"ionic-angular": "^3.9.10",
|
||||||
"ionic-image-loader": "^6.3.3",
|
"ionic-image-loader": "^6.3.3",
|
||||||
"ionic-image-loader-v5": "^1.0.2",
|
"ionic-image-loader-v5": "^1.0.2",
|
||||||
@@ -18633,20 +18632,6 @@
|
|||||||
"ms": "^2.0.0"
|
"ms": "^2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/husky": {
|
|
||||||
"version": "8.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
|
|
||||||
"integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
|
|
||||||
"bin": {
|
|
||||||
"husky": "lib/bin.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/typicode"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/iconv-lite": {
|
"node_modules/iconv-lite": {
|
||||||
"version": "0.6.3",
|
"version": "0.6.3",
|
||||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
|
||||||
@@ -58908,11 +58893,6 @@
|
|||||||
"ms": "^2.0.0"
|
"ms": "^2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"husky": {
|
|
||||||
"version": "8.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
|
|
||||||
"integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg=="
|
|
||||||
},
|
|
||||||
"iconv-lite": {
|
"iconv-lite": {
|
||||||
"version": "0.6.3",
|
"version": "0.6.3",
|
||||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
|
||||||
|
|||||||
@@ -182,7 +182,6 @@
|
|||||||
"hammerjs": "^2.0.8",
|
"hammerjs": "^2.0.8",
|
||||||
"howler": "^2.2.3",
|
"howler": "^2.2.3",
|
||||||
"http-server": "^14.1.1",
|
"http-server": "^14.1.1",
|
||||||
"husky": "^8.0.3",
|
|
||||||
"ionic-angular": "^3.9.10",
|
"ionic-angular": "^3.9.10",
|
||||||
"ionic-image-loader": "^6.3.3",
|
"ionic-image-loader": "^6.3.3",
|
||||||
"ionic-image-loader-v5": "^1.0.2",
|
"ionic-image-loader-v5": "^1.0.2",
|
||||||
|
|||||||
@@ -234,7 +234,7 @@
|
|||||||
|
|
||||||
<!-- most searched word-->
|
<!-- most searched word-->
|
||||||
<div class="most-searched-words d-md-flex flex-md-column">
|
<div class="most-searched-words d-md-flex flex-md-column">
|
||||||
<p class="title ion-text-center">{{searchResult}}</p>
|
<p *ngIf="showDocuments == false" class="title ion-text-center">{{searchResult}}</p>
|
||||||
<div class="most-searched-word-container height-100 overflow-y-auto">
|
<div class="most-searched-word-container height-100 overflow-y-auto">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -520,7 +520,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -569,7 +569,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -622,7 +622,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
this.search.basicSearch(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
|
this.search.basicSearch(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
res.Categories.forEach(e => {
|
res.Categories.forEach(e => {
|
||||||
@@ -671,7 +671,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '361').subscribe(res => {
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -733,7 +733,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -780,7 +780,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
this.search.basicSearch(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
|
this.search.basicSearch(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '8').subscribe(res => {
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -885,7 +885,7 @@ export class SearchPage implements OnInit {
|
|||||||
this.showLoader = true;
|
this.showLoader = true;
|
||||||
this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
|
this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, searchDocumentDateEnd, this.searchSenderId
|
||||||
, this.searchOrganicEntiryCode, this.searchDocTypeId, '386').subscribe(res => {
|
, this.searchOrganicEntiryCode, this.searchDocTypeId, '386').subscribe(res => {
|
||||||
if (!res.Categories.length && this.showSearchDocuments.length == 0) {
|
if (!res.Categories.length) {
|
||||||
this.searchResult = "Não encontramos o que procura";
|
this.searchResult = "Não encontramos o que procura";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,19 @@ export class NewGroupPage implements OnInit{
|
|||||||
this.showDuration = event.detail.checked;
|
this.showDuration = event.detail.checked;
|
||||||
|
|
||||||
if(event.detail.checked) {
|
if(event.detail.checked) {
|
||||||
this.expirationDate = null;
|
// ✅ Set default 1 hour duration
|
||||||
|
const now = new Date();
|
||||||
|
this.expirationDate = new Date(
|
||||||
|
now.getFullYear(),
|
||||||
|
now.getMonth(),
|
||||||
|
now.getDate(),
|
||||||
|
now.getHours() + 1, // +1 hour
|
||||||
|
now.getMinutes(),
|
||||||
|
now.getSeconds(),
|
||||||
|
now.getMilliseconds()
|
||||||
|
);
|
||||||
|
|
||||||
|
this.displayDuration = this.formatDuration(0, 1, 0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.expirationDate = null;
|
this.expirationDate = null;
|
||||||
@@ -348,4 +360,29 @@ export class NewGroupPage implements OnInit{
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
formatDuration(days: number, hours: number, minutes: number): string {
|
||||||
|
if (days > 0) {
|
||||||
|
if (days === 1) {
|
||||||
|
if (hours === 1) {
|
||||||
|
return `${days} day ${hours} hora ${minutes} minutos`;
|
||||||
|
} else {
|
||||||
|
return `${days} day ${hours} horas ${minutes} minutos`;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (hours === 1) {
|
||||||
|
return `${days} days ${hours} hora ${minutes} minutos`;
|
||||||
|
} else {
|
||||||
|
return `${days} days ${hours} horas ${minutes} minutos`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (hours === 1) {
|
||||||
|
return `${hours} hora ${minutes} minutos`;
|
||||||
|
} else {
|
||||||
|
return `${hours} horas ${minutes} minutos`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user