Fix type inputs from PR
This commit is contained in:
parent
ffa8e44997
commit
25cee52c72
|
|
@ -42,7 +42,7 @@ const documents = {
|
||||||
"\n fragment SchoolClassParts on SchoolClassNode {\n id\n name\n }\n": types.SchoolClassPartsFragmentDoc,
|
"\n fragment SchoolClassParts on SchoolClassNode {\n id\n name\n }\n": types.SchoolClassPartsFragmentDoc,
|
||||||
"\n fragment UserParts on PrivateUserNode {\n id\n pk\n username\n email\n firstName\n lastName\n avatarUrl\n expiryDate\n readOnly\n lastModuleLevel {\n id\n name\n filterAttributeType\n }\n lastModule {\n id\n slug\n }\n lastTopic {\n id\n slug\n }\n selectedClass {\n id\n readOnly\n }\n recentModules(orderBy: \"-visited\") {\n edges {\n node {\n ...ModuleParts\n }\n }\n }\n schoolClasses {\n ...SchoolClassParts\n }\n }\n": types.UserPartsFragmentDoc,
|
"\n fragment UserParts on PrivateUserNode {\n id\n pk\n username\n email\n firstName\n lastName\n avatarUrl\n expiryDate\n readOnly\n lastModuleLevel {\n id\n name\n filterAttributeType\n }\n lastModule {\n id\n slug\n }\n lastTopic {\n id\n slug\n }\n selectedClass {\n id\n readOnly\n }\n recentModules(orderBy: \"-visited\") {\n edges {\n node {\n ...ModuleParts\n }\n }\n }\n schoolClasses {\n ...SchoolClassParts\n }\n }\n": types.UserPartsFragmentDoc,
|
||||||
"\n fragment TeamParts on TeamNode {\n name\n code\n id\n members {\n firstName\n lastName\n id\n isMe\n }\n }\n": types.TeamPartsFragmentDoc,
|
"\n fragment TeamParts on TeamNode {\n name\n code\n id\n members {\n firstName\n lastName\n id\n isMe\n }\n }\n": types.TeamPartsFragmentDoc,
|
||||||
"\nfragment WagtailImageParts on WagtailImageNode {\n id\n src\n alt\n width\n height\n title\n }\n": types.WagtailImagePartsFragmentDoc,
|
"\nfragment WagtailImageParts on WagtailImageNode {\n id\n src\n alt\n width\n height\n title\n srcset\n }\n": types.WagtailImagePartsFragmentDoc,
|
||||||
"\n fragment ModuleParts on ModuleNode {\n id\n title\n metaTitle\n teaser\n intro\n slug\n heroImage { ...WagtailImageParts }\n heroSource\n solutionsEnabled\n highlights {\n ...HighlightParts\n }\n language\n inEditMode @client\n level {\n id\n name\n }\n category {\n id\n name\n }\n topic {\n slug\n title\n }\n bookmark {\n note {\n id\n text\n }\n }\n }\n": types.ModulePartsFragmentDoc,
|
"\n fragment ModuleParts on ModuleNode {\n id\n title\n metaTitle\n teaser\n intro\n slug\n heroImage { ...WagtailImageParts }\n heroSource\n solutionsEnabled\n highlights {\n ...HighlightParts\n }\n language\n inEditMode @client\n level {\n id\n name\n }\n category {\n id\n name\n }\n topic {\n slug\n title\n }\n bookmark {\n note {\n id\n text\n }\n }\n }\n": types.ModulePartsFragmentDoc,
|
||||||
"\n query MeQuery {\n me {\n ...UserParts\n team {\n ...TeamParts\n }\n isTeacher\n permissions\n onboardingVisited\n }\n }\n ": types.MeQueryDocument,
|
"\n query MeQuery {\n me {\n ...UserParts\n team {\n ...TeamParts\n }\n isTeacher\n permissions\n onboardingVisited\n }\n }\n ": types.MeQueryDocument,
|
||||||
"\n fragment InstrumentHighlightsWithIdOnlyFragment on InstrumentNode {\n highlights {\n id\n }\n }\n ": types.InstrumentHighlightsWithIdOnlyFragmentFragmentDoc,
|
"\n fragment InstrumentHighlightsWithIdOnlyFragment on InstrumentNode {\n highlights {\n id\n }\n }\n ": types.InstrumentHighlightsWithIdOnlyFragmentFragmentDoc,
|
||||||
|
|
@ -195,7 +195,7 @@ export function graphql(source: "\n fragment TeamParts on TeamNode {\n name\
|
||||||
/**
|
/**
|
||||||
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
|
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
|
||||||
*/
|
*/
|
||||||
export function graphql(source: "\nfragment WagtailImageParts on WagtailImageNode {\n id\n src\n alt\n width\n height\n title\n }\n"): (typeof documents)["\nfragment WagtailImageParts on WagtailImageNode {\n id\n src\n alt\n width\n height\n title\n }\n"];
|
export function graphql(source: "\nfragment WagtailImageParts on WagtailImageNode {\n id\n src\n alt\n width\n height\n title\n srcset\n }\n"): (typeof documents)["\nfragment WagtailImageParts on WagtailImageNode {\n id\n src\n alt\n width\n height\n title\n srcset\n }\n"];
|
||||||
/**
|
/**
|
||||||
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
|
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -2,7 +2,7 @@
|
||||||
<wagtail-image
|
<wagtail-image
|
||||||
:src="value.src"
|
:src="value.src"
|
||||||
:srcset="value.srcset"
|
:srcset="value.srcset"
|
||||||
alt=""
|
:alt="value.alt"
|
||||||
:original-height="value.height"
|
:original-height="value.height"
|
||||||
:original-width="value.width"
|
:original-width="value.width"
|
||||||
class="image-block"
|
class="image-block"
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@
|
||||||
:srcset="module.heroImage.srcset"
|
:srcset="module.heroImage.srcset"
|
||||||
:original-width="module.heroImage.width"
|
:original-width="module.heroImage.width"
|
||||||
:original-height="module.heroImage.height"
|
:original-height="module.heroImage.height"
|
||||||
|
:alt="module.heroImage.alt"
|
||||||
></wagtail-image>
|
></wagtail-image>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<img
|
<img
|
||||||
:src="props.src"
|
:src="props.src"
|
||||||
:srcset="props.srcset"
|
:srcset="props.srcset"
|
||||||
:alt="alt"
|
:alt="props.alt"
|
||||||
class="wagtail-image__image"
|
class="wagtail-image__image"
|
||||||
:sizes="computedSizes"
|
:sizes="computedSizes"
|
||||||
loading="eager"
|
loading="eager"
|
||||||
|
|
@ -16,15 +16,19 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup lang="ts">
|
||||||
import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
|
import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
|
||||||
|
|
||||||
const props = defineProps({
|
export interface Props {
|
||||||
src: String,
|
src: string;
|
||||||
alt: String(''),
|
alt?: string;
|
||||||
originalWidth: Number,
|
originalWidth: number;
|
||||||
originalHeight: Number,
|
originalHeight: number;
|
||||||
srcset: String,
|
srcset?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
|
alt: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
const imgElement = ref(null);
|
const imgElement = ref(null);
|
||||||
|
|
@ -57,7 +61,6 @@ const computedSizes = computed(() => {
|
||||||
if (600 < width.value && width.value <= 1200) {
|
if (600 < width.value && width.value <= 1200) {
|
||||||
size = '800px';
|
size = '800px';
|
||||||
}
|
}
|
||||||
console.log(size, width.value);
|
|
||||||
return size;
|
return size;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -107,6 +110,7 @@ onBeforeUnmount(() => {
|
||||||
object-position: center;
|
object-position: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.wagtail-image.loaded {
|
.wagtail-image.loaded {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -99,6 +99,7 @@ fragment WagtailImageParts on WagtailImageNode {
|
||||||
width
|
width
|
||||||
height
|
height
|
||||||
title
|
title
|
||||||
|
srcset
|
||||||
}
|
}
|
||||||
`);
|
`);
|
||||||
|
|
||||||
|
|
|
||||||
2042
schema.graphql
2042
schema.graphql
File diff suppressed because it is too large
Load Diff
|
|
@ -5,7 +5,7 @@ from api.graphene_wagtail import generate_image_url
|
||||||
|
|
||||||
class ModuleInterface(relay.Node):
|
class ModuleInterface(relay.Node):
|
||||||
pk = graphene.Int()
|
pk = graphene.Int()
|
||||||
hero_image = graphene.Field('books.schema.nodes.WagtailImageNode')
|
hero_image = graphene.Field('books.schema.nodes.WagtailImageNode', required=True)
|
||||||
topic = graphene.Field('books.schema.nodes.TopicNode')
|
topic = graphene.Field('books.schema.nodes.TopicNode')
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ type ModuleNode implements ModuleInterface {
|
||||||
metaTitle: String!
|
metaTitle: String!
|
||||||
level: ModuleLevelNode
|
level: ModuleLevelNode
|
||||||
category: ModuleCategoryNode
|
category: ModuleCategoryNode
|
||||||
heroImage: WagtailImageNode
|
heroImage: WagtailImageNode!
|
||||||
|
|
||||||
"""e.g. 'Reuters', 'Wikipedia'"""
|
"""e.g. 'Reuters', 'Wikipedia'"""
|
||||||
heroSource: String!
|
heroSource: String!
|
||||||
|
|
@ -140,7 +140,7 @@ interface ModuleInterface {
|
||||||
"""The ID of the object"""
|
"""The ID of the object"""
|
||||||
id: ID!
|
id: ID!
|
||||||
pk: Int
|
pk: Int
|
||||||
heroImage: WagtailImageNode
|
heroImage: WagtailImageNode!
|
||||||
topic: TopicNode
|
topic: TopicNode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -153,6 +153,7 @@ type WagtailImageNode implements Node {
|
||||||
id: ID!
|
id: ID!
|
||||||
src: String
|
src: String
|
||||||
alt: String
|
alt: String
|
||||||
|
srcset: String
|
||||||
}
|
}
|
||||||
|
|
||||||
type TopicNode implements Node {
|
type TopicNode implements Node {
|
||||||
|
|
@ -751,12 +752,13 @@ type ProjectNode implements Node {
|
||||||
slug: String!
|
slug: String!
|
||||||
objectives: String!
|
objectives: String!
|
||||||
appearance: String!
|
appearance: String!
|
||||||
student: PublicUserNode
|
student: PublicUserNode!
|
||||||
final: Boolean!
|
final: Boolean!
|
||||||
schoolClass: SchoolClassNode
|
schoolClass: SchoolClassNode
|
||||||
entries: [ProjectEntryNode]
|
entries: [ProjectEntryNode]
|
||||||
pk: Int
|
pk: Int
|
||||||
entriesCount: Int
|
entriesCount: Int
|
||||||
|
owner: PublicUserNode
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProjectEntryNode implements Node {
|
type ProjectEntryNode implements Node {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue