From 5cadfdfd780fcb19f3da029958761f1400dfd06c Mon Sep 17 00:00:00 2001 From: AbleKSaju <126228406+AbleKSaju@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:57:36 +0530 Subject: [PATCH 1/3] fix: invalid doc urls --- .github/CONTRIBUTING.md | 2 +- README.md | 6 ++---- package.json | 2 +- src/components/SearchBar.vue | 2 +- src/utils/getStartedConfig.ts | 17 +++++++---------- src/utils/misc.ts | 2 +- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 58a6a65c..f7e3daf8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -93,7 +93,7 @@ We know documentation and tests are boring, but they're important and we need you to add them for large changes. - **Documentation**: If the feature being added requires an explanation then - [documentation](https://docs.frappebooks.com/) should be updated in the + [documentation](https://docs.frappe.io/books/) should be updated in the [frappe/books_docs](https://github.com/frappe/books_docs) repository. _Add a link to the documentation PR in your feature PR._ - **Tests**: If your features alters business logic then tests should be added. diff --git a/README.md b/README.md index f25925d4..97e78097 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ > > Frappe Books is looking for a maintainer, please view [#775](https://github.com/frappe/books/issues/775) for more info. -
Frappe Books logo @@ -15,7 +14,7 @@ Free Desktop book-keeping software for small businesses and freelancers. -[frappebooks.com](https://frappebooks.com/) +[frappe.io/books](https://frappe.io/books/) Frappe Books Preview @@ -54,8 +53,7 @@ Free Desktop book-keeping software for small businesses and freelancers. ## Installation Download and install the latest release for your platform from the [releases -page](https://github.com/frappe/books/releases) or the [download -page](https://frappebooks.com/download). +page](https://github.com/frappe/books/releases) . ## Development diff --git a/package.json b/package.json index c8f94644..f3e9e439 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "singleQuote": true, "trailingComma": "es5" }, - "homepage": "https://frappebooks.com", + "homepage": "https://frappe.io/books", "repository": { "url": "https://github.com/frappe/books" }, diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue index 2d9d18d4..db54374b 100644 --- a/src/components/SearchBar.vue +++ b/src/components/SearchBar.vue @@ -307,7 +307,7 @@ export default defineComponent({ }, methods: { openDocs() { - ipc.openLink('https://docs.frappebooks.com/' + docsPathMap.Search); + ipc.openLink('https://docs.frappe.io/' + docsPathMap.Search); }, getShortcuts() { const ifOpen = (cb: Function) => () => this.openModal && cb(); diff --git a/src/utils/getStartedConfig.ts b/src/utils/getStartedConfig.ts index 044beb64..935e5a4c 100644 --- a/src/utils/getStartedConfig.ts +++ b/src/utils/getStartedConfig.ts @@ -45,8 +45,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { description: t`Review your chart of accounts, add any account or tax heads as needed`, action: () => routeTo('/chart-of-accounts'), fieldname: 'chartOfAccountsReviewed', - documentation: - 'https://docs.frappebooks.com/setting-up/initial-entries.html#add-additional-bank-accounts', + documentation: 'https://docs.frappe.io/books/chart-of-accounts', }, { key: 'Opening Balances', @@ -54,8 +53,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { icon: 'opening-ac', fieldname: 'openingBalanceChecked', description: t`Set up your opening balances before performing any accounting entries`, - documentation: - 'https://docs.frappebooks.com/setting-up/opening-balances.html', + documentation: 'https://docs.frappe.io/books/setup-opening-balances', }, { key: 'Add Taxes', @@ -65,7 +63,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { description: t`Set up your tax templates for your sales or purchase transactions`, action: () => routeTo('/list/Tax'), documentation: - 'https://docs.frappebooks.com/setting-up/initial-entries.html#add-taxes', + 'https://docs.frappe.io/books/create-initial-entries#add-taxes', }, ], }, @@ -86,7 +84,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { }), fieldname: 'salesItemCreated', documentation: - 'https://docs.frappebooks.com/setting-up/initial-entries.html#add-sales-items', + 'https://docs.frappe.io/books/create-initial-entries#add-sales-items', }, { key: 'Add Customers', @@ -102,7 +100,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { }), fieldname: 'customerCreated', documentation: - 'https://docs.frappebooks.com/setting-up/initial-entries.html#add-customers', + 'https://docs.frappe.io/books/create-initial-entries#add-customers', }, { key: 'Create Sales Invoice', @@ -111,8 +109,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { description: t`Create your first sales invoice for the created customer`, action: () => routeTo('/list/SalesInvoice'), fieldname: 'invoiceCreated', - documentation: - 'https://docs.frappebooks.com/transactions/sales-invoices.html', + documentation: 'https://docs.frappe.io/books/sales-invoices', }, ], }, @@ -153,7 +150,7 @@ export function getGetStartedConfig(): GetStartedConfigItem[] { action: () => routeTo('/list/PurchaseInvoice'), fieldname: 'billCreated', documentation: - 'https://docs.frappebooks.com/transactions/purchase-invoices.html', + 'https://docs.frappe.io/books/purchase-invoices#creating-purchase-invoices', }, ], }, diff --git a/src/utils/misc.ts b/src/utils/misc.ts index c6539fb4..79497c02 100644 --- a/src/utils/misc.ts +++ b/src/utils/misc.ts @@ -132,7 +132,7 @@ export const docsPathMap: Record = { [ModelNameEnum.PrintTemplate]: 'books/print-templates', // Miscellaneous - Search: 'books/search', + Search: 'books/quick-search', NumberSeries: 'books/number-series', ImportWizard: 'books/import-wizard', Settings: 'books/settings', From 13a0a5cc501bd4fa16f0f7de569960ea597eba41 Mon Sep 17 00:00:00 2001 From: akshayitzme Date: Sat, 10 Aug 2024 11:23:50 +0530 Subject: [PATCH 2/3] fix: replaced runners to macos-11 --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5180ee5d..93e8b3ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: jobs: setup_and_build: - runs-on: macos-11 + runs-on: macos-latest steps: - name: Setup node uses: actions/setup-node@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4ed59551..50277c59 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: workflow_dispatch jobs: build-macos: - runs-on: macos-11 + runs-on: macos-latest steps: - name: Setup node uses: actions/setup-node@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1021a6d1..65cbcff3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ on: jobs: setup_and_test: - runs-on: macos-11 + runs-on: macos-latest steps: - name: Setup node uses: actions/setup-node@v2 @@ -32,7 +32,7 @@ jobs: run: yarn test setup_and_uitest: - runs-on: macos-11 + runs-on: macos-latest steps: - name: Setup node uses: actions/setup-node@v2 From feb253feea5286e4eaeb17ad5170aa85c681d622 Mon Sep 17 00:00:00 2001 From: akshayitzme Date: Sat, 10 Aug 2024 12:15:15 +0530 Subject: [PATCH 3/3] fix: use macos-12 for build action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93e8b3ee..74f5a2d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: jobs: setup_and_build: - runs-on: macos-latest + runs-on: macos-12 steps: - name: Setup node uses: actions/setup-node@v2