Skip to content

Commit ec006f7

Browse files
rgaiacsrgaiacs
committed
Fix errors from pre-commit.ci
1 parent 9823278 commit ec006f7

File tree

10 files changed

+86
-88
lines changed

10 files changed

+86
-88
lines changed

‎.editorconfig

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true

‎.gitlab-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ variables:
33
GIT_CLEAN_FLAGS: "-ffdx"
44
# Change pip's cache directory to be inside the project directory since we can only cache local items.
55
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
6-
EXTRA_VALUES_ACCEPTANCE: '--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./secrets/config/gesis-acceptance.yaml --values ./config/gesis.yml --values ./config/gesis-acceptance.yml'
6+
EXTRA_VALUES_ACCEPTANCE: "--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./secrets/config/gesis-acceptance.yaml --values ./config/gesis.yml --values ./config/gesis-acceptance.yml"
77

88
# This workflow:rules are required to enable merge request pipelines!
99
workflow:
@@ -53,7 +53,7 @@ include:
5353
stage: lint
5454
dir: mybinder
5555
extra_values: ${EXTRA_VALUES_ACCEPTANCE}
56-
git_crypt: 'true'
56+
git_crypt: "true"
5757
rules:
5858
- if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event'
5959
- if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -65,6 +65,6 @@ include:
6565
dir: mybinder
6666
k8s_context: methods-hub/binder.methodshub.gesis.org:acceptance
6767
extra_values: ${EXTRA_VALUES_ACCEPTANCE}
68-
git_crypt: 'true'
68+
git_crypt: "true"
6969
rules:
7070
- if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event'

‎config/gesis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ prometheus:
116116
persistentVolume:
117117
storageClass: local-storage-prometheus
118118
static:
119-
enabled: false
119+
enabled: false

‎mybinder/files/etc/jupyter/templates/login.html

+13-18
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
{% extends "templates/login.html" %}
2-
3-
{% block header_buttons %}
4-
{% block login_widget %}
5-
{% endblock %}
1+
{% extends "templates/login.html" %} {% block header_buttons %} {% block
2+
login_widget %} {% endblock %}
63
<span class="flex-spacer"></span>
7-
{{super()}}
8-
{% endblock header_buttons %}
9-
10-
{% block site %}
4+
{{super()}} {% endblock header_buttons %} {% block site %}
115
<div id="ipython-main-app" class="container">
126
<h1>Binder inaccessible</h1>
137
<h2>
14-
You can get a new Binder for this repo by clicking <a href="{{binder_url}}">here</a>.
8+
You can get a new Binder for this repo by clicking
9+
<a href="{{binder_url}}">here</a>.
1510
</h2>
16-
<p>
17-
The shareable URL for this repo is: <tt>{{binder_url}}</tt>
18-
</p>
11+
<p>The shareable URL for this repo is: <tt>{{binder_url}}</tt></p>
1912

2013
<h4>Is this a Binder that you created?</h4>
2114
<p>
22-
If so, your authentication cookie for this Binder has been deleted or expired.
23-
You can launch a new Binder for this repo by clicking <a href="{{binder_url}}">here</a>.
15+
If so, your authentication cookie for this Binder has been deleted or
16+
expired. You can launch a new Binder for this repo by clicking
17+
<a href="{{binder_url}}">here</a>.
2418
</p>
2519

2620
<h4>Did someone give you this Binder link?</h4>
2721
<p>
28-
If so, the link is outdated or incorrect.
29-
Recheck the link for typos or ask the person who gave you the link for an updated link.
30-
A shareable Binder link should look like <tt>{{binder_url}}</tt>.
22+
If so, the link is outdated or incorrect. Recheck the link for typos or ask
23+
the person who gave you the link for an updated link. A shareable Binder
24+
link should look like <tt>{{binder_url}}</tt>.
25+
</p>
3126
</div>
3227
{% endblock site %}

‎mybinder/files/etc/jupyter/templates/page.html

+47-45
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,48 @@
1-
{% extends "templates/page.html" %}
2-
3-
{% block header_buttons %}
4-
5-
{% block login_widget %}
6-
{% endblock %}
7-
8-
{% if jitsi_url %}
9-
<span>
10-
<a id="visit-repo-link" href="{{ jitsi_url }}" class="btn btn-default btn-sm navbar-btn" target="_blank"
11-
style="margin-right: 2px; margin-left: 4px;">Join this repo's Video Chat</a>
12-
</span>
13-
{% endif %}
14-
15-
{% if ref_url %}
16-
<span>
17-
<a id="visit-repo-link" href="{{ ref_url }}" class="btn btn-default btn-sm navbar-btn" target="_blank"
18-
style="margin-right: 2px; margin-left: 4px;">Visit repo</a>
19-
</span>
20-
{% endif %}
21-
22-
{% if persistent_binder_url %}
23-
<span>
24-
<button id="copy-binder-link" title="Copy binder link to clipboard" class="btn btn-default btn-sm navbar-btn"
25-
style="margin-right: 0; margin-left: 2px;"
26-
data-url="{{ persistent_binder_url }}" onclick="copy_link_into_clipboard(this);">
27-
Copy Binder link
28-
</button>
29-
</span>
30-
{% endif %}
31-
32-
{% endblock header_buttons %}
33-
34-
{% block script %}
35-
{% if persistent_binder_url %}
36-
<script type='text/javascript'>
37-
function copy_link_into_clipboard(b) {
38-
var $temp = $("<input>");
39-
$(b).parent().append($temp);
40-
$temp.val($(b).data('url')).select();
41-
document.execCommand("copy");
42-
$temp.remove();
43-
}
1+
{% extends "templates/page.html" %} {% block header_buttons %} {% block
2+
login_widget %} {% endblock %} {% if jitsi_url %}
3+
<span>
4+
<a
5+
id="visit-repo-link"
6+
href="{{ jitsi_url }}"
7+
class="btn btn-default btn-sm navbar-btn"
8+
target="_blank"
9+
style="margin-right: 2px; margin-left: 4px"
10+
>Join this repo's Video Chat</a
11+
>
12+
</span>
13+
{% endif %} {% if ref_url %}
14+
<span>
15+
<a
16+
id="visit-repo-link"
17+
href="{{ ref_url }}"
18+
class="btn btn-default btn-sm navbar-btn"
19+
target="_blank"
20+
style="margin-right: 2px; margin-left: 4px"
21+
>Visit repo</a
22+
>
23+
</span>
24+
{% endif %} {% if persistent_binder_url %}
25+
<span>
26+
<button
27+
id="copy-binder-link"
28+
title="Copy binder link to clipboard"
29+
class="btn btn-default btn-sm navbar-btn"
30+
style="margin-right: 0; margin-left: 2px"
31+
data-url="{{ persistent_binder_url }}"
32+
onclick="copy_link_into_clipboard(this);"
33+
>
34+
Copy Binder link
35+
</button>
36+
</span>
37+
{% endif %} {% endblock header_buttons %} {% block script %} {% if
38+
persistent_binder_url %}
39+
<script type="text/javascript">
40+
function copy_link_into_clipboard(b) {
41+
var $temp = $("<input>");
42+
$(b).parent().append($temp);
43+
$temp.val($(b).data("url")).select();
44+
document.execCommand("copy");
45+
$temp.remove();
46+
}
4447
</script>
45-
{% endif %}
46-
{% endblock %}
48+
{% endif %} {% endblock %}

‎mybinder/files/etc/jupyter/templates/tree.html

+13-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
{% extends "templates/tree.html" %}
2-
3-
{% block headercontainer %}
4-
<span class="flex-spacer"></span>
5-
{% endblock %}
6-
7-
{% block header_buttons %}
8-
{{super()}}
9-
{% if shutdown_button %}
10-
<span id="shutdown_widget">
11-
<button id="shutdown" class="btn btn-sm navbar-btn"
12-
title="{% trans %}Stop the Jupyter server{% endtrans %}">
13-
{% trans %}Quit{% endtrans %}
14-
</button>
15-
</span>
16-
{% endif %}
17-
{% endblock header_buttons %}
1+
{% extends "templates/tree.html" %} {% block headercontainer %}
2+
<span class="flex-spacer"></span>
3+
{% endblock %} {% block header_buttons %} {{super()}} {% if shutdown_button %}
4+
<span id="shutdown_widget">
5+
<button
6+
id="shutdown"
7+
class="btn btn-sm navbar-btn"
8+
title="{% trans %}Stop the Jupyter server{% endtrans %}"
9+
>
10+
{% trans %}Quit{% endtrans %}
11+
</button>
12+
</span>
13+
{% endif %} {% endblock header_buttons %}

‎mybinder/templates/static/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ metadata:
2424
release: {{ .Release.Name }}
2525
data:
2626
{{- (.Files.Glob "files/static/*").AsConfig | nindent 2 }}
27-
{{- end }}
27+
{{- end }}

‎mybinder/templates/static/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ spec:
4242
name: config
4343
- mountPath: /www/data/
4444
name: files
45-
{{- end }}
45+
{{- end }}

‎mybinder/templates/static/ingress.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ spec:
3737
{{- range $host := .Values.static.ingress.hosts }}
3838
- {{ $host }}
3939
{{- end }}
40-
{{- end }}
40+
{{- end }}

‎mybinder/templates/static/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ spec:
1616
app: static
1717
component: nginx
1818
release: {{ .Release.Name }}
19-
{{- end }}
19+
{{- end }}

0 commit comments

Comments
 (0)