Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: patrikx3/redis-ui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2020.10.155
Choose a base ref
...
head repository: patrikx3/redis-ui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 10,535 additions and 921 deletions.
  1. +0 −21 .editorconfig
  2. +121 −0 .github/workflows/build.yml
  3. +5 −1 .gitignore
  4. +5 −0 .ncurc.json
  5. +8 −1 .npmignore
  6. 0 .npmrc
  7. +208 −0 .p3xrs-conns-example.json
  8. +152 −0 .p3xrs-conns.json
  9. +0 −14 .travis.yml
  10. +3 −4 Dockerfile
  11. +1 −1 Gruntfile.js
  12. +1 −10 LICENSE
  13. +194 −113 README.md
  14. +1 −0 _config.yml
  15. +10 −0 artifacts/apple/entitlements/entitlements.mas.inherit.plist
  16. +29 −0 artifacts/apple/entitlements/entitlements.mas.plist
  17. BIN artifacts/apple/icons/redis.icns
  18. BIN artifacts/helpers/redis-commander-types/redis-type-hash.png
  19. BIN artifacts/helpers/redis-commander-types/redis-type-list.png
  20. BIN artifacts/helpers/redis-commander-types/redis-type-set.png
  21. BIN artifacts/helpers/redis-commander-types/redis-type-string.png
  22. BIN artifacts/helpers/redis-commander-types/redis-type-zset.png
  23. BIN artifacts/preview-images/preview-2.png
  24. BIN artifacts/preview-images/preview-3.png
  25. BIN artifacts/preview-images/preview-4.png
  26. BIN artifacts/preview-images/preview-5.png
  27. BIN artifacts/preview-images/preview-6.png
  28. BIN artifacts/preview-images/preview.png
  29. +90 −0 artifacts/readme/angularjs.md
  30. +34 −10 artifacts/readme/create-https-cert.md
  31. +34 −10 artifacts/readme/docker-cluster.md
  32. +64 −0 artifacts/readme/macos.md
  33. +69 −0 artifacts/readme/pika.md
  34. +107 −0 artifacts/readme/privacy-policy.md
  35. +34 −10 artifacts/readme/screenshots.md
  36. +38 −11 artifacts/readme/start-up-server.md
  37. +137 −0 change-log.2018.md
  38. +306 −0 change-log.2019.md
  39. +700 −0 change-log.2020.md
  40. +349 −0 change-log.2021.md
  41. +96 −0 change-log.2022.md
  42. +133 −0 change-log.2023.md
  43. +479 −0 change-log.2024.md
  44. +87 −0 change-log.md
  45. +0 −441 changelog.md
  46. +58 −0 com.patrikx3.redis-ui.yml
  47. +34 −10 contributors.md
  48. +5 −5 docker-compose.yml
  49. +18 −1 k8s/chart/templates/configmap.yaml
  50. +31 −27 k8s/chart/templates/deployment.yaml
  51. +37 −40 k8s/chart/templates/ingress.yaml
  52. +6 −0 k8s/chart/templates/service.yaml
  53. +31 −21 k8s/chart/values.yaml
  54. +2 −1 k8s/manifests/configmap.yaml
  55. +10 −2 p3xrs.json
  56. +76 −31 package.json
  57. +0 −11 redis-ui.iml
  58. +52 −0 scripts/fix-change-log.js
  59. +24 −0 scripts/fix-packages-publish.js
  60. +18 −0 scripts/notarize.js
  61. +4 −0 scripts/start-local-only-electron.sh
  62. +92 −34 src/app.js
  63. +12 −3 src/electron/global.js
  64. BIN src/electron/images/128x128.png
  65. +49 −3 src/electron/module/create/menu.js
  66. +26 −4 src/electron/module/create/window.js
  67. +13 −6 src/electron/window/main/angular/toast/index.js
  68. +4 −1 src/electron/window/main/css/style.css
  69. +10 −3 src/electron/window/main/index.html
  70. +17 −3 src/electron/window/main/onload.js
  71. +0 −26 src/express/boot.js
  72. +49 −0 src/flathub/metainfo.xml
  73. +7 −0 src/flathub/p3x-redis-ui.desktop
  74. +21 −0 src/lib/relaunch.js
  75. +15 −1 src/strings/en/index.js
  76. +79 −0 src/strings/ru/index.js
  77. +15 −1 src/strings/zn/index.js
  78. +0 −40 todo.md
  79. +6,225 −0 yarn.lock
