Skip to content

Commit

Permalink
Merge pull request #7648 from ever-co/develop
Browse files Browse the repository at this point in the history
* refactor: optimized organization team findAll query

* fix: create and update organization team APIs

* fix: memberIds not defined

* fix: removed console

* Update Dockerfile

* #7589 - Deployment to DO Droplets / Other VMs via SSH (#7591)

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* Update docker-compose.api.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: Deploy API to DO App Platform (WIP)

* added docker-compose-api and deploy-do-droplet-demo.yml

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: Deploy to DO App Platform (WIP)

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: fix of Deploy to DO App Platform (WIP)

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: temporary

* chore: fix

* chore: fix

* chore: fix envsubst

* chore: fix

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: fix

* chore: fix

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: fix

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: fix

* chore: by mistake :)

* added docker-compose-api and deploy-do-droplet-demo.yml

* chore: fix

* chore: fix

* chore: switch to smaller instances

* chore: show list of apps

* chore: fix

* chore: fix

* chore: add stage

* chore: fix branches

---------

Co-authored-by: geoffrey1330 <israelgeoffrey13@gmail.com>

* chore: fix

* chore: fix

* chore: fix

* chore: fix

* chore: update deployments to DO App Platform and add to README.md

* fix: #7631 | sticky smart table header

* Improve 404 Not Found page (#7634)

* fix: #7632 | redirect user to home page after 3 sec, style page

* fix: #7632 | add button so user redirect himself instead of waiting to get redirected auto

* [Refactor] Tenant / Role Permission Guard (#7644)

* fix: used direct role permission service instead of join using user

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: added role permission module for permission guard

* fix: direct query count for role permission check

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: updated auth module

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix: added role permission module for permission guard

* fix: removed tenant module (unnecessary module)

* fix: removed tenant module (unnecessary module)

* fix(deepscan): removed unused import

* chore: increase RAM limits

* chore: log heap size

* feat: add caching to some Middlewares and other improvements

---------

Co-authored-by: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com>
Co-authored-by: Rahul R <rahulrathore576@gmail.com>
Co-authored-by: geoffrey1330 <israelgeoffrey13@gmail.com>
Co-authored-by: CoderNadir <coder.nadir@gmail.com>
Co-authored-by: coderNadir <78637183+coderNadir@users.noreply.github.com>
  • Loading branch information
6 people committed Mar 4, 2024
2 parents d8b4bb4 + dd18092 commit d0ea45b
Show file tree
Hide file tree
Showing 185 changed files with 2,671 additions and 1,366 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aliases:
echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
nvm install v18
nvm alias default v18
echo 'export NODE_OPTIONS=--max-old-space-size=7000' >> $BASH_ENV
echo 'export NODE_OPTIONS=--max-old-space-size=12288' >> $BASH_ENV
echo 'export NG_CLI_ANALYTICS=false' >> $BASH_ENV
source $BASH_ENV
nvm use v18
Expand Down
4 changes: 2 additions & 2 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ USER node:node

ENV CI=true

ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=7000"}
ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=12288"}
ENV NODE_ENV=${NODE_ENV:-production}
ENV API_HOST=${API_HOST:-api}
ENV API_PORT=${API_PORT:-3000}
Expand All @@ -304,7 +304,7 @@ ENV DB_NAME=${DB_NAME:-postgres}
ENV DB_PORT=${DB_PORT:-5432}
ENV DB_USER=${DB_USER}
ENV DB_PASS=${DB_PASS}
ENV DB_TYPE=${DB_TYPE:-sqlite}
ENV DB_TYPE=${DB_TYPE:-better-sqlite3}
ENV DB_SSL_MODE=${DB_SSL_MODE}
ENV DB_CA_CERT=${DB_CA_CERT}
ENV DB_POOL_SIZE=${DB_POOL_SIZE}
Expand Down
Loading

0 comments on commit d0ea45b

Please sign in to comment.