Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0122de0
chore: design system lift
ariansobczak-rst Feb 9, 2023
f2e8f64
chore: resolved seeds warnings
ariansobczak-rst Feb 10, 2023
905c9da
chore: improved design system pages
ariansobczak-rst Feb 13, 2023
98f7b07
chore: introduced dropzone translation example
ariansobczak-rst Feb 14, 2023
8564245
chore: add availableLanguages to example app
ariansobczak-rst Feb 15, 2023
713aba8
chore: cleand up pages
ariansobczak-rst Feb 17, 2023
ed29514
chore: cleaned up pages and locale
ariansobczak-rst Feb 21, 2023
e3a7948
chore: add debug component
ariansobczak-rst Feb 24, 2023
a2c9e42
chore: component translations example (#67)
jwasiak Feb 28, 2023
e20dacd
chore: added pages translation
ariansobczak-rst Mar 1, 2023
3428860
chore(deps): bump moment-timezone from 0.5.34 to 0.5.37 (#56)
dependabot[bot] Mar 1, 2023
9f66cfd
chore: design system lift
ariansobczak-rst Feb 9, 2023
ed6de9b
chore: use component loader in example app
ariansobczak-rst Mar 1, 2023
9c4daa0
chore: cleaned up design system examples
ariansobczak-rst Mar 1, 2023
9584a4b
feat: improve i18n configuration (#70)
ariansobczak-rst Mar 14, 2023
126edbb
chore: cleaned up sidenav
ariansobczak-rst Mar 14, 2023
3adf0e8
style: fit design system
ariansobczak-rst Mar 20, 2023
5a4903e
feat: update to esm
dziraf Mar 23, 2023
24b81e8
feat: make login page SPA
dziraf Mar 28, 2023
78ed0de
chore(beta): bump beta packages
dziraf Mar 29, 2023
0bd41a3
chore(beta): bump adminjs packages
dziraf Mar 29, 2023
e64afac
chore: fix linter
dziraf Mar 29, 2023
0524fec
chore: update login component to use translateComponent
dziraf Mar 30, 2023
b83f9bf
chore: use @adminjs/design-system/styled-components
dziraf Apr 3, 2023
ef742ed
feat: Themes in demo app (#71)
ariansobczak-rst Apr 5, 2023
c2db64f
chore: introduced getThemeDir
ariansobczak-rst Apr 5, 2023
77b556a
chore: added messages to design system examples
ariansobczak-rst Apr 5, 2023
3003ff0
style: extend button variant on design sytem example page
ariansobczak-rst Apr 6, 2023
552b757
chore(deps): bump beta versions
ariansobczak-rst Apr 7, 2023
cdbf10b
chore: improved example page translations examples (#72)
ariansobczak-rst Apr 17, 2023
b3c8d79
chore: update adminjs packages to v7
dziraf Apr 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
PORT=3000
SERVER="EXPRESS" # EXPRESS HAPIJS FASTIFY NESTJS
SESSION_SECRET=s3sS10n_secr3t
LOCALE=en

MONGO_DATABASE_URL=mongodb://localhost:27017/adminjs-example-app
POSTGRES_DATABASE_URL=postgres://adminjs:adminjs@localhost:5435/adminjs
MYSQL_DATABASE_URL=mysql://root:adminjs@localhost:3308/adminjs?schema=public
DATABASE_LOGGING=true
DATABASE_SYNC=false
DISABLE_ADMINJS_ACTIONS=false

GITHUB_URL=https://github.com/SoftwareBrothers/adminjs/issues
SLACK_URL=https://adminjs.page.link/slack
DOCUMENTATION_URL=https://adminjs.co
STORYBOOK_URL=https://adminjs-storybook-beta.web.app/
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"ecmaVersion": 2022
},
"plugins": [
"@typescript-eslint",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- name: Setup
uses: actions/setup-node@v2
with:
node-version: "16.x"
- uses: actions/cache@v1
node-version: "18.x"
- uses: actions/cache@v2
id: yarn-cache
with:
path: node_modules
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"semi": true,
"singleQuote": true,
"printWidth": 120,
"trailingComma": "es5"
"trailingComma": "all"
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Example application using [adminjs](https://github.com/SoftwareBrothers/adminjs)

## Demo

You can check out the current demo version at: https://adminjs-demo.herokuapp.com
You can check out the current demo version at: https://demo.adminjs.co

login: [email protected]
password: password
Login: [email protected]
Password: password

## Prerequisites

Expand Down
16 changes: 8 additions & 8 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ version: '3.7'
services:
mongo_db:
container_name: adminjs-example-mongo
image: mongo:5.0.6
image: mongo
ports:
- "27017:27017"
volumes:
- mongo_db:/data/db
- mongo_db_example_app:/data/db

postgres_db:
container_name: adminjs-example-postgres
image: postgres:12-alpine
image: postgres
environment:
- POSTGRES_DB=adminjs
- POSTGRES_USER=adminjs
- POSTGRES_PASSWORD=adminjs
ports:
- "5435:5432"
volumes:
- postgres_db:/var/lib/postgresql/data
- postgres_db_example_app:/var/lib/postgresql/data

mysql_db:
container_name: adminjs-example-mysql
Expand All @@ -32,9 +32,9 @@ services:
ports:
- "3308:3306"
volumes:
- mysql_db:/var/lib/mysql
- mysql_db_example_app:/var/lib/mysql

volumes:
mongo_db:
postgres_db:
mysql_db:
mongo_db_example_app:
postgres_db_example_app:
mysql_db_example_app:
148 changes: 78 additions & 70 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@
"version": "1.0.0",
"description": "",
"author": "",
"type": "module",
"license": "ISC",
"engines": {
"node": ">=16"
"node": ">=18"
},
"scripts": {
"lint": "eslint src --ext .ts,.tsx",
"typeorm": "./node_modules/typeorm/cli.js --dataSource dist/sources/typeorm/config.js",
"sequelize": "yarn sequelize-cli --config src/sources/sequelize/config.js",
"knex": "npx knex --knexpath dist/sources/objectionjs/index.js --knexfile dist/sources/objectionjs/knexfile.js",
"migration:up": "yarn sequelize db:migrate && yarn typeorm migration:run && yarn mikro-orm migration:up && yarn prisma migrate dev --schema prisma/schema.prisma && yarn knex migrate:latest",
"knex": "dotenv -c '.env' -- npx knex --knexpath dist/sources/objectionjs/index.js --knexfile dist/sources/objectionjs/knexfile.cjs",
"mikroorm": "node --experimental-specifier-resolution=node --loader ts-node/esm ./node_modules/.bin/mikro-orm",
"migration:up": "yarn sequelize db:migrate && yarn typeorm migration:run && yarn mikroorm migration:up && yarn prisma migrate dev --schema prisma/schema.prisma && yarn knex migrate:latest",
"migration:up:production": "yarn sequelize db:migrate && yarn typeorm migration:run && yarn mikro-orm migration:up && yarn prisma migrate deploy --schema prisma/schema.prisma",
"docker:up": "docker-compose -f docker-compose.yaml up -d",
"start:dev": "nodemon",
"start": "node dist/index.js",
"build": "rm -rf dist && tsc",
"build:watch": "rm -rf dist && tsc -w",
"build": "yarn clean && tsc && yarn copy-theme",
"build:watch": "tsc -w",
"postgres:clean": "node dist/scripts/truncate-postgres",
"mysql:clean": "prisma migrate reset --force && prisma migrate deploy",
"mongodb:clean": "node dist/scripts/truncate-mongodb",
Expand All @@ -28,7 +30,9 @@
"seed:mongoose": "node dist/sources/mongoose/seeds/run",
"seed:mikro-orm": "node dist/sources/mikroorm/seeds/run",
"seed:prisma": "node dist/sources/prisma/seeds/run",
"seed:all": "yarn seed:typeorm && yarn seed:sequelize && yarn seed:mongoose && yarn seed:mikro-orm && yarn seed:prisma"
"seed:all": "yarn seed:typeorm && yarn seed:sequelize && yarn seed:mongoose && yarn seed:mikro-orm && yarn seed:prisma",
"clean": "rimraf dist",
"copy-theme": "copyfiles -u 1 src/themes/**/theme.bundle.js src/themes/**/*.css dist/"
},
"mikro-orm": {
"useTsNode": true,
Expand All @@ -41,80 +45,84 @@
"schema": "prisma/schema.prisma"
},
"dependencies": {
"@adminjs/express": "^5.0.0",
"@adminjs/fastify": "^2.0.0",
"@adminjs/hapi": "^6.0.0",
"@adminjs/mikroorm": "^2.0.0",
"@adminjs/mongoose": "^3.0.0",
"@adminjs/objection": "^1.0.0",
"@adminjs/passwords": "^3.0.0",
"@adminjs/prisma": "^2.0.0",
"@adminjs/sequelize": "^3.0.0",
"@adminjs/typeorm": "^4.0.0",
"@faker-js/faker": "^7.3.0",
"@fortawesome/fontawesome-free": "^6.0.0",
"@fortawesome/fontawesome-svg-core": "^1.3.0",
"@fortawesome/free-regular-svg-icons": "^6.0.0",
"@fortawesome/free-solid-svg-icons": "^6.0.0",
"@fortawesome/react-fontawesome": "^0.1.17",
"@hapi/boom": "^9.1.4",
"@hapi/cookie": "^11.0.2",
"@hapi/hapi": "^20.2.1",
"@mikro-orm/cli": "^4",
"@mikro-orm/core": "^4",
"@mikro-orm/migrations": "^4",
"@mikro-orm/nestjs": "^4",
"@mikro-orm/postgresql": "^4",
"@nestjs/common": "^8.3.1",
"@nestjs/core": "^8.3.1",
"@nestjs/mongoose": "^9.0.2",
"@nestjs/platform-express": "^8.3.1",
"@nestjs/typeorm": "^9.0.0",
"@prisma/client": "^3.9.2",
"adminjs": "^6.6.5",
"@adminjs/express": "^6.0.0",
"@adminjs/fastify": "^4.0.0",
"@adminjs/hapi": "^7.0.0",
"@adminjs/koa": "^4.0.0",
"@adminjs/mikroorm": "^3.0.0",
"@adminjs/mongoose": "^4.0.0",
"@adminjs/objection": "^2.0.0",
"@adminjs/passwords": "^4.0.0",
"@adminjs/prisma": "^4.0.0",
"@adminjs/sequelize": "^4.0.0",
"@adminjs/themes": "^1.0.0",
"@adminjs/typeorm": "^5.0.0",
"@faker-js/faker": "^7.6.0",
"@hapi/boom": "^10.0.1",
"@hapi/cookie": "^12.0.1",
"@hapi/hapi": "^21.3.0",
"@koa/router": "^12.0.0",
"@mikro-orm/cli": "^5.6.15",
"@mikro-orm/core": "^5.6.15",
"@mikro-orm/migrations": "^5.6.15",
"@mikro-orm/nestjs": "^5.1.7",
"@mikro-orm/postgresql": "^5.6.15",
"@nestjs/common": "^9.3.12",
"@nestjs/core": "^9.3.12",
"@nestjs/mongoose": "^9.2.2",
"@nestjs/platform-express": "^9.3.12",
"@nestjs/typeorm": "^9.0.1",
"@prisma/client": "^4.11.0",
"adminjs": "^7.0.0",
"ajv-formats": "^2.1.1",
"argon2": "^0.28.4",
"argon2": "^0.30.3",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"connect-pg-simple": "^7.0.0",
"connect-pg-simple": "^8.0.0",
"cors": "^2.8.5",
"dotenv": "^16.0.0",
"express": "^4.17.2",
"dotenv": "^16.0.3",
"express": "^4.18.2",
"express-formidable": "^1.2.0",
"express-session": "^1.17.2",
"fastify-static": "^4.5.0",
"i18next": "^21.9.2",
"express-session": "^1.17.3",
"fastify-static": "^4.7.0",
"i18next": "^22.4.13",
"knex": "^2.4.2",
"mongoose": "^6.2.1",
"nodemon": "^2.0.15",
"koa": "^2.14.2",
"koa2-formidable": "^1.0.3",
"mongoose": "^7.0.2",
"nodemon": "^2.0.21",
"objection": "^3.0.1",
"pg": "^8.7.3",
"prisma": "^3.12.0",
"react-i18next": "^11.18.6",
"reflect-metadata": "^0.1.12",
"rxjs": "^7.5.4",
"sequelize": "^6.29.0",
"sequelize-cli": "^6.4.1",
"tslib": "^2.3.1",
"typeorm": "^0.3.7",
"uuid": "^8.3.2"
"pg": "^8.10.0",
"prisma": "^4.11.0",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.0",
"sequelize": "^6.29.3",
"sequelize-cli": "^6.6.0",
"tslib": "^2.5.0",
"typeorm": "^0.3.12",
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/argon2": "^0.15.0",
"@types/connect-pg-simple": "^7.0.0",
"@types/cors": "^2.8.12",
"@types/express-session": "^1.17.4",
"@types/node": "^16.10",
"@typescript-eslint/eslint-plugin": "^5.11.0",
"@typescript-eslint/parser": "^5.11.0",
"eslint": "^8.8.0",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"prettier": "^2.5.1",
"ts-node": "^10.5.0",
"tsconfig-paths": "^3.12.0",
"typescript": "^4.5.5"
"@types/cors": "^2.8.13",
"@types/express-session": "^1.17.7",
"@types/lodash": "^4.14.191",
"@types/node": "^18.15.5",
"@types/uuid": "^9.0.1",
"@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^5.56.0",
"copyfiles": "^2.4.1",
"dotenv-cli": "^7.1.0",
"eslint": "^8.36.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^2.8.6",
"rimraf": "^4.4.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.1.2",
"typescript": "^5.0.2"
}
}
12 changes: 12 additions & 0 deletions public/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
html {
scroll-behavior: smooth;
}

a {
text-decoration: none;
color: inherit;
}

a.adminjs_Header {
display: block;
}
1 change: 1 addition & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Loading