21 changes: 0 additions & 21 deletions .editorconfig

This file was deleted.

121 changes: 121 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
name: Build and Release on Tag

on:
push:
tags:
- 'v*'

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['lts/*']
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- run: npm i -g grunt-cli
- run: npm install
- run: grunt

deploy-image:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: get-npm-version
id: package-version
uses: martinbeentjes/npm-get-version-action@main
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push Docker image
run: |
docker buildx build . \
--platform linux/amd64,linux/arm64,linux/arm/v7 \
-t patrikx3/p3x-redis-ui:latest \
-t patrikx3/p3x-redis-ui:${{ steps.package-version.outputs.current-version }} \
--push
package-and-release-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: 'lts/*'
- name: Install dependencies
run: |
yarn install
rm -rf node_modules/cpu-features/
# - name: Decode and Install Certificates
# env:
# CERTIFICATE_P12_BASE64: ${{ secrets.CERTIFICATE_P12_BASE64 }}
# CERTIFICATE_P12_PASSWORD: ${{ secrets.CERTIFICATE_P12_PASSWORD }}
# run: |
# echo $CERTIFICATE_P12_BASE64 | base64 --decode > certificate.p12
# security create-keychain -p actions temp.keychain
# security import certificate.p12 -k ~/Library/Keychains/temp.keychain -P "$CERTIFICATE_P12_PASSWORD" -T /usr/bin/codesign
# security list-keychains -s temp.keychain
# security default-keychain -s temp.keychain
# security unlock-keychain -p actions temp.keychain
# security set-key-partition-list -S apple-tool:,apple: -s -k actions temp.keychain
- name: Build and package macOS app
# env:
# APPLE_ID: ${{ secrets.APPLE_ID }}
# APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
# APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
# DEBUG: "*"
run: npm run publish-macos

