public access token

activatedgeek · Apr 13, 2024 · 5c0199c · 5c0199c
1 parent 6aaff70
commit 5c0199c
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 30 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -8,6 +8,7 @@ on:
 env:
   ASTRO_SITE: ${{ vars.ASTRO_SITE }}
   GOATCOUNTER_SITE: ${{ vars.GOATCOUNTER_SITE }}
+  PUBLIC_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
   ## Node related.
   DISABLE_OPENCOLLECTIVE: 1
   ADBLOCK: 1
@@ -19,13 +20,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Checkout beagle
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.actor }}/${{ secrets.PAGES_REPO }}
-          token: ${{ secrets.GH_PAT }}
-          path: ${{ secrets.PAGES_REPO }}
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ npm install
 ### Environment Variables
 
 - `ASTRO_SITE`: Full base domain, e.g. `sanyamkapoor.com`
-- `MAPBOX_ACCESS_TOKEN`: [Mapbox](http://mapbox.com) access token.
+- `PUBLIC_MAPBOX_ACCESS_TOKEN`: [Mapbox](http://mapbox.com) access token.
 
 Optional:
 

diff --git a/src/components/lib/Mapbox.jsx b/src/components/lib/Mapbox.jsx
@@ -12,7 +12,7 @@ import Pin from "./Pin";
 
 export default function Mapbox({
   children,
-  mapboxAccessToken,
+  token,
   mapStyle = "mapbox://styles/mapbox/streets-v12",
   latitude = 40.72833,
   longitude = -73.99417,
@@ -21,7 +21,7 @@ export default function Mapbox({
 }) {
   return (
     <Map
-      mapboxAccessToken={mapboxAccessToken}
+      mapboxAccessToken={token}
       initialViewState={{
         latitude: latitude,
         longitude: longitude,

diff --git a/src/components/maps/heatmap.jsx b/src/components/maps/heatmap.jsx
@@ -1,14 +1,9 @@
 import Mapbox from "@components/lib/Mapbox";
 import Heatmap from "@components/lib/Heatmap";
 
-export default function Map({ mapboxAccessToken, data, ...props }) {
+export default function Map({ data, ...props }) {
   return (
-    <Mapbox
-      mapboxAccessToken={mapboxAccessToken}
-      mapStyle="mapbox://styles/mapbox/dark-v11"
-      zoom={3}
-      {...props}
-    >
+    <Mapbox mapStyle="mapbox://styles/mapbox/dark-v11" zoom={3} {...props}>
       <Heatmap data={data} />
     </Mapbox>
   );

diff --git a/src/components/maps/places.jsx b/src/components/maps/places.jsx
@@ -1,13 +1,8 @@
 import Mapbox, { MapboxMarkers } from "@components/lib/Mapbox";
 
-export default function Map({ mapboxAccessToken, places, ...props }) {
+export default function Map({ places, ...props }) {
   return (
-    <Mapbox
-      mapboxAccessToken={mapboxAccessToken}
-      mapStyle="mapbox://styles/mapbox/light-v11"
-      zoom={3}
-      {...props}
-    >
+    <Mapbox mapStyle="mapbox://styles/mapbox/light-v11" zoom={3} {...props}>
       <MapboxMarkers places={places} />
     </Mapbox>
   );

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -2,12 +2,15 @@
 import Html from "@components/Html.astro";
 
 const frontmatter = {
-  title: "Search",
+  title: "Maps",
+  description: "Life Maps",
   authors: [{ collection: "authors", id: "sk" }],
   date: new Date(),
 };
 ---
 
 <Html frontmatter={frontmatter}>
-  <h1>Astro</h1>
+  <main>
+    <h1>Maps</h1>
+  </main>
 </Html>
diff --git a/src/pages/places.astro b/src/pages/places.astro
@@ -14,7 +14,7 @@ const frontmatter = {
 <Html frontmatter={frontmatter}>
   <Map
     client:only="react"
-    mapboxAccessToken={import.meta.env.MAPBOX_ACCESS_TOKEN}
+    token={import.meta.env.PUBLIC_MAPBOX_ACCESS_TOKEN}
     places={data}
   />
 </Html>
diff --git a/src/pages/somebody-fed-phil.astro b/src/pages/somebody-fed-phil.astro
@@ -14,7 +14,7 @@ const frontmatter = {
 <Html frontmatter={frontmatter}>
   <Map
     client:only="react"
-    mapboxAccessToken={import.meta.env.MAPBOX_ACCESS_TOKEN}
+    token={import.meta.env.PUBLIC_MAPBOX_ACCESS_TOKEN}
     places={data}
     zoom={2}
   />

diff --git a/src/pages/us.astro b/src/pages/us.astro
@@ -14,7 +14,7 @@ const frontmatter = {
 <Html frontmatter={frontmatter}>
   <Map
     client:only="react"
-    mapboxAccessToken={import.meta.env.MAPBOX_ACCESS_TOKEN}
+    token={import.meta.env.PUBLIC_MAPBOX_ACCESS_TOKEN}
     places={data}
     zoom={12}
   />

diff --git a/src/pages/wine.astro b/src/pages/wine.astro
@@ -31,7 +31,7 @@ const frontmatter = {
 <Html frontmatter={frontmatter}>
   <Heatmap
     client:only="react"
-    mapboxAccessToken={import.meta.env.MAPBOX_ACCESS_TOKEN}
+    token={import.meta.env.PUBLIC_MAPBOX_ACCESS_TOKEN}
     data={data}
   />
 </Html>