Skip to content

Commit

Permalink
chore: clean up 🧹
Browse files Browse the repository at this point in the history
Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
  • Loading branch information
vinayakkulkarni committed Jul 28, 2023
1 parent 36431d1 commit 0831f3e
Show file tree
Hide file tree
Showing 19 changed files with 6,042 additions and 2,538 deletions.
4 changes: 2 additions & 2 deletions app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<main
class="h-screen w-screen bg-gray-100 text-gray-900 transition-colors duration-150 dark:bg-gray-900 dark:text-gray-100"
>
<v-header />
<VHeader />
<nuxt-page class="py-10 -my-10" />
<v-footer />
<VFooter />
</main>
</template>

Expand Down
54 changes: 36 additions & 18 deletions assets/css/fonts.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
font-style: normal;
font-weight: 100;
font-display: swap;
src: url('~/assets/fonts/Inter-Thin.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Thin.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Thin.woff?v=3.12') format('woff');
}

Expand All @@ -12,7 +13,8 @@
font-style: italic;
font-weight: 100;
font-display: swap;
src: url('~/assets/fonts/Inter-ThinItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-ThinItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ThinItalic.woff?v=3.12') format('woff');
}

Expand All @@ -21,7 +23,8 @@
font-style: normal;
font-weight: 200;
font-display: swap;
src: url('~/assets/fonts/Inter-ExtraLight.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-ExtraLight.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraLight.woff?v=3.12') format('woff');
}

Expand All @@ -30,7 +33,8 @@
font-style: italic;
font-weight: 200;
font-display: swap;
src: url('~/assets/fonts/Inter-ExtraLightItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-ExtraLightItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraLightItalic.woff?v=3.12') format('woff');
}

Expand All @@ -39,7 +43,8 @@
font-style: normal;
font-weight: 300;
font-display: swap;
src: url('~/assets/fonts/Inter-Light.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Light.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Light.woff?v=3.12') format('woff');
}

Expand All @@ -48,7 +53,8 @@
font-style: italic;
font-weight: 300;
font-display: swap;
src: url('~/assets/fonts/Inter-LightItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-LightItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-LightItalic.woff?v=3.12') format('woff');
}

Expand All @@ -57,7 +63,8 @@
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('~/assets/fonts/Inter-Regular.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Regular.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Regular.woff?v=3.12') format('woff');
}

Expand All @@ -66,7 +73,8 @@
font-style: italic;
font-weight: 400;
font-display: swap;
src: url('~/assets/fonts/Inter-Italic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Italic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Italic.woff?v=3.12') format('woff');
}

Expand All @@ -75,7 +83,8 @@
font-style: normal;
font-weight: 500;
font-display: swap;
src: url('~/assets/fonts/Inter-Medium.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Medium.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Medium.woff?v=3.12') format('woff');
}

Expand All @@ -84,7 +93,8 @@
font-style: italic;
font-weight: 500;
font-display: swap;
src: url('~/assets/fonts/Inter-MediumItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-MediumItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-MediumItalic.woff?v=3.12') format('woff');
}

Expand All @@ -93,7 +103,8 @@
font-style: normal;
font-weight: 600;
font-display: swap;
src: url('~/assets/fonts/Inter-SemiBold.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-SemiBold.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-SemiBold.woff?v=3.12') format('woff');
}

Expand All @@ -102,7 +113,8 @@
font-style: italic;
font-weight: 600;
font-display: swap;
src: url('~/assets/fonts/Inter-SemiBoldItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-SemiBoldItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-SemiBoldItalic.woff?v=3.12') format('woff');
}

Expand All @@ -111,7 +123,8 @@
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('~/assets/fonts/Inter-Bold.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Bold.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Bold.woff?v=3.12') format('woff');
}

Expand All @@ -120,7 +133,8 @@
font-style: italic;
font-weight: 700;
font-display: swap;
src: url('~/assets/fonts/Inter-BoldItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-BoldItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-BoldItalic.woff?v=3.12') format('woff');
}

Expand All @@ -129,7 +143,8 @@
font-style: normal;
font-weight: 800;
font-display: swap;
src: url('~/assets/fonts/Inter-ExtraBold.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-ExtraBold.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraBold.woff?v=3.12') format('woff');
}

Expand All @@ -138,7 +153,8 @@
font-style: italic;
font-weight: 800;
font-display: swap;
src: url('~/assets/fonts/Inter-ExtraBoldItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-ExtraBoldItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraBoldItalic.woff?v=3.12') format('woff');
}

Expand All @@ -147,7 +163,8 @@
font-style: normal;
font-weight: 900;
font-display: swap;
src: url('~/assets/fonts/Inter-Black.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-Black.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Black.woff?v=3.12') format('woff');
}

Expand All @@ -156,7 +173,8 @@
font-style: italic;
font-weight: 900;
font-display: swap;
src: url('~/assets/fonts/Inter-BlackItalic.woff2?v=3.12') format('woff2'),
src:
url('~/assets/fonts/Inter-BlackItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-BlackItalic.woff?v=3.12') format('woff');
}

Expand Down
13 changes: 11 additions & 2 deletions assets/css/global.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
@import url('@unocss/reset/tailwind.css');

html {
font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
'Helvetica Neue', Arial, sans-serif;
font-family:
Inter,
-apple-system,
BlinkMacSystemFont,
'Segoe UI',
Roboto,
'Helvetica Neue',
Arial,
sans-serif;
font-size: 12px;
word-spacing: 1px;
text-size-adjust: 100%;
Expand Down
2 changes: 1 addition & 1 deletion components/common/ui/VFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
import { useNuxtApp } from '#app';
import { defineComponent, reactive } from 'vue';
export default defineComponent({
name: 'Footer',
name: 'VFooter',
setup() {
const { $config } = useNuxtApp();
const state = reactive({
Expand Down
2 changes: 1 addition & 1 deletion components/common/ui/VHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import { useMap } from '~/composables/useMap';
export default defineComponent({
name: 'Header',
name: 'VHeader',
setup() {
const isDark = useDark();
const map = useMap();
Expand Down
33 changes: 12 additions & 21 deletions components/map/CommonMap.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<main class="h-full w-full select-none">
<v-map
<VMap
:options="{ ...store.$state.map.options, style: store.style }"
@loaded="onMapLoaded"
@click="onMapClicked"
Expand All @@ -10,7 +10,7 @@
>
<template v-if="store.loaded">
<!-- Map :: Default Controls -->
<v-control-scale v-if="store.$state.map.controls.scale.shown" />
<VControlScale v-if="store.$state.map.controls.scale.shown" />

<!-- Map :: Default Slot -->
<slot />
Expand Down Expand Up @@ -54,25 +54,16 @@
/>
</svg>
</div>
<transition
enter-active-class="transition duration-100 ease-out"
enter-from-class="transform scale-95 translate-x-4 opacity-0"
enter-to-class="transform scale-100 opacity-100"
leave-active-class="transition duration-75 ease-in translate-x-4"
leave-from-class="transform scale-100 opacity-100"
leave-to-class="transform scale-95 opacity-0"
<div
v-if="store.$state.utils.basemaps.shown"
class="absolute right-0 top-0 mr-12 w-48 origin-right rounded-md bg-gray-300 shadow-lg ring-1 ring-white ring-opacity-5 sm:w-64 dark:bg-gray-700"
>
<div
v-if="store.$state.utils.basemaps.shown"
class="absolute right-0 top-0 mr-12 w-48 origin-right rounded-md bg-gray-300 shadow-lg ring-1 ring-white ring-opacity-5 sm:w-64 dark:bg-gray-700"
>
<basemaps
:data="store.$state.utils.basemaps.data"
@update-map-style="updateBasemap"
@close="store.$state.utils.basemaps.shown = false"
/>
</div>
</transition>
<basemaps
:data="store.$state.utils.basemaps.data"
@update-map-style="updateBasemap"
@close="store.$state.utils.basemaps.shown = false"
/>
</div>
</div>
<slot name="tools-tr" class="visible" />
</div>
Expand Down Expand Up @@ -190,7 +181,7 @@
<!-- Map :: Layers Slot -->
<slot name="layers" />
</template>
</v-map>
</VMap>
</main>
</template>

Expand Down
2 changes: 1 addition & 1 deletion components/map/_partials/Basemaps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<script lang="ts">
export default defineComponent({
name: 'Basemaps',
name: 'VBasemaps',
props: {
data: {
type: Object,
Expand Down
92 changes: 0 additions & 92 deletions components/map/_partials/Geocoder.vue

This file was deleted.

1 change: 0 additions & 1 deletion components/map/_partials/Layers.vue

This file was deleted.

Loading

0 comments on commit 0831f3e

Please sign in to comment.