Skip to content

Commit 54da415

Browse files
authored
#185 Host the data-browser assets / JS bundles (#318)
1 parent 87c2de1 commit 54da415

32 files changed

+1848
-39
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ By far most changes relate to `atomic-server`, so if not specified, assume the c
55

66
## [UNRELEASED]
77

8+
- Host the data-browser assets / JS bundles from `atomic-server`'s binary #185
89
- Upgrade `actix`, `clap` and `tauri` dependencies #301
910
- No `Mutex` for `Appstate` in server #303
1011
- Allow reading Commits #307

CONTRIBUTE.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,19 @@ drill -b benchmark.yml --stats
9898
- We use [semver](https://semver.org/), and are still quite far from 1.0.0.
9999
- The version for `atomic-lib` is the most important, and dictates the versions of `cli` and `server`. When `lib` changes minor version, `cli` and `server` should follow.
100100

101-
102101
## Doing the CI's work
103102

104103
If the CI scripts for some reason do not do their job (buildin releases, docker file, publishing to cargo), you can follow these instructions:
105104

106105
### Building and publishing binaries
107106

108-
1. `cargo build --release`
109-
1. `cargo build --release --features desktop` if you want the tray item (mac + win support)
110-
1. Create a release on github, add the binaries.
107+
1. Make sure to update the `app_assets` folder:
108+
1. get [atomic-data-browser](https://github.com/joepio/atomic-data-browser) locally
109+
2. run `yarn build`
110+
3. copy the contents of `publish` to `app_assets`
111+
2. `cargo build --release`
112+
3. `cargo build --release --features desktop` if you want the tray item (mac + win support)
113+
4. Create a release on github, add the binaries.
111114

112115
I've got to automate this process some day...
113116

Cargo.lock

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

server/Cargo.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ rio_turtle = "0.6.1"
3131
rustls-pemfile = "0.2.1"
3232
sanitize-filename = "0.3.0"
3333
serde_json = "1.0.60"
34+
static-files = "0.2.3"
3435
sysinfo = "0.20.5"
3536
tantivy = "0.16.1"
3637
tracing = "0.1.31"
@@ -72,9 +73,17 @@ version = "1.17.0"
7273
features = ["env-filter"]
7374
version = "0.3.9"
7475

76+
[dependencies.actix-web-static-files]
77+
git = "https://github.com/kilork/actix-web-static-files.git"
78+
rev = "2d3b6160f0de4ba061c5d76b5704f34fb677f6df"
79+
# version = "0.4.0"
80+
7581
[dev-dependencies]
7682
actix-rt = "2.5.1"
7783

84+
[build-dependencies]
85+
static-files = "0.2.3"
86+
7887
[features]
7988
default = ["https"]
8089
https = ["acme-lib", "rustls"]

server/app_assets/_config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This is a fix for making sure github pages serves the doc pages
2+
include:
3+
- "_*_.html"
4+
- "_*_.*.html"
7.74 KB
Loading
22.5 KB
Loading
7.16 KB
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<browserconfig>
3+
<msapplication>
4+
<tile>
5+
<square150x150logo src="/mstile-150x150.png"/>
6+
<TileColor>#ffffff</TileColor>
7+
</tile>
8+
</msapplication>
9+
</browserconfig>

server/app_assets/dist/index.css

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

0 commit comments

Comments
 (0)