Skip to content

Commit 15855c1

Browse files
addshoreaddshore
committed
WBSTACK MODIFICATIONS
Initial modifications
1 parent 2e16ccc commit 15855c1

File tree

9 files changed

+323
-6
lines changed

9 files changed

+323
-6
lines changed

‎.dockerignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# We only want to ignore these for the docker build
2+
# I hope they are included in docker-compose...
3+
/src/node_modules
4+
/src/build

‎Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM node:12 as builder
2+
3+
WORKDIR /src/app
4+
5+
COPY package.json package-lock.json ./
6+
7+
# TODO remove the --force from the install...
8+
RUN npm install --force && npm cache clean --force
9+
10+
COPY . .
11+
12+
RUN npm run-script build
13+
14+
15+
FROM nginx:1-alpine
16+
17+
ADD ./nginx/default.conf /etc/nginx/conf.d/default.conf
18+
COPY --from=builder --chown=nginx:nginx /src/app/build /usr/share/nginx/html

‎docker-compose.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: "3.7"
2+
services:
3+
debug:
4+
image: node:12-alpine
5+
working_dir: /home/node/app
6+
command: npm start
7+
volumes:
8+
- ./src:/home/node/app
9+
expose:
10+
- "8080"

‎docker/default.conf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
server {
2+
listen 80 default_server;
3+
listen [::]:80 default_server;
4+
server_name localhost;
5+
charset utf-8;
6+
7+
# files transfer
8+
client_body_in_file_only clean;
9+
client_body_buffer_size 32K;
10+
client_max_body_size 1026g;
11+
sendfile on;
12+
send_timeout 300s;
13+
14+
# redirect server error pages / and set response status to 200 / ok
15+
#error_page 404 =200 /;
16+
17+
root /usr/share/nginx/html;
18+
index index.html index.html;
19+
20+
# Always serve index.html for any request
21+
# location / {
22+
# root /usr/share/nginx/html;
23+
# try_files $uri /index.html;
24+
# }
25+
26+
# deny access to .htaccess files, if Apache's document root concurs with nginx's one
27+
location ~ /\.ht {
28+
deny all;
29+
}
30+
31+
# deny access to hidden files (beginning with a period)
32+
location ~ /\. {
33+
access_log off; log_not_found off; deny all;
34+
}
35+
}

‎index.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,14 @@ <h5 class="modal-title" id="keyboardShortcutHelpModalLabel" data-i18n="wdqs-dial
429429
</div>
430430
</div>
431431

432+
<!-- Query Builder Discovery feedback banner -->
433+
<div id="query-builder-discovery-feedback">
434+
We want to make querying Wikidata easier.
435+
<a href="https://www.wikidata.org/wiki/Wikidata:Improve_the_workflows_for_queries_and_lists/Simple_query_Builder" target="_blank">Give us your feedback on our suggestions</a>
436+
(Opens in new tab)
437+
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
438+
</div>
439+
432440
<!-- JS files -->
433441
<!-- build:js js/vendor.min.js -->
434442
<script src="node_modules/jquery/dist/jquery.js"></script>
@@ -538,6 +546,7 @@ <h5 class="modal-title" id="keyboardShortcutHelpModalLabel" data-i18n="wdqs-dial
538546
<script src="wikibase/queryService/api/UrlShortener.js"></script>
539547
<script src="wikibase/queryService/RdfNamespaces.js"></script>
540548
<script src="wikibase/init.js"></script>
549+
<script src="wikibase/feedbackBannerInit.js"></script>
541550
<!-- endbuild -->
542551

543552
</body>

0 commit comments

Comments
 (0)