diff --git a/.github/workflows/desktop-app-cd-prod.yml b/.github/workflows/desktop-app-cd-prod.yml index f2e57b96b..d80814983 100644 --- a/.github/workflows/desktop-app-cd-prod.yml +++ b/.github/workflows/desktop-app-cd-prod.yml @@ -102,10 +102,6 @@ jobs: shell: bash run: | cd packages/desktop-app - curl https://asset.noovolari.com/signing-tool/CodeSignTool-v1.2.7-windows.zip --output CodeSignTool-v1.2.7-windows.zip -s - unzip CodeSignTool-v1.2.7-windows.zip - CONFIG_FILE=code_sign_tool.properties - cat "./CodeSignTool-v1.2.7-windows/conf/$CONFIG_FILE" npm install npm run release-win rm -Rf ./release/win-unpacked @@ -404,6 +400,7 @@ jobs: publish-changelog: runs-on: ubuntu-latest + environment: prod needs: [ publish-draft ] if: needs.tag-validation.outputs.validator == 1 steps: @@ -424,6 +421,7 @@ jobs: invalidate-distribution: runs-on: ubuntu-latest + environment: prod needs: [ publish-changelog ] if: needs.tag-validation.outputs.validator == 1 steps: @@ -443,6 +441,7 @@ jobs: publish-github-release: runs-on: ubuntu-latest + environment: prod needs: [ invalidate-distribution, tag-validation ] if: needs.tag-validation.outputs.validator == 1 steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index f7453e015..564c0d9a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.26.1](https://github.com/Noovolari/leapp/compare/v0.26.0...v0.26.1) (2024-06-05) + +### Bug Fixes +* fixed Leapp Pro workspace export functionality: +now it is able to keep IAM Users Access Keys in the system keychain during the transition to the local workspace. +Thanks to [Nuru](https://github.com/Nuru) for the support! + +### [0.26.0](https://github.com/Noovolari/leapp/compare/v0.25.3...v0.26.0) (2024-05-13) + +### Features +* added **Noovolari important communication** to command bar + ### [0.25.3](https://github.com/Noovolari/leapp/compare/v0.25.2...v0.25.3) (2024-03-29) ### Bug Fixes diff --git a/docs/leapp-pro/export-pro-workspace.md b/docs/leapp-pro/export-pro-workspace.md index 6e51a728a..323ee1cf2 100644 --- a/docs/leapp-pro/export-pro-workspace.md +++ b/docs/leapp-pro/export-pro-workspace.md @@ -10,13 +10,15 @@ 3. from the Leapp Options "General" tab, click the button next to the "Export Pro/Team workspace" label; ![](../../images/tutorials/export-pro-workspace/export-pro-workspace.png?style=center-img) 4. close the Leapp Options dialog; -5. close Leapp (on macOS ⌘+Q); -5. you should see a **Leapp-lock.json.exported** file in the ~/.Leapp folder; -6. remove the Leapp-lock.json file and rename Leapp-lock.json.exported to Leapp-lock.json; +5. Lock the Leapp Pro workspace; +6. switch to the Local workspace; +7. close Leapp (on macOS ⌘+Q); +8. you should see a **Leapp-lock.json.exported** file in the ~/.Leapp folder; +9. remove the Leapp-lock.json file and rename Leapp-lock.json.exported to Leapp-lock.json; ```shell rm Leapp-lock.json mv Leapp-lock.json.exported Leapp-lock.json ``` -7. re-open Leapp; -8. switch to the Local Workspace; -9. you should now see your Pro Workspace migrated into the Local one. +10. re-open Leapp; +11. switch to the Local Workspace; +12. you should now see your Pro Workspace migrated into the Local one. diff --git a/docs/leapp-pro/getting-started/index.md b/docs/leapp-pro/getting-started/index.md deleted file mode 100644 index b30cc500f..000000000 --- a/docs/leapp-pro/getting-started/index.md +++ /dev/null @@ -1,18 +0,0 @@ -## Why Leapp Pro? -Leapp Pro enable Users to protect their Cloud access with Username and password. - -![](../../images/leapp-pro/leapp-pro.png) - -With Leapp Pro you can **back up and synchronize** your Leapp workspace and access to any device you want without losing your access configurations. - -### Getting started guide -- [Sign up to Leapp Pro](/leapp-pro/getting-started/sign-up/) -- [Sign in to Leapp Pro](/leapp-pro/getting-started/sign-in) -- [Lock your Leapp Pro Workspace](/leapp-pro/getting-started/lock) - - -### Security and syncronization - -Once you updgrade your Plan to Leapp Pro, your local Workspace will be moved to the Pro Workspace. -All the data inside your workspace are secured with [end-to-end encryption](/security/zero-knowledge) through your [Master password](/leapp-pro/security-and-password/). - diff --git a/docs/leapp-pro/getting-started/lock.md b/docs/leapp-pro/getting-started/lock.md deleted file mode 100644 index 0a5970f7f..000000000 --- a/docs/leapp-pro/getting-started/lock.md +++ /dev/null @@ -1,20 +0,0 @@ -_Leapp Pro_ allows the user to temporary lock the workspace, making it accessible only by typing again your _master-password_. -This feature provides a further security level on top of the standard _Leapp Community edition_. - -## How to lock the Leapp Pro workspace - -To lock your _Leapp Pro_ workspace you should click on the _Workspace button_ located in the top-left area and select the _Lock option_. -![Workspace button](../../../images/leapp-pro/pro-workspace-button.png?style=img 'Workspace button') -![Lock option](../../../images/leapp-pro/pro-workspace-lock-option.png?style=center-img 'Lock option') -The Leapp Pro lock screen should appear, prompting for your _master-password_. -![Leapp Pro lock screen](../../../images/leapp-pro/lock-screen.png?style=center-img 'Leapp Pro lock screen') - -## Touch ID - -You can also use your fingerprint to unlock Leapp if your PC is Touch ID compatible. -After Logging to your Pro workspace for the first time, Leapp will associate your workspace with your system Touch ID. -After that the option will be available and can also be tweaked in the general tab of the option menu. - -## Troubles in locking your Workspace - -In case of any troubles locking _Leapp Pro_ workspace please [contact us](https://www.leapp.cloud/contacts). diff --git a/docs/leapp-pro/getting-started/sign-in.md b/docs/leapp-pro/getting-started/sign-in.md deleted file mode 100644 index 738b83eb1..000000000 --- a/docs/leapp-pro/getting-started/sign-in.md +++ /dev/null @@ -1,27 +0,0 @@ -With _Leapp Pro_ you can always sign-in from any location, gaining instant access to your personal workspace. - -## Sign-in to Leapp Pro - -After [upgrading Leapp Community edition](./sign-up.md), you can sign-in at any time, just clicking on the _Workspace button_ -located in the top-left area and selecting the _Sign-in Workspace_ option. -![Workspace button](../../../images/leapp-pro/local-workspace-button.png?style=img 'Workspace button') -![Sign-in Workspace option](../../../images/leapp-pro/local-workspace-sign-in-option.png?style=img 'Sign-in Workspace option') - -The _Sign-in Workspace_ dialog will appear. -Enter your _Email address_, _master-password_ and click on -the _Add Workspace_ button. - -![Sign-in dialog](../../../images/leapp-pro/sign-in-dialog.png?style=img 'Sign-in dialog') - -If the information entered is correct, your _Leapp Pro_ workspace will be displayed and you can immediately use -it to manage your cloud credentials. - -![Leapp Pro Workspace](../../../images/leapp-pro/leapp-app-pro-workspace.png?style=img 'Leapp Pro Workspace') - - -To avoid unwanted access, you can [lock](./lock.md) your _Leapp Pro_ workspace at any time. - -## Troubles in signing in to Leapp Pro? - -In case of any troubles signing in to _Leapp Pro_ please [contact us](https://www.leapp.cloud/contacts). - diff --git a/docs/leapp-pro/getting-started/sign-up.md b/docs/leapp-pro/getting-started/sign-up.md deleted file mode 100644 index 420d6e328..000000000 --- a/docs/leapp-pro/getting-started/sign-up.md +++ /dev/null @@ -1,26 +0,0 @@ -A _Leapp Pro_ upgrade is required to enable new workspace features like _Cloud access_ from multiple locations and _Workspace locking_. - -## Sign-up to Leapp Pro - -To sign up for _Leapp Pro_ you should upgrade your version of Leapp Community edition. -Click on the _Options_ button in the top-right area. -![Settings button](../../../images/leapp-pro/leapp-app-settings-button.png?style=center-img 'Settings button') -In the _Options dialog_, select the _Plans_ tab and click on _Upgrade to Pro_ button. -![Plans tab](../../../images/leapp-pro/leapp-app-settings-plans-upgrade-button.png?style=center-img 'Plans tab') -The upgrade window should appear. Enter your email (it will be the email address associated with your _Leapp Pro_ account) and click on the _Upgrade now_ button. -![Upgrade window](../../../images/leapp-pro/leapp-app-upgrade-pro-dialog.png?style=center-img 'Upgrade window') -At this point a window will appear, so you can specify a payment method to complete the _Leapp Pro_ upgrade. -After the payment process you will receive a confirmation email containing the _Complete the registration_ link. -![Upgrade email](../../../images/leapp-pro/leapp-pro-upgrade-email.png?style=center-img 'Upgrade email') -Clicking the link in the confirmation email will open a web page that will allow you to enter your personal info -and the _master-password_, essential to provide the security requirements of _Leapp Pro_. -![Sign-up page](../../../images/leapp-pro/leapp-pro-sign-up-page.png?style=center-img 'Sign-up page') -After entering your personal info and the _master-password_ click the _Continue_ button. You can now finally [sign in to Leapp Pro](./sign-in.md). - -## Troubles in signing up to Leapp Pro? - -In case of any troubles signing up to _Leapp Pro_ please [contact us](https://www.leapp.cloud/contacts). - -## How to Sign-in - -Take a look to [this page](./sign-in.md) to sign-in your Leapp Pro workspace. diff --git a/docs/leapp-pro/security-and-password.md b/docs/leapp-pro/security-and-password.md deleted file mode 100644 index 74a496c8e..000000000 --- a/docs/leapp-pro/security-and-password.md +++ /dev/null @@ -1,38 +0,0 @@ -# Password issues - -## Can I recover my password? - -Unfortunately, it is not possible to recover the master password. The master password is very important as it's the key point of our zero-knowledge encryption mechanism. -If you forget it, you'll lose access to the previously encrypted Leapp Sessions and Integrations. -That's why it is crucial that you keep your password safe; we suggest you to store it in a password manager like 1Password. - -## How is my data encrypted? - -All information associated with your stored data is protected with end-to-end encryption. -Leapp Sessions and Integrations are encrypted before being forwarded to the backend. -Specifically, Leapp Pro uses AES 256-bit encryption as well as PBKDF-SHA512 to secure your data. - -AES is a standard in cryptography and is used by the U.S. government and other government -agencies around the world for protecting top-secret data. With proper implementation and a -strong encryption key (your Master Password), AES is considered unbreakable. - -PBKDF-SHA512 is used to derive the encryption key from your master password. Then this -key is salted and hashed for authenticating with the Leapp Pro backend. The default iteration -count used with PBKDF2 is 500,000 iterations on the client. Each Secret has its own generated symmetric key; -this symmetric key is encrypted using the user’s *public RSA key* (this is also the foundation of the Secret sharing system). -This encryption and decryption are done entirely on the Leapp Pro clients because your *master password* is never stored on or transmitted to Leapp Team backend. - -It is important to highlight the fact that the backend does not act as a credentials broker, i.e. it has no visibility on the long-term/short-term credentials -used by Leapp Pro Desktop App/CLI to access the cloud providers. In addition, the secrets retrieved from the backend, are an encrypted version of access configurations; -access configurations DO NOT include temporary credentials. There is a single edge case: the IAM User. -Indeed, the IAM User Session access configuration contains IAM User’s access keys, which are long-term credentials. -Still, the Leapp Pro backend has no visibility on these long-term credentials, as they’re encrypted by the client before being forwarded to the Leapp Team backend. - -## Touch ID - -When you unlock Leapp Pro, using a longer and more secure account password is easier than you might otherwise have chosen. - -### Your fingerprint is not stored in Leapp. -Leapp never scans or stores your fingerprint. Touch ID is provided by macOS, which only tells Leapp Pro if your fingerprint was recognized or not. - -Learn more about [Touch ID's advanced security technology](https://support.apple.com/HT204587). diff --git a/docs/leapp-pro/synchronization.md b/docs/leapp-pro/synchronization.md deleted file mode 100644 index 92fc275c9..000000000 --- a/docs/leapp-pro/synchronization.md +++ /dev/null @@ -1,36 +0,0 @@ -## What's a Pro Workspace -A Pro Workspace is a new Workspace that is created upon first login with your [registered Pro User](../getting-started/sign-up). -This workspace is *synchronized* with your Cloud account every time you **create**, **edit**, or **delete** an *integration* or a *session*; -this way it is possible to **use *Leapp Pro* on different devices**, maintaining all your saved integrations and sessions. - -## How the Synchronization works - -Synchronization works by [encrypting](../security-and-password) all your -sessions and integrations with your [master password](../security-and-password), created during your [sign-up](../getting-started/sign-up) process. -This way we maintain a [0-knowlegde](../../security/zero-knowledge) approach on your data through all the lifecycle of your *Pro workspace*. - -The encrypted data is then saved in the Cloud on your Leapp Pro personal space. - -You, as a Leapp Pro user, can always keep an eye on the status of synchronization using the *synchronization widget* in the bottom-left area of Leapp. - -![Synchronization widget - synchronization active and done](../../images/leapp-pro/syncok.png?style=center-img) - -When all the data is correctly synchronized you'll see the image above. - -When *Leapp Pro* is synchronizing you'll see the icon and text changing to the one in the image below. - -![Synchronization widget - synchronization in progress](../../images/leapp-pro/syncprogress.png?style=center-img) - -If you eventually lose connection or have a problem in synchronizing your data the widget will turn yellow as shown below. - -![Synchronization widget - synchronization failed](../../images/leapp-pro/syncfailed.png?style=center-img) - -You have the possibility to manually trigger another synchronization process and see if the problem is resolved. - -!!! Info - - When Leapp Pro is restarted it will try to synchronize your data in the Cloud if you're logged in, so you can also close Leapp safely even if in synch failed state. - -## Do you have any trouble with Synchronization - -In case of any troubles locking _Leapp Pro_ workspace please [contact us](https://www.leapp.cloud/contacts). diff --git a/mkdocs.yml b/mkdocs.yml index 372512e31..0704436a9 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -58,15 +58,7 @@ nav: - 'Developer Reference': 'plugins/plugins-development.md' - 'General Options': 'built-in-features/general-options.md' - 'Leapp PRO': - - 'Getting Started': - - 'Getting Started': 'leapp-pro/getting-started/index.md' - - 'Sign-up': 'leapp-pro/getting-started/sign-up.md' - - 'Sign-in': 'leapp-pro/getting-started/sign-in.md' - - 'Lock your Workspace': 'leapp-pro/getting-started/lock.md' - - 'Synchronization': 'leapp-pro/synchronization.md' - - 'Security and password': 'leapp-pro/security-and-password.md' - 'Export PRO Workspace': 'leapp-pro/export-pro-workspace.md' - - 'Roadmap': https://roadmap.leapp.cloud/tabs/4-in-progress - Contributing: - 'Get involved': 'contributing/get-involved.md' - 'Useful Scripts': 'usefull-scripts/export-profile.md' @@ -125,8 +117,8 @@ extra: markdown_extensions: - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - admonition - pymdownx.details - pymdownx.highlight diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json index c29d9a0e2..d6124f194 100644 --- a/packages/cli/package-lock.json +++ b/packages/cli/package-lock.json @@ -9547,7 +9547,7 @@ } }, "node_modules/es-abstract": { - "version": "1.23.2", + "version": "1.23.3", "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -9589,11 +9589,11 @@ "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", "string.prototype.trimend": "^1.0.8", - "string.prototype.trimstart": "^1.0.7", + "string.prototype.trimstart": "^1.0.8", "typed-array-buffer": "^1.0.2", "typed-array-byte-length": "^1.0.1", "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.5", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.15" }, @@ -11149,10 +11149,11 @@ } }, "node_modules/globalthis": { - "version": "1.0.3", + "version": "1.0.4", "license": "MIT", "dependencies": { - "define-properties": "^1.1.3" + "define-properties": "^1.2.1", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" diff --git a/packages/cli/src/service/team-service-stub.ts b/packages/cli/src/service/team-service-stub.ts index 4c6e2c66a..5c8c2ba45 100644 --- a/packages/cli/src/service/team-service-stub.ts +++ b/packages/cli/src/service/team-service-stub.ts @@ -30,6 +30,12 @@ export interface WorkspaceState { export class TeamService { constructor(_l: any, _e: any, _a: any, _p: any, _t: any, _m: any, _s: any, _r: any, _v: any, _i: any, _c: any, _n: any, _o: any, _y: any) {} + get skipKeychainSecretsDeletion(): boolean { + return false; + } + + set skipKeychainSecretsDeletion(value: boolean) {} + get isLeappTeamStubbed(): boolean { return true; } diff --git a/packages/desktop-app/package-lock.json b/packages/desktop-app/package-lock.json index 441fc6919..80079fe22 100644 --- a/packages/desktop-app/package-lock.json +++ b/packages/desktop-app/package-lock.json @@ -1,12 +1,12 @@ { "name": "Leapp", - "version": "0.25.3", + "version": "0.26.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Leapp", - "version": "0.25.3", + "version": "0.26.1", "hasInstallScript": true, "dependencies": { "@angular/animations": "^13.2.2", @@ -2844,10 +2844,10 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.2", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.7", "picocolors": "^1.0.0" }, "engines": { @@ -2966,17 +2966,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-member-expression-to-functions": "^7.23.0", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.24.1", - "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-annotate-as-pure": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-member-expression-to-functions": "^7.24.7", + "@babel/helper-optimise-call-expression": "^7.24.7", + "@babel/helper-replace-supers": "^7.24.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", "semver": "^6.3.1" }, "engines": { @@ -2987,10 +2987,10 @@ } }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": { - "version": "7.22.5", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3063,50 +3063,54 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", + "version": "7.24.7", "license": "MIT", + "dependencies": { + "@babel/types": "^7.24.7" + }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name/node_modules/@babel/template": { - "version": "7.24.0", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.23.0", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.23.0" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3140,17 +3144,17 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.22.5", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.0", + "version": "7.24.7", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -3184,12 +3188,12 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.23.0", - "@babel/helper-optimise-call-expression": "^7.22.5" + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-member-expression-to-functions": "^7.24.7", + "@babel/helper-optimise-call-expression": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3209,34 +3213,35 @@ } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.22.5", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", + "version": "7.24.7", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -3300,10 +3305,10 @@ } }, "node_modules/@babel/highlight": { - "version": "7.24.2", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -3313,7 +3318,7 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "bin": { "parser": "bin/babel-parser.js" @@ -3399,13 +3404,13 @@ } }, "node_modules/@babel/plugin-proposal-decorators": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "peer": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.24.1", - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/plugin-syntax-decorators": "^7.24.1" + "@babel/helper-create-class-features-plugin": "^7.24.7", + "@babel/helper-plugin-utils": "^7.24.7", + "@babel/plugin-syntax-decorators": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -3648,11 +3653,11 @@ } }, "node_modules/@babel/plugin-syntax-decorators": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "peer": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -4485,17 +4490,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.1", - "@babel/generator": "^7.24.1", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.24.1", - "@babel/types": "^7.24.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -4504,10 +4509,10 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.24.1", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/types": "^7.24.0", + "@babel/types": "^7.24.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -4529,11 +4534,11 @@ } }, "node_modules/@babel/types": { - "version": "7.24.0", + "version": "7.24.7", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.23.4", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -12831,7 +12836,7 @@ } }, "node_modules/es-abstract": { - "version": "1.23.2", + "version": "1.23.3", "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -12873,11 +12878,11 @@ "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", "string.prototype.trimend": "^1.0.8", - "string.prototype.trimstart": "^1.0.7", + "string.prototype.trimstart": "^1.0.8", "typed-array-buffer": "^1.0.2", "typed-array-byte-length": "^1.0.1", "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.5", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.15" }, diff --git a/packages/desktop-app/package.json b/packages/desktop-app/package.json index f9ef8c265..aba2d9370 100644 --- a/packages/desktop-app/package.json +++ b/packages/desktop-app/package.json @@ -1,6 +1,6 @@ { "name": "Leapp", - "version": "0.25.3", + "version": "0.26.1", "private": true, "author": { "name": "Noovolari", @@ -137,7 +137,6 @@ "signingHashAlgorithms": [ "sha256" ], - "sign": "scripts/windows-sign.js", "target": [ "nsis" ] diff --git a/packages/desktop-app/src/app/components/command-bar/command-bar.component.html b/packages/desktop-app/src/app/components/command-bar/command-bar.component.html index 4124dd1f2..ef14ba34f 100644 --- a/packages/desktop-app/src/app/components/command-bar/command-bar.component.html +++ b/packages/desktop-app/src/app/components/command-bar/command-bar.component.html @@ -78,7 +78,7 @@
- + + + diff --git a/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.scss b/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.scss new file mode 100644 index 000000000..bc7ba48ed --- /dev/null +++ b/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.scss @@ -0,0 +1,228 @@ +@import "../../../../assets/scss/modals"; +@import "../../../../assets/scss/mixins/palette"; + +::ng-deep { + .modal-content { + max-height: 600px!important; + } + .confirm-modal { + max-width: 520px; + width: 100%; + } + h3 { + text-align: left; + font-size: 17px; + color: $text-color; + font-weight: bold; + + span { + font-size: 1.3rem; color: $silver-dark; font-weight: normal; + } + } + div.updater > div.html-content { + color: $text-color; + overflow-y: scroll; + text-align: left; + height: 480px; + margin: -39px -5px 22px 3px; + + h1 { + font-size: 19px; + padding-top: 20px; + font-weight: 600; + letter-spacing: -.5px; + margin-left: 2px; + margin-right: 6px; + } + + h2 { + text-align: center!important; + color: $text-color; + font-size: 19px!important; + font-weight: bold!important; + margin-top: 10px; + margin-right: 6px; + } + h3 { + text-align: left!important; + color: $text-color; + font-size: 17px!important; + font-weight: bold!important; + margin-left: 2px; + margin-right: 6px; + } + + p { + font-size: 14px; + padding-bottom: 10px; + margin-bottom: 0; + margin-left: 2px; + color: $changelog-date-color; + margin-right: 6px; + } + + a { + color: $main-color-light; + text-decoration: none; + background-color: transparent; + display: inline; + cursor: pointer; + } + + li { + font-size: 14px; + white-space:pre-wrap; + color: $changelog-date-color; + margin-right: 6px; + } + + span { + display: inline-block; + color: $silver-dark; + font-weight: normal; + margin-bottom: 7px; + } + + span.centered-text { + display: block; + text-align: center; + font-weight: bold; + } + + img { + margin-bottom: 7px; + } + } + .noovolari-modal { + max-width: 600px; + .modal-content { + padding: 20px 5px 20px 20px; + } + .html-content { + padding-right: 20px; + .communication-title { + font-weight: 500; + font-size: 30px; + color: black + } + .communication-span { + color: #666666; + } + } + .centered-text { + font-weight: 400; + } + b { + font-weight: 800; + } + } +} + +.updater-header { + margin-right: -5px; + margin-left: -20px; + border-bottom: 1px solid #E0E0E0; +} + +.modal-title { + margin-top: -10px; + height: 60px; + display: flex; + align-items: center; + width: 560px; + position: relative; + margin-bottom: 10px; + + .modal-title-icon { + position: inherit; + i { + background-color: $main-color-light; + color: $primary-text-color; + border-radius: 5px; + padding: 8px; + font-size: 24px; + } + } + + .modal-title-message { + position: inherit; + flex-grow: 1; + margin-left: 20px; + display: flex; + align-items: center; + + span { + letter-spacing: -.5px; + font-weight: 600; + font-size: 18px; + } + + div { + font-weight: 400; + font-size: 14px; + color: $changelog-date-color; + letter-spacing: -.5px; + } + + img:nth-child(1) { + width: 250px; + height: 35px; + margin-right: 25px; + } + + img:nth-child(3) { + width: 183px; + height: 59px; + margin-left: 25px; + } + + .vertical-divider { + background-color: #999999; + width: 1px; + height: 59px; + } + } + + .modal-title-close { + position: relative; + i { + position: relative; + bottom: 2px; + } + } +} + +.button-equalizer { + display: flex; + justify-content: flex-end; + position: relative; + margin: -36px; + margin-right: 30px; + top: -50px; + padding-top: 15px; + + button { + border: none; + margin: 0 10px; + padding: 8px 16px; + font-weight: 500; + letter-spacing: -.5px; + + &.enabled { + border-radius: 5px; + color: $primary-text-color; + background-color: #454082; + } + + &.disabled { + color: $changelog-date-color; + background-color: unset; + margin-left: 0; + } + } +} + +.modal-body { + padding-right: 0; + padding-left: 0; +} diff --git a/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.spec.ts b/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.spec.ts new file mode 100644 index 000000000..14ba8fc2c --- /dev/null +++ b/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { NoovolariDialogComponent } from "./noovolari-dialog.component"; + +describe("NoovolariDialogComponent", () => { + let component: NoovolariDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [NoovolariDialogComponent], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(NoovolariDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.ts b/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.ts new file mode 100644 index 000000000..fb317b771 --- /dev/null +++ b/packages/desktop-app/src/app/components/dialogs/noovolari-dialog/noovolari-dialog.component.ts @@ -0,0 +1,47 @@ +import { Component, Input, OnInit } from "@angular/core"; +import { BsModalRef } from "ngx-bootstrap/modal"; +import { WindowService } from "../../../services/window.service"; +import { OptionsService } from "../../../services/options.service"; +import { constants } from "@noovolari/leapp-core/models/constants"; + +@Component({ + selector: "app-noovolari-dialog", + templateUrl: "./noovolari-dialog.component.html", + styleUrls: ["./noovolari-dialog.component.scss"], +}) +export class NoovolariDialogComponent implements OnInit { + @Input() + title: string; + + @Input() + description: string; + + @Input() + link?: string; + + @Input() + buttonName?: string; + + eConstants = constants; + + constructor(public optionsService: OptionsService, private readonly bsModalRef: BsModalRef, private readonly windowService: WindowService) {} + + ngOnInit(): void {} + + closeAndOpenLink(): void { + if (this.link) { + this.windowService.openExternalUrl(this.link); + } + this.close(); + } + + manageLinkEvents(event: any): void { + if (event?.target?.localName === "a" && event?.target?.href) { + this.windowService.openExternalUrl(event.target.href); + } + } + + close(): void { + this.bsModalRef.hide(); + } +} diff --git a/packages/desktop-app/src/app/components/dialogs/options-dialog/options-dialog.component.html b/packages/desktop-app/src/app/components/dialogs/options-dialog/options-dialog.component.html index 3af464823..9277fb0bc 100644 --- a/packages/desktop-app/src/app/components/dialogs/options-dialog/options-dialog.component.html +++ b/packages/desktop-app/src/app/components/dialogs/options-dialog/options-dialog.component.html @@ -389,7 +389,7 @@

Installed plugins - + diff --git a/packages/desktop-app/src/app/components/sync-pro-widget/sync-pro-widget.component.html b/packages/desktop-app/src/app/components/sync-pro-widget/sync-pro-widget.component.html index 4a4f3b62b..fdbb5527c 100644 --- a/packages/desktop-app/src/app/components/sync-pro-widget/sync-pro-widget.component.html +++ b/packages/desktop-app/src/app/components/sync-pro-widget/sync-pro-widget.component.html @@ -2,9 +2,9 @@
Not active -