diff --git a/.cspell.json b/.cspell.json index 5de63cf5..a106d4ba 100644 --- a/.cspell.json +++ b/.cspell.json @@ -13,7 +13,7 @@ "test_**", "**.conf", "requirements.txt", - "press/utils/country_timezone.py" + "jcloude/utils/country_timezone.py" ], "words": [ "2.4.6", diff --git a/.github/helper/install.sh b/.github/helper/install.sh index f935a53d..b0938aba 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -27,13 +27,13 @@ sed -i 's/schedule:/# schedule:/g' Procfile sed -i 's/socketio:/# socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile -bench get-app press "${GITHUB_WORKSPACE}" +bench get-app jcloude "${GITHUB_WORKSPACE}" bench setup requirements --dev bench start &> bench_start_logs.txt & 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 --site test_site install-app jcloude bench set-config -g server_script_enabled 1 bench set-config -g http_port 8000 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 35fbaa3e..d976e616 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -84,7 +84,7 @@ jobs: - name: Run Semgrep rules run: | pip install semgrep==1.32 - semgrep ci --config ./press-semgrep-rules.yml --config r/python.lang.correctness + semgrep ci --config ./jcloude-semgrep-rules.yml --config r/python.lang.correctness ui-tests: name: Client @@ -162,22 +162,22 @@ jobs: uses: crazy-max/ghaction-github-runtime@v3 - name: Install Playwright browsers - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: npx playwright install chromium - name: Setup Test Users - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: | - bench --site test_site execute press.press.doctype.team.test_team.create_test_press_admin_team \ + bench --site test_site execute jcloude.jcloude.doctype.team.test_team.create_test_jcloude_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/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: npx playwright test --project=chromium - name: Generate Coverage Report - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: npx nyc report --reporter=cobertura --reporter=text --report-dir=./coverage - name: Upload Playwright Test report @@ -185,17 +185,17 @@ jobs: uses: actions/upload-artifact@v4 with: name: playwright-report - path: /home/runner/jingrow-bench/apps/press/dashboard/playwright-report + path: /home/runner/jingrow-bench/apps/jcloude/dashboard/playwright-report - name: Upload coverage data uses: codecov/codecov-action@v5 with: disable_search: true - files: /home/runner/jingrow-bench/apps/press/dashboard/coverage/cobertura-coverage.xml + files: /home/runner/jingrow-bench/apps/jcloude/dashboard/coverage/cobertura-coverage.xml fail_ci_if_error: false verbose: true token: ${{ secrets.CODECOV_TOKEN }} - name: press-dashboard + name: jcloude-dashboard flags: dashboard tests: @@ -283,10 +283,10 @@ jobs: 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 }} + bench --site test_site run-parallel-tests --app jcloude --with-coverage --total-builds 2 --build-number ${{ matrix.container }} env: TYPE: server - COVERAGE_RCFILE: /home/runner/jingrow-bench/apps/press/.coveragerc + COVERAGE_RCFILE: /home/runner/jingrow-bench/apps/jcloude/.coveragerc - name: Upload coverage reports to Codecov uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index e310501d..41f6b043 100644 --- a/.gitignore +++ b/.gitignore @@ -136,12 +136,12 @@ dmypy.json *.swp tags node_modules -press/docs/current -press/public/dashboard -press/www/dashboard.html -press/www/dashboard-old.html -press/public/css/email.css -press/public/css/saas-next.css +jcloude/docs/current +jcloude/public/dashboard +jcloude/www/dashboard.html +jcloude/www/dashboard-old.html +jcloude/public/css/email.css +jcloude/public/css/saas-next.css dashboard/tailwind.theme.json dashboard/components.d.ts @@ -158,8 +158,8 @@ backbone/packer/meta-data backbone/packer/cloud-init-scaleway.img # marketplace -press/public/css/marketplace.css -press/public/css/marketplace-next.css +jcloude/public/css/marketplace.css +jcloude/public/css/marketplace-next.css # Vim .vim diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54ccdf58..0fdddb7c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,12 +11,12 @@ repos: # Ignore any files that might contain jinja / bundles exclude: | (?x)^( - press/public/dist/.*| + jcloude/public/dist/.*| .*node_modules.*| .*boilerplate.*| - press/www/website_script.js| - press/templates/includes/.*| - press/public/js/.*min.js + jcloude/www/website_script.js| + jcloude/templates/includes/.*| + jcloude/public/js/.*min.js )$ - repo: http://git.jingrow.com/pre-commit/pre-commit-hooks @@ -24,7 +24,7 @@ repos: hooks: - id: debug-statements - id: trailing-whitespace - files: 'press.*' + files: 'jcloude.*' exclude: '.*json$|.*txt$|.*csv|.*md|.*svg' - id: check-merge-conflict - id: check-ast diff --git a/CODEOWNERS b/CODEOWNERS index 8788841e..f23c77e2 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -22,4 +22,4 @@ dashboard/ @regdocs saas @rutwikhdev deploy* @18alantom -press/Dockerfile @18alantom +jcloude/Dockerfile @18alantom diff --git a/README.md b/README.md index 85ea75cc..ccf4c4e1 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ **Full Service Cloud Hosting For The Jingrow Stack - Powers Jingrow Cloud** -[![codecov](https://codecov.io/gh/jingrow/press/branch/master/graph/badge.svg?token=0puvH0jUx9)](https://codecov.io/gh/jingrow/press) +[![codecov](https://codecov.io/gh/jingrow/jcloude/branch/master/graph/badge.svg?token=0puvH0jUx9)](https://codecov.io/gh/jingrow/jcloude) [![unittests](http://git.jingrow.com/jingrow/jcloude/actions/workflows/main.yaml/badge.svg)](http://git.jingrow.com/jingrow/jcloude/actions/workflows/main.yaml)
- Managed press + Managed jcloude

- Website + Website - Documentation
diff --git a/codecov.yml b/codecov.yml index 5564e53d..2865d643 100644 --- a/codecov.yml +++ b/codecov.yml @@ -10,4 +10,4 @@ coverage: threshold: 0% if_ci_failed: ignore ignore: - - press/press/report/** + - jcloude/jcloude/report/** diff --git a/dashboard/index.html b/dashboard/index.html index e47b348b..5d5d1bac 100644 --- a/dashboard/index.html +++ b/dashboard/index.html @@ -5,7 +5,7 @@ Jingrow Cloud - + diff --git a/dashboard/src/components/AccessRequestDialog.vue b/dashboard/src/components/AccessRequestDialog.vue index 293cf9c0..a7ba7c1d 100644 --- a/dashboard/src/components/AccessRequestDialog.vue +++ b/dashboard/src/components/AccessRequestDialog.vue @@ -100,7 +100,7 @@ const permissionsMeta = computed(() => ({ })); const request = createResource({ - url: 'press.api.client.insert', + url: 'jcloude.api.client.insert', makeParams: () => { const permission = Object.keys(permissionsMeta.value).reduce( (acc, permission) => { diff --git a/dashboard/src/components/AccessRequestStatusDialog.vue b/dashboard/src/components/AccessRequestStatusDialog.vue index 77f317e8..53c1f781 100644 --- a/dashboard/src/components/AccessRequestStatusDialog.vue +++ b/dashboard/src/components/AccessRequestStatusDialog.vue @@ -74,7 +74,7 @@ const emit = defineEmits<{ const open = ref(true); const status = createResource({ - url: 'press.api.access.status', + url: 'jcloude.api.access.status', auto: true, params: { doctype: props.doctype, diff --git a/dashboard/src/components/ActiveServersDialog.vue b/dashboard/src/components/ActiveServersDialog.vue index 8d3089bd..f36eb5af 100644 --- a/dashboard/src/components/ActiveServersDialog.vue +++ b/dashboard/src/components/ActiveServersDialog.vue @@ -30,7 +30,7 @@ export default { }, resources: { activeServers: { - url: 'press.api.account.active_servers', + url: 'jcloude.api.account.active_servers', auto: true, }, }, diff --git a/dashboard/src/components/AddDomainDialog.vue b/dashboard/src/components/AddDomainDialog.vue index 59498015..f33191bc 100644 --- a/dashboard/src/components/AddDomainDialog.vue +++ b/dashboard/src/components/AddDomainDialog.vue @@ -165,13 +165,13 @@ export default { }, resources: { checkDNS: { - url: 'press.api.site.check_dns', + url: 'jcloude.api.site.check_dns', validate() { if (!this.newDomain) throw new DashboardError('Domain cannot be empty'); }, }, addDomain: { - url: 'press.api.site.add_domain', + url: 'jcloude.api.site.add_domain', onSuccess() { this.$resources.checkDNS.reset(); this.$emit('domainAdded'); @@ -179,7 +179,7 @@ export default { }, }, retryAddDomain: { - url: 'press.api.site.retry_add_domain', + url: 'jcloude.api.site.retry_add_domain', onSuccess() { this.$emit('domainAdded'); // this.$resources.domains.fetch(); diff --git a/dashboard/src/components/AddTagDialog.vue b/dashboard/src/components/AddTagDialog.vue index e136ba84..ea575faa 100644 --- a/dashboard/src/components/AddTagDialog.vue +++ b/dashboard/src/components/AddTagDialog.vue @@ -26,7 +26,7 @@ diff --git a/dashboard/src/components/AddressForm.vue b/dashboard/src/components/AddressForm.vue index 9d3e3543..ab2d8a7c 100644 --- a/dashboard/src/components/AddressForm.vue +++ b/dashboard/src/components/AddressForm.vue @@ -65,7 +65,7 @@ export default { }, resources: { countryList: { - url: 'press.api.account.country_list', + url: 'jcloude.api.account.country_list', auto: true, onSuccess() { let userCountry = this.$team?.pg.country; @@ -79,7 +79,7 @@ export default { }, validateGST() { return { - url: 'press.api.billing.validate_gst', + url: 'jcloude.api.billing.validate_gst', makeParams() { return { address: this.address, diff --git a/dashboard/src/components/BackupFilesUploader.vue b/dashboard/src/components/BackupFilesUploader.vue index 228be626..3ad58522 100644 --- a/dashboard/src/components/BackupFilesUploader.vue +++ b/dashboard/src/components/BackupFilesUploader.vue @@ -183,7 +183,7 @@ export default { return true; } let post = createResource({ - url: 'press.api.site.validate_restoration_space_requirements', + url: 'jcloude.api.site.validate_restoration_space_requirements', method: 'POST', }); return post.fetch({ diff --git a/dashboard/src/components/BuyPrepaidCreditsForm.vue b/dashboard/src/components/BuyPrepaidCreditsForm.vue index 50e0a33f..5302c699 100644 --- a/dashboard/src/components/BuyPrepaidCreditsForm.vue +++ b/dashboard/src/components/BuyPrepaidCreditsForm.vue @@ -49,7 +49,7 @@ > Razorpay Logo @@ -64,7 +64,7 @@ > Stripe Logo diff --git a/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue b/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue index e10ffc9f..600f38ea 100644 --- a/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue +++ b/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue @@ -64,7 +64,7 @@ export default { resources: { createRazorpayOrder() { return { - url: 'press.api.billing.create_razorpay_order', + url: 'jcloude.api.billing.create_razorpay_order', params: { amount: this.amount, transaction_type: this.type, @@ -83,7 +83,7 @@ export default { }, handlePaymentFailed() { return { - url: 'press.api.billing.handle_razorpay_payment_failed', + url: 'jcloude.api.billing.handle_razorpay_payment_failed', onSuccess() { console.log('Payment Failed.'); }, @@ -99,7 +99,7 @@ export default { key: data.key_id, order_id: data.order_id, name: 'Jingrow Cloud', - image: '/assets/press/images/jingrow-cloud-logo.png', + image: '/assets/jcloude/images/jingrow-cloud-logo.png', prefill: { email: this.$team.pg.user, }, diff --git a/dashboard/src/components/BuyPrepaidCreditsStripe.vue b/dashboard/src/components/BuyPrepaidCreditsStripe.vue index 4f0b8e52..617d5b00 100644 --- a/dashboard/src/components/BuyPrepaidCreditsStripe.vue +++ b/dashboard/src/components/BuyPrepaidCreditsStripe.vue @@ -76,7 +76,7 @@ export default { resources: { createPaymentIntent() { return { - url: 'press.api.billing.create_payment_intent_for_buying_credits', + url: 'jcloude.api.billing.create_payment_intent_for_buying_credits', params: { amount: this.amount, }, diff --git a/dashboard/src/components/ChurnFeedbackDialog.vue b/dashboard/src/components/ChurnFeedbackDialog.vue index 5f8aaa42..2973b300 100644 --- a/dashboard/src/components/ChurnFeedbackDialog.vue +++ b/dashboard/src/components/ChurnFeedbackDialog.vue @@ -74,7 +74,7 @@ export default { resources: { submitFeedback() { return { - url: 'press.api.account.feedback', + url: 'jcloude.api.account.feedback', makeParams() { return { team: this.team, diff --git a/dashboard/src/components/CommunicationInfoDialog.vue b/dashboard/src/components/CommunicationInfoDialog.vue index dad5c7b7..924d0907 100644 --- a/dashboard/src/components/CommunicationInfoDialog.vue +++ b/dashboard/src/components/CommunicationInfoDialog.vue @@ -111,7 +111,7 @@ export default { resources: { getCommunicationInfos() { return { - url: 'press.api.client.run_pg_method', + url: 'jcloude.api.client.run_pg_method', makeParams() { return { dt: this.referenceDoctype, @@ -127,7 +127,7 @@ export default { }, updateCommunicationInfos() { return { - url: 'press.api.client.run_pg_method', + url: 'jcloude.api.client.run_pg_method', makeParams() { return { dt: this.referenceDoctype, diff --git a/dashboard/src/components/ConfigEditorDialog.vue b/dashboard/src/components/ConfigEditorDialog.vue index 9d212b87..597255d3 100644 --- a/dashboard/src/components/ConfigEditorDialog.vue +++ b/dashboard/src/components/ConfigEditorDialog.vue @@ -122,7 +122,7 @@ export default { resources: { standardKeys() { return { - url: 'press.api.site.get_site_config_standard_keys', + url: 'jcloude.api.site.get_site_config_standard_keys', cache: 'Site Config Standard Keys', initialData: [], auto: true, diff --git a/dashboard/src/components/CustomAlerts.vue b/dashboard/src/components/CustomAlerts.vue index 24a73adb..850327a4 100644 --- a/dashboard/src/components/CustomAlerts.vue +++ b/dashboard/src/components/CustomAlerts.vue @@ -108,7 +108,7 @@ export default { resources: { banners() { return { - url: 'press.api.account.get_user_banners', + url: 'jcloude.api.account.get_user_banners', auto: !!this.$team?.pg, onSuccess: (data) => { try { @@ -148,7 +148,7 @@ export default { }; }, dismissBanner() { - return { url: 'press.api.account.dismiss_banner' }; + return { url: 'jcloude.api.account.dismiss_banner' }; }, }, }; diff --git a/dashboard/src/components/GitHubAppSelector.vue b/dashboard/src/components/GitHubAppSelector.vue index 77b05f7d..8a50199c 100644 --- a/dashboard/src/components/GitHubAppSelector.vue +++ b/dashboard/src/components/GitHubAppSelector.vue @@ -149,18 +149,18 @@ export default { resources: { options() { return { - url: 'press.api.github.options', + url: 'jcloude.api.github.options', auto: true, }; }, branches() { return { - url: 'press.api.github.branches', + url: 'jcloude.api.github.branches', }; }, clearAccessToken() { return { - url: 'press.api.github.clear_token_and_get_installation_url', + url: 'jcloude.api.github.clear_token_and_get_installation_url', onSuccess(installation_url) { window.location.href = installation_url + '?state=' + this.state; }, diff --git a/dashboard/src/components/HomeSummary.vue b/dashboard/src/components/HomeSummary.vue index e9769cbd..2dac775a 100644 --- a/dashboard/src/components/HomeSummary.vue +++ b/dashboard/src/components/HomeSummary.vue @@ -35,7 +35,7 @@ export default { home() { if (!this.$team.pg?.name) return; return { - url: 'press.api.client.run_pg_method', + url: 'jcloude.api.client.run_pg_method', cache: ['home_data', this.$team.pg.name], makeParams() { return { diff --git a/dashboard/src/components/InvoiceTable.vue b/dashboard/src/components/InvoiceTable.vue index e9db6c07..e490b6e8 100644 --- a/dashboard/src/components/InvoiceTable.vue +++ b/dashboard/src/components/InvoiceTable.vue @@ -160,7 +160,7 @@ export default { }, downloadInvoiceAsCSV() { return { - url: 'press.api.billing.fetch_invoice_items', + url: 'jcloude.api.billing.fetch_invoice_items', makeParams() { return { invoice: this.invoiceId, diff --git a/dashboard/src/components/LinkControl.vue b/dashboard/src/components/LinkControl.vue index 6f8aa79d..f793f80c 100644 --- a/dashboard/src/components/LinkControl.vue +++ b/dashboard/src/components/LinkControl.vue @@ -38,7 +38,7 @@ export default { resources: { options() { return { - url: 'press.api.client.search_link', + url: 'jcloude.api.client.search_link', params: { doctype: this.options.doctype, order_by: this.options.orderBy, diff --git a/dashboard/src/components/MarketplaceAppListing.vue b/dashboard/src/components/MarketplaceAppListing.vue index 600bd7d1..c422952d 100644 --- a/dashboard/src/components/MarketplaceAppListing.vue +++ b/dashboard/src/components/MarketplaceAppListing.vue @@ -33,7 +33,7 @@ :upload-args="{ doctype: 'Marketplace App', docname: app.pg.name, - method: 'press.api.marketplace.update_app_image', + method: 'jcloude.api.marketplace.update_app_image', }" >