From b8b09b1af39812ac7587d8fdc4d5c6e21d12913d Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Wed, 19 Sep 2018 09:02:13 +0200 Subject: [PATCH] example with uploadcare --- client/index.html | 8 +++++ client/src/components/ContentBlock.vue | 2 ++ .../content-block-form/ContentBlockForm.vue | 12 ++++++- .../content-blocks/ImageUrlBlock.vue | 19 ++++++++++ .../ContentBlockElementChooserWidget.vue | 2 +- .../components/content-forms/ImageForm.vue | 19 ++++++++-- package-lock.json | 13 +++++++ package.json | 3 +- .../migrations/0003_auto_20180918_1605.py | 20 +++++++++++ server/book/models/contentblock.py | 4 ++- server/book/schema/inputs.py | 1 + server/book/schema/mutations.py | 8 +++-- server/book/tests/test_module_mutations.py | 36 +++++++++++++++---- 13 files changed, 133 insertions(+), 14 deletions(-) create mode 100644 client/src/components/content-blocks/ImageUrlBlock.vue create mode 100644 server/book/migrations/0003_auto_20180918_1605.py diff --git a/client/index.html b/client/index.html index 19347652..53b85083 100644 --- a/client/index.html +++ b/client/index.html @@ -8,6 +8,14 @@ + + + +
diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue index 2fcdc62a..5e2af3ff 100644 --- a/client/src/components/ContentBlock.vue +++ b/client/src/components/ContentBlock.vue @@ -36,6 +36,7 @@ import BasicKnowledgeWidget from '@/components/content-blocks/BasicKnowledgeWidget'; import Task from '@/components/content-blocks/Task'; import ImageBlock from '@/components/content-blocks/ImageBlock'; + import ImageUrlBlock from '@/components/content-blocks/ImageUrlBlock'; import VideoBlock from '@/components/content-blocks/VideoBlock'; import LinkBlock from '@/components/content-blocks/LinkBlock'; import DocumentBlock from '@/components/content-blocks/DocumentBlock'; @@ -53,6 +54,7 @@ 'basic_knowledge': BasicKnowledgeWidget, 'student_entry': StudentEntry, 'image_block': ImageBlock, + 'image_url_block': ImageUrlBlock, 'video_block': VideoBlock, 'link_block': LinkBlock, 'document_block': DocumentBlock, diff --git a/client/src/components/content-block-form/ContentBlockForm.vue b/client/src/components/content-block-form/ContentBlockForm.vue index eb9a5058..c89052f3 100644 --- a/client/src/components/content-block-form/ContentBlockForm.vue +++ b/client/src/components/content-block-form/ContentBlockForm.vue @@ -17,6 +17,7 @@ v-on:link-change-text="changeLinkText" v-on:text-change-value="changeTextValue" v-on:document-change-url="changeDocumentUrl" + v-on:image-change-url="changeImageUrl" v-on:video-change-url="changeVideoUrl"> @@ -81,7 +82,7 @@ return 'link-form'; case 'video_block': return 'video-form'; - case 'image_block': + case 'image_url_block': return 'image-form'; case 'text_block': return 'text-form'; @@ -112,6 +113,9 @@ changeVideoUrl(value, index) { this._updateProperty(value, index, 'url') }, + changeImageUrl(value, index) { + this._updateProperty(value, index, 'url') + }, changeDocumentUrl(value, index) { this._updateProperty(value, index, 'url') }, @@ -167,6 +171,12 @@ } }; break; + case 'image_url_block': + el = { + ...el, + url: '' + }; + break; } this.localContentBlock.contents.splice(index, 1, el); diff --git a/client/src/components/content-blocks/ImageUrlBlock.vue b/client/src/components/content-blocks/ImageUrlBlock.vue new file mode 100644 index 00000000..f22cbe2b --- /dev/null +++ b/client/src/components/content-blocks/ImageUrlBlock.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue index 87cd08e7..434589af 100644 --- a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue +++ b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue @@ -8,7 +8,7 @@
Video
-
+
Bild
diff --git a/client/src/components/content-forms/ImageForm.vue b/client/src/components/content-forms/ImageForm.vue index 0a1203c5..83e8be89 100644 --- a/client/src/components/content-forms/ImageForm.vue +++ b/client/src/components/content-forms/ImageForm.vue @@ -1,11 +1,26 @@