Skip to content

Commit 90dd61a

Browse files
krzysztofjeziornykrzysztofjeziorny
authored
Merge branch 'environ' into master
2 parents b304863 + 57e7a15 commit 90dd61a

22 files changed

+392
-338
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,8 @@ typings/
194194
# ublock + chromium
195195
/uBlock0.chromium
196196
/chromium-profile
197-
# direnv
198197
/.direnv
198+
199+
# KJ
200+
deploy.sh
201+
gunicorn.sh

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: serve
1+
.PHONY: serve install
22

33
serve:
44
python manage.py runserver
@@ -13,3 +13,6 @@ format:
1313
black bookmarks
1414
black siteroot
1515
npx prettier bookmarks/frontend --write
16+
17+
install:
18+
.venv/bin/pip install -r requirements.txt --upgrade

‎bookmarks/frontend/components/SearchAutoComplete.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
{/if}
210210
{#each suggestions.tags as suggestion}
211211
<li class="menu-item" class:selected={selectedIndex === suggestion.index}>
212-
<a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
212+
<a href={'#'} on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
213213
{suggestion.label}
214214
</a>
215215
</li>
@@ -220,7 +220,7 @@
220220
{/if}
221221
{#each suggestions.recentSearches as suggestion}
222222
<li class="menu-item" class:selected={selectedIndex === suggestion.index}>
223-
<a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
223+
<a href={'#'} on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
224224
{suggestion.label}
225225
</a>
226226
</li>
@@ -231,7 +231,7 @@
231231
{/if}
232232
{#each suggestions.bookmarks as suggestion}
233233
<li class="menu-item" class:selected={selectedIndex === suggestion.index}>
234-
<a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
234+
<a href={'#'} on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
235235
{suggestion.label}
236236
</a>
237237
</li>

‎bookmarks/frontend/components/TagAutocomplete.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<!-- menu list items -->
132132
{#each suggestions as tag,i}
133133
<li class="menu-item" class:selected={selectedIndex === i}>
134-
<a href="#" on:mousedown|preventDefault={() => complete(tag)}>
134+
<a href={'#'} on:mousedown|preventDefault={() => complete(tag)}>
135135
{tag.name}
136136
</a>
137137
</li>

‎bookmarks/templates/bookmarks/bookmark_list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@
154154
<div class="bookmark-pagination">
155155
{% pagination bookmark_list.bookmarks_page %}
156156
</div>
157-
{% endif %}
157+
{% endif %}

‎bookmarks/templates/bookmarks/bulk_edit/toggle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" width="20px"
33
height="20px">
44
<path
5-
d="M7 3a1 1 0 000 2h6a1 1 0 100-2H7zM4 7a1 1 0 011-1h10a1 1 0 110 2H5a1 1 0 01-1-1zM2 11a2 2 0 012-2h12a2 2 0 012 2v4a2 2 0 01-2 2H4a2 2 0 01-2-2v-4z"/>
5+
d="M7 3a1 1 0 000 2h6a1 1 0 100-2H7zM4 7a1 1 0 011-1h10a1 1 0 110 2H5a1 1 0 01-1-1zM2 11a2 2 0 012-2h12a2 2 0 012 2v4a2 2 0 01-2 2H4a2 2 0 01-2-2v-4z"/>
66
</svg>
77
</button>

‎bookmarks/templates/bookmarks/layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ <h1>LINKDING</h1>
133133
</div>
134134
<script src="{% static "bundle.js" %}?v={{ app_version }}"></script>
135135
</body>
136-
</html>
136+
</html>

‎bookmarks/templates/bookmarks/nav_menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@
8585
</ul>
8686
</div>
8787
</div>
88-
{% endhtmlmin %}
88+
{% endhtmlmin %}

‎bookmarks/templates/bookmarks/tag_cloud.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<a href="?{% add_tag_to_query tag.name %}"
2121
class="mr-2" data-is-tag-item>
2222
<span
23-
class="highlight-char">{{ tag.name|first_char }}</span><span>{{ tag.name|remaining_chars:1 }}</span>
23+
class="highlight-char">{{ tag.name|first_char }}</span><span>{{ tag.name|remaining_chars:1 }}</span>
2424
</a>
2525
{% else %}
2626
{# Render remaining tags normally #}

‎bookmarks/templates/settings/general.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ <h2>Profile</h2>
169169
<div class="form-input-hint">
170170
Enabling this feature will automatically create snapshots of bookmarked websites on the <a
171171
href="https://web.archive.org/" target="_blank" rel="noopener">Internet Archive Wayback
172-
Machine</a>.
172+
Machine</a>.
173173
This allows to preserve, and later access the website as it was at the point in time it was bookmarked, in
174174
case it goes offline or its content is modified.
175175
Please consider donating to the <a href="https://archive.org/donate" target="_blank"
@@ -317,23 +317,23 @@ <h2>Export</h2>
317317
<h2>About</h2>
318318
<table class="table">
319319
<tbody>
320-
<tr>
321-
<td>Version</td>
322-
<td>{{ version_info }}</td>
323-
</tr>
324-
<tr>
325-
<td rowspan="3" style="vertical-align: top">Links</td>
326-
<td><a href="https://github.com/sissbruecker/linkding/"
327-
target="_blank">GitHub</a></td>
328-
</tr>
329-
<tr>
330-
<td><a href="https://github.com/sissbruecker/linkding#documentation"
331-
target="_blank">Documentation</a></td>
332-
</tr>
333-
<tr>
334-
<td><a href="https://github.com/sissbruecker/linkding/blob/master/CHANGELOG.md"
335-
target="_blank">Changelog</a></td>
336-
</tr>
320+
<tr>
321+
<td>Version</td>
322+
<td>{{ version_info }}</td>
323+
</tr>
324+
<tr>
325+
<td rowspan="3" style="vertical-align: top">Links</td>
326+
<td><a href="https://github.com/sissbruecker/linkding/"
327+
target="_blank">GitHub</a></td>
328+
</tr>
329+
<tr>
330+
<td><a href="https://github.com/sissbruecker/linkding#documentation"
331+
target="_blank">Documentation</a></td>
332+
</tr>
333+
<tr>
334+
<td><a href="https://github.com/sissbruecker/linkding/blob/master/CHANGELOG.md"
335+
target="_blank">Changelog</a></td>
336+
</tr>
337337
</tbody>
338338
</table>
339339
</section>

‎bookmarks/templates/settings/nav.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
{% url 'bookmarks:settings.integrations' as integrations_url %}
44

55
<ul class="tab tab-block">
6-
<li class="tab-item {% if request.get_full_path == index_url or request.get_full_path == general_url%}active{% endif %}">
7-
<a href="{% url 'bookmarks:settings.general' %}">General</a>
8-
</li>
9-
<li class="tab-item {% if request.get_full_path == integrations_url %}active{% endif %}">
10-
<a href="{% url 'bookmarks:settings.integrations' %}">Integrations</a>
11-
</li>
12-
{% if request.user.is_superuser %}
6+
<li class="tab-item {% if request.get_full_path == index_url or request.get_full_path == general_url%}active{% endif %}">
7+
<a href="{% url 'bookmarks:settings.general' %}">General</a>
8+
</li>
9+
<li class="tab-item {% if request.get_full_path == integrations_url %}active{% endif %}">
10+
<a href="{% url 'bookmarks:settings.integrations' %}">Integrations</a>
11+
</li>
12+
{% if request.user.is_superuser %}
1313
<li class="tab-item tooltip tooltip-bottom" data-tooltip="The admin panel provides additional features &#010; such as user management and bulk operations.">
14-
<a href="{% url 'admin:index' %}" target="_blank">
15-
<span>Admin</span>
16-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="ml-1" style="width: 1.2em; height: 1.2em; vertical-align: -0.2em;">
17-
<path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z" />
18-
<path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z" />
19-
</svg>
20-
</a>
14+
<a href="{% url 'admin:index' %}" target="_blank">
15+
<span>Admin</span>
16+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="ml-1" style="width: 1.2em; height: 1.2em; vertical-align: -0.2em;">
17+
<path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z" />
18+
<path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z" />
19+
</svg>
20+
</a>
2121
</li>
22-
{% endif %}
22+
{% endif %}
2323
</ul>
2424
<br>

‎deploy_excludes

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
__pycache__
2+
_sources
3+
._*
4+
.DS_Store
5+
.editorconfig
6+
.env
7+
.env.*
8+
.git
9+
.gitignore
10+
.github
11+
.svn
12+
.venv
13+
*._*
14+
*.kdev4
15+
*.lock
16+
*.log
17+
*.log.*
18+
*.pid
19+
*.pyc
20+
*.pyo
21+
*.scss
22+
*.sqlite3
23+
*.swp
24+
*.vim
25+
*.vscode
26+
*~
27+
/bookmarks/static/favicon.png
28+
data
29+
db.sqlite3
30+
deploy_excludes
31+
deploy_includes
32+
deploy.sh
33+
develserver.sh
34+
docs
35+
docker
36+
Gruntfile.js
37+
gulpfile.js
38+
media
39+
migrations/*
40+
node_modules
41+
rollup.config.mjs
42+
sass
43+
scss
44+
/siteroot/settings/dev.py
45+
svn
46+
svn/*.sh
47+
/static
48+
tmp
49+
vim
50+
vim/*.sh

‎deploy_includes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bookmarks/styles/*
2+
migrations/__init__.py

0 commit comments

Comments
 (0)