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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-12 10:45:49 +01:00
parent f28e991338 d4222a7844
commit 3f65108fe4
5 changed files with 271 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+70 -41
View File
@@ -81,7 +81,8 @@
"@ionic-native/status-bar": "^5.0.0",
"@ionic-native/streaming-media": "^5.36.0",
"@ionic-native/wheel-selector": "^5.31.1",
"@ionic/core": "^5.8.1",
"@ionic/angular": "^6.7.5",
"@ionic/core": "^6.7.5",
"@ionic/pwa-elements": "^3.0.2",
"@ionic/storage": "^2.3.1",
"@ionic/storage-angular": "^3.0.6",
@@ -4798,20 +4799,21 @@
}
},
"node_modules/@ionic/angular": {
"version": "5.9.4",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.9.4.tgz",
"integrity": "sha512-U/85FePF48VaZXTudTwpVXDqhGmYfarl/7vki7a4umnIORnWtHqD2/pXsqqZ/O1EcbALwULYIeVXAfkFpPd2wQ==",
"peer": true,
"version": "6.7.5",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.7.5.tgz",
"integrity": "sha512-nV8HP7RedjYkIAT8nVr5ifHNT0D3XzA74RPG3/WCCFJKunERNJ9SBiNkCTWhUpSkqsYYwEB4+SOOHz+R5NLk/w==",
"dependencies": {
"@ionic/core": "5.9.4",
"tslib": "^1.9.3"
"@ionic/core": "6.7.5",
"ionicons": "^6.1.3",
"jsonc-parser": "^3.0.0",
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/core": ">=8.2.7",
"@angular/forms": ">=8.2.7",
"@angular/router": ">=8.2.7",
"rxjs": ">=6.2.0",
"zone.js": ">=0.8.26"
"@angular/core": ">=12.0.0",
"@angular/forms": ">=12.0.0",
"@angular/router": ">=12.0.0",
"rxjs": ">=6.6.0",
"zone.js": ">=0.11.0"
}
},
"node_modules/@ionic/angular-toolkit": {
@@ -4913,10 +4915,13 @@
}
}
},
"node_modules/@ionic/angular/node_modules/tslib": {
"version": "1.14.1",
"license": "0BSD",
"peer": true
"node_modules/@ionic/angular/node_modules/ionicons": {
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
"integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
"dependencies": {
"@stencil/core": "^2.18.0"
}
},
"node_modules/@ionic/cli-framework": {
"version": "4.2.0",
@@ -5014,15 +5019,23 @@
"license": "0BSD"
},
"node_modules/@ionic/core": {
"version": "5.9.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.4.tgz",
"integrity": "sha512-Ngz9yVT6fIiGdSxxBer8uJxP4w6PasvohYpLxhtMgYiWnyIu0vZra2ui3HrYukCzUo5/SbNPiUr1l7cj1E+7qw==",
"version": "6.7.5",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
"integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
"dependencies": {
"@stencil/core": "^2.4.0",
"ionicons": "^5.5.3",
"@stencil/core": "^2.18.0",
"ionicons": "^6.1.3",
"tslib": "^2.1.0"
}
},
"node_modules/@ionic/core/node_modules/ionicons": {
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
"integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
"dependencies": {
"@stencil/core": "^2.18.0"
}
},
"node_modules/@ionic/lab": {
"version": "3.1.7",
"dev": true,
@@ -7664,8 +7677,9 @@
"license": "MIT"
},
"node_modules/@stencil/core": {
"version": "2.8.1",
"license": "MIT",
"version": "2.22.3",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
"integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
"bin": {
"stencil": "bin/stencil"
},
@@ -22444,7 +22458,6 @@
},
"node_modules/jsonc-parser": {
"version": "3.0.0",
"devOptional": true,
"license": "MIT"
},
"node_modules/jsonfile": {
@@ -43762,18 +43775,23 @@
}
},
"@ionic/angular": {
"version": "5.9.4",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.9.4.tgz",
"integrity": "sha512-U/85FePF48VaZXTudTwpVXDqhGmYfarl/7vki7a4umnIORnWtHqD2/pXsqqZ/O1EcbALwULYIeVXAfkFpPd2wQ==",
"peer": true,
"version": "6.7.5",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.7.5.tgz",
"integrity": "sha512-nV8HP7RedjYkIAT8nVr5ifHNT0D3XzA74RPG3/WCCFJKunERNJ9SBiNkCTWhUpSkqsYYwEB4+SOOHz+R5NLk/w==",
"requires": {
"@ionic/core": "5.9.4",
"tslib": "^1.9.3"
"@ionic/core": "6.7.5",
"ionicons": "^6.1.3",
"jsonc-parser": "^3.0.0",
"tslib": "^2.0.0"
},
"dependencies": {
"tslib": {
"version": "1.14.1",
"peer": true
"ionicons": {
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
"integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
"requires": {
"@stencil/core": "^2.18.0"
}
}
}
},
@@ -43918,13 +43936,23 @@
}
},
"@ionic/core": {
"version": "5.9.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.4.tgz",
"integrity": "sha512-Ngz9yVT6fIiGdSxxBer8uJxP4w6PasvohYpLxhtMgYiWnyIu0vZra2ui3HrYukCzUo5/SbNPiUr1l7cj1E+7qw==",
"version": "6.7.5",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
"integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
"requires": {
"@stencil/core": "^2.4.0",
"ionicons": "^5.5.3",
"@stencil/core": "^2.18.0",
"ionicons": "^6.1.3",
"tslib": "^2.1.0"
},
"dependencies": {
"ionicons": {
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
"integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
"requires": {
"@stencil/core": "^2.18.0"
}
}
}
},
"@ionic/lab": {
@@ -45962,7 +45990,9 @@
"version": "3.1.0"
},
"@stencil/core": {
"version": "2.8.1"
"version": "2.22.3",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
"integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng=="
},
"@szmarczak/http-timer": {
"version": "1.1.2",
@@ -56219,8 +56249,7 @@
"version": "2.2.1"
},
"jsonc-parser": {
"version": "3.0.0",
"devOptional": true
"version": "3.0.0"
},
"jsonfile": {
"version": "6.1.0",
package.json
+2 -1
View File
@@ -95,7 +95,8 @@
"@ionic-native/status-bar": "^5.0.0",
"@ionic-native/streaming-media": "^5.36.0",
"@ionic-native/wheel-selector": "^5.31.1",
"@ionic/core": "^5.8.1",
"@ionic/angular": "^6.7.5",
"@ionic/core": "^6.7.5",
"@ionic/pwa-elements": "^3.0.2",
"@ionic/storage": "^2.3.1",
"@ionic/storage-angular": "^3.0.6",
src/global.scss
+1 -6
View File
@@ -24,7 +24,7 @@
@import "~@ionic/angular/css/text-alignment.css";
@import "~@ionic/angular/css/text-transformation.css";
@import "~@ionic/angular/css/flex-utils.css";
@import "./style/ios.scss";
@@ -441,11 +441,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.modal-padding-top {
margin-top: 87px;
.modal-wrapper {
// height: 99%;
// top: 2%;
// position: relative;
}
}
.modal-top-100-width-background, .modal-desktop {
src/style/ios.scss
+192
View File
@@ -0,0 +1,192 @@
.modal-desktop::part(content) {
max-width: 1466px !important;
height: 100%;
}
.profile-modal::part(content) {
position: absolute;
right: 0px;
height: 90%;
max-width: 100%;
top: 0px;
border-radius: 0 0 25px 25px;
}
@media only screen and (min-width: 701px) {
.profile-modal::part(content) {
max-width: 400px;
}
}
.notification-modal::part(content) {
position: absolute;
top: 23px;
right: 0px;
height: 87px;
max-width: 400px;
border-radius: 9px;
-webkit-border-radius: 9px;
-moz-border-radius: 9px;
-ms-border-radius: 9px;
-o-border-radius: 9px;
}
.notification-modal::part(backdrop) {
display: none;
}
.aside-modal::part(content) {
position: absolute;
right: 0px;
height: 100%;
width: 400px;
}
.modal-width-100-width-background::part(content),
.modal-desktop::part(content) {
width: 100% !important;
height: 100% !important;
position: relative;
}
.modal-top-100-width-background::part(content),
.modal-desktop::part(content) {
width: 100%;
height: 99%;
position: relative;
}
@media only screen and (min-width: 1366px) {
.modal-desktop-remove-background::part(content) {
transform: none !important;
box-shadow: none !important;
height: 100% !important;
top: unset !important;
.ion-page {
transform: none !important;
-webkit-transform: none !important;
-moz-transform: none !important;
-ms-transform: none !important;
-o-transform: none !important;
}
}
.modal-desktop-remove-background::part(backdrop) {
display: none;
transform: none !important;
}
}
.chat-mobile-modal-to-Desktop::part(content) {
transform: none !important;
width: 100%;
height: 100%;
box-shadow: none !important;
}
.chat-mobile-modal-to-Desktop::part(backdrop) {
display: none;
transform: none !important;
}
.modal-width-100::part(content) {
width: 100%;
height: 100%;
}
.chat-popover::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: calc(100% - 160px) !important;
max-height: 160px;
min-height: 160px;
}
.temporary-message::part(content) {
background-color: #00000073;
width: 500px;
height: fit-content;
height: 300px;
}
ion-modal::part(content) {
backdrop-filter: blur(12px);
}
.transparentblack-modal::part(content) {
--background: rgb(44, 39, 45);
}
.exp-options::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: unset !important;
}
.chat-options-popover::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: unset !important;
}
.group-duration::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: unset !important;
}
.chat-popover::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: unset !important;
}
.messages-options::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: unset !important;
}
.events-options::part(content) {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: unset !important;
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "09cfbb94e",
"SHA": "09cfbb94e477031f935319def04f2f4d46e01e87",
"shortSHA": "f28e99133",
"SHA": "f28e991338b0829c10b3ac8d8d018b1a05662cc1",
"branch": "merge-all",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Jul 12 10:35:13 2023 +0100'",
"lastCommitMessage": "angular chae",
"lastCommitNumber": "5057",
"lastCommitTime": "'Wed Jul 12 10:44:06 2023 +0100'",
"lastCommitMessage": "update tiny",
"lastCommitNumber": "5058",
"change": "",
"changeStatus": "On branch merge-all\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore\n\tmodified: package-lock.json\n\tmodified: package.json",
"changeStatus": "On branch merge-all\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/global.scss\n\tnew file: src/style/ios.scss\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}