diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d31fd17..ab2f5d40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ - 🙏 DO - Document your changes in the pull request - ❗ DON'T - - Do not update the versions, current version is only [set by the maintainer](./img/gitops.png) and updated automatically by [bump-everywhere](https://github.com/undergroundwires/bump-everywhere) + - Do not update the versions, current version is only [set by the maintainer](./img/architecture/gitops.png) and updated automatically by [bump-everywhere](https://github.com/undergroundwires/bump-everywhere) ## Guidelines diff --git a/README.md b/README.md index 031a3ee4..460bf1be 100644 --- a/README.md +++ b/README.md @@ -68,11 +68,11 @@ - The [state](src/application/State/ApplicationState.ts) is a mutable singleton & event producer. - The application is defined & controlled in a [single YAML file](src/application/application.yaml) (see [Data-driven programming](https://en.wikipedia.org/wiki/Data-driven_programming)) -![DDD + vue.js](img/app-ddd.png) +![DDD + vue.js](img/architecture/app-ddd.png) ### AWS Infrastructure -[![AWS solution](img/aws-solution.png)](https://github.com/undergroundwires/aws-static-site-with-cd) +[![AWS solution](img/architecture/aws-solution.png)](https://github.com/undergroundwires/aws-static-site-with-cd) - It uses infrastructure from the following repository: [aws-static-site-with-cd](https://github.com/undergroundwires/aws-static-site-with-cd) - Runs on AWS 100% serverless and automatically provisioned using [GitHub Actions](.github/workflows/). @@ -84,4 +84,4 @@ - Versioning, tagging, creation of `CHANGELOG.md` and releasing is automated using [bump-everywhere](https://github.com/undergroundwires/bump-everywhere) action - Everything that's merged in the master goes directly to production. -[![CI/CD to AWS with GitHub Actions](img/gitops.png)](.github/workflows/) +[![CI/CD to AWS with GitHub Actions](img/architecture/gitops.png)](.github/workflows/) diff --git a/build/README.md b/build/README.md new file mode 100644 index 00000000..4c1822f8 --- /dev/null +++ b/build/README.md @@ -0,0 +1,5 @@ +# build + +- These are the file that are used by electron. +- Logos are created by from the [PNG icon](./../public/icon.png) + - by running `npx electron-icon-builder --input=./public/icon.png --output=build --flatten` diff --git a/build/icons/1024x1024.png b/build/icons/1024x1024.png new file mode 100644 index 00000000..8d10c443 Binary files /dev/null and b/build/icons/1024x1024.png differ diff --git a/build/icons/128x128.png b/build/icons/128x128.png new file mode 100644 index 00000000..6a11ebab Binary files /dev/null and b/build/icons/128x128.png differ diff --git a/build/icons/16x16.png b/build/icons/16x16.png new file mode 100644 index 00000000..1b1db4bd Binary files /dev/null and b/build/icons/16x16.png differ diff --git a/build/icons/24x24.png b/build/icons/24x24.png new file mode 100644 index 00000000..a01174c0 Binary files /dev/null and b/build/icons/24x24.png differ diff --git a/build/icons/256x256.png b/build/icons/256x256.png new file mode 100644 index 00000000..c155a206 Binary files /dev/null and b/build/icons/256x256.png differ diff --git a/build/icons/32x32.png b/build/icons/32x32.png new file mode 100644 index 00000000..6199d289 Binary files /dev/null and b/build/icons/32x32.png differ diff --git a/build/icons/48x48.png b/build/icons/48x48.png new file mode 100644 index 00000000..609f7b86 Binary files /dev/null and b/build/icons/48x48.png differ diff --git a/build/icons/512x512.png b/build/icons/512x512.png new file mode 100644 index 00000000..40f260d4 Binary files /dev/null and b/build/icons/512x512.png differ diff --git a/build/icons/64x64.png b/build/icons/64x64.png new file mode 100644 index 00000000..4dd4fbef Binary files /dev/null and b/build/icons/64x64.png differ diff --git a/build/icons/icon.icns b/build/icons/icon.icns new file mode 100644 index 00000000..35e2f1e2 Binary files /dev/null and b/build/icons/icon.icns differ diff --git a/build/icons/icon.ico b/build/icons/icon.ico new file mode 100644 index 00000000..10066302 Binary files /dev/null and b/build/icons/icon.ico differ diff --git a/img/app-ddd.drawio b/img/architecture/app-ddd.drawio similarity index 100% rename from img/app-ddd.drawio rename to img/architecture/app-ddd.drawio diff --git a/img/app-ddd.png b/img/architecture/app-ddd.png similarity index 100% rename from img/app-ddd.png rename to img/architecture/app-ddd.png diff --git a/img/aws-solution.drawio b/img/architecture/aws-solution.drawio similarity index 100% rename from img/aws-solution.drawio rename to img/architecture/aws-solution.drawio diff --git a/img/aws-solution.png b/img/architecture/aws-solution.png similarity index 100% rename from img/aws-solution.png rename to img/architecture/aws-solution.png diff --git a/img/gitops.drawio b/img/architecture/gitops.drawio similarity index 100% rename from img/gitops.drawio rename to img/architecture/gitops.drawio diff --git a/img/gitops.png b/img/architecture/gitops.png similarity index 100% rename from img/gitops.png rename to img/architecture/gitops.png diff --git a/package-lock.json b/package-lock.json index cc7015f7..e98f5fd7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "privacy.sexy", - "version": "0.6.0", + "version": "0.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1757,6 +1757,16 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -5473,6 +5483,13 @@ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz", "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==" }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "filelist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz", @@ -8541,7 +8558,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "5.1.0", @@ -8750,6 +8771,13 @@ "thenify-all": "^1.0.0" } }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -14640,7 +14668,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "is-binary-path": { "version": "1.0.1", @@ -14931,7 +14963,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "is-absolute-url": { "version": "3.0.3", diff --git a/public/icon.png b/public/icon.png new file mode 100644 index 00000000..ddab709d Binary files /dev/null and b/public/icon.png differ diff --git a/src/background.ts b/src/background.ts index 52da64bb..cb542cfc 100644 --- a/src/background.ts +++ b/src/background.ts @@ -35,12 +35,12 @@ function createWindow() { height: 955, webPreferences: { // Use pluginOptions.nodeIntegration, leave this alone - // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info + // See https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration nodeIntegration: (process.env .ELECTRON_NODE_INTEGRATION as unknown) as boolean, }, - // https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/recipes.html#icons - icon: path.join(__static, `favicon.ico`), + // https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/recipes.html#set-tray-icon + icon: path.join(__static, 'icon.png'), }); win.setMenuBarVisibility(false); diff --git a/vue.config.js b/vue.config.js index 3a1b2cd0..910b5d59 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,9 +6,6 @@ module.exports = { electronBuilder: { // https://www.electron.build/configuration/configuration builderOptions: { - win: { - icon: './public/favicon.ico' - }, publish: [{ // https://www.electron.build/configuration/publish#githuboptions // https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/recipes.html#enable-publishing-to-github