Merge branch 'development' of https://github.com/openstreetmap-polska/aed-mapa into development

2022-01-27 20:55:02 +01:00 · 2022-01-27 20:55:02 +01:00 · c0e07919e5
commit c0e07919e5
--- a/.github/workflows/deploy_to_dev.yaml
+++ b/.github/workflows/deploy_to_dev.yaml
@ -11,6 +11,7 @@ jobs:
  deploy:
    name: Deploy to dev env
    runs-on: ubuntu-latest
+    environment: dev
    steps:
      - name: Install SSH Key
        uses: kielabokkie/ssh-key-and-known-hosts-action@v1
@ -19,4 +20,25 @@ jobs:
          ssh-host: ${{ secrets.SSH_HOST_IP }}
          ssh-port: ${{ secrets.SSH_HOST_PORT }}
      - name: Run deploy script on host
-        run: ssh -t -p ${{ secrets.SSH_HOST_PORT }} -l ${{ secrets.SSH_USER }} ${{ secrets.SSH_HOST_IP }} /home/${{ secrets.SSH_USER }}/deploy_dev.sh 2> deploy_dev_err.txt
+        env:
+          OAUTH_CONSUMER_KEY: ${{ secrets.OAUTH_CONSUMER_KEY }}
+          OAUTH_SECRET: ${{ secrets.OAUTH_SECRET }}
+          OSM_API_URL: ${{ secrets.URL }}
+        run: |
+          ssh -t -p ${{ secrets.SSH_HOST_PORT }} -l ${{ secrets.SSH_USER }} ${{ secrets.SSH_HOST_IP }} << EOF
+            set -e
+            cd /home/${{ secrets.SSH_USER }}/aed-mapa-dev/
+            git pull
+            rm -rf /home/${{ secrets.SSH_USER }}/temp_deploy_dev/
+            mkdir /home/${{ secrets.SSH_USER }}/temp_deploy_dev/
+            rsync --recursive \
+              --exclude '*.py' --exclude '*.geojson' --exclude '.git*' --exclude 'aed_poland_metadata.json' \
+              --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \
+              --quiet /home/${{ secrets.SSH_USER }}/aed-mapa-dev/ /home/${{ secrets.SSH_USER }}/temp_deploy_dev/
+            sed -i "s/<< oauth_consumer_key >>/$OAUTH_CONSUMER_KEY/;s/<< oauth_secret >>/$OAUTH_SECRET/;s|<< url >>|$OSM_API_URL|" /home/${{ secrets.SSH_USER }}/temp_deploy_dev/src/osm-integration.js
+            rsync --update --recursive --delete \
+              --exclude '*.py' --exclude '*.geojson' --exclude '.git*' --exclude 'aed_poland_metadata.json' \
+              --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \
+              --verbose /home/${{ secrets.SSH_USER }}/temp_deploy_dev/ /var/www/dev/
+            rm -rf /home/${{ secrets.SSH_USER }}/temp_deploy_dev/
+          EOF
--- a/.github/workflows/deploy_to_prod.yaml
+++ b/.github/workflows/deploy_to_prod.yaml
@ -11,6 +11,7 @@ jobs:
  deploy:
    name: Deploy to prod env
    runs-on: ubuntu-latest
+    environment: prod
    steps:
      - name: Install SSH Key
        uses: kielabokkie/ssh-key-and-known-hosts-action@v1
@ -19,4 +20,25 @@ jobs:
          ssh-host: ${{ secrets.SSH_HOST_IP }}
          ssh-port: ${{ secrets.SSH_HOST_PORT }}
      - name: Run deploy script on host
-        run: ssh -t -p ${{ secrets.SSH_HOST_PORT }} -l ${{ secrets.SSH_USER }} ${{ secrets.SSH_HOST_IP }} /home/${{ secrets.SSH_USER }}/deploy_prod.sh 2> deploy_prod_err.txt
+        env:
+          OAUTH_CONSUMER_KEY: ${{ secrets.OAUTH_CONSUMER_KEY }}
+          OAUTH_SECRET: ${{ secrets.OAUTH_SECRET }}
+          OSM_API_URL: ${{ secrets.URL }}
+        run: |
+          ssh -t -p ${{ secrets.SSH_HOST_PORT }} -l ${{ secrets.SSH_USER }} ${{ secrets.SSH_HOST_IP }} << EOF
+            set -e
+            cd /home/${{ secrets.SSH_USER }}/aed-mapa/
+            git pull
+            rm -rf /home/${{ secrets.SSH_USER }}/temp_deploy_prod/
+            mkdir /home/${{ secrets.SSH_USER }}/temp_deploy_prod/
+            rsync --recursive \
+              --exclude '*.py' --exclude '*.geojson' --exclude '.git*' --exclude 'aed_poland_metadata.json' \
+              --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \
+              --quiet /home/${{ secrets.SSH_USER }}/aed-mapa/ /home/${{ secrets.SSH_USER }}/temp_deploy_prod/
+            sed -i "s/<< oauth_consumer_key >>/$OAUTH_CONSUMER_KEY/;s/<< oauth_secret >>/$OAUTH_SECRET/;s|<< url >>|$OSM_API_URL|" /home/${{ secrets.SSH_USER }}/temp_deploy_prod/src/osm-integration.js
+            rsync --update --recursive --delete \
+              --exclude '*.py' --exclude '*.geojson' --exclude '.git*' --exclude 'aed_poland_metadata.json' \
+              --exclude 'requirements.txt' --exclude 'LICENSE' --exclude 'README.md' --exclude '*.ods' --exclude '*.csv' \
+              --verbose /home/${{ secrets.SSH_USER }}/temp_deploy_prod/ /var/www/html/
+            rm -rf /home/${{ secrets.SSH_USER }}/temp_deploy_prod/
+          EOF
--- a/.gitignore
+++ b/.gitignore
@ -132,3 +132,6 @@ dmypy.json
 # IDE folders
 .idea
 .vscode
+
+# IIS configuration file
+web.config
--- a/index.html
+++ b/index.html
@ -82,7 +82,7 @@
                <div id="navbar-logged" class="navbar-item has-dropdown is-hoverable">
                  <a id="navbar-username" class="navbar-link has-text-white-ter has-text-weight-light is-arrowless">
                  </a>
-              
+
                  <div class="navbar-dropdown has-background-green">
                    <a class="navbar-item" id="logout">
                      <svg class="icon mr-1" style="width:24px;height:24px" viewBox="0 0 24 24">
@ -205,8 +205,8 @@
          <button class="modal-close is-large" aria-label="close" onclick="closeModal()"></button>
        </div>

-        <div id="map"></div> 
-        <footer> 
+        <div id="map"></div>
+        <footer>
          <div class="footer-partners is-white">
            <div class="columns is-vcentered is-mobile is-gapless">
              <div class="column is-narrow ml-2">
@ -226,7 +226,7 @@
              </div>
              <div class="column is-hidden-touch">
                <div class="attrib is-size-7 has-text-weight-light">
-                <span id="refresh-time" class="is-hidden-mobile pr-1">Ostatnia aktualizacja danych OSM: 
+                <span id="refresh-time" class="is-hidden-mobile pr-1">Ostatnia aktualizacja danych OSM:
                  <span class="has-text-grey-dark"></span>
                </span>
                <span class="osm-attribution">dane © twórcy <a target="_top" rel="noopener" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>.</span>
@ -237,7 +237,7 @@
                <span class="osm-attribution smaller-text">dane © twórcy <a target="_top" rel="noopener" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>.</span>
                </div>
              </div>
-            </div>            
+            </div>
          </div>
        </footer>
        <button id="addNode" class="button is-success is-large is-hidden-touch has-text-weight-light"
@ -247,15 +247,15 @@
        </svg>
          Dodaj&nbsp;<span class="has-text-weight-semibold">AED</span>
        </button>
-        <button id="addNode-mobile-1" 
-        class="button is-floating is-medium is-success is-hidden-desktop add-button" 
+        <button id="addNode-mobile-1"
+        class="button is-floating is-medium is-success is-hidden-desktop add-button"
        aria-label="Dodaj AED" style="bottom: 8px;left: 16px;">
          <svg class="icon" viewBox="0 0 24 24">
            <path fill="currentColor" d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
          </svg>
        </button>
-        <button id="addNode-mobile-2" 
-        class="button is-floating is-medium is-success is-hidden-desktop is-hidden add-button" 
+        <button id="addNode-mobile-2"
+        class="button is-floating is-medium is-success is-hidden-desktop is-hidden add-button"
        aria-label="Dalej" style="bottom: 8px;left: 16px;">
          <svg class="icon" viewBox="0 0 24 24">
            <path fill="currentColor" d="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
@ -267,9 +267,22 @@
            <path fill="currentColor" d="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
          </svg>
        </button>
+        <script>
+          if ('serviceWorker' in navigator){
+            window.addEventListener('load', () =>{
+              navigator.serviceWorker.register('serviceWorker.js')
+              .then(reg => {
+                console.log('SW registred', reg);
+              }).catch(err => {
+                console.log('SW registration faild!', err);
+              });
+            });
+          }
+        </script>
        <script src="./src/other-ui-stuff.js"></script>
        <script src="./src/map.js"></script>
        <script src="./src/osm-integration.js"></script>
+        <script src="./src/pwa-EventListeners.js" type="module"></script>

        <!-- Cloudflare Web Analytics -->
        <script defer src='https://static.cloudflareinsights.com/beacon.min.js'
--- a/serviceWorker.js
+++ b/serviceWorker.js
@ -0,0 +1,44 @@
+const cacheName = 'aed-map';
+const resToPrecache = [
+ '/',
+ '/index.html',
+ '/src/css/main.css'
+];
+
+self.addEventListener('install', event => {
+    console.log('SW install event!');
+    event.waitUntil(
+        caches.open(cacheName)
+        .then(cache => {
+            return cache.addAll(resToPrecache);
+        })
+    );
+});
+
+self.addEventListener('activate', event => {
+    console.log('SW now ready to handle fetches!');
+  });
+
+
+self.addEventListener('fetch', event => {
+    event.respondWith(
+        // try get response from network
+        
+        fetch(event.request).then(async response => {
+            // if network success, cache it for all GET requests
+            var responseClone = response.clone(); 
+
+            if(event.request.method == 'GET'){
+                await caches.open(cacheName)
+                .then(cache => {
+                    cache.put(event.request, responseClone);
+                });
+            }
+            return response;
+        }).catch(function(){
+        // if network fails, try get response from cache
+
+            return caches.match(event.request);
+        })
+    );
+});
--- a/site.webmanifest
+++ b/site.webmanifest
@ -1,20 +1,29 @@
 {
-    "name": "AED Mapa",
-    "short_name": "AED Mapa",
-    "start_url": "/",
+    "name": "Mapa AED",
+    "short_name": "Mapa AED",
+    "description": "Mapa defibrylatorów (AED) na terenie Polski",
+    "start_url": "/index.html",
    "icons": [
        {
            "src": "./src/favicon/android-chrome-192x192.png",
            "sizes": "192x192",
-            "type": "image/png"
+            "type": "image/png",
+            "purpose": "any maskable"
        },
        {
            "src": "./src/favicon/android-chrome-256x256.png",
            "sizes": "256x256",
-            "type": "image/png"
+            "type": "image/png",
+            "purpose": "any maskable"
+        },
+        {
+            "src": "./src/favicon/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "any maskable"
        }
    ],
    "theme_color": "#008855",
    "background_color": "#f5f5f5",
-    "display": "standalone"
+    "display": "fullscreen"
 }
--- a/src/favicon/android-chrome-512x512.png
+++ b/src/favicon/android-chrome-512x512.png
--- a/src/img/card-image-144x144.png
+++ b/src/img/card-image-144x144.png
--- a/src/osm-integration.js
+++ b/src/osm-integration.js
@ -1,10 +1,10 @@
 // osm integration stuff
+// to be filled during deploy
 var auth = osmAuth({
-    oauth_consumer_key: 'SVN3D2Q8ciaIbHCdHbhuiG7mEwvOGbnSDcy1ZgnV',
-    oauth_secret: 'alqjD88o2qtdN9ZwtOfanqqu5Rbp2lhIxbGFukTD',
-    url: "https://master.apis.dev.openstreetmap.org",
+    oauth_consumer_key: '<< oauth_consumer_key >>',
+    oauth_secret: '<< oauth_secret >>',
+    url: "<< url >>",
    landing: 'land.html',
-
 });
 // global variables
 var openChangesetId = null;
--- a/src/pwa-EventListeners.js
+++ b/src/pwa-EventListeners.js
@ -0,0 +1,16 @@
+export const pwaTrackingListeners = () => {
+    const fireAddToHomeScreenImpression = event => {
+        event.userChoice.then(choiceResult => {});
+      //This is to prevent `beforeinstallprompt` event that triggers again on `Add` or `Cancel` click
+      window.removeEventListener("beforeinstallprompt", fireAddToHomeScreenImpression);
+    };
+    window.addEventListener("beforeinstallprompt", fireAddToHomeScreenImpression);
+    
+    //Track web app install by user
+    window.addEventListener("appinstalled", event => {
+    });
+  
+    //Track from where your web app has been opened/browsed
+    window.addEventListener("load", () => {      
+    });
+  };