Skip to content

Commit 092393f

Browse files
committed
Merge branch 'main' into next
2 parents 5829036 + 99f958a commit 092393f

File tree

10 files changed

+16
-19
lines changed

10 files changed

+16
-19
lines changed

adminforth/documentation/docs/tutorial/01-helloWorld.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,4 +340,4 @@ Also, for better development experience we recommend to create file `custom/tsco
340340

341341
## Possible configuration options
342342

343-
Check [AdminForthConfig](/docs/api/types/Back/interfaces/AdminForthConfig.md) for all possible options.
343+
Check [AdminForthConfig](/docs/api/Back/interfaces/AdminForthConfig.md) for all possible options.

adminforth/documentation/docs/tutorial/02-glossary.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ There might be several datasources in the system for various databases e.g. One
1313

1414
## resource
1515

16-
A [Resource](/docs/api/types/Back/interfaces/AdminForthResource.md) is a representation of a table or collection in AdminForth. One resource is one table in the database.
16+
A [Resource](/docs/api/Back/interfaces/AdminForthResource.md) is a representation of a table or collection in AdminForth. One resource is one table in the database.
1717
It has a `name` which should match name in database, a datasource id, and a list of columns.
1818
Also it has various customization options.
1919

2020
## column
2121

22-
A [Column](/docs/api/types/Back/interfaces/AdminForthResourceColumn.md) is a representation of a column in a table. It has a `name` which should be equal to name in database and various configuration options.
22+
A [Column](/docs/api/Back/interfaces/AdminForthResourceColumn.md) is a representation of a column in a table. It has a `name` which should be equal to name in database and various configuration options.
2323

2424
## record
2525

@@ -29,7 +29,7 @@ A record is a row in a relational database table. Or Document in document databa
2929

3030
Action is one of operations which can be performed on the resource or it's records.
3131

32-
There are next [actions](/docs/api/types/Common/enumerations/AllowedActionsEnum.md):
32+
There are next [actions](/docs/api/Common/enumerations/AllowedActionsEnum.md):
3333

3434
* create
3535
* edit
@@ -40,7 +40,7 @@ There are next [actions](/docs/api/types/Common/enumerations/AllowedActionsEnum.
4040

4141
## adminUser
4242

43-
[Object](/docs/api/types/Common/interfaces/AdminUser) which represents a user who logged in to the AdminForth.
43+
[Object](/docs/api/Common/interfaces/AdminUser) which represents a user who logged in to the AdminForth.
4444

4545

4646
## hook

adminforth/documentation/docs/tutorial/03-Customization/01-branding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The first things you would probably like to change are the logo, favicon and the
1010

1111
First of all create directory named `custom` at the same level with your TypeScript/JavaScript index file.
1212

13-
We will use this directory for all custom components. If you want to call your dir with other name then `custom`, just set [customComponentsDir option](/docs/api/types/Back/interfaces/AdminForthConfig#customcomponentsdir)
13+
We will use this directory for all custom components. If you want to call your dir with other name then `custom`, just set [customComponentsDir option](/docs/api/Back/interfaces/AdminForthConfig#customcomponentsdir)
1414

1515
Place your logo file into the `custom` directory e.g. (`logo.svg`)
1616

adminforth/documentation/docs/tutorial/03-Customization/02-customFieldRendering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ Here is how it looks:
6060
![alt text](<Custom record field rendering.png>)
6161

6262
In very similar way you can render how cell is rendered in `'edit'` and `'create'` view.
63-
You can use it for creating custom editors for the fields. Check [component specs](/docs/api/types/Common/interfaces/AdminForthFieldComponents#create) to understand which props are passed to the component
63+
You can use it for creating custom editors for the fields. Check [component specs](/docs/api/Common/interfaces/AdminForthFieldComponents#create) to understand which props are passed to the component
6464

6565
## Parametrize the custom components
6666

6767
Sometimes you need to render same component with different parameters.
68-
You can use [full component declaration](/docs/api/types/Common/interfaces/AdminForthComponentDeclarationFull)
68+
You can use [full component declaration](/docs/api/Common/interfaces/AdminForthComponentDeclarationFull)
6969

7070

7171
```ts title='./resources/apartments.ts'

adminforth/documentation/docs/tutorial/03-Customization/04-hooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,4 @@ always performed before any hooks and any database requests.
221221

222222
## All hooks
223223

224-
Check all hooks in the [API reference](/docs/api/types/Back/interfaces/AdminForthResource).
224+
Check all hooks in the [API reference](/docs/api/Back/interfaces/AdminForthResource).

adminforth/documentation/docs/tutorial/03-Customization/07-alert.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ When you are writing custom components or pages you might need to show alerts or
44

55
For example if fetch to the API fails you might want to show an error message to the user.
66

7-
AdminForth has very simple [frontend API](/docs/api/types/FrontendAPI/interfaces/FrontendAPIInterface) for this.
7+
AdminForth has very simple [frontend API](/docs/api/FrontendAPI/interfaces/FrontendAPIInterface) for this.
88

99
To see an example of alerts, you can call them yourself.
1010

adminforth/documentation/docs/tutorial/03-Customization/08-pageInjections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Also we have to add an Api to get percentages:
173173
admin.express.serve(app)
174174
```
175175

176-
> ☝️ Please note that we are using [Frontend API](/docs/api/types/FrontendAPI/interfaces/FrontendAPIInterface/) `adminforth.list.updateFilter({field: 'number_of_rooms', operator: 'eq', value: selectedRoomsCount});` to set filter when we are located on apartments list page
176+
> ☝️ Please note that we are using [Frontend API](/docs/api/FrontendAPI/interfaces/FrontendAPIInterface/) `adminforth.list.updateFilter({field: 'number_of_rooms', operator: 'eq', value: selectedRoomsCount});` to set filter when we are located on apartments list page
177177
178178
Here is how it looks:
179179
![alt text](<Page Injections.png>)
@@ -315,7 +315,7 @@ npm i text-analyzer
315315
```
316316
317317
318-
> ☝️ Please note that we are using AdminForth [Frontend API](/docs/api/types/FrontendAPI/interfaces/FrontendAPIInterface/) `adminforth.list.closeThreeDotsDropdown();` to close the dropdown after the item is clicked.
318+
> ☝️ Please note that we are using AdminForth [Frontend API](/docs/api/FrontendAPI/interfaces/FrontendAPIInterface/) `adminforth.list.closeThreeDotsDropdown();` to close the dropdown after the item is clicked.
319319
320320
321321
## List table custom action icons

adminforth/documentation/docs/tutorial/03-Customization/09-bulkActions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ For example you might want allow setting `listed` field to `false` for multiple
77
AdminForth by default provides a checkbox in first column of the list view for this purposes.
88

99
By default AdminForth provides only one bulk action `delete` which allows to delete multiple records at once
10-
(if deletion for records available by [resource.options.allowedActions](/docs/api/types/Back/interfaces/ResourceOptions/#allowedactions))
10+
(if deletion for records available by [resource.options.allowedActions](/docs/api/Back/interfaces/ResourceOptions/#allowedactions))
1111

1212
To add custom bulk action quickly:
1313

adminforth/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adminforth",
3-
"version": "1.5.12-next.2",
3+
"version": "1.6.0",
44
"description": "OpenSource Vue3 powered forth-generation admin panel",
55
"main": "dist/index.js",
66
"module": "dist/index.js",
@@ -17,9 +17,6 @@
1717
"build": "rm -rf dist && tsc && npm run prepareDist && npm link",
1818
"--comment-prepareDist": "-rl allows supply the spa without symlinks which allows to not include source code in the package",
1919
"prepareDist": "cp -rL spa dist/",
20-
"put-git-tag": "git tag v$(node -p \"require('./package.json').version\") && git push --tags",
21-
"rollout": "npm run build && npm version patch && npm publish && npm run rollout-doc && npm run put-git-tag",
22-
"rollout-next": "npm run build && npm version prerelease --preid=next && npm publish --tag next && npm run put-git-tag",
2320
"rollout-doc": "cd documentation && npm run build && npm run deploy",
2421
"docs": "typedoc",
2522
"--comment_postinstall": "postinstall executed after package installed in other project package and when we do npm ci in the package",

0 commit comments

Comments
 (0)