Merge branch 'environ' into master

Author: krzysztofjeziorny

.gitignore

@@ -194,5 +194,8 @@ typings/
 # ublock + chromium
 /uBlock0.chromium
 /chromium-profile
-# direnv
 /.direnv
+
+# KJ
+deploy.sh
+gunicorn.sh

Makefile

@@ -1,4 +1,4 @@
-.PHONY: serve
+.PHONY: serve install
 
 serve:
 	python manage.py runserver
@@ -12,5 +12,8 @@ test:
 format:
 	black bookmarks
 	black siteroot
-	npx prettier bookmarks/frontend --write
+  npx prettier bookmarks/frontend --write
 	npx prettier bookmarks/styles --write
+
+install:
+	.venv/bin/pip install -r requirements.txt --upgrade

bookmarks/frontend/components/SearchAutoComplete.svelte

@@ -210,7 +210,7 @@
     {/if}
     {#each suggestions.tags as suggestion}
       <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+        <a href={'#'} on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
           {suggestion.label}
         </a>
       </li>
@@ -221,7 +221,7 @@
     {/if}
     {#each suggestions.recentSearches as suggestion}
       <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+        <a href={'#'} on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
           {suggestion.label}
         </a>
       </li>
@@ -232,7 +232,7 @@
     {/if}
     {#each suggestions.bookmarks as suggestion}
       <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+        <a href={'#'} on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
           {suggestion.label}
         </a>
       </li>

bookmarks/frontend/components/TagAutocomplete.svelte

@@ -119,7 +119,7 @@
     <!-- menu list items -->
     {#each suggestions as tag,i}
       <li class="menu-item" class:selected={selectedIndex === i}>
-        <a href="#" on:mousedown|preventDefault={() => complete(tag)}>
+        <a href={'#'} on:mousedown|preventDefault={() => complete(tag)}>
           {tag.name}
         </a>
       </li>

bookmarks/templates/bookmarks/bookmark_list.html

@@ -158,4 +158,4 @@
   <div class="bookmark-pagination{% if request.user_profile.sticky_pagination %} sticky{% endif %}">
     {% pagination bookmark_list.bookmarks_page %}
   </div>
-{% endif %}
+{% endif %}

bookmarks/templates/bookmarks/layout.html

@@ -98,4 +98,4 @@ <h1>LINKDING</h1>
   {% endblock %}
 </div>
 </body>
-</html>
+</html>

bookmarks/templates/bookmarks/nav_menu.html

@@ -80,4 +80,4 @@
       </ul>
     </div>
   </div>
-{% endhtmlmin %}
+{% endhtmlmin %}

bookmarks/templates/bookmarks/tag_cloud.html

@@ -20,7 +20,7 @@
               <a href="?{% add_tag_to_query tag.name %}"
                  class="mr-2" data-is-tag-item>
                 <span
-                    class="highlight-char">{{ tag.name|first_char }}</span><span>{{ tag.name|remaining_chars:1 }}</span>
+                  class="highlight-char">{{ tag.name|first_char }}</span><span>{{ tag.name|remaining_chars:1 }}</span>
               </a>
             {% else %}
               {# Render remaining tags normally #}

bookmarks/templates/settings/general.html

@@ -194,7 +194,7 @@ <h2>Profile</h2>
           <div class="form-input-hint">
             Enabling this feature will automatically create snapshots of bookmarked websites on the <a
               href="https://web.archive.org/" target="_blank" rel="noopener">Internet Archive Wayback
-            Machine</a>.
+              Machine</a>.
             This allows to preserve, and later access the website as it was at the point in time it was bookmarked, in
             case it goes offline or its content is modified.
             Please consider donating to the <a href="https://archive.org/donate" target="_blank"

bookmarks/templates/settings/nav.html

@@ -19,6 +19,6 @@
             </svg>
         </a>
     </li>
-    {% endif %}
+  {% endif %}
 </ul>
 <br>

deploy_excludes

@@ -0,0 +1,47 @@
+__pycache__
+_sources
+._*
+.DS_Store
+.editorconfig
+.env
+.env.*
+.git
+.gitignore
+.github
+.svn
+.venv
+*._*
+*.kdev4
+*.lock
+*.log
+*.log.*
+*.pid
+*.pyc
+*.pyo
+*.scss
+*.sqlite3
+*.swp
+*.vim
+*.vscode
+*~
+/bookmarks/static/favicon.png
+data
+db.sqlite3
+deploy_excludes
+deploy_includes
+deploy.sh
+develserver.sh
+docs
+docker
+Gruntfile.js
+gulpfile.js
+media
+node_modules
+rollup.config.mjs
+sass
+scss
+/siteroot/settings/dev.py
+/static
+tmp
+vim
+vim/*.sh

deploy_includes

@@ -0,0 +1,2 @@
+bookmarks/styles/*
+migrations/__init__.py