From 9b066771a9a713979b38bf3bd9d3aa386ced2204 Mon Sep 17 00:00:00 2001 From: winkidney Date: Thu, 21 Mar 2019 17:34:17 +0800 Subject: [PATCH] Feature: Try to add initial structure for pin-form --- pinry/static/js/vue/main.js | 16 +++ pinry/templates/base.html | 219 +++++++++++++++-------------- pinry/templates/core/pins.html | 2 + pinry/templates/includes/pin_form-vue.html | 42 ++++++ 4 files changed, 170 insertions(+), 109 deletions(-) create mode 100644 pinry/templates/includes/pin_form-vue.html diff --git a/pinry/static/js/vue/main.js b/pinry/static/js/vue/main.js index 0111934..45287d3 100644 --- a/pinry/static/js/vue/main.js +++ b/pinry/static/js/vue/main.js @@ -116,6 +116,19 @@ function HeightTable(blockMargin) { return self; } +Vue.component( + 'pin-form', + { + data: function () { + return {}; + }, + props: ['url'], + template: "#pin-form-template", + mounted: function () {}, + methods: {} + } +); + Vue.component( 'light-box', @@ -435,6 +448,9 @@ var app = new Vue({ ); }, methods: { + showPinForm: function() { + + }, onViewPin: function(pin) { this.currentPin = pin; }, diff --git a/pinry/templates/base.html b/pinry/templates/base.html index 64ad1a3..9f4d532 100644 --- a/pinry/templates/base.html +++ b/pinry/templates/base.html @@ -1,119 +1,120 @@ {% load staticfiles compress %} - - - - {% block title %}Pinry{% endblock %} + + + + {% block title %}Pinry{% endblock %} + + + + + + {% compress css %} + + + + + {% endcompress %} + {% compress css inline %} + {% block extra_css %}{% endblock %} + {% endcompress %} + - + + + + - - - - - {% compress css %} - - - - - {% endcompress %} - {% compress css inline %} - {% block extra_css %}{% endblock %} - {% endcompress %} - + +
+ + + - - - - + + + - - - - + +
+ +
+ - - - + + {% block yield %}{% endblock %} + +
+ +{% include 'includes/vue-pin.html' %} +{% include 'includes/lightbox-vue.html' %} +{% include 'includes/pin_form-vue.html' %} +{% block extra_templates %}{% endblock %} + - -
- -
- - - -
- {% block yield %}{% endblock %} -
- - - - {% include 'includes/vue-pin.html' %} - {% include 'includes/lightbox-vue.html' %} - {% block extra_templates %}{% endblock %} - - - - - - - - - {% compress js %} - - - {% endcompress %} - {% compress js inline %} - {% block extra_js %}{% endblock %} - {% endcompress %} - - + + + + + + +{% compress js %} + + +{% endcompress %} +{% compress js inline %} + {% block extra_js %}{% endblock %} +{% endcompress %} + + diff --git a/pinry/templates/core/pins.html b/pinry/templates/core/pins.html index d3aa77a..1b6c708 100644 --- a/pinry/templates/core/pins.html +++ b/pinry/templates/core/pins.html @@ -13,4 +13,6 @@ + + {% endblock %} diff --git a/pinry/templates/includes/pin_form-vue.html b/pinry/templates/includes/pin_form-vue.html new file mode 100644 index 0000000..a398e8d --- /dev/null +++ b/pinry/templates/includes/pin_form-vue.html @@ -0,0 +1,42 @@ +{% verbatim %} + +{% endverbatim %}