Skip to content

Commit

Permalink
Merge pull request #71 from Oceans-1876/develop
Browse files Browse the repository at this point in the history
New Landing Page
  • Loading branch information
ka7eh authored Dec 14, 2022
2 parents 22014a9 + 5e6d9d4 commit a62da78
Show file tree
Hide file tree
Showing 29 changed files with 3,981 additions and 6,060 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
> Tested with node v16.6
- Install dependencies: `npm install`.
- Create a Mapbox account (mapbox.com) and get an API access token from your account page (https://account.mapbox.com).
- Set the `API_SERVER` variable to your API server. E.g. `http://localhost:8000`, if you're running the API locally.

### Build Docker
Expand All @@ -18,6 +17,6 @@ You can optionally set the `PUBLIC_PATH` when building the application. Once tha

To run the container:

`docker run -ti --rm --name frontend -p 8888:80 oceans-1876/frontend`
`docker run -ti --rm --name frontend -p 8080:80 oceans-1876/frontend`

You can connect using the browser at http://localhost:8888/
You can connect using the browser at http://localhost:8080/
9,100 changes: 3,180 additions & 5,920 deletions package-lock.json

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,70 +20,70 @@
"@emotion/react": "~11.10",
"@emotion/styled": "~11.10",
"@mui/material": "~5.10",
"@mui/x-date-pickers": "^5.0.0-beta.5",
"axios": "~0.27",
"convert-units": "~3.0.0-beta.4",
"@mui/x-date-pickers": "~5.0",
"axios": "~1.2",
"convert-units": "~3.0.0-beta.5",
"dayjs": "~1.11",
"dotenv": "~16.0",
"maplibre-gl": "~2.2",
"maplibre-gl": "~2.4",
"maplibre-gl-basemaps": "~0.1",
"match-sorter": "~6.3",
"react": "~18.2",
"react-dom": "~18.2",
"react-router-dom": "~6.3"
"react-router-dom": "~6.4"
},
"devDependencies": {
"@babel/core": "~7.18",
"@babel/eslint-parser": "~7.18",
"@babel/core": "~7.20",
"@babel/eslint-parser": "~7.19",
"@babel/polyfill": "~7.12",
"@babel/preset-env": "~7.18",
"@babel/preset-env": "~7.20",
"@babel/preset-react": "~7.18",
"@babel/preset-typescript": "~7.18",
"@testing-library/react": "~13.3",
"@types/jest": "~28.1",
"@testing-library/react": "~13.4",
"@types/jest": "~29.2",
"@types/react": "~18.0",
"@types/react-dom": "~18.0",
"@typescript-eslint/eslint-plugin": "~5.33",
"@typescript-eslint/parser": "~5.33",
"@typescript-eslint/eslint-plugin": "~5.46",
"@typescript-eslint/parser": "~5.46",
"babel-eslint": "~10.1",
"babel-jest": "~28.1",
"babel-loader": "~8.2",
"babel-jest": "~29.3",
"babel-loader": "~9.1",
"clean-webpack-plugin": "~4.0",
"css-loader": "~6.7",
"css-minimizer-webpack-plugin": "~4.0",
"eslint": "~8.21",
"css-minimizer-webpack-plugin": "~4.2",
"eslint": "~8.29",
"eslint-config-airbnb": "~19.0",
"eslint-config-prettier": "~8.5",
"eslint-config-react-app": "~7.0",
"eslint-plugin-import": "~2.26",
"eslint-plugin-jsx-a11y": "~6.6",
"eslint-plugin-prettier": "~4.2",
"eslint-plugin-react": "~7.30",
"eslint-plugin-react": "~7.31",
"eslint-plugin-react-hooks": "~4.6",
"eslint-webpack-plugin": "~3.2",
"favicons": "~6.2",
"favicons-webpack-plugin": "~5.0",
"favicons": "~7.0",
"favicons-webpack-plugin": "~6.0",
"file-loader": "~6.2",
"gh-pages": "~4.0",
"html-webpack-plugin": "~5.5",
"husky": "~8.0",
"jest": "~28.1",
"jest": "~29.3",
"json-minimizer-webpack-plugin": "~4.0",
"lint-staged": "~13.0",
"mini-css-extract-plugin": "~2.6",
"prettier": "~2.7",
"sass": "~1.54",
"sass-loader": "~13.0",
"lint-staged": "~13.1",
"mini-css-extract-plugin": "~2.7",
"prettier": "~2.8",
"sass": "~1.56",
"sass-loader": "~13.2",
"style-loader": "~3.3",
"svg-inline-loader": "~0.8",
"ts-jest": "~28.0",
"ts-jest": "~29.0",
"typedoc": "~0.23",
"typescript": "~4.7",
"typescript": "~4.9",
"url-loader": "~4.1",
"webpack": "~5.74",
"webpack-bundle-analyzer": "~4.5",
"webpack-cli": "~4.10",
"webpack-dev-server": "~4.10",
"webpack": "~5.75",
"webpack-bundle-analyzer": "~4.7",
"webpack-cli": "~5.0",
"webpack-dev-server": "~4.11",
"webpack-merge": "~5.8"
}
}
Binary file added src/components/Home/button_analysis.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/components/Home/button_api.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/components/Home/button_explore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/components/Home/home_overlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a62da78

Please sign in to comment.