- name: Upload macOS build to GitHub Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ github.ref_name }}
files: |
dist/*.dmg
dist/*.zip
dist/*.blockmap
dist/latest-mac.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package-and-release-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: 'lts/*'
- name: Install dependencies
run: |
yarn install
Remove-Item -Recurse -Force node_modules/cpu-features
shell: pwsh

- name: Build and package Windows app
run: npm run publish-windows
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Windows build to GitHub Release
uses: softprops/action-gh-release@v1
with:
files: |
dist/*.exe
dist/*.msi
dist/*.blockmap
dist/latest.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -8,8 +8,12 @@
.idea/inspectionProfiles/Project_Default.xml
.idea/inspectionProfiles/profiles_settings.xml

node_modules/.yarn-integrity


/dist
/p3x-redis-ui-settings
/.flatpak-builder
/.build
/repo

.DS_Store
5 changes: 5 additions & 0 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"reject": [
"electron-store"
]
}
9 changes: 8 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -14,4 +14,11 @@
/corifeus-boot.json
/secure
/scripts
/dist
/dist
/.github
/.vscode
/.flatpak-builder
/.build
/repo
/generated-sources.json
/com.patrikx3.redis-ui.yml
Empty file added .npmrc
Empty file.
208 changes: 208 additions & 0 deletions .p3xrs-conns-example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
{
"update": "2024-03-30T07:14:37.928Z",
"list": [
{
"id": "P3Xid5a0dfde8c710100089fc907b54ac0d",
"name": "localhost",
"host": "localhost",
"port": 6379,
"readonly": false,
"cluster": false,
"sentinel": false,
"nodes": [],
"tlsWithoutCert": false,
"ssh": false,
"sshPort": 22
},
{
"id": "P3Xida0d91ee8c71010000f522eeef7a348",
"name": "server prod",
"host": "secure",
"port": 6379,
"readonly": false,
"cluster": false,
"sentinel": false,
"nodes": [],
"ssh": false,
"sshPort": 22,
"password": "secure"
},
{
"id": "P3Xid86322ee8c71010008c337ccb2c67ef",
"name": "server test",
"host": "secure",
"port": 6380,
"readonly": false,
"cluster": false,
"sentinel": false,
"nodes": [],
"askAuth": false,
"ssh": false,
"sshPort": 22,
"password": "secure"
},
{
"id": "P3Xid2dd6106a981010008259e3d1f3a201",
"name": "server test with tls",
"host": "secure",
"password": "secure",
"port": 7379,
"readonly": false,
"askAuth": false,
"sentinel": false,
"cluster": false,
"nodes": [],
"ssh": false,
"sshPort": 22,
"tlsWithoutCert": false,
"tlsRejectUnauthorized": false,
"tlsCrt": "-----BEGIN CERTIFICATE-----secure-----END CERTIFICATE-----",
"tlsKey": "-----BEGIN PRIVATE KEY-----secure-----END PRIVATE KEY-----",
"tlsCa": "-----BEGIN CERTIFICATE-----secure-----END CERTIFICATE-----"
},
{
"id": "P3Xidf634827e881010008da44ae82969f5",
"name": "vpn redis",
"host": "secure",
"port": 6379,
"readonly": true,
"tlsWithoutCert": false,
"tlsRejectUnauthorized": true,
"cluster": false,
"nodes": [],
"ssh": false,
"sshPort": 22,
"sentinel": false
},
{
"id": "P3Xid3862da58e81010008b1bd28b2142e3",
"name": "sentinel",
"host": "secure",
"port": 26379,
"readonly": true,
"askAuth": false,
"tlsWithoutCert": false,
"tlsRejectUnauthorized": true,
"cluster": false,
"sentinel": true,
"nodes": [
{
"host": "secure",
"port": 26380,
"id": "P3Xid81e69c68e81010005182fd9e1d5261"
},
{
"host": "secure",
"port": 26381,
"id": "P3Xid62099c68e81010000cf739e167e6a6"
}
],
"ssh": false,
"sshPort": 22,
"sentinelName": "sentinel"
},
{
"id": "P3Xid13512e98e8101000aac09572042541",
"name": "demona tunnel",
"host": "localhost",
"port": 6379,
"askAuth": false,
"readonly": true,
"tlsWithoutCert": false,
"tlsRejectUnauthorized": false,
"ssh": true,
"sshHost": "secure",
"sshPort": 22,
"sshUsername": "secure",
"cluster": false,
"sentinel": false,
"nodes": [],
"sshPassword": "",
"sshPrivateKey": "-----BEGIN RSA PRIVATE KEY-----secure-----END RSA PRIVATE KEY-----"
},
{
"name": "server test tunnel",
"host": "localhost",
"port": 6380,
"askAuth": false,
"id": "P3Xid1d5973b8e8101000430f568d12ecb5",
"tlsWithoutCert": false,
"tlsRejectUnauthorized": true,
"ssh": true,
"sshHost": "secure",
"sshPort": 22,
"sshUsername": "redis-ui",
"cluster": false,
"sentinel": false,
"nodes": [],
"password": "private",
"sshPrivateKey": "-----BEGIN OPENSSH PRIVATE KEY-----secure-----END OPENSSH PRIVATE KEY-----"
},
{
"name": "cluster",
"host": "localhost",
"port": 36379,
"askAuth": false,
"username": "",
"id": "P3Xid27bac4b8e8101000a4b8746ee66bc3",
"tlsWithoutCert": false,
"tlsRejectUnauthorized": false,
"ssh": false,
"sshPort": 22,
"cluster": true,
"sentinel": false,
"nodes": [
{
"host": "localhost",
"port": 36380,
"id": "P3Xid0af6c4b8e81010000e240e7a8ce7ac"
},
{
"host": "localhost",
"port": 36381,
"id": "P3Xid3907c4b8e810100084704e45d3bd37"
}
]
},
{
"name": "cluster grokzen",
"host": "localhost",
"port": 7000,
"askAuth": false,
"id": "P3Xid491fe7b8e81010008ba0f8c654ae0e",
"tlsWithoutCert": false,
"tlsRejectUnauthorized": false,
"ssh": false,
"sshPort": 22,
"cluster": true,
"sentinel": false,
"nodes": [
{
"host": "localhost",
"port": 7001,
"id": "P3Xid8035e7b8e8101000836a3798403521"
},
{
"host": "localhost",
"port": 7002,
"id": "P3Xidbbe6e7b8e810100007d8705d2db9a3"
},
{
"host": "localhost",
"port": 7003,
"id": "P3Xiddd68e7b8e810100003921524ee5e38"
},
{
"host": "localhost",
"port": 7004,
"id": "P3Xid73e9e7b8e810100006f8a0a1ab2c2b"
},
{
"host": "localhost",
"port": 7005,
"id": "P3Xid1d5be7b8e810100009ae5b8ee7e201"
}
]
}
]
}
Loading