Skip to content

Commit 649ffa8

Browse files
authored
Merge pull request #108 from unipept/fix/blocked-external-requests
Fix no external network requests
2 parents c3a77ef + a6e0c6f commit 649ffa8

File tree

8 files changed

+198
-123
lines changed

8 files changed

+198
-123
lines changed

package-lock.json

Lines changed: 128 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"devDependencies": {
6464
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
6565
"@babel/plugin-proposal-optional-chaining": "^7.10.3",
66-
"@mdi/font": "^4.1.95",
66+
"@mdi/font": "^5.8.55",
6767
"@types/jquery": "^3.3.31",
6868
"@vue/cli-plugin-babel": "^3.11.0",
6969
"@vue/cli-plugin-eslint": "^4.5.6",

public/index.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
<meta name="viewport" content="width=device-width,initial-scale=1.0">
77
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
88
<title>Unipept Desktop</title>
9-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
10-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
9+
<link rel="stylesheet" href="/styles/roboto.css">
1110
<!-- Globally include jQuery. We are currently working on removing jQuery as a dependency, so this could be removed
1211
later on. TODO -->
13-
<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
12+
<script src="/scripts/jquery-3.4.1.min.js"></script>
1413
<!-- Hack to get jQuery to work in an node.js-environment (Electron). See:
1514
https://stackoverflow.com/questions/35962868/why-cant-i-reference-jquery-using-a-script-tag-in-electron -->
16-
<script type="text/javascript">
17-
jQuery = $ = module.exports
15+
<script type="text/javascript">
16+
jQuery = $ = module.exports
1817
</script>
19-
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.4.13/d3.min.js"></script>
18+
<script src="/scripts/d3-3.4.13.min.js"></script>
2019
<!-- Globally include Unipept-visualizations. This should get removed once this does no longer depent on jQuery
2120
anymore. -->
2221
<script src="/scripts/unipept-visualizations.es5.js"></script>

public/scripts/d3-3.4.13.min.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/scripts/jquery-3.4.1.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/styles/roboto.css

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
@font-face {
2+
font-family: 'Roboto';
3+
font-style: normal;
4+
font-weight: 100;
5+
src: url(https://fonts.gstatic.com/s/roboto/v20/KFOkCnqEu92Fr1MmgVxIIzc.ttf) format('truetype');
6+
}
7+
@font-face {
8+
font-family: 'Roboto';
9+
font-style: normal;
10+
font-weight: 300;
11+
src: url(https://fonts.gstatic.com/s/roboto/v20/KFOlCnqEu92Fr1MmSU5fBBc9.ttf) format('truetype');
12+
}
13+
@font-face {
14+
font-family: 'Roboto';
15+
font-style: normal;
16+
font-weight: 400;
17+
src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu4mxP.ttf) format('truetype');
18+
}
19+
@font-face {
20+
font-family: 'Roboto';
21+
font-style: normal;
22+
font-weight: 500;
23+
src: url(https://fonts.gstatic.com/s/roboto/v20/KFOlCnqEu92Fr1MmEU9fBBc9.ttf) format('truetype');
24+
}
25+
@font-face {
26+
font-family: 'Roboto';
27+
font-style: normal;
28+
font-weight: 700;
29+
src: url(https://fonts.gstatic.com/s/roboto/v20/KFOlCnqEu92Fr1MmWUlfBBc9.ttf) format('truetype');
30+
}
31+
@font-face {
32+
font-family: 'Roboto';
33+
font-style: normal;
34+
font-weight: 900;
35+
src: url(https://fonts.gstatic.com/s/roboto/v20/KFOlCnqEu92Fr1MmYUtfBBc9.ttf) format('truetype');
36+
}

0 commit comments

Comments
 (0)