Skip to content

Commit

Permalink
Merge pull request #33 from sacconazzo/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sacconazzo authored Oct 11, 2024
2 parents 70224c7 + 3a7f4f7 commit 29c5838
Show file tree
Hide file tree
Showing 17 changed files with 2,224 additions and 2,498 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ COPY package.json .
COPY pnpm-*.yaml ./

COPY directus/package.json ./directus/
COPY directus/extensions/auctions/package.json ./directus/extensions/auctions/
COPY directus/extensions/auctions-hook/package.json ./directus/extensions/auctions-hook/
COPY directus/extensions/users/package.json ./directus/extensions/users/
COPY directus/extensions/users-hook/package.json ./directus/extensions/users-hook/
COPY packages/utilities/package.json ./packages/utilities/
COPY frontend/package.json ./frontend/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
const policies = JSON.parse(
'{"id":"f1eb9d5a-699e-4a6c-8cdb-d9a194eec728","name":"Auctioners","icon":"account_box","description":null,"ip_access":null,"enforce_tfa":0,"admin_access":0,"app_access":0}',
);
const policies = JSON.parse('{"id":"f1eb9d5a-699e-4a6c-8cdb-d9a194eec728","name":"Users","icon":"account_box","description":null,"ip_access":null,"enforce_tfa":0,"admin_access":0,"app_access":0}');

module.exports = {
up: async knex => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const role = JSON.parse('{"id":"E8EDAA1E-EBBC-4024-83A6-A2C832AC7D84","name":"Auctioners","icon":"account_box","description":"User subscribed","parent":null}');
const role = JSON.parse('{"id":"E8EDAA1E-EBBC-4024-83A6-A2C832AC7D84","name":"Users","icon":"account_box","description":"User subscribed","parent":null}');

module.exports = {
up: async knex => {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "auctions-hook",
"name": "users-hook",
"description": "Please enter a description for your extension",
"icon": "extension",
"version": "1.0.0",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
tags:
- name: Auctions
- name: Custom
description: CustomTag
paths:
"/auctions/test":
"/users/test":
post:
summary: Test
description: Test
tags:
- Users
- Auctions
- Custom
requestBody:
content:
application/json:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "auctions",
"name": "users",
"description": "Please enter a description for your extension",
"icon": "extension",
"version": "1.0.0",
Expand All @@ -24,6 +24,6 @@
},
"dependencies": {
"@directus/extensions-sdk": "11.0.8",
"directus-extension-api-docs": "^2.1.3"
"directus-extension-api-docs": "^2.1.5"
}
}
File renamed without changes.
6 changes: 3 additions & 3 deletions directus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"directus": "^11.1.0",
"directus-extension-api-docs": "^2.1.3",
"directus": "^11.1.1",
"directus-extension-api-docs": "^2.1.5",
"find-root": "^1.1.0",
"fs-extra": "^10.1.0",
"mysql": "^2.18.1",
Expand All @@ -26,7 +26,7 @@
},
"devDependencies": {
"directus-x": "^2.0.0",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-plugin-prettier": "^4.2.1",
"nodemon": "^2.0.22",
"prettier": "^2.8.8"
Expand Down
8 changes: 4 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"version": "1.0.0",
"private": true,
"dependencies": {
"@types/node": "^22.5.5",
"@types/react": "^18.3.5",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-scripts": "5.0.1",
"typescript": "^5.6.2",
"react-scripts": "^5.0.1",
"typescript": "^5.6.3",
"utilities": "workspace:^",
"web-vitals": "^2.1.4"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "directus-monorepo-cicd-boilerplate",
"version": "3.0.0",
"version": "3.0.1",
"author": "Giona Righini (sacconazzo)",
"license": "MIT",
"description": "directus on google cloud run",
Expand All @@ -19,6 +19,6 @@
"private": true,
"dependencies": {
"@nrwl/nx-cloud": "^19.1.0",
"nx": "^19.7.3"
"nx": "^19.8.4"
}
}
6 changes: 3 additions & 3 deletions packages/utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"license": "MIT",
"dependencies": {
"@types/jest": "^29.5.13",
"@types/node": "^18.19.50",
"@types/node": "^18.19.55",
"jest": "^29.7.0",
"typescript": "^4.9.5"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-prettier": "^4.2.1",
"jest-extended": "^3.2.4",
"nodemon": "^2.0.22",
Expand Down
Loading

0 comments on commit 29c5838

Please sign in to comment.