diff --git a/.gitignore b/.gitignore index 32e3263c..c3a6f5c3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ vendor.bundle.js bundle.js.map dist/ yarn-error.log -src/app/public/data +src/app/data # Bundled JS src/app/build diff --git a/CHANGELOG.md b/CHANGELOG.md index df5bbd71..e3e85605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Split DrawMap commponents into Layers and DrawTools [#57](https://github.com/azavea/iow-boundary-tool/pull/57) - Make `Roles` enum an `IntEnum` subclass [#74](https://github.com/azavea/iow-boundary-tool/pull/74) - Drop `Role` table and refactor as choice field on User [#117](https://github.com/azavea/iow-boundary-tool/pull/117) +- Return user information from login endpoint [#136](https://github.com/azavea/iow-boundary-tool/pull/136) ### Fixed diff --git a/docker-compose.yml b/docker-compose.yml index f368ade2..14bbb17f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: stdin_open: true working_dir: /usr/local/src environment: - - REACT_APP_GIT_COMMIT=${REACT_APP_GIT_COMMIT:-latest} + - VITE_GIT_COMMIT=${VITE_GIT_COMMIT:-latest} - CHOKIDAR_USEPOLLING=true - CHOKIDAR_INTERVAL=100 - PORT=4545 diff --git a/src/app/craco.config.js b/src/app/craco.config.js deleted file mode 100644 index fada05a7..00000000 --- a/src/app/craco.config.js +++ /dev/null @@ -1,19 +0,0 @@ -module.exports = { - webpack: { - configure: (webpackConfig, { env }) => { - if (env !== 'development') { - return webpackConfig; - } - - webpackConfig.module.rules.unshift({ - test: /\.js?$/, - use: ['prettier-loader'], - // force this loader to run first if it's not first in loaders list - enforce: 'pre', - exclude: /node_modules/, - }); - - return webpackConfig; - }, - }, -}; diff --git a/src/app/public/data/.gitkeep b/src/app/data/.gitkeep similarity index 100% rename from src/app/public/data/.gitkeep rename to src/app/data/.gitkeep diff --git a/src/app/public/favicon.ico b/src/app/favicon.ico similarity index 100% rename from src/app/public/favicon.ico rename to src/app/favicon.ico diff --git a/src/app/public/index.html b/src/app/index.html similarity index 61% rename from src/app/public/index.html rename to src/app/index.html index 8a179600..764a962f 100644 --- a/src/app/public/index.html +++ b/src/app/index.html @@ -2,33 +2,25 @@ - + - + - - + Boundary Sync
+