Skip to content

Commit 4097b2a

Browse files
authored
Merge pull request #81 from SoftwareBrothers/feat/rebrand
chore: rebrand AdminBro to AdminJS
2 parents 45b6268 + fd68832 commit 4097b2a

18 files changed

+428
-304
lines changed

.env-example

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NODE_ENV=test
2-
POSTGRES_USER="adminbro"
3-
POSTGRES_PASSWORD="adminbro"
4-
POSTGRES_DATABASE="adminbro-sequelize-test"
2+
POSTGRES_USER="adminjs"
3+
POSTGRES_PASSWORD="adminjs"
4+
POSTGRES_DATABASE="adminjs-sequelize-test"
55
POSTGRES_HOST
66
POSTGRES_PORT

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
## admin-bro-sequelizejs
1+
## adminjs-sequelizejs
22

3-
This is an official [AdminBro](https://github.com/SoftwareBrothers/admin-bro) adapter which integrates [sequelize ORM](http://docs.sequelizejs.com/) into admin-bro.
3+
This is an official [AdminJS](https://github.com/SoftwareBrothers/adminjs) adapter which integrates [sequelize ORM](http://docs.sequelizejs.com/) into AdminJS.
44

55
## Usage
66

7-
The plugin can be registered using standard `AdminBro.registerAdapter` method.
7+
The plugin can be registered using standard `AdminJS.registerAdapter` method.
88

99
```javascript
10-
const AdminBro = require('admin-bro')
11-
const AdminBroSequelize = require('@admin-bro/sequelize')
10+
const AdminJS = require('adminjs')
11+
const AdminJSSequelize = require('@adminjs/sequelize')
1212

13-
AdminBro.registerAdapter(AdminBroSequelize)
13+
AdminJS.registerAdapter(AdminJSSequelize)
1414
```
1515

16-
More options can be found on [AdminBro](https://github.com/SoftwareBrothers/admin-bro) official website.
16+
More options can be found on [AdminJS](https://github.com/SoftwareBrothers/adminjs) official website.
1717

1818
## Testing
1919

@@ -29,7 +29,7 @@ npm run sequelize db:migrate
2929

3030
## License
3131

32-
AdminBro is Copyright © 2018 SoftwareBrothers.co. It is free software, and may be redistributed under the terms specified in the [LICENSE](LICENSE) file.
32+
AdminJS is Copyright © 2021 SoftwareBrothers.co. It is free software, and may be redistributed under the terms specified in the [LICENSE](LICENSE) file.
3333

3434
## About SoftwareBrothers.co
3535

example-app/.adminbro/.entry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
AdminBro.UserComponents = {}
1+
AdminJS.UserComponents = {}

example-app/.adminbro/bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example-app/.env-example

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
NODE_ENV=test
2-
POSTGRES_USER="adminbro"
3-
POSTGRES_PASSWORD="adminbro"
4-
POSTGRES_DATABASE="adminbro-sequelize"
2+
POSTGRES_USER="adminjs"
3+
POSTGRES_PASSWORD="adminjs"
4+
POSTGRES_DATABASE="adminjs-sequelize"

example-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"wait-on": "^5.2.0"
2121
},
2222
"dependencies": {
23-
"@admin-bro/express": "^3.0.0",
24-
"@admin-bro/sequelize": "1.0.0-beta.5",
25-
"admin-bro": "^3.1.1",
23+
"@adminjs/express": "^3.0.0",
24+
"@adminjs/sequelize": "1.0.0-beta.5",
25+
"adminjs": "^3.1.1",
2626
"dotenv": "^8.2.0",
2727
"express": "^4.17.1",
2828
"express-formidable": "^1.2.0",

example-app/src/connect.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import buildUser from './users/user.entity'
44
import buildComment from './comments/comment.entity'
55

66
const connect = async (): Promise<Sequelize> => {
7-
const dbName = process.env.POSTGRES_DATABASE || 'adminbro-sequelize'
7+
const dbName = process.env.POSTGRES_DATABASE || 'adminjs-sequelize'
88
const host = process.env.POSTGRES_HOST || 'localhost'
9-
const password = process.env.POSTGRES_PASSWORD || 'adminbro'
10-
const user = process.env.POSTGRES_USER || 'adminbro'
9+
const password = process.env.POSTGRES_PASSWORD || 'adminjs'
10+
const user = process.env.POSTGRES_USER || 'adminjs'
1111
const port = process.env.POSTGRES_PORT || 5432
1212

1313
const sequelize = new Sequelize(

example-app/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ import { config } from 'dotenv'
55
config({ path: path.join(__dirname, '../../.env') })
66

77
import express from 'express'
8-
import AdminBro from 'admin-bro'
9-
import { buildRouter } from '@admin-bro/express'
10-
import AdminBroSequelize from '@admin-bro/sequelize'
8+
import AdminJS from 'adminjs'
9+
import { buildRouter } from '@adminjs/express'
10+
import AdminJSSequelize from '@adminjs/sequelize'
1111

1212
import userAdmin from './users/user.admin'
1313

1414
import connect from './connect'
1515

1616
const PORT = 3000
1717

18-
AdminBro.registerAdapter(AdminBroSequelize)
18+
AdminJS.registerAdapter(AdminJSSequelize)
1919
const run = async () => {
2020
const sequelize = await connect()
2121
const app = express()
22-
const admin = new AdminBro({
22+
const admin = new AdminJS({
2323
databases: [sequelize],
2424
resources: [{
2525
resource: sequelize.models.User,

example-app/src/users/user.admin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ResourceOptions } from 'admin-bro'
1+
import { ResourceOptions } from 'adminjs'
22

33
const options: ResourceOptions = {
44
properties: {

example-app/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"types": ["cypress"],
1717
"paths": {
1818
"react": ["node_modules/@types/react"],
19-
"admin-bro": ["node_modules/admin-bro"],
19+
"adminjs": ["node_modules/adminjs"],
2020
},
2121
"baseUrl": "."
2222
},

index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22
/**
3-
* @module @admin-bro/sequelize
3+
* @module @adminjs/sequelize
44
* @subcategory Adapters
55
* @section modules
66
*
77
* @description
8-
* ### A Sequelize database adapter for AdminBro.
8+
* ### A Sequelize database adapter for AdminJS.
99
*
1010
* #### Installation
1111
*
1212
* To install the adapter run
1313
*
1414
* ```
15-
* yarn add @admin-bro/sequelize
15+
* yarn add @adminjs/sequelize
1616
* ```
1717
*
1818
* ### Usage
1919
*
2020
* In order to use it in your project register the adapter first:
2121
*
2222
* ```javascript
23-
* const AdminBro = require('admin-bro')
24-
* const AdminBroSequelize = require('@admin-bro/sequelize')
23+
* const AdminJS = require('adminjs')
24+
* const AdminJSSequelize = require('@adminjs/sequelize')
2525
*
26-
* AdminBro.registerAdapter(AdminBroSequelize)
26+
* AdminJS.registerAdapter(AdminJSSequelize)
2727
* ```
2828
*
2929
* ### Passing an entire database
3030
*
3131
* Sequelize generates folder in your app called `./models` and there is an `index.js` file.
32-
* You can require it and pass to {@link AdminBroOptions} like this:
32+
* You can require it and pass to {@link AdminJSOptions} like this:
3333
*
3434
* ```javascript
3535
* const db = require('../models');
36-
* const AdminBro = new AdminBro({
36+
* const AdminJS = new AdminJS({
3737
* databases: [db],
38-
* //... other AdminBroOptions
38+
* //... other AdminJSOptions
3939
* })
4040
* //...
4141
* ```
@@ -57,7 +57,7 @@
5757
*
5858
* ```javascript
5959
* const db = require('../models');
60-
* const AdminBro = new AdminBro({
60+
* const AdminJS = new AdminJS({
6161
* databases: [db], // you can still load an entire database and adjust just one resource
6262
* resources: [{
6363
* resource: db.vendor,
@@ -75,7 +75,7 @@
7575
/**
7676
* Implementation of {@link BaseDatabase} for Sequelize Adapter
7777
*
78-
* @memberof module:@admin-bro/sequelize
78+
* @memberof module:@adminjs/sequelize
7979
* @type {typeof BaseDatabase}
8080
* @static
8181
*/
@@ -84,7 +84,7 @@ const Database = require('./build/database').default
8484
/**
8585
* Implementation of {@link BaseResource} for Sequelize Adapter
8686
*
87-
* @memberof module:@admin-bro/sequelize
87+
* @memberof module:@adminjs/sequelize
8888
* @type {typeof BaseResource}
8989
* @static
9090
*/

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@admin-bro/sequelize",
2+
"name": "@adminjs/sequelize",
33
"version": "1.2.1",
4-
"description": "Sequelize adapter for AdminBro",
4+
"description": "Sequelize adapter for AdminJS",
55
"main": "build/index.js",
66
"types": "index.d.ts",
77
"scripts": {
@@ -16,12 +16,12 @@
1616
},
1717
"repository": {
1818
"type": "git",
19-
"url": "git+https://github.com/SoftwareBrothers/admin-bro-sequelizejs.git"
19+
"url": "git+https://github.com/SoftwareBrothers/adminjs-sequelizejs.git"
2020
},
2121
"author": "Wojciech Krysiak",
2222
"license": "MIT",
2323
"peerDependencies": {
24-
"admin-bro": ">=3.0.0",
24+
"adminjs": ">=5.0.0",
2525
"sequelize": ">=4"
2626
},
2727
"husky": {
@@ -39,7 +39,7 @@
3939
"@types/sinon-chai": "^3.2.4",
4040
"@typescript-eslint/eslint-plugin": "^3.7.0",
4141
"@typescript-eslint/parser": "^3.7.0",
42-
"admin-bro": "^3.2.3",
42+
"adminjs": "^5.0.0",
4343
"chai": "^4.2.0",
4444
"eslint": "^7.5.0",
4545
"eslint-config-airbnb": "^18.2.0",

src/database.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseDatabase, BaseResource } from 'admin-bro'
1+
import { BaseDatabase, BaseResource } from 'adminjs'
22
import { Sequelize } from 'sequelize'
33

44
import Resource from './resource'

src/property.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-underscore-dangle */
2-
import { BaseProperty, PropertyType } from 'admin-bro'
2+
import { BaseProperty, PropertyType } from 'adminjs'
33
import { ModelAttributeColumnOptions } from 'sequelize/types'
44

55
const TYPES_MAPPING = [

src/resource.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
2-
import { ValidationError, Filter, BaseRecord } from 'admin-bro'
2+
import { ValidationError, Filter, BaseRecord } from 'adminjs'
33

44
import chai, { expect } from 'chai'
55
import sinonChai from 'sinon-chai'

src/resource.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-param-reassign */
22
import { unflatten } from 'flat'
3-
import { BaseResource, BaseRecord, BaseProperty, Filter } from 'admin-bro'
3+
import { BaseResource, BaseRecord, BaseProperty, Filter } from 'adminjs'
44
import { Op } from 'sequelize'
55

66
import { Model, ModelAttributeColumnOptions } from 'sequelize/types'
@@ -207,7 +207,7 @@ class Resource extends BaseResource {
207207
* What it does exactly:
208208
* - removes keys with empty strings for the `number`, `float` and 'reference' properties.
209209
*
210-
* @param {Object} params received from AdminBro form
210+
* @param {Object} params received from AdminJS form
211211
*
212212
* @return {Object} converted params
213213
*/

src/utils/create-validation-error.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ValidationError } from 'admin-bro'
1+
import { ValidationError } from 'adminjs'
22

33
const createValidationError = (originalError) => {
44
const errors = Object.keys(originalError.errors).reduce((memo, key) => {

0 commit comments

Comments
 (0)