TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into 45001-component-to-show-the-list-of-non-working-days-of-year

Browse Source
45001-component-to-show-the-list-of-non-working-days-of-year
bsatarnejad 2 years ago
parent 5980033e8b 8bcbf705b2
commit 7840a9820d
4 changed files with 2196 additions and 1706 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 29
      bin/compose
  2. 3
      docker/prod/setup/postinstall-common.sh
  3. 3836
      frontend/package-lock.json
  4. 34
      frontend/package.json

29
bin/compose
Unescape View File

@ -36,24 +36,31 @@ if [ -f config/database.yml ]; then
exit 1
fi
if command -v docker-compose &> /dev/null
then
DOCKER_COMPOSE="docker-compose"
else
DOCKER_COMPOSE="docker compose"
fi
if [[ "$@" = "start" ]]; then
# backend will be started automatically as a dependency of the frontend
docker-compose -f $COMPOSE_FILE up -d frontend
$DOCKER_COMPOSE -f $COMPOSE_FILE up -d frontend
elif [[ "$@" = "run" ]]; then
docker-compose -f $COMPOSE_FILE up -d frontend
docker-compose -f $COMPOSE_FILE stop backend
docker-compose -f $COMPOSE_FILE run --rm backend rm -f tmp/pids/server.pid # delete if necessary so new server can come up
docker-compose -f $COMPOSE_FILE run --rm -p ${PORT:-3000}:3000 --name rails backend # run backend in TTY so you can debug using pry for instance
$DOCKER_COMPOSE -f $COMPOSE_FILE up -d frontend
$DOCKER_COMPOSE -f $COMPOSE_FILE stop backend
$DOCKER_COMPOSE -f $COMPOSE_FILE run --rm backend rm -f tmp/pids/server.pid # delete if necessary so new server can come up
$DOCKER_COMPOSE -f $COMPOSE_FILE run --rm -p ${PORT:-3000}:3000 --name rails backend # run backend in TTY so you can debug using pry for instance
elif [[ "$1" = "setup" ]]; then
docker-compose -f $COMPOSE_FILE run backend setup
yes no | docker-compose -f $COMPOSE_FILE run frontend npm install
$DOCKER_COMPOSE -f $COMPOSE_FILE run backend setup
yes no | $DOCKER_COMPOSE -f $COMPOSE_FILE run frontend npm install
elif [[ "$1" = "reset" ]]; then
docker-compose -f $COMPOSE_FILE down && docker volume rm `docker volume ls -q | grep ${PWD##*/}_`
$DOCKER_COMPOSE -f $COMPOSE_FILE down && docker volume rm `docker volume ls -q | grep ${PWD##*/}_`
elif [[ "$1" = "rspec" ]]; then
if ! docker ps | grep ${PWD##*/}_backend-test_1 > /dev/null; then
echo "Test backend not running yet. Starting it..."
docker-compose -f $COMPOSE_FILE up -d backend-test
$DOCKER_COMPOSE -f $COMPOSE_FILE up -d backend-test
while ! docker logs --since 1m ${PWD##*/}_backend-test_1 | grep "Ready for tests" > /dev/null; do
sleep 1
@ -63,7 +70,7 @@ elif [[ "$1" = "rspec" ]]; then
echo "Ready for tests"
fi
docker-compose -f $COMPOSE_FILE exec backend-test bundle exec rspec "${@:2}"
$DOCKER_COMPOSE -f $COMPOSE_FILE exec backend-test bundle exec rspec "${@:2}"
else
docker-compose -f $COMPOSE_FILE $*
$DOCKER_COMPOSE -f $COMPOSE_FILE $*
fi

3
docker/prod/setup/postinstall-common.sh
Unescape View File

@ -39,6 +39,9 @@ rm -rf "$APP_PATH/tmp/cache/assets"
# Remove node_modules and entire frontend
rm -rf "$APP_PATH/node_modules/" "$APP_PATH/frontend/node_modules/"
# Remove angular cache
rm -rf "$APP_PATH/frontend/.angular"
# Clean cache in root
rm -rf /root/.npm

3836
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

34
frontend/package.json
Unescape View File

@ -7,15 +7,15 @@
"devDependencies": {
"@angular-devkit/build-angular": "^15.0.2",
"@angular-eslint/builder": "^15.1.0",
"@angular-eslint/eslint-plugin": "^13.2.1",
"@angular-eslint/eslint-plugin-template": "^13.2.1",
"@angular-eslint/schematics": "13.2.1",
"@angular-eslint/template-parser": "^13.2.1",
"@angular-eslint/eslint-plugin": "^15.1.0",
"@angular-eslint/eslint-plugin-template": "^15.1.0",
"@angular-eslint/schematics": "15.1.0",
"@angular-eslint/template-parser": "^15.1.0",
"@angular/language-service": "15.0.2",
"@babel/core": "^7.18.5",
"@compodoc/compodoc": "^1.1.19",
"@html-eslint/eslint-plugin": "^0.13.1",
"@html-eslint/parser": "^0.13.1",
"@html-eslint/eslint-plugin": "^0.15.0",
"@html-eslint/parser": "^0.15.0",
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
"@storybook/addon-actions": "^6.5.10",
"@storybook/addon-essentials": "^6.5.10",
@ -44,22 +44,22 @@
"@types/urijs": "^1.19.6",
"@types/uuid": "^8.3.4",
"@types/webpack-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"@typescript-eslint/eslint-plugin": "5.48.0",
"@typescript-eslint/parser": "5.48.0",
"babel-loader": "^8.2.5",
"browserslist": "^4.8.7",
"codelyzer": "^6.0.0",
"css-loader": "^6.7.1",
"eslint": "^7.26.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint": "^8.31.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-change-detection-strategy": "^0.1.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jasmine": "^4.1.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-storybook": "^0.6.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jasmine": "^4.1.3",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-storybook": "^0.6.8",
"esprint": "^3.1.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",

Write Preview
Loading…
Cancel
Save