Skip to content

Commit

Permalink
Merge pull request #41 from nblackburn/feature/refactor-components
Browse files Browse the repository at this point in the history
Refactor components
  • Loading branch information
nblackburn committed Nov 6, 2022
2 parents 7031197 + 610daf3 commit 2174321
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 29 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@nblackburn/website",
"private": true,
"version": "1.7.3",
"version": "1.7.4",
"scripts": {
"start": "astro dev",
"build": "astro build",
Expand Down
5 changes: 3 additions & 2 deletions src/components/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@
</template>

<script lang="ts">
import { defineComponent } from 'vue';
import * as styles from './about.css';
import NavLink from '@components/navLink.vue';
import SocialLinks from '@components/socialLinks.vue';
export default {
export default defineComponent({
components: { SocialLinks, NavLink },
setup() {
return { styles };
}
};
});
</script>
6 changes: 3 additions & 3 deletions src/components/dynamicPalette.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
</template>

<script lang="ts">
import { onMounted } from 'vue';
import { onMounted, defineComponent } from 'vue';
import { getActivePalette, applyPalette } from '@utilities/paletteManager';
export default {
export default defineComponent({
setup() {
onMounted(() => {
const bodyElement = document.body;
Expand All @@ -15,5 +15,5 @@ export default {
applyPalette(activePalette, bodyElement);
});
}
};
});
</script>
6 changes: 3 additions & 3 deletions src/components/link.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import { h } from 'vue';
import { h, defineComponent } from 'vue';
import { isExternalLink, buildRefLink } from '@utilities/refLink';
export default {
export default defineComponent({
props: {
href: {
type: String
Expand Down Expand Up @@ -32,5 +32,5 @@ export default {
slots.default()
);
}
};
});
</script>
6 changes: 3 additions & 3 deletions src/components/linkGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</template>

<script lang="ts">
import { PropType } from 'vue';
import Link from '@components/link.vue';
import * as styles from './linkGroups.css';
import { defineComponent, PropType } from 'vue';
type Item = {
id: string;
Expand All @@ -42,7 +42,7 @@ type Group = {
items: Item[];
};
export default {
export default defineComponent({
components: {
Link
},
Expand All @@ -59,5 +59,5 @@ export default {
setup() {
return { styles };
}
};
});
</script>
7 changes: 4 additions & 3 deletions src/components/navLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
</template>

<script lang="ts">
import Link from '@components/link.vue';
import { defineComponent } from 'vue';
import * as styles from './navLink.css';
import Link from '@components/link.vue';
export default {
export default defineComponent({
components: {
Link
},
Expand All @@ -42,5 +43,5 @@ export default {
setup() {
return { styles };
}
};
});
</script>
5 changes: 3 additions & 2 deletions src/components/notFound.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
</template>

<script lang="ts">
import { defineComponent } from 'vue';
import * as styles from './notFound.css';
export default {
export default defineComponent({
setup() {
return { styles };
}
};
});
</script>
5 changes: 3 additions & 2 deletions src/components/pageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
</template>

<script lang="ts">
import { defineComponent } from 'vue';
import * as styles from './pageHeader.css';
export default {
export default defineComponent({
props: {
title: {
type: String
Expand All @@ -22,5 +23,5 @@ export default {
setup() {
return { styles };
}
};
});
</script>
6 changes: 3 additions & 3 deletions src/components/projectCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</template>

<script lang="ts">
import { PropType } from 'vue';
import Link from '@components/link.vue';
import * as styles from './projectCard.css';
import { format, parseISO } from 'date-fns';
import { defineComponent, PropType } from 'vue';
export type Project = {
url: string;
Expand All @@ -45,7 +45,7 @@ export type Project = {
publishedDate: string;
};
export default {
export default defineComponent({
components: {
Link
},
Expand All @@ -68,5 +68,5 @@ export default {
return { styles, publishDate };
}
};
});
</script>
5 changes: 3 additions & 2 deletions src/components/projectList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
</template>

<script lang="ts">
import { defineComponent } from 'vue';
import * as styles from './projectList.css';
export default {
export default defineComponent({
setup() {
return { styles };
}
};
});
</script>
6 changes: 3 additions & 3 deletions src/components/socialLinks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script lang="ts">
import * as styles from './socialLinks.css';
import NavLink from '@components/navLink.vue';
import { defineComponent } from 'vue';
const socialLinks = [
{ id: 'email', name: 'Email', href: 'mailto:[email protected]' },
Expand All @@ -40,14 +41,13 @@ const socialLinks = [
}
];
export default {
export default defineComponent({
components: {
NavLink
},
setup() {
return { styles, socialLinks };
}
};
});
</script>
,
5 changes: 3 additions & 2 deletions src/components/story.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@
</template>

<script lang="ts">
import { defineComponent } from 'vue';
import * as styles from './story.css';
export default {
export default defineComponent({
setup() {
return { styles };
}
};
});
</script>

0 comments on commit 2174321

Please sign in to comment.