Skip to content

Commit 1a8dbbd

Browse files
committed
Merge branch 'dev'
2 parents a19b9f9 + 0c95248 commit 1a8dbbd

File tree

8 files changed

+87
-95
lines changed

8 files changed

+87
-95
lines changed

backend/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"minimum-stability": "dev",
2222
"prefer-stable": true,
2323
"require": {
24-
"craftcms/ckeditor": "4.3.1",
24+
"craftcms/ckeditor": "4.4.0",
2525
"craftcms/cloud": "*",
26-
"craftcms/cms": "5.4.9",
26+
"craftcms/cms": "5.5.0.1",
2727
"vlucas/phpdotenv": "^5.4.0"
2828
},
2929
"require-dev": {

backend/composer.lock

+75-74
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/config/project/project.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dateModified: 1730275377
1+
dateModified: 1731920264
22
elementSources:
33
craft\elements\Entry:
44
-
@@ -174,5 +174,5 @@ system:
174174
edition: solo
175175
live: true
176176
name: 'Starter starter'
177-
schemaVersion: 5.3.0.2
177+
schemaVersion: 5.5.0.0
178178
timeZone: America/Los_Angeles

frontend/app.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const { data: globalsData } = await useAsyncData('globals', async () => {
2727
:pages="globalsData?.pages"
2828
/>
2929
<Alert />
30-
<main class="page" id="main" tabindex="-1">
30+
<main class="page min-h-screen" id="main" tabindex="-1">
3131
<NuxtPage />
3232
</main>
3333
<Footer :globalData="globalsData?.global" />

frontend/components/postForm.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import { useGraphQL } from '~/composables/useGraphQL'
44
import { CREATE_POST_MUTATION } from '~/queries/post.mjs'
55
import { useFlashes } from '~/composables/useFlashes'
66
7+
const config = useRuntimeConfig()
78
const graphql = useGraphQL()
89
const { addFlash } = useFlashes()
910
const message = ref('')
10-
const authorId = ref(1)
11+
const authorId = ref(config.public.ADMIN_USER_ID)
1112
const loading = ref(false)
1213
1314
const emit = defineEmits(['post-submitted'])

frontend/components/signInForm.vue

-14
This file was deleted.

frontend/nuxt.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export default defineNuxtConfig({
2424
GQL_HOST: process.env.GQL_HOST,
2525
CRAFT_URL: process.env.CRAFT_URL,
2626
BASE_URL: process.env.BASE_URL,
27-
SITE_NAME: process.env.SITE_NAME
27+
SITE_NAME: process.env.SITE_NAME,
28+
ADMIN_USER_ID: process.env.ADMIN_USER_ID
2829
}
2930
},
3031
vite: {

frontend/pages/article/[slug].vue

+3
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ useHead(() => ({
8282
8383
<template v-else-if="hasArticle">
8484
<header class="container mx-auto pt-12 pb-6 px-2 text-2xl">
85+
<figure v-if="currentArticle.image">
86+
<img :src="currentArticle.image.url" :alt="currentArticle.image.description" />
87+
</figure>
8588
<h1 class="font-bold text-4xl sm:text-6xl lg:text-9xl">{{ currentArticle.title }}</h1>
8689
<p v-if="currentArticle.pageSubheading">{{ currentArticle.pageSubheading }}</p>
8790
<div class="text-xs mt-4">

0 commit comments

Comments
 (0)