From 3a48e8132ab18f2ed3fe3d64bae54a018cb5ef41 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 11 Jul 2023 19:52:36 +0100 Subject: [PATCH 1/2] update to ionic 6 --- package-lock.json | 111 +++++++++++++++--------- package.json | 3 +- src/global.scss | 7 +- src/style/ios.scss | 192 +++++++++++++++++++++++++++++++++++++++++ version/git-version.ts | 14 +-- 5 files changed, 272 insertions(+), 55 deletions(-) create mode 100644 src/style/ios.scss diff --git a/package-lock.json b/package-lock.json index d1f59dcfc..b4339c72f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", @@ -4796,20 +4797,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": { @@ -4911,10 +4913,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", @@ -5012,15 +5017,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, @@ -7662,8 +7675,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" }, @@ -22424,7 +22438,6 @@ }, "node_modules/jsonc-parser": { "version": "3.0.0", - "devOptional": true, "license": "MIT" }, "node_modules/jsonfile": { @@ -43737,18 +43750,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" + } } } }, @@ -43893,13 +43911,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": { @@ -45937,7 +45965,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", @@ -56179,8 +56209,7 @@ "version": "2.2.1" }, "jsonc-parser": { - "version": "3.0.0", - "devOptional": true + "version": "3.0.0" }, "jsonfile": { "version": "6.1.0", diff --git a/package.json b/package.json index a16107b2c..5f83cdf95 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/global.scss b/src/global.scss index c8f5f661d..f0ee0c7a9 100644 --- a/src/global.scss +++ b/src/global.scss @@ -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 { diff --git a/src/style/ios.scss b/src/style/ios.scss new file mode 100644 index 000000000..3ec4f0cab --- /dev/null +++ b/src/style/ios.scss @@ -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; + } + \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 9ae5a60cf..77fb04bae 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "bde8a32f4", - "SHA": "bde8a32f4d1e0f7720c6db9e546d084e1f6e4c08", - "branch": "developer", + "shortSHA": "89e11c6fe", + "SHA": "89e11c6fe47a65bfe2c3975c3558023a8de784a3", + "branch": "feature/ionic-6", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jun 30 10:44:41 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "5023", + "lastCommitTime": "'Fri Jun 30 10:49:33 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "5035", "change": "", - "changeStatus": "On branch developer\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/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/suport/oapr.ts\n\tnew file: src/firebase-config.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/ionic-6\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/global.scss\n\tnew file: src/style/ios.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From d4222a784494fef5868ae4d933cacf2021f4482f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 11 Jul 2023 20:14:10 +0100 Subject: [PATCH 2/2] update --- version/git-version.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/version/git-version.ts b/version/git-version.ts index 77fb04bae..24e0fa42b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "89e11c6fe", - "SHA": "89e11c6fe47a65bfe2c3975c3558023a8de784a3", + "shortSHA": "3a48e8132", + "SHA": "3a48e8132ab18f2ed3fe3d64bae54a018cb5ef41", "branch": "feature/ionic-6", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jun 30 10:49:33 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "5035", + "lastCommitTime": "'Tue Jul 11 19:52:36 2023 +0100'", + "lastCommitMessage": "update to ionic 6", + "lastCommitNumber": "5036", "change": "", - "changeStatus": "On branch feature/ionic-6\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/global.scss\n\tnew file: src/style/ios.scss", + "changeStatus": "On branch feature/ionic-6\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file