From 485f4b7eba1e819b64fe01139de02fe5d7ca70c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 14:56:33 -0700
Subject: [PATCH 1/2] Revert "Replaces date elements with datepicker"

This reverts commit 869cfa6d341f25ee25d8576adcdc2e3b8d239b9c.
---
 bookwyrm/templates/book/edit_book.html               | 12 ++----------
 bookwyrm/templates/snippets/datepicker_js.html       |  3 ---
 bookwyrm/templates/snippets/readthrough_form.html    | 12 ++----------
 .../snippets/shelve_button/finish_reading_modal.html | 12 ++----------
 .../snippets/shelve_button/start_reading_modal.html  |  6 +-----
 5 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/datepicker_js.html

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index e75bd96eb..5fe63595e 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -133,11 +133,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <duet-date-picker
-                        identifier="id_first_published_date"
-                        name="first_published_date"
-                        {% if form.first_published_date.value %}value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}
-                    ></duet-date-picker>
+                    <duet-date-picker identifier="id_first_published_date" name="first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -145,11 +141,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <duet-date-picker
-                        identifier="id_published_date"
-                        name="published_date"
-                        {% if form.published_date.value %}value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}
-                    ></duet-date-picker>
+                    <duet-date-picker identifier="id_published_date" name="published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/templates/snippets/datepicker_js.html b/bookwyrm/templates/snippets/datepicker_js.html
deleted file mode 100644
index abfadaaf8..000000000
--- a/bookwyrm/templates/snippets/datepicker_js.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="module" src="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/duet.esm.js"></script>
-<script nomodule src="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/duet.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/themes/default.css" />
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index 256fcea54..c5be295e1 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -5,11 +5,7 @@
 <div class="field">
     <label class="label">
         {% trans "Started reading" %}
-        <duet-date-picker
-            identifier="id_start_date-{{ readthrough.id }}"
-            name="start_date"
-            value="{{ readthrough.start_date | date:'Y-m-d' }}">
-        </duet-date-picker>
+        <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
     </label>
 </div>
 {# Only show progress for editing existing readthroughs #}
@@ -32,10 +28,6 @@
 <div class="field">
     <label class="label">
         {% trans "Finished reading" %}
-        <duet-date-picker
-            identifier="id_finish_date-{{ readthrough.id }}"
-            name="finish_date"
-            value="{{ readthrough.finish_date | date:'Y-m-d' }}">
-        </duet-date-picker>
+        <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
     </label>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index 6d4ea5eac..ca65bf06c 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -17,21 +17,13 @@
     <div class="field">
         <label class="label">
             {% trans "Started reading" %}
-            <duet-date-picker
-                identifier="id_start_date-{{ uuid }}"
-                name="start_date"
-                value="{{ readthrough.start_date | date:'Y-m-d' }}"
-            ></duet-date-picker>
+            <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
         </label>
     </div>
     <div class="field">
         <label class="label">
             {% trans "Finished reading" %}
-            <duet-date-picker
-                identifier="id_finish_date-{{ uuid }}"
-                name="finish_date"
-                value="{{ readthrough.finish_date | date:'Y-m-d' }}"
-            ></duet-date-picker>
+            <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
     </div>
 </section>
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index 47d620e0d..213416836 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -15,11 +15,7 @@
     <div class="field">
         <label class="label">
             {% trans "Started reading" %}
-            <duet-date-picker
-                identifier="start_id_start_date-{{ uuid }}"
-                name="start_date"
-                value="{% now "Y-m-d" %}"
-            ></duet-date-picker>
+            <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
     </div>
 </section>

From 3f4807a3451ff6b3271c9d9f4161f0928181e885 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 14:56:43 -0700
Subject: [PATCH 2/2] Revert "Adds datepicker script dependencies to templates"

This reverts commit 33ca7b4b763c118cf84ee85205e64ccd1355b220.
---
 bookwyrm/templates/author.html            | 3 ---
 bookwyrm/templates/book/book.html         | 1 -
 bookwyrm/templates/book/edit_book.html    | 8 ++------
 bookwyrm/templates/book/editions.html     | 4 ----
 bookwyrm/templates/edit_author.html       | 4 ----
 bookwyrm/templates/feed/feed_layout.html  | 1 -
 bookwyrm/templates/get_started/books.html | 4 ----
 bookwyrm/templates/user/layout.html       | 5 -----
 8 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index ec952d4c6..a7ea9db56 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -38,6 +38,3 @@
 </div>
 {% endblock %}
 
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 53be123d8..40da64861 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -333,5 +333,4 @@
 
 {% block scripts %}
 <script src="/static/js/vendor/tabs.js"></script>
-{% include 'snippets/datepicker_js.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 5fe63595e..bcf111267 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -133,7 +133,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <duet-date-picker identifier="id_first_published_date" name="first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -141,7 +141,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <duet-date-picker identifier="id_published_date" name="published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -245,7 +245,3 @@
 </form>
 
 {% endblock %}
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 64dd2775f..775b05c86 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -51,7 +51,3 @@
     {% include 'snippets/pagination.html' with page=editions path=request.path %}
 </div>
 {% endblock %}
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index ecf32358e..b575bbb2f 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -81,7 +81,3 @@
 </form>
 
 {% endblock %}
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 431cf6dd7..75fc1951a 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -105,5 +105,4 @@
 
 {% block scripts %}
 <script src="/static/js/vendor/tabs.js"></script>
-{% include 'snippets/datepicker_js.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index e3fd87bbd..9613508b9 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -64,7 +64,3 @@
 </form>
 {% endblock %}
 
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 1aa762027..661d80781 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -81,8 +81,3 @@
 {% block panel %}{% endblock %}
 
 {% endblock %}
-
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}