diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c070ff --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# ignore all reflected build files +_site/* +.jekyll-cache/* \ No newline at end of file diff --git a/README.md b/README.md index c56d0ec..05c1e71 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ # networkmap -This map of PCW's network coverage is built with MapBox. +This map of PCW's network coverage is built with MapBox via Jekyll. + +# Local Development +You can run this site locally in a container using Docker +* clone the repo with `git clone` +* `docker compose up -d` +* `jekyll` will serve at `localhost:4000` + +# Editing map contents +* As of 8/20/24, the map **no longer uses the geosjon files in `/data`**. It is now linked to a Google Apps Script that generates GeoJSON files dynamically based of the content of a spreadsheet - **please contact a PCW staff member for access.** diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..caa312b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +services: + jekyll: + # image: jekyll/jekyll + build: . + volumes: + - .:/srv/jekyll + ports: + - "4000:4000" + # command: jekyll serve --force_polling --drafts \ No newline at end of file diff --git a/dockerfile b/dockerfile new file mode 100644 index 0000000..97e1032 --- /dev/null +++ b/dockerfile @@ -0,0 +1,4 @@ +# from my digging the github action uses jekyll 3.9.5 but that doesn't exist on dhub... +# https://github.com/jekyll/jekyll/issues/9066 - issue with webrick gem - downgrade version +FROM jekyll/jekyll:3.8.5 +CMD jekyll serve --force_polling --drafts \ No newline at end of file diff --git a/img/favicon.ico b/favicon.ico similarity index 100% rename from img/favicon.ico rename to favicon.ico diff --git a/index.html b/index.html index a340b6f..92749ec 100644 --- a/index.html +++ b/index.html @@ -1,123 +1,20 @@ + Network Map | Philly Community Wireless - + + + + - +
-
- ← +
+ ←
- + +
- - + + \ No newline at end of file diff --git a/style.css b/style.css new file mode 100644 index 0000000..5d16223 --- /dev/null +++ b/style.css @@ -0,0 +1,105 @@ +body { margin: 0; padding: 0; } +#map { position: absolute; top: 0; bottom: 0; width: 100%; } + +.layer-icon { + width: 20px; + height: 20px; + display: inline-block; + margin-right: 5px; + } + +.bookmarks { + position:relative; + right: 10px; + background-color: rgb(227,229,230); + padding: 10px; + border-radius: 4px; + font-family: Arial, sans-serif; + z-index: 1; + width:100%; + height:100%; + font-size: 14px; +} + +.switch-container { + display: flex; + align-items: center; + margin-right: 1px; /* Add margin to the right */ +} + +.switch-container div:last-child { + margin-left: 1px; /* Add margin to the left for the text */ +} + +.popup-image-container { + margin-top: 10px; + text-align: center; +} + +.popup-image { + max-width: 100%; + height: auto; +} + +.rounded-rect { + background: rgb(227,229,230); + border-radius: 10px; + box-shadow: 0 0 50px -25px black; + top:1px; +} + +.flex-center { + position: absolute; + display: flex; + justify-content: center; + align-items: center; +} + +.flex-center.right { + right: 0px; +} + +.sidebar-content { + position: absolute; + width: 90%; + font-family: Arial, Helvetica, sans-serif; + color: gray; +} + +.sidebar-toggle { + position: absolute; + width: 2em; /* Increased width */ + height: 2.5em; /* Increased height */ + font-size: 1.5em; /* Increased font size */ + overflow: visible; + display: flex; + justify-content: center; + align-items: center; + top:auto; + left:auto; +} + +.sidebar-toggle.right { + left: -1.8em; +} + +.sidebar-toggle:hover { + color: #0aa1cf; + cursor: pointer; +} + +.sidebar { + transition: transform 1s; + z-index: 1; + width: 215px; + height: 300px; +} + +.right.collapsed { + transform: translateX(215px); +} + +.bookmarks div[style*="font-weight: bold"] { + margin-top: 10px; /* Adjust this value to increase/decrease the space */ +} +