Skip to content

Commit 29ce17b

Browse files
despensdespens
committed
patches specific to Rhizome ArtBase
1 parent fa96147 commit 29ce17b

19 files changed

+465
-128
lines changed

‎Dockerfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM node:12 as builder
2+
3+
WORKDIR /src/app
4+
5+
COPY package.json package-lock.json ./
6+
7+
RUN npm install --force && npm cache clean --force
8+
9+
COPY . .
10+
11+
RUN npm run-script build
12+
13+
FROM nginx:1-alpine
14+
LABEL org.opencontainers.image.source="https://github.com/rhizomedotorg/artbase-query-gui/"
15+
16+
ADD ./docker/nginx.default.conf /etc/nginx/conf.d/default.conf
17+
COPY --from=builder --chown=nginx:nginx /src/app/build /usr/share/nginx/html

‎Gruntfile.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ module.exports = function( grunt ) {
148148
cwd: './',
149149
src: [
150150
'*.html',
151-
'logo.svg', 'logo-embed.svg', 'robots.txt', 'favicon.*'
151+
'robots.txt', 'favicon.*'
152152
],
153153
dest: buildFolder
154154
},{
@@ -179,6 +179,22 @@ module.exports = function( grunt ) {
179179
],
180180
dest: buildFolder + '/default-config.json',
181181
filter: 'isFile'
182+
},
183+
{// json custom config
184+
expand: false,
185+
src: [
186+
'custom-config.json'
187+
],
188+
dest: buildFolder + '/custom-config.json',
189+
filter: 'isFile'
190+
},
191+
{// extra assets
192+
expand: true,
193+
cwd: './',
194+
src: [
195+
'Rhizome-Logo-R.svg'
196+
],
197+
dest: buildFolder
182198
}
183199
]
184200
}

‎Rhizome-Logo-R.svg‎

Lines changed: 61 additions & 0 deletions
Loading

‎custom-config.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"api": {
3+
"sparql": {
4+
"uri": "https://query.artbase.rhizome.org/proxy/wdqs/bigdata/namespace/wdq/sparql"
5+
},
6+
"wikibase": {
7+
"uri": "https://query.artbase.rhizome.org/proxy/wikibase/w/api.php"
8+
},
9+
"examples": {
10+
"server": "https://query.artbase.rhizome.org/proxy/wikibase/",
11+
"apiPath": "w/api.php",
12+
"pageTitle": "Query/Examples",
13+
"pagePathElement": "wiki/"
14+
},
15+
"urlShortener": "tinyurl",
16+
"query-builder": {
17+
"server": "https://query-builder-test.toolforge.org/"
18+
}
19+
},
20+
"brand": {
21+
"title": "ArtBase Query",
22+
"logo": "https://artbase.rhizome.org/w/resources/assets/artbase/Rhizome-Logo-Web.svg",
23+
"favicon": "https://rhizome.global.ssl.fastly.net/static/favicon/favicon.ico?v=xQQqrB8XAN1",
24+
"copyrightUrl": "https://artbase.rhizome.org/wiki/Copyright"
25+
},
26+
"location": {
27+
"root": "./",
28+
"index": "./"
29+
},
30+
"prefixes": {}
31+
}

‎custom-style.less‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
@font-face {
2+
font-family: "HKGrotesk";
3+
src: url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Regular.ttf") format('truetype'),
4+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Regular.woff2") format("woff2"),
5+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Regular.woff") format("woff");
6+
font-weight: normal;
7+
}
8+
9+
@font-face {
10+
font-family: "HKGrotesk";
11+
src: url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Bold.ttf") format('truetype'),
12+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Bold.woff2") format("woff2"),
13+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Bold.woff") format("woff");
14+
font-weight: bold;
15+
}
16+
17+
@font-face {
18+
font-family: "HKGrotesk";
19+
src: url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-BoldItalic.ttf") format('truetype'),
20+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-BoldItalic.woff2") format("woff2"),
21+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-BoldItalic.woff") format("woff");
22+
font-weight: bold;
23+
font-style: italic;
24+
}
25+
26+
@font-face {
27+
font-family: "HKGrotesk";
28+
src: url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-LightItalic.ttf") format('truetype'),
29+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-LightItalic.woff2") format("woff2"),
30+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-LightItalic.woff") format("woff");
31+
font-weight: 300;
32+
font-style: italic;
33+
}
34+
35+
@font-face {
36+
font-family: "HKGrotesk";
37+
src: url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Light.ttf") format('truetype'),
38+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Light.woff2") format("woff2"),
39+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Light.woff") format("woff");
40+
font-weight: 300;
41+
}
42+
43+
@font-face {
44+
font-family: "HKGrotesk";
45+
src: url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Italic.ttf") format('truetype'),
46+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Italic.woff2") format("woff2"),
47+
url("https://artbase.rhizome.org/w/resources/assets/artbase/HKGrotesk/HKGrotesk-Italic.woff") format("woff");
48+
font-style: italic;
49+
}
50+
51+
52+
body {
53+
font-family: 'HK Grotesk';
54+
color: #000;
55+
font-size: 16px;
56+
}
57+
58+
.CodeMirror {
59+
font-size: 14px;
60+
}
61+
62+
63+
64+
// remove inactive status bars below editor
65+
.query-helper-tag-cloud,
66+
.status.navbar.navbar-default {
67+
display: none;
68+
}
69+
70+
.query-main {
71+
border-bottom: 1px solid @border-color-base--disabled;
72+
}
73+
74+
.artbase-branding {
75+
padding: .5rem 15px 0;
76+
.artbase-rhizome-logo {
77+
position: relative;
78+
top: -2px;
79+
margin-right: 6px;
80+
}
81+
}
82+
83+
84+
/* QUERY RESULTS */
85+
#query-result {
86+
font-size: 14px;
87+
.bootstrap-table {
88+
padding: 0 !important;
89+
}
90+
}
91+
92+
button[name=paginationSwitch] {
93+
display: none !important;
94+
}
95+
96+
.fixed-table-pagination {
97+
padding-left: 1rem;
98+
padding-right: 1rem;
99+
}

‎docker/nginx.default.conf‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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+
location /proxy/wikibase {
15+
rewrite /proxy/wikibase/(.*) /$1 break;
16+
proxy_pass http://wikibase.svc:80;
17+
}
18+
19+
location /proxy/wdqs {
20+
rewrite /proxy/wdqs/(.*) /$1 break;
21+
proxy_pass http://wdqs-proxy.svc:80;
22+
}
23+
24+
location / {
25+
root /usr/share/nginx/html;
26+
index index.html index.htm;
27+
}
28+
29+
error_page 500 502 503 504 /50x.html;
30+
location = /50x.html {
31+
root /usr/share/nginx/html;
32+
}
33+
34+
# deny access to hidden files (beginning with a period)
35+
location ~ /\. {
36+
access_log off; log_not_found off; deny all;
37+
}
38+
}

‎embed.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@
5555
top: 0px;
5656
height: 100%;
5757
width: 100%;
58-
background-size: 80% 80%;
59-
background-image: url(logo-embed.svg);
58+
background-image: url(Rhizome-Logo-R.svg);
6059
background-repeat: no-repeat;
61-
background-position: center;
60+
background-position: 50% 50%;
6261
z-index: -1;
6362
}
6463

@@ -121,7 +120,7 @@
121120
.bootstrap-table {
122121
width: 100%;
123122
height: auto;
124-
padding: 20px 50px;
123+
/* padding: 20px 50px; */
125124
}
126125

127126
#query-result .jstree {
@@ -252,7 +251,9 @@
252251
}
253252

254253
.brand img {
255-
padding: 0.1em;
254+
height: 10px;
255+
padding-bottom: 2px;
256+
padding-right: 3px;
256257
}
257258

258259
@media only screen and (max-height: 285px) {
@@ -310,8 +311,6 @@
310311
padding: 0px;
311312
}
312313

313-
}
314-
315314
</style>
316315
<style id="MJX-CHTML-styles">/* placeholder for MathJax */</style>
317316
<body>
@@ -326,12 +325,12 @@
326325
</div>
327326
</noscript>
328327

329-
<a class="edit-link brand" target="_blank" rel="noopener" href="./"><img width="24" height="15" src=""><span></span></a>
328+
<a class="edit-link brand" target="_blank" rel="noopener" href="./"><img src=""><span></span></a>
329+
<!--
330330
<div class="header-toolbar">
331331
<ul id="result-browser-menu">
332332
</ul>
333333
</div>
334-
335334
<div class="toolbar-right">
336335
<ul id="embed-right-menu">
337336
<li>
@@ -384,7 +383,8 @@
384383
<span class="query-total"><span class="label label-default" id="response-summary"></span></span>
385384
</li>
386385
</ul>
387-
</div>
386+
</div>
387+
-->
388388
<div class="action-bar">
389389
<div class="message"></div>
390390
</div>

‎index.html‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,13 @@
5757
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#header-navbar-collapse" aria-expanded="false">
5858
<span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
5959
</button>
60-
<div class="navbar-brand">
61-
<a href="./"><img src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="><span></span></a>
60+
<div class="h4 artbase-branding">
61+
<a href="//rhizome.org/">
62+
<img src="//artbase.rhizome.org/w/resources/assets/artbase/Rhizome-Logo-Web.svg" class="artbase-rhizome-logo" alt="RHIZOME" width="130" height="20"></a>
63+
/
64+
<a href="//artbase.rhizome.org">ArtBase</a>
65+
/
66+
<b>Query</b>
6267
</div>
6368
</div>
6469
<div class="collapse navbar-collapse in" id="header-navbar-collapse">
@@ -68,6 +73,7 @@
6873
<span class="fa fa-folder-open-o"></span> <span data-i18n="wdqs-app-button-examples" id="examples-label"></span>
6974
</button>
7075
</li>
76+
<!--
7177
<li class="dropdown">
7278
<div class="btn-group navbar-btn">
7379
<a href="https://www.wikidata.org/wiki/Special:MyLanguage/Wikidata:SPARQL_query_service/Wikidata_Query_Help" target="_blank" class="btn btn-default">
@@ -112,6 +118,7 @@
112118
</ul>
113119
</div>
114120
</li>
121+
-->
115122
</ul>
116123
<ul class="nav navbar-nav navbar-right" id="right-navbar">
117124
<li>

0 commit comments

Comments
 (0)