Skip to content

Commit

Permalink
Merge pull request #4 from owddm/kmain
Browse files Browse the repository at this point in the history
Smaller fixes and updates
  • Loading branch information
kinxiel committed Apr 11, 2023
2 parents 0aacb9c + ce58aa2 commit 5881a1b
Show file tree
Hide file tree
Showing 8 changed files with 920 additions and 1,039 deletions.
3 changes: 1 addition & 2 deletions components/Map.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@
if (!mounted) {
return
}
lMap = L.map(map.value!).setView([34.82801, 135.57879], 9.4)
lMap = L.map(map.value!).setView([34.95937, 136.07081], 9.4)
const gl = new MaplibreLayer({
attribution: "\u003ca href=\"https://www.maptiler.com/copyright/\" target=\"_blank\"\u003e\u0026copy; MapTiler\u003c/a\u003e \u003ca href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\"\u003e\u0026copy; OpenStreetMap contributors\u003c/a\u003e",
style: `https://api.maptiler.com/maps/${mapId}/style.json?key=${key}`
})
gl.addTo(lMap)
stop = watchEffect(() => {
console.log('Rendering markers')
const lMarkers = markers.map(marker => {
let title = marker.title ? `<div class="map-event--label"><div class="map-event--title">${marker.title}</div>${marker.subtitle ? `<div class="map-event--info">${marker.subtitlePrefix ? `<strong>${marker.subtitlePrefix}</strong> ` : ''}${marker.subtitle}</div></div>`: ''}` : ''
const html = `<img src="/_nuxt/assets/map/marker/${marker.type}.svg" class="map-event--image">${title}`
Expand Down
24 changes: 0 additions & 24 deletions components/SiteMain.vue

This file was deleted.

14 changes: 1 addition & 13 deletions layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,8 @@
<div class="container">
<SiteHeader />
<main><slot /></main>
<div class="footer">
<SiteFooter />
</div>
<SiteFooter />
</div>
</template>

<style scoped>
.container {
display: flex;
flex-direction: column;
min-height: 100vh;
padding: 3rem;
}
.footer {
margin-top: 3rem;
}
</style>
1 change: 1 addition & 0 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
ssr: false,
css: ["assets/style.css"],
});
Loading

0 comments on commit 5881a1b

Please sign in to comment.