Skip to content

Commit b9482b3

Browse files
joepiojoepio
committedFeb 4, 2023
Move static assets around, align build with server and fix PWA #292 
1 parent f954b31 commit b9482b3

27 files changed

+35
-17
lines changed
 

‎.vscode/tasks.json

+7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
"detail": "pnpm test",
2323
"isBackground": true,
2424
"group": "test"
25+
},
26+
{
27+
"type": "shell",
28+
"command": "./build_server.sh",
29+
"label": "build server JS assets",
30+
"isBackground": true,
31+
"group": "build"
2532
}
2633
]
2734
}

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ This changelog covers all three packages, as they are (for now) updated as a who
55
## UNRELEASED
66

77
- Add `Store.parseMetaTags` to load JSON-AD objects stored in the DOM. Speeds up initial page load by allowing server to set JSON-AD objects in the initial HTML response.
8+
- Move static assets around, align build with server and fix PWA #292
89

910
## v0.35.0
1011

‎build_server.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
pnpm run build &&
4+
rm -r ../atomic-data-rust/server/app_assets/ &&
5+
mkdir ../atomic-data-rust/server/app_assets/ &&
6+
cp -r data-browser/dist/ ../atomic-data-rust/server/app_assets/ &&
7+
cp data-browser/tests/e2e.spec.ts ../atomic-data-rust/server/e2e_tests/e2e-generated.spec.ts &&
8+
cp data-browser/tests/testimage.svg ../atomic-data-rust/server/e2e_tests/testimage.svg &&
9+
cp -r data-browser/tests/e2e.spec.ts-snapshots/ ../atomic-data-rust/server/e2e_tests/e2e-generated.spec.ts-snapshots/

‎data-browser/index.html

+10-8
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<meta content="The easiest way to create, share and model Linked Atomic Data." name="description" />
8-
<link href="/icon.png" rel="icon" type="image/png" />
9-
<link href="/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
10-
<link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png" />
11-
<link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png" />
12-
<link color="#1e43a3" href="/mask-icon.svg" rel="mask-icon" />
8+
<link href="/app_data/images/icon.png" rel="icon" type="image/png" />
9+
<link href="/app_data/images/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
10+
<link href="/app_data/images/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png" />
11+
<link href="/app_data/images/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png" />
12+
<link color="#1e43a3" href="/app_data/images/mask-icon.svg" rel="mask-icon" />
1313
<meta content="yes" name="apple-mobile-web-app-capable" />
1414
<meta content="yes" name="mobile-web-app-capable" />
15+
<!-- Custom fonts -->
1516
<link rel="dns-prefetch" href="https://fonts.googleapis.com">
1617
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
1718
<link rel="preconnect" crossorigin="anonymous" href="https://fonts.googleapis.com">
1819
<link rel="preconnect" crossorigin="anonymous" href="https://fonts.gstatic.com">
19-
<link
20-
crossorigin="anonymous"
20+
<link crossorigin="anonymous"
2121
href="https://fonts.googleapis.com/css2?family=Montserrat:wght@700&family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap"
2222
rel="stylesheet">
23-
<title>Atomic Data Browser</title>
23+
<title>Atomic Data</title>
2424
<style>
2525
:root {
2626
--text-splash: black;
@@ -32,6 +32,8 @@
3232
}
3333

3434
</style>
35+
<!-- Meta tags and code added by from Atomic-Server -->
36+
<!-- { inject_html_head } -->
3537
</head>
3638

3739
<body>

‎data-browser/public/.nojekyll

Whitespace-only changes.

‎data-browser/public/app_data/images/default_social_preview.jpg

52.4 KB
Loading

‎data-browser/public/icon.png ‎data-browser/public/app_data/images/icon.png

File renamed without changes.

‎data-browser/public/browserconfig.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<browserconfig>
33
<msapplication>
44
<tile>
5-
<square150x150logo src="/mstile-150x150.png"/>
5+
<square150x150logo src="/app_data/images/mstile-150x150.png"/>
66
<TileColor>#ffffff</TileColor>
77
</tile>
88
</msapplication>

‎data-browser/vite.config.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,43 +28,43 @@ export default defineConfig({
2828
theme_color: '#ffffff',
2929
icons: [
3030
{
31-
src: 'android-chrome-192x192.png',
31+
src: 'app_data/images/android-chrome-192x192.png',
3232
sizes: '192x192',
3333
type: 'image/png',
3434
purpose: 'any',
3535
},
3636
{
37-
src: 'android-chrome-512x512.png',
37+
src: 'app_data/images/android-chrome-512x512.png',
3838
sizes: '512x512',
3939
type: 'image/png',
4040
purpose: 'any',
4141
},
4242
{
43-
src: 'maskable_icon.png',
43+
src: 'app_data/images/maskable_icon.png',
4444
sizes: '1024x1024',
4545
type: 'image/png',
4646
purpose: 'maskable',
4747
},
4848
{
49-
src: 'maskable_icon_x512.png',
49+
src: 'app_data/images/maskable_icon_x512.png',
5050
sizes: '512x512',
5151
type: 'image/png',
5252
purpose: 'maskable',
5353
},
5454
{
55-
src: 'maskable_icon_x384.png',
55+
src: 'app_data/images/maskable_icon_x384.png',
5656
sizes: '384x384',
5757
type: 'image/png',
5858
purpose: 'maskable',
5959
},
6060
{
61-
src: 'maskable_icon_x192.png',
61+
src: 'app_data/images/maskable_icon_x192.png',
6262
sizes: '192x192',
6363
type: 'image/png',
6464
purpose: 'maskable',
6565
},
6666
{
67-
src: 'maskable_icon_x128.png',
67+
src: 'app_data/images/maskable_icon_x128.png',
6868
sizes: '128x128',
6969
type: 'image/png',
7070
purpose: 'maskable',

‎package.json

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"lint": "pnpm run -r lint",
3737
"lint-fix": "pnpm run -r lint-fix",
3838
"build": "pnpm run -r build",
39-
"build-server": "pnpm run build && cp -r data-browser/dist/assets/ ../atomic-data-rust/server/app_assets/dist/ && cp data-browser/tests/e2e.spec.ts ../atomic-data-rust/server/e2e_tests/e2e-generated.spec.ts && cp data-browser/tests/testimage.svg ../atomic-data-rust/server/e2e_tests/testimage.svg && cp -r data-browser/tests/e2e.spec.ts-snapshots/ ../atomic-data-rust/server/e2e_tests/e2e-generated.spec.ts-snapshots/",
4039
"test": "pnpm run -r test",
4140
"test-query": "pnpm run --filter @tomic/data-browser test-query",
4241
"start": "pnpm run -r --parallel start",

0 commit comments

Comments
 (0)
Please sign in to comment.