Skip to content

Commit

Permalink
[MERGE] Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
Matteo Bilotta committed Oct 5, 2021
2 parents 554ea83 + 01b296e commit e67ba24
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
6 changes: 3 additions & 3 deletions components/globals/jumbotron.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@
import TextLoader from "@/components/loaders/text-loader.vue";
interface JumbotronData { dailyMessage: DailyMessage | null; }
interface JumbotronData { dailyMessage?: DailyMessage; }
export default Vue.extend({
name: "Jumbotron",
components: { TextLoader },
data: (): JumbotronData => ({ dailyMessage: null }),
created: async function(): Promise<void>
data: (): JumbotronData => ({ dailyMessage: undefined }),
fetch: async function(): Promise<void>
{
this.dailyMessage = await DailyMessage.GetRandomOne();
Expand Down
2 changes: 1 addition & 1 deletion components/timelines/timeline.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="container timeline">
<template v-if="items.length">
<template v-if="items">
<TimelineItem v-for="item, index in items"
:key="index"
:item="item"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@byloth/website",
"version": "5.0.10",
"version": "5.0.9",
"description": "My personal website as a Nuxt.js application, written in TypeScript and based on Material Design.",
"keywords": [
"Vue.js",
Expand Down
14 changes: 6 additions & 8 deletions pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,23 @@

<script lang="ts">
import Vue from "vue";
import { Context } from "@nuxt/types";
import Timeline from "@/components/timelines/timeline.vue";
import { Post } from "@/models";
interface HomePageData { posts: Post[]; }
interface HomePageData { posts?: Post[]; }
interface HomePageAsyncData { posts: Post[]; }
export default Vue.extend({
name: "HomePage",
components: { Timeline },
data: (): HomePageData => ({ posts: [] }),
asyncData: async (context: Context): Promise<HomePageAsyncData> => ({ posts: await Post.GetAll(context) }),
data: (): HomePageData => ({ posts: undefined }),
head: { title: "Home" },
created: async function(): Promise<void>
{
this.posts = await Post.GetAll(this);
}
head: { title: "Home" }
});
</script>

Expand Down
2 changes: 1 addition & 1 deletion store/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const state = (): ConfigState => ({
title: "Chi sono"
}
],
version: "5.0.10"
version: "5.0.9"
});

export { state };

0 comments on commit e67ba24

Please sign in to comment.