Skip to content

Commit

Permalink
Merge pull request #1143 from geoql/refactor/nuxt-3.x-v-mapbox-migration
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 authored Mar 13, 2023
2 parents d9f5076 + 7158191 commit 52ad6fb
Show file tree
Hide file tree
Showing 48 changed files with 7,779 additions and 18,549 deletions.
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
MAP_ACCESS_TOKEN=
MAPBOX_MAP_TOKEN=
AWS_MAP_TOKEN=

GITHUB_TOKEN=
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.nuxt
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ jobs:
prettier: true
prettier_extensions: js,ts,vue
neutral_check_on_warning: true
- name: Run build 🏁
run: npm run generate
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
shamefully-hoist=true
strict-peer-dependencies=false
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.nuxt
4 changes: 2 additions & 2 deletions app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<script lang="ts">
import { defineComponent } from 'vue';
import VHeader from '@/components/common/ui/VHeader.vue';
import VFooter from '@/components/common/ui/VFooter.vue';
import VHeader from '~/components/common/ui/VHeader.vue';
import VFooter from '~/components/common/ui/VFooter.vue';
export default defineComponent({
components: {
VHeader,
Expand Down
106 changes: 44 additions & 62 deletions assets/css/fonts.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,179 +3,161 @@
font-style: normal;
font-weight: 100;
font-display: swap;
src:
url("~/assets/fonts/Inter-Thin.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Thin.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Thin.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Thin.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 100;
font-display: swap;
src:
url("~/assets/fonts/Inter-ThinItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-ThinItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-ThinItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ThinItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 200;
font-display: swap;
src:
url("~/assets/fonts/Inter-ExtraLight.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-ExtraLight.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-ExtraLight.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraLight.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 200;
font-display: swap;
src:
url("~/assets/fonts/Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-ExtraLightItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-ExtraLightItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraLightItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 300;
font-display: swap;
src:
url("~/assets/fonts/Inter-Light.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Light.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Light.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Light.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 300;
font-display: swap;
src:
url("~/assets/fonts/Inter-LightItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-LightItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-LightItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-LightItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 400;
font-display: swap;
src:
url("~/assets/fonts/Inter-Regular.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Regular.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Regular.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Regular.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 400;
font-display: swap;
src:
url("~/assets/fonts/Inter-Italic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Italic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Italic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Italic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 500;
font-display: swap;
src:
url("~/assets/fonts/Inter-Medium.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Medium.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Medium.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Medium.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 500;
font-display: swap;
src:
url("~/assets/fonts/Inter-MediumItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-MediumItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-MediumItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-MediumItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 600;
font-display: swap;
src:
url("~/assets/fonts/Inter-SemiBold.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-SemiBold.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-SemiBold.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-SemiBold.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 600;
font-display: swap;
src:
url("~/assets/fonts/Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-SemiBoldItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-SemiBoldItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-SemiBoldItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 700;
font-display: swap;
src:
url("~/assets/fonts/Inter-Bold.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Bold.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Bold.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Bold.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 700;
font-display: swap;
src:
url("~/assets/fonts/Inter-BoldItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-BoldItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-BoldItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-BoldItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 800;
font-display: swap;
src:
url("~/assets/fonts/Inter-ExtraBold.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-ExtraBold.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-ExtraBold.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraBold.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 800;
font-display: swap;
src:
url("~/assets/fonts/Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-ExtraBoldItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-ExtraBoldItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-ExtraBoldItalic.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: normal;
font-weight: 900;
font-display: swap;
src:
url("~/assets/fonts/Inter-Black.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-Black.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-Black.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-Black.woff?v=3.12') format('woff');
}

@font-face {
font-family: Inter;
font-style: italic;
font-weight: 900;
font-display: swap;
src:
url("~/assets/fonts/Inter-BlackItalic.woff2?v=3.12") format("woff2"),
url("~/assets/fonts/Inter-BlackItalic.woff?v=3.12") format("woff");
src: url('~/assets/fonts/Inter-BlackItalic.woff2?v=3.12') format('woff2'),
url('~/assets/fonts/Inter-BlackItalic.woff?v=3.12') format('woff');
}

/* -------------------------------------------------------
Expand All @@ -188,21 +170,21 @@ Usage:
}
*/
@font-face {
font-family: "Inter var";
font-family: 'Inter var';
font-weight: 100 900;
font-display: swap;
font-style: normal;
font-named-instance: "Regular";
src: url("~/assets/fonts/Inter-roman.var.woff2?v=3.12") format("woff2");
font-named-instance: 'Regular';
src: url('~/assets/fonts/Inter-roman.var.woff2?v=3.12') format('woff2');
}

@font-face {
font-family: "Inter var";
font-family: 'Inter var';
font-weight: 100 900;
font-display: swap;
font-style: italic;
font-named-instance: "Italic";
src: url("~/assets/fonts/Inter-italic.var.woff2?v=3.12") format("woff2");
font-named-instance: 'Italic';
src: url('~/assets/fonts/Inter-italic.var.woff2?v=3.12') format('woff2');
}

/* --------------------------------------------------------------------------
Expand All @@ -219,9 +201,9 @@ explicitly, e.g.
*/
@font-face {
font-family: "Inter var experimental";
font-family: 'Inter var experimental';
font-weight: 100 900;
font-display: swap;
font-style: oblique 0deg 10deg;
src: url("~/assets/fonts/Inter.var.woff2?v=3.12") format("woff2");
src: url('~/assets/fonts/Inter.var.woff2?v=3.12') format('woff2');
}
11 changes: 2 additions & 9 deletions assets/css/global.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
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
Loading

0 comments on commit 52ad6fb

Please sign in to comment.