Skip to content

Commit

Permalink
Revert "Merge pull request #139 from bibboxen/feature/maintenance_upd…
Browse files Browse the repository at this point in the history
…ate"

This reverts commit 47a831d, reversing
changes made to a2b7cc6.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch develop
# Your branch is up to date with 'origin/develop'.
#
# Changes to be committed:
#       deleted:    .docker/data/.gitignore
#       deleted:    .docker/data/README.md
#       modified:   .docker/nginx.conf
#       deleted:    .docker/templates/default.conf.template
#       modified:   .github/workflows/pr-php.yaml
#       modified:   CHANGELOG.md
#       modified:   README.md
#       modified:   composer.json
#       modified:   composer.lock
#       modified:   config/packages/itkdev_openid_connect.yaml
#       modified:   docker-compose.dev.yml
#       deleted:    docker-compose.override.yml
#       modified:   docker-compose.redirect.yml
#       modified:   docker-compose.server.override.yml
#       modified:   docker-compose.server.yml
#       modified:   docker-compose.yml
#       modified:   engine/package-lock.json
#       modified:   engine/plugins/fbs/package-lock.json
#       modified:   engine/plugins/queue/package-lock.json
#       modified:   engine/plugins/server/package-lock.json
#       modified:   engine/plugins/state_machine/package-lock.json
#       modified:   package-lock.json
#       modified:   package.json
#       modified:   src/Command/TokenCleanUpCommand.php
#       modified:   src/Command/UserCreateCommand.php
#       modified:   src/Controller/Admin/Sip2UserCrudController.php
#       modified:   src/Controller/Admin/UserCrudController.php
#       modified:   src/Controller/TokenController.php
#       modified:   src/Repository/BoxConfigurationRepository.php
#       modified:   src/Repository/SchoolRepository.php
#       modified:   src/Repository/Sip2UserRepository.php
#       modified:   src/Repository/TokenRepository.php
#       modified:   src/Security/TokenAuthenticator.php
#       modified:   src/Service/TokenService.php
#       modified:   src/Utils/AdLoginState.php
  • Loading branch information
turegjorup committed Oct 29, 2024
1 parent 47a831d commit 236a75b
Show file tree
Hide file tree
Showing 35 changed files with 2,125 additions and 3,410 deletions.
5 changes: 0 additions & 5 deletions .docker/data/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions .docker/data/README.md

This file was deleted.

6 changes: 4 additions & 2 deletions .docker/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
worker_processes auto;

error_log /dev/stderr notice;
error_log /var/log/nginx/error.log notice;
pid /tmp/nginx.pid;

events {
Expand All @@ -26,9 +26,11 @@ http {
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /dev/stdout main;
access_log /var/log/nginx/access.log main;

sendfile on;
#tcp_nopush on;

keepalive_timeout 65;

gzip on;
Expand Down
42 changes: 0 additions & 42 deletions .docker/templates/default.conf.template

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/pr-php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.3']
php: ['8.1']
name: Validate composer (${{ matrix.php}})
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.3']
php: ['8.1']
name: Coding style fixer (${{ matrix.php }})
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.3']
php: ['8.1']
name: Validate database schema (${{ matrix.php }})
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Add "other permanent location instruction" for books that should be sent to a di

### Changed

- Upgraded engine to node 22.
- Upgraded to PHP 8.3
- Upgraded engine to node 18.
- Upgraded to PHP 8.1
- Upgraded to latest github actions
- Change linting and files extensions, add changelog to actions check [#129](https://github.com/bibboxen/bibselv/pull/129)
- Performance improvements: usememo, usecallback [#129](https://github.com/bibboxen/bibselv/pull/129)
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ The engine then changes the machines state and sends it back to the frontend.

## Tech stack

- Node.js 22.x
- Node.js 14.x
- Symfony 5.x
- PHP 8.3
- React 18.x
- PHP 7.4
- React 16.x

## Development setup

Expand All @@ -50,7 +50,7 @@ cp engine/example_config.json engine/config.json
Install dependencies for the engine.

```sh
docker compose run --rm engine bash -c './scripts/install.sh --also=dev'
docker compose run engine bash -c './scripts/install.sh --also=dev'
```

### Environment variables
Expand All @@ -70,7 +70,7 @@ CLI_REDIRECT=APP_CLI_REDIRECT_URI # Redirect route for CLI login
Install the frontend react dependencies.

```sh
docker-compose run --rm frontend bash -c 'npm install'
docker-compose run frontend bash -c 'npm install'
```

### Symfony
Expand Down Expand Up @@ -221,13 +221,13 @@ When PRs are created towards the develop branch all coding styles are checked by
To check for coding standards, run the following:

```sh
docker-compose run --rm frontend bash -c 'npm run check-coding-standards'
docker-compose run frontend bash -c 'npm run check-coding-standards'
```

To automatically apply coding standards, run:

```sh
docker-compose run --rm frontend bash -c 'npm run apply-coding-standards'
docker-compose run frontend bash -c 'npm run apply-coding-standards'
```

### Code linting Engine
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.7",
"easycorp/easyadmin-bundle": "^4.2",
"itk-dev/openid-connect-bundle": "^3.1",
"itk-dev/openid-connect-bundle": "^1.0",
"symfony/console": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/expression-language": "^5.4",
Expand Down
Loading

0 comments on commit 236a75b

Please sign in to comment.