diff --git a/.cspell.json b/.cspell.json index e7fc575a..5de63cf5 100644 --- a/.cspell.json +++ b/.cspell.json @@ -200,7 +200,7 @@ "frappeclient", "frappehr", "Frappeio", - "frappeui", + "jingrowui", "fremovexattr", "fsetxattr", "fstype", diff --git a/.github/helper/install.sh b/.github/helper/install.sh index c8843a3c..f935a53d 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -6,21 +6,21 @@ cd ~ || exit sudo apt update && sudo apt install redis-server libcups2-dev -pip install frappe-bench -bench init --skip-assets --python "$(which python)" ~/frappe-bench --frappe-path http://git.jingrow.com/balamurali27/frappe --frappe-branch fc-ci +pip install jingrow-bench +bench init --skip-assets --python "$(which python)" ~/jingrow-bench --jingrow-path http://git.jingrow.com/balamurali27/jingrow --jingrow-branch fc-ci mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'" mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" install_whktml() { - wget -O /tmp/wkhtmltox.tar.xz http://git.jingrow.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz + wget -O /tmp/wkhtmltox.tar.xz http://git.jingrow.com/jingrow/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz tar -xf /tmp/wkhtmltox.tar.xz -C /tmp sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf sudo chmod o+x /usr/local/bin/wkhtmltopdf } install_whktml & -cd ~/frappe-bench || exit +cd ~/jingrow-bench || exit sed -i 's/watch:/# watch:/g' Procfile sed -i 's/schedule:/# schedule:/g' Procfile @@ -32,7 +32,7 @@ bench get-app press "${GITHUB_WORKSPACE}" bench setup requirements --dev bench start &> bench_start_logs.txt & -CI=Yes bench build --app frappe & +CI=Yes bench build --app jingrow & bench new-site --db-root-password root --admin-password admin test_site bench --site test_site install-app press bench set-config -g server_script_enabled 1 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1c1a3a05..35fbaa3e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -10,9 +10,9 @@ on: workflow_dispatch: env: - DB_NAME: test_frappe - DB_USER: test_frappe - DB_PASSWORD: test_frappe + DB_NAME: test_jingrow + DB_USER: test_jingrow + DB_PASSWORD: test_jingrow concurrency: group: ${{ github.ref }} @@ -162,22 +162,22 @@ jobs: uses: crazy-max/ghaction-github-runtime@v3 - name: Install Playwright browsers - working-directory: /home/runner/frappe-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/press/dashboard run: npx playwright install chromium - name: Setup Test Users - working-directory: /home/runner/frappe-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/press/dashboard run: | bench --site test_site execute press.press.doctype.team.test_team.create_test_press_admin_team \ --kwargs "{\"email\": \"${PRESS_ADMIN_USER_EMAIL}\", \"free_account\": True, \"skip_onboarding\": True}" bench --site test_site set-password "$PRESS_ADMIN_USER_EMAIL" "$PRESS_ADMIN_USER_PASSWORD" - name: Run Playwright Tests - working-directory: /home/runner/frappe-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/press/dashboard run: npx playwright test --project=chromium - name: Generate Coverage Report - working-directory: /home/runner/frappe-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/press/dashboard run: npx nyc report --reporter=cobertura --reporter=text --report-dir=./coverage - name: Upload Playwright Test report @@ -185,13 +185,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: playwright-report - path: /home/runner/frappe-bench/apps/press/dashboard/playwright-report + path: /home/runner/jingrow-bench/apps/press/dashboard/playwright-report - name: Upload coverage data uses: codecov/codecov-action@v5 with: disable_search: true - files: /home/runner/frappe-bench/apps/press/dashboard/coverage/cobertura-coverage.xml + files: /home/runner/jingrow-bench/apps/press/dashboard/coverage/cobertura-coverage.xml fail_ci_if_error: false verbose: true token: ${{ secrets.CODECOV_TOKEN }} @@ -280,26 +280,26 @@ jobs: install: true - name: Run Tests - working-directory: /home/runner/frappe-bench + working-directory: /home/runner/jingrow-bench run: | bench --site test_site set-config allow_tests true bench --site test_site run-parallel-tests --app press --with-coverage --total-builds 2 --build-number ${{ matrix.container }} env: TYPE: server - COVERAGE_RCFILE: /home/runner/frappe-bench/apps/press/.coveragerc + COVERAGE_RCFILE: /home/runner/jingrow-bench/apps/press/.coveragerc - name: Upload coverage reports to Codecov uses: actions/upload-artifact@v4 with: name: coverage-${{ matrix.container }} - path: /home/runner/frappe-bench/sites/coverage.xml + path: /home/runner/jingrow-bench/sites/coverage.xml if: always() - name: Upload bench start logs uses: actions/upload-artifact@v4 with: name: bench-start-logs-${{ matrix.container }} - path: /home/runner/frappe-bench/bench_start_logs.txt + path: /home/runner/jingrow-bench/bench_start_logs.txt if: always() coverage: diff --git a/.gitignore b/.gitignore index 5e8d1eac..e310501d 100644 --- a/.gitignore +++ b/.gitignore @@ -129,7 +129,7 @@ dmypy.json # Pyre type checker .pyre/ -# Added by frappe +# Added by jingrow .DS_Store *.pyc *.egg-info diff --git a/.mergify.yml b/.mergify.yml index b5ae304c..d06d1bb3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,7 +3,7 @@ pull_request_rules: conditions: - and: - and: - - author!=frappe-pr-bot + - author!=jingrow-pr-bot - author!=mergify[bot] - author!=github-actions - or: diff --git a/README.md b/README.md index 21c01642..68a8194b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ **Full Service Cloud Hosting For The Frappe Stack - Powers Frappe Cloud** -[![codecov](https://codecov.io/gh/frappe/press/branch/master/graph/badge.svg?token=0puvH0jUx9)](https://codecov.io/gh/frappe/press) +[![codecov](https://codecov.io/gh/jingrow/press/branch/master/graph/badge.svg?token=0puvH0jUx9)](https://codecov.io/gh/jingrow/press) [![unittests](http://git.jingrow.com/jingrow/jcloude/actions/workflows/main.yaml/badge.svg)](http://git.jingrow.com/jingrow/jcloude/actions/workflows/main.yaml) @@ -55,9 +55,9 @@ Additionally, customers lacked full control over their servers—no SSH access, ### Under the Hood -- [**Frappe Framework**](http://git.jingrow.com/frappe/frappe): A full-stack web application framework written in Python and Javascript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API. +- [**Frappe Framework**](http://git.jingrow.com/jingrow/jingrow): A full-stack web application framework written in Python and Javascript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API. -- [**Frappe UI**](http://git.jingrow.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework. +- [**Frappe UI**](http://git.jingrow.com/jingrow/jingrow-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework. - [**Agent**](http://git.jingrow.com/jingrow/agent): A flask app designed to work along with Press. It provides a CLI interface for Press to communicate with the sites and benches. @@ -80,7 +80,7 @@ pre-commit install ## Learn and connect - [Telegram Public Group](https://t.me/frappecloud) -- [Discuss Forum](https://discuss.framework.jingrow.com/c/frappe-cloud/77) +- [Discuss Forum](https://discuss.framework.jingrow.com/c/jingrow-cloud/77) - [Documentation](https://docs.framework.jingrow.com/cloud)
diff --git a/backbone/packer/cloud-init-scaleway.yml b/backbone/packer/cloud-init-scaleway.yml index b38fd34b..f386e538 100644 --- a/backbone/packer/cloud-init-scaleway.yml +++ b/backbone/packer/cloud-init-scaleway.yml @@ -6,7 +6,7 @@ users: - name: root shell: /usr/bin/bash - - name: frappe + - name: jingrow gecos: Frappe groups: sudo lock_passwd: false diff --git a/backbone/tests/test_hypervisor.py b/backbone/tests/test_hypervisor.py index c0f834fa..70317edc 100644 --- a/backbone/tests/test_hypervisor.py +++ b/backbone/tests/test_hypervisor.py @@ -2,7 +2,7 @@ # For license information, please see license.txt from unittest.mock import MagicMock -from frappe.tests.utils import FrappeTestCase +from jingrow.tests.utils import FrappeTestCase from backbone.hypervisor import Hypervisor diff --git a/backbone/vagrant/Vagrantfile b/backbone/vagrant/Vagrantfile index 27ddc2bf..8bba7cd4 100644 --- a/backbone/vagrant/Vagrantfile +++ b/backbone/vagrant/Vagrantfile @@ -37,8 +37,8 @@ Vagrant.configure("2") do |config| # Default Cluster # Reverse Proxy Server - config.vm.define "n1.local.frappe.dev" do |n1| - n1.vm.hostname = "n1.local.frappe.dev" + config.vm.define "n1.local.jingrow.dev" do |n1| + n1.vm.hostname = "n1.local.jingrow.dev" n1.vm.network "private_network", ip: "10.0.1.101", netmask: "255.255.0.0" n1.vm.network "private_network", ip: "10.1.1.101", netmask: "255.255.0.0" n1.vm.provider :libvirt do |libvirt| @@ -47,8 +47,8 @@ Vagrant.configure("2") do |config| end # Primary App Server - config.vm.define "f1.local.frappe.dev" do |f1| - f1.vm.hostname = "f1.local.frappe.dev" + config.vm.define "f1.local.jingrow.dev" do |f1| + f1.vm.hostname = "f1.local.jingrow.dev" f1.vm.network "private_network", ip: "10.0.2.101", netmask: "255.255.0.0" f1.vm.network "private_network", ip: "10.1.2.101", netmask: "255.255.0.0" f1.vm.provider :libvirt do |libvirt| @@ -58,8 +58,8 @@ Vagrant.configure("2") do |config| end # Replica of f1 - # config.vm.define "f2.local.frappe.dev" do |f2| - # f2.vm.hostname = "f2.local.frappe.dev" + # config.vm.define "f2.local.jingrow.dev" do |f2| + # f2.vm.hostname = "f2.local.jingrow.dev" # f2.vm.network "private_network", ip: "10.0.2.102", netmask: "255.255.0.0" # f2.vm.network "private_network", ip: "10.1.2.102", netmask: "255.255.0.0" # f2.vm.provider :libvirt do |libvirt| @@ -69,8 +69,8 @@ Vagrant.configure("2") do |config| # end # Primary DB Server - config.vm.define "m1.local.frappe.dev" do |m1| - m1.vm.hostname = "m1.local.frappe.dev" + config.vm.define "m1.local.jingrow.dev" do |m1| + m1.vm.hostname = "m1.local.jingrow.dev" m1.vm.network "private_network", ip: "10.0.3.101", netmask: "255.255.0.0" m1.vm.network "private_network", ip: "10.1.3.101", netmask: "255.255.0.0" m1.vm.provider :libvirt do |libvirt| @@ -80,8 +80,8 @@ Vagrant.configure("2") do |config| end # Replica of m1 - # config.vm.define "m2.local.frappe.dev" do |m2| - # m2.vm.hostname = "m2.local.frappe.dev" + # config.vm.define "m2.local.jingrow.dev" do |m2| + # m2.vm.hostname = "m2.local.jingrow.dev" # m2.vm.network "private_network", ip: "10.0.3.102", netmask: "255.255.0.0" # m2.vm.network "private_network", ip: "10.1.3.102", netmask: "255.255.0.0" # m2.vm.provider :libvirt do |libvirt| @@ -91,8 +91,8 @@ Vagrant.configure("2") do |config| # end # # Secondary Cluster - # config.vm.define "n2.frappe.dev" do |n2| - # n2.vm.hostname = "n2.frappe.dev" + # config.vm.define "n2.jingrow.dev" do |n2| + # n2.vm.hostname = "n2.jingrow.dev" # n2.vm.network "private_network", ip: "10.0.1.102", netmask: "255.255.0.0" # n2.vm.network "private_network", ip: "10.1.1.102", netmask: "255.255.0.0" # end @@ -100,15 +100,15 @@ Vagrant.configure("2") do |config| # Additional Hosts. # Docker Registry - config.vm.define "registry.local.frappe.dev" do |registry| - registry.vm.hostname = "registry.local.frappe.dev" + config.vm.define "registry.local.jingrow.dev" do |registry| + registry.vm.hostname = "registry.local.jingrow.dev" registry.vm.network "private_network", ip: "10.0.4.101", netmask: "255.255.0.0" registry.vm.network "private_network", ip: "10.1.4.101", netmask: "255.255.0.0" end # Log Server = ElasticSearch + Logstash + Kibana - config.vm.define "log.local.frappe.dev" do |log| - log.vm.hostname = "log.local.frappe.dev" + config.vm.define "log.local.jingrow.dev" do |log| + log.vm.hostname = "log.local.jingrow.dev" log.vm.network "private_network", ip: "10.0.4.102", netmask: "255.255.0.0" log.vm.network "private_network", ip: "10.1.4.102", netmask: "255.255.0.0" log.vm.provider :libvirt do |libvirt| @@ -118,8 +118,8 @@ Vagrant.configure("2") do |config| end # Uptime Server = Prometheus + Grafana - config.vm.define "monitor.local.frappe.dev" do |monitor| - monitor.vm.hostname = "monitor.local.frappe.dev" + config.vm.define "monitor.local.jingrow.dev" do |monitor| + monitor.vm.hostname = "monitor.local.jingrow.dev" monitor.vm.network "private_network", ip: "10.0.4.103", netmask: "255.255.0.0" monitor.vm.network "private_network", ip: "10.1.4.103", netmask: "255.255.0.0" monitor.vm.provider :libvirt do |libvirt| @@ -128,8 +128,8 @@ Vagrant.configure("2") do |config| end # Analytics Server = Plausible - # config.vm.define "analytics.local.frappe.dev" do |analytics| - # analytics.vm.hostname = "analytics.local.frappe.dev" + # config.vm.define "analytics.local.jingrow.dev" do |analytics| + # analytics.vm.hostname = "analytics.local.jingrow.dev" # analytics.vm.network "private_network", ip: "10.0.4.104", netmask: "255.255.0.0" # analytics.vm.network "private_network", ip: "10.1.4.104", netmask: "255.255.0.0" # analytics.vm.provider :libvirt do |libvirt| @@ -138,8 +138,8 @@ Vagrant.configure("2") do |config| # end # Trace Server = Sentry - config.vm.define "trace.local.frappe.dev" do |trace| - trace.vm.hostname = "trace.local.frappe.dev" + config.vm.define "trace.local.jingrow.dev" do |trace| + trace.vm.hostname = "trace.local.jingrow.dev" trace.vm.network "private_network", ip: "10.0.4.105", netmask: "255.255.0.0" trace.vm.network "private_network", ip: "10.1.4.105", netmask: "255.255.0.0" trace.vm.provider :libvirt do |libvirt| @@ -148,16 +148,16 @@ Vagrant.configure("2") do |config| end end - # config.vm.define "sn1.local.frappe.dev" do |sn1| + # config.vm.define "sn1.local.jingrow.dev" do |sn1| # sn1.vm.box = "scaleway" - # sn1.vm.hostname = "sn1.local.frappe.dev" + # sn1.vm.hostname = "sn1.local.jingrow.dev" # sn1.vm.network "private_network", ip: "10.2.0.101", netmask: "255.255.0.0" # sn1.vm.network "private_network", ip: "10.3.0.101", netmask: "255.255.0.0", auto_config: false # end - # config.vm.define "sf1.local.frappe.dev" do |sf1| + # config.vm.define "sf1.local.jingrow.dev" do |sf1| # sf1.vm.box = "scaleway" - # sf1.vm.hostname = "sf1.local.frappe.dev" + # sf1.vm.hostname = "sf1.local.jingrow.dev" # sf1.vm.network "private_network", ip: "10.2.1.101", netmask: "255.255.0.0" # sf1.vm.network "private_network", ip: "10.3.1.101", netmask: "255.255.0.0", auto_config: false # sf1.vm.provider :libvirt do |libvirt| diff --git a/dashboard/package.json b/dashboard/package.json index 70533cfa..a32c0c79 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -30,8 +30,8 @@ "dayjs": "^1.10.7", "echarts": "^5.4.3", "feather-icons": "^4.26.0", - "frappe-charts": "2.0.0-rc22", - "frappe-ui": "0.1.168", + "jingrow-charts": "2.0.0-rc22", + "jingrow-ui": "0.1.168", "fuse.js": "6.6.2", "libarchive.js": "^1.3.0", "lodash": "^4.17.19", diff --git a/dashboard/src/assets/style.css b/dashboard/src/assets/style.css index 12a13bf4..ba1a51fa 100644 --- a/dashboard/src/assets/style.css +++ b/dashboard/src/assets/style.css @@ -1,4 +1,4 @@ -@import 'frappe-ui/src/style.css'; +@import 'jingrow-ui/src/style.css'; @layer components { /* Works on Firefox */ diff --git a/dashboard/src/components/AccessRequestDialog.vue b/dashboard/src/components/AccessRequestDialog.vue index ece1b5c4..293cf9c0 100644 --- a/dashboard/src/components/AccessRequestDialog.vue +++ b/dashboard/src/components/AccessRequestDialog.vue @@ -59,10 +59,10 @@ diff --git a/dashboard/src/components/FoldStep.vue b/dashboard/src/components/FoldStep.vue index 81c9d561..c64a2c76 100644 --- a/dashboard/src/components/FoldStep.vue +++ b/dashboard/src/components/FoldStep.vue @@ -47,7 +47,7 @@