Merge branch 'environ' into master

krzysztofjeziorny · Sep 16, 2024 · 06dd03f · 06dd03f
2 parents 53e4aeb + c2b0672
commit 06dd03f
Show file tree

Hide file tree

Showing 20 changed files with 349 additions and 248 deletions.
diff --git a/.gitignore b/.gitignore
@@ -194,5 +194,8 @@ typings/
 # ublock + chromium
 /uBlock0.chromium
 /chromium-profile
-# direnv
 /.direnv
+
+# KJ
+deploy.sh
+gunicorn.sh
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: serve
+.PHONY: serve install
 
 serve:
 	python manage.py runserver
@@ -13,3 +13,6 @@ format:
 	black bookmarks
 	black siteroot
 	npx prettier bookmarks/frontend --write
+
+install:
+	.venv/bin/pip install -r requirements.txt --upgrade
diff --git a/bookmarks/frontend/components/SearchAutoComplete.svelte b/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>

diff --git a/bookmarks/frontend/components/TagAutocomplete.svelte b/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>

diff --git a/bookmarks/templates/bookmarks/bookmark_list.html b/bookmarks/templates/bookmarks/bookmark_list.html
@@ -152,4 +152,4 @@
   <div class="bookmark-pagination">
     {% pagination bookmark_list.bookmarks_page %}
   </div>
-{% endif %}
+{% endif %}
diff --git a/bookmarks/templates/bookmarks/layout.html b/bookmarks/templates/bookmarks/layout.html
@@ -98,4 +98,4 @@ <h1>LINKDING</h1>
   {% endblock %}
 </div>
 </body>
-</html>
+</html>
diff --git a/bookmarks/templates/bookmarks/nav_menu.html b/bookmarks/templates/bookmarks/nav_menu.html
@@ -80,4 +80,4 @@
       </ul>
     </div>
   </div>
-{% endhtmlmin %}
+{% endhtmlmin %}
diff --git a/bookmarks/templates/bookmarks/tag_cloud.html b/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 #}

diff --git a/bookmarks/templates/settings/general.html b/bookmarks/templates/settings/general.html
@@ -171,7 +171,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"
@@ -331,23 +331,23 @@ <h2>Export</h2>
       <h2>About</h2>
       <table class="table">
         <tbody>
-        <tr>
-          <td>Version</td>
-          <td>{{ version_info }}</td>
-        </tr>
-        <tr>
-          <td rowspan="3" style="vertical-align: top">Links</td>
-          <td><a href="https://github.com/sissbruecker/linkding/"
-                 target="_blank">GitHub</a></td>
-        </tr>
-        <tr>
-          <td><a href="https://github.com/sissbruecker/linkding#documentation"
-                 target="_blank">Documentation</a></td>
-        </tr>
-        <tr>
-          <td><a href="https://github.com/sissbruecker/linkding/blob/master/CHANGELOG.md"
-                 target="_blank">Changelog</a></td>
-        </tr>
+          <tr>
+            <td>Version</td>
+            <td>{{ version_info }}</td>
+          </tr>
+          <tr>
+            <td rowspan="3" style="vertical-align: top">Links</td>
+            <td><a href="https://github.com/sissbruecker/linkding/"
+                   target="_blank">GitHub</a></td>
+          </tr>
+          <tr>
+            <td><a href="https://github.com/sissbruecker/linkding#documentation"
+                   target="_blank">Documentation</a></td>
+          </tr>
+          <tr>
+            <td><a href="https://github.com/sissbruecker/linkding/blob/master/CHANGELOG.md"
+                   target="_blank">Changelog</a></td>
+          </tr>
         </tbody>
       </table>
     </section>

diff --git a/bookmarks/templates/settings/nav.html b/bookmarks/templates/settings/nav.html
@@ -19,6 +19,6 @@
             </svg>
         </a>
     </li>
-    {% endif %}
+  {% endif %}
 </ul>
 <br>
diff --git a/deploy_excludes b/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
diff --git a/deploy_includes b/deploy_includes
@@ -0,0 +1,2 @@
+bookmarks/styles/*
+migrations/__init__.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,4 +98,4 @@ <h1>LINKDING</h1> @@
       {% endblock %}
     </div>
     </body>
-    </html>
+    </html>