ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Refactor some more occurences of basic knowledge to instrument

This commit is contained in:
Ramon Wenger 2019-07-17 09:07:18 +02:00
parent 4c7dd96455
commit 2a4cf56825
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/graphql/gql/basicKnowledgeQuery.gql
View File

@ -1,9 +0,0 @@
query BasicKnowledgeQuery($slug: String!){
basicKnowledge(slug: $slug) {
id
title
slug
type
contents
}
}

9
client/src/graphql/gql/instrumentQuery.gql Normal file
View File

@ -0,0 +1,9 @@
query InstrumentQuery($slug: String!){
instrument(slug: $slug) {
id
title
slug
type
contents
}
}

12
client/src/pages/instrument.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="instrument"> <div class="instrument">
<h1 class="instrument__title">{{basicKnowledge.title}}</h1> <h1 class="instrument__title">{{instrument.title}}</h1>
<component v-for="component in basicKnowledge.contents" <component v-for="component in instrument.contents"
:key="component.id" :key="component.id"
:is="component.type" :is="component.type"
v-bind="component"> v-bind="component">
@ -12,7 +12,7 @@
</template> </template>
<script> <script>
import BASIC_KNOWLEDGE_QUERY from '@/graphql/gql/basicKnowledgeQuery.gql'; import INSTRUMENT_QUERY from '@/graphql/gql/instrumentQuery.gql';
import TextBlock from '@/components/content-blocks/TextBlock'; import TextBlock from '@/components/content-blocks/TextBlock';
import InstrumentWidget from '@/components/content-blocks/InstrumentWidget'; import InstrumentWidget from '@/components/content-blocks/InstrumentWidget';
@ -25,9 +25,9 @@
export default { export default {
apollo: { apollo: {
basicKnowledge() { instrument() {
return { return {
query: BASIC_KNOWLEDGE_QUERY, query: INSTRUMENT_QUERY,
variables: { variables: {
slug: this.$route.params.slug slug: this.$route.params.slug
} }
@ -49,7 +49,7 @@
data() { data() {
return { return {
basicKnowledge: {} instrument: {}
} }
} }
} }

8
server/basicknowledge/queries.py
View File

@ -10,7 +10,7 @@ from .models import BasicKnowledge
class BasicKnowledgeNode(DjangoObjectType): class BasicKnowledgeNode(DjangoObjectType):
class Meta: class Meta:
model = BasicKnowledge model = BasicKnowledge
filter_fields = ['slug'] filter_fields = ['slug', 'type']
interfaces = (relay.Node,) interfaces = (relay.Node,)
only_fields = [ only_fields = [
'slug', 'title', 'type', 'contents', 'slug', 'title', 'type', 'contents',
@ -18,10 +18,10 @@ class BasicKnowledgeNode(DjangoObjectType):
class BasicKnowledgeQuery(object): class BasicKnowledgeQuery(object):
basic_knowledge = graphene.Field(BasicKnowledgeNode, slug=graphene.String(), id=graphene.ID()) instrument = graphene.Field(BasicKnowledgeNode, slug=graphene.String(), id=graphene.ID())
basic_knowledge_pages = DjangoFilterConnectionField(BasicKnowledgeNode) instruments = DjangoFilterConnectionField(BasicKnowledgeNode)
def resolve_basic_knowledge(self, info, **kwargs): def resolve_instrument(self, info, **kwargs):
slug = kwargs.get('slug') slug = kwargs.get('slug')
room_id = kwargs.get('id') room_id = kwargs.get('id')