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

Develop to Master #519

Merged
merged 25 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
185ab38
Setup vite
henrinie-nc Aug 8, 2024
625c63c
Fix env paths to use VITE_ prefix
henrinie-nc Aug 12, 2024
fde3e1a
Fix imports to use the configured "@/*" shortcut for "src/"
henrinie-nc Aug 12, 2024
cbe1da0
remove webpack
henrinie-nc Aug 13, 2024
6dd93ea
update license year
henrinie-nc Aug 13, 2024
b123774
add vitest, remove mocha with old test setup
henrinie-nc Aug 13, 2024
22b1a98
Update package name
henrinie-nc Aug 13, 2024
f6c91f9
rename test files and use vitest in tests
henrinie-nc Aug 13, 2024
ab1de84
fix imports
henrinie-nc Aug 13, 2024
93d925b
fix css imports
henrinie-nc Aug 13, 2024
db4bcb9
hacky fix for react-leaflet-draw rectangle drawing issue
henrinie-nc Aug 13, 2024
f87aee6
update react-leaflet-fullscreen to 1.0.2
henrinie-nc Aug 13, 2024
840984a
remove $FlowFixMe comments
henrinie-nc Aug 14, 2024
efc1771
add new eslint configuration
henrinie-nc Aug 15, 2024
9c85cbc
update types, restrict react types to ^16
henrinie-nc Aug 16, 2024
a1f874e
fix typing for map.ts
henrinie-nc Aug 16, 2024
f5ba595
eslint fixes in storage.ts
henrinie-nc Aug 16, 2024
3a90d62
Convert some React.ReactNode's to JSX.Element
henrinie-nc Aug 16, 2024
643ee4e
Add fragments to fix typing issue for react children
henrinie-nc Aug 16, 2024
8915ceb
update readme to match changes from moving to vite
henrinie-nc Aug 16, 2024
06b581a
update package scripts used in github actions
henrinie-nc Aug 16, 2024
7b84973
remove ie rendering engine tag as the browser is no longer used (#515)
henrinie-nc Aug 27, 2024
24cf60d
revert automatically generated invoices not editable text (#517)
NC-jsAhonen Aug 29, 2024
009e006
fix intended use issue for readonly perms (#516)
henrinie-nc Aug 29, 2024
19a9719
Merge branch 'master' into develop
henrinie-nc Sep 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 0 additions & 22 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,5 @@
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"env": {
"test": {
"plugins": [
"istanbul"
]
}
},
"plugins": [
"react-hot-loader/babel",
"@babel/plugin-proposal-class-properties",
[
"module-resolver",
{
"root": [
"./src"
],
"alias": {
"src": "./src"
}
}
]
]
}
14 changes: 7 additions & 7 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Required
API_URL=https://mvj.dev.hel.ninja/v1
STORAGE_PREFIX=MVJ
VITE_API_URL=https://mvj.dev.hel.ninja/v1
VITE_STORAGE_PREFIX=MVJ
PORT=3000
# The SSO OpenId Connect settings
OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj
OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/
OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/
OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj
OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj
VITE_OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj
VITE_OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/
VITE_OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/
VITE_OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj
VITE_OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj
41 changes: 0 additions & 41 deletions .eslintrc

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: yarn
- run: yarn test:coverage
- run: yarn compile
- run: yarn coverage
- run: yarn build
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 City of Helsinki
Copyright (c) 2024 City of Helsinki

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
34 changes: 10 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,19 @@


# MVJ UI
City of Helsinki ground rental system UI
City of Helsinki Land lease UI

Based on [React Boilerplate](https://github.com/nordsoftware/react-boilerplate).

## What's in the box?

- [Flowtype](https://flowtype.org/) Type checker
- [Typescript](https://www.typescriptlang.org/) Type checker
- [Yarn](https://yarnpkg.com/) Dependency manager
- [Vite](https://vitejs.dev/) Front-end tooling
- [Vitest](https://vitest.dev/) Testing framework
- [React](https://facebook.github.io/react/) User interface components
- [Redux](http://redux.js.org/) Predictable state container
- [Lodash](https://lodash.com/) Utility library
- [Babel](https://babeljs.io/) ES.Next transpiler
- [Eslint](http://eslint.org/) Linting utility
- [Webpack](https://webpack.github.io/) Module bundler
- [Mocha](https://mochajs.org/) Testing framework
- [Chai](http://chaijs.com/) Assertion library
- [Enzyme](https://github.com/airbnb/enzyme) React testing utilities
- And more...

## Usage with Docker

Expand Down Expand Up @@ -54,32 +49,23 @@ Make sure you have [Yarn](https://yarnpkg.com/en/docs/install) installed globall
```bash
yarn
```
#### 3. Setup Flow typing definitions for dependencies

```bash
flow-typed install
```
If the tool cannot be found as is, you can invoke it from
the node binary folder manually (i.e.
`./node_modules/.bin/flow-typed`) instead of just
`flow-typed`).

#### 4. Add .env file
#### 3. Add .env file

```bash
cp .env.example .env
```

#### 5. Start the development server
#### 4. Start the development server

```bash
yarn start
```

#### 6. Compile the distribution build
#### 5. Compile the distribution build

```bash
yarn run compile
yarn run build
```
## Test

Expand All @@ -91,12 +77,12 @@ yarn test

#### Run the test suit in watch mode

```
```bash
yarn run test:watch
```

#### Generate the test coverage report

```
```bash
yarn run test:coverage
```
57 changes: 0 additions & 57 deletions config/env.js

This file was deleted.

58 changes: 0 additions & 58 deletions config/paths.js

This file was deleted.

19 changes: 0 additions & 19 deletions config/polyfills.js

This file was deleted.

Loading