Skip to content

Commit

Permalink
Merge pull request #168 from openstreetmap-polska/dev
Browse files Browse the repository at this point in the history
deploy changes to prod (photo gallery, ui improvements)
  • Loading branch information
ttomasz authored Sep 20, 2023
2 parents 3493bbe + ecd9ade commit 56b1c97
Show file tree
Hide file tree
Showing 44 changed files with 11,384 additions and 287 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"extensions": [
"dbaeumer.vscode-eslint",
"dsznajder.es7-react-js-snippets",
"esbenp.prettier-vscode",
"lukas-tr.materialdesignicons-intellisense",
"jock.svg"
]
Expand All @@ -28,7 +29,7 @@
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",
"postCreateCommand": "npm install",

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node"
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
6 changes: 1 addition & 5 deletions .github/workflows/ci_test.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
name: Test CI test

on:
push:
branches-ignore:
- main
- dev
pull_request:
paths:
- src/**
- public/**
- package*.json
- .github/workflows/ci_test.yml
pull_request:
types: [opened, reopened, synchronize, ready_for_review]

jobs:
Expand Down
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ REACT_APP_OSM_OAUTH2_CLIENT_SECRET=vSfLjZquQ5xlcD9Lq9rhyDuH1ItpakgY5DW59WrRtHY
HOST=127.0.0.1
```

*Note: You can use Github Codespaces to develop.*

### Available Scripts

In the project directory, you can run:
Expand Down Expand Up @@ -83,6 +85,16 @@ Creates sprites from marker icons.

Make sure dev dependencies are installed.

#### `npm run css-build`

Build `sass/mystyles.scss` file into `src/mystyles.css` which is included in `index.tsc` and has the adjusted bulma css for the entire app.

Run this if changed e.g. navbar breakpoint or customized bulma further in `sass/mystyles.css`.

#### `npm run css-watch`

Watches `sass/mystyles.scss` for changes and runs `npm run css-build` if it detects any.

# Data source
Map and AED locations are from [OpenStreetMap](https://www.openstreetmap.org/copyright)

Expand All @@ -91,10 +103,8 @@ Map and AED locations are from [OpenStreetMap](https://www.openstreetmap.org/cop
- [OSM Auth](https://github.com/osmlab/osm-auth)
- [OSM opening_hours](https://github.com/opening-hours/opening_hours.js/)
- [React](https://reactjs.org/docs/getting-started.html)
- [Bulma](https://bulma.io/)
- [Bulma](https://bulma.io/)
- [Bulma Checkradio](https://wikiki.github.io/form/checkradio/)
- [Bulma Tooltip](https://bulma-tooltip.netlify.app/)
- [Bulma Collapsible](https://bulma-collapsible.netlify.app/)
- [React Bulma Components](https://react-bulma.dev/en/storybook)
- [Material Design Icons](https://dev.materialdesignicons.com/getting-started/react)
- [spritezero-cli](https://gitlab.com/beyondtracks/spritezero-cli)
Expand Down
Loading

0 comments on commit 56b1c97

Please sign in to comment.