Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix failing build #246

Merged
merged 7 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,17 @@ module.exports = {
root: true,
rules: {
'no-debugger': 1,
'no-console': 1,
'no-console': [
'warn',
{
'allow': [
'info',
'table',
'warn',
'error'
]
}
],
'no-redeclare': 'off',
'promise/always-return': 'off',
'promise/catch-or-return': 'off',
Expand All @@ -66,4 +76,3 @@ module.exports = {
},
},
};

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ __pycache__
reports
*.iml
.env
.env.development.local
.jenkins/backups

node_modules
build
build
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dev: ## Run the development app
$(run) --service-ports web

test: ## Execute tests
$(run) unittest $(ARGS)
$(run) test $(ARGS)

clean: ## Clean docker stuff
$(dc) down -v --remove-orphans
Expand All @@ -39,4 +39,4 @@ trivy: ## Detect image vulnerabilities
trivy image --ignore-unfixed nginxinc/nginx-unprivileged:mainline-alpine-slim

requirements: ## Upgrade requirements (in package.json and package-lock.json) to latest versions
npm upgrade
npm upgrade
35 changes: 18 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# HIOR
# Handboek Inrichting Openbare Ruimte

Handboek Inrichting Openbare Ruimte

- PROD: [https://hior.amsterdam.nl](https://hior.amsterdam.nl)
- ACC: [https://acc.hior.amsterdam.nl](https://acc.hior.amsterdam.nl)

Het HIOR is een integrale verzameling van het vigerend beleid voor de inrichting van de openbare ruimte in Amsterdam.
Het HIOR helpt opdrachtgevers, projectleiders, ontwerpers, adviseurs en beheerders om invulling te geven aan het Amsterdamse beleid.
Het Handboek Inrichting Openbare Ruimte (HIOR) is een integrale verzameling van het vigerend beleid voor de inrichting van de openbare ruimte in Amsterdam. Het HIOR helpt opdrachtgevers, projectleiders, ontwerpers, adviseurs en beheerders om invulling te geven aan het Amsterdamse beleid.

In deze applicatie kan beleid worden gezocht:

Expand All @@ -15,27 +9,32 @@ In deze applicatie kan beleid worden gezocht:

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

De productie- (PROD) en acceptatieomgevingen (ACC) zijn te vinden op:

- Productie: [https://hior.amsterdam.nl](https://hior.amsterdam.nl)
- Acceptatie: [https://acc.hior.amsterdam.nl](https://acc.hior.amsterdam.nl)

## Available Scripts

In the project directory, you can run:

#### `npm start`
`npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.\
You will also see any lint errors in the console.

Ohter commands:
Other commands:

#### `npm run lint`
`npm run lint`

#### `npm run test`
`npm run test`

#### `npm run test:watch`
`npm run test:watch`

#### `npm run build`
`npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.
Expand All @@ -45,15 +44,17 @@ Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

#### `npm run eject`
### Ejecting the app

`npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However, we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

Expand Down
5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ services:
context: .
args:
- BUILD_ARG=acc
image: docker-registry.secure.amsterdam.nl/ruimte/hior:${VERSION:-latest}
image: docker-registry.secure.amsterdam.nl/ruimte/hior:${VERSION:-latest}
environment:
- TZ=Europe/Amsterdam
ipc: host
ports:
- "8000:8000"

unittest:
test:
build:
context: .
target: builder
environment:
- NODE_ENV=test
- CI=true
- TZ=Europe/Amsterdam
- BUILD_ARG=acc
Expand Down
Loading