Feat/campaigns drizzle

.env.example

@@ -1,7 +1,23 @@
 DATABASE_URL="postgresql://postgres:postgres@localhost:5432/opensensemap"
 SHADOW_DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
+
 SESSION_SECRET="super-duper-s3cret"
+
 MAPBOX_ACCESS_TOKEN=""
 MAPBOX_GEOCODING_API="https://api.mapbox.com/geocoding/v5/mapbox.places/"
+
 OSEM_API_URL="https://api.opensensemap.org/"
 DIRECTUS_URL="https://coelho.opensensemap.org"
+
+MYBADGES_API_URL = "https://api.v2.mybadges.org/"
+MYBADGES_URL = "https://mybadges.org/"
+MYBADGES_SERVERADMIN_USERNAME = ""
+MYBADGES_SERVERADMIN_PASSWORD = ""
+MYBADGES_ISSUERID_OSEM = ""
+MYBADGES_CLIENT_ID = ""
+MYBADGES_CLIENT_SECRET = ""
+
+NOVU_API_KEY= ""
+NOVU_API_URL = ""
+NOVU_WEBSOCKET_URL = ""
+NOVU_APPLICATION_IDENTIFIER = ""

.github/dependabot.yaml

@@ -0,0 +1,15 @@
+version: 2
+
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/deploy.yml

@@ -9,6 +9,7 @@ on:
 permissions:
   actions: write
   contents: read
+  packages: write
 
 jobs:
   lint:
@@ -140,13 +141,6 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
-      - name: 👀 Read app name
-        uses: SebRollen/[email protected]
-        id: app_name
-        with:
-          file: "fly.toml"
-          field: "app"
-
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
@@ -161,67 +155,37 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
-      # - name: 🔑 Fly Registry Auth
-      #   uses: docker/login-action@v2
-      #   with:
-      #     registry: registry.fly.io
-      #     username: x
-      #     password: ${{ secrets.FLY_API_TOKEN }}
-
-      # - name: 🐳 Docker build
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     push: true
-      #     tags: registry.fly.io/${{ steps.app_name.outputs.value }}:${{ github.ref_name }}-${{ github.sha }}
-      #     build-args: |
-      #       COMMIT_SHA=${{ github.sha }}
-      #     cache-from: type=local,src=/tmp/.buildx-cache
-      #     cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/opensensemap/frontend
+
+      - name: 🔑 GitHub Registry Auth
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🐳 Docker build
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            COMMIT_SHA=${{ github.sha }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
 
       # This ugly bit is necessary if you don't want your cache to grow forever
       # till it hits GitHub's limit of 5GB.
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
       # https://github.com/moby/buildkit/issues/1896
-      # - name: 🚚 Move cache
-      #   run: |
-      #     rm -rf /tmp/.buildx-cache
-      #     mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-  # deploy:
-  #   name: 🚀 Deploy
-  #   runs-on: ubuntu-latest
-  #   needs: [lint, typecheck, vitest, cypress, build]
-  #   # only build/deploy main branch on pushes
-  #   if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
-
-  #   steps:
-  #     - name: 🛑 Cancel Previous Runs
-  #       uses: styfle/[email protected]
-
-  #     - name: ⬇️ Checkout repo
-  #       uses: actions/checkout@v3
-
-  #     - name: 👀 Read app name
-  #       uses: SebRollen/[email protected]
-  #       id: app_name
-  #       with:
-  #         file: "fly.toml"
-  #         field: "app"
-
-  #     - name: 🚀 Deploy Staging
-  #       if: ${{ github.ref == 'refs/heads/dev' }}
-  #       uses: superfly/[email protected]
-  #       with:
-  #         args: "deploy --app ${{ steps.app_name.outputs.value }}-staging --image registry.fly.io/${{ steps.app_name.outputs.value }}:${{ github.ref_name }}-${{ github.sha }}"
-  #       env:
-  #         FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-
-  #     - name: 🚀 Deploy Production
-  #       if: ${{ github.ref == 'refs/heads/main' }}
-  #       uses: superfly/[email protected]
-  #       with:
-  #         args: "deploy --image registry.fly.io/${{ steps.app_name.outputs.value }}:${{ github.ref_name }}-${{ github.sha }}"
-  #       env:
-  #         FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+      - name: 🚚 Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

app/components/Map/Map.tsx

@@ -0,0 +1,44 @@
+import type { MapProps, MapRef } from "react-map-gl";
+import { NavigationControl, Map as ReactMap } from "react-map-gl";
+import { forwardRef } from "react";
+
+const Map = forwardRef<MapRef, MapProps>(
+  (
+    // take fog and terrain out of props to resolve error
+    { children, mapStyle, fog = null, terrain = null, ...props },
+    ref
+  ) => {
+    return (
+      <ReactMap
+        id="osem"
+        dragRotate={false}
+        initialViewState={{
+          longitude: 10,
+          latitude: 25,
+          zoom: 2,
+        }}
+        mapStyle="mapbox://styles/mapbox/streets-v12"
+        mapboxAccessToken={ENV.MAPBOX_ACCESS_TOKEN}
+        pitchWithRotate={false}
+        preserveDrawingBuffer
+        ref={ref}
+        style={{
+          width: "100%",
+          height: "100%",
+          position: "fixed",
+          top: 0,
+          left: 0,
+        }}
+        touchZoomRotate={false}
+        {...props}
+      >
+        {children}
+        <NavigationControl position="bottom-left" showCompass={false} />
+      </ReactMap>
+    );
+  }
+);
+
+Map.displayName = "Map";
+
+export default Map;