merge conflicts

This commit is contained in:
Tobias Merkle 2024-04-30 15:12:37 -04:00
parent 7bee956d5a
commit a8a882f10c
10 changed files with 100 additions and 390 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -15,6 +15,8 @@
<meta name="viewport"
content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
<link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet'>
<script type="module" crossorigin src="/main:app_store:sys/assets/index-oEHGQ8XY.js"></script>
<link rel="stylesheet" crossorigin href="/main:app_store:sys/assets/index-P4oc20OK.css">
</head>
<body>

View File

@ -1,12 +0,0 @@
<svg width="779" height="514" viewBox="0 0 779 514" fill="none" xmlns="http://www.w3.org/2000/svg">
<style>
@media (prefers-color-scheme: dark) {
svg { fill: white; }
}
@media (prefers-color-scheme: light) {
svg { fill: black; }
}
</style>
<path d="M753.092 5.91932C756.557 5.09976 755.962 -0.00012207 752.401 -0.00012207H426.001C424.755 -0.00012207 423.639 0.77027 423.197 1.93535L236.968 492.6C235.729 495.865 240.123 498.255 242.191 495.441L569.357 50.1132C569.778 49.5392 570.391 49.1339 571.084 48.97L753.092 5.91932Z"/>
<path d="M11.9665 40.2288C9.10949 38.777 10.2135 34.4583 13.4167 34.5557L404.273 46.4367C406.334 46.4993 407.719 48.5749 406.986 50.5023L347.438 206.981C346.804 208.647 344.865 209.396 343.275 208.588L11.9665 40.2288Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 826 B

File diff suppressed because one or more lines are too long

View File

@ -85,7 +85,6 @@ fn init(our: Address) {
if let Ok(request) = serde_json::from_slice::<HomepageRequest>(message.body()) {
match request {
HomepageRequest::Add { label, icon, path } => {
println!("adding app {label} {path}");
app_data.insert(
message.source().process.clone(),
HomepageApp {
@ -111,7 +110,6 @@ fn init(our: Address) {
match request {
HttpServerRequest::Http(incoming) => {
let path = incoming.bound_path(None);
println!("on path: {}", path);
if path == "/apps" {
send_response(
StatusCode::OK,

View File

@ -9,7 +9,7 @@
<meta httpEquiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport"
content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
<script type="module" crossorigin src="/assets/index-DL74GjLl.js"></script>
<script type="module" crossorigin src="/assets/index-jKxRCta5.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BIXROKBk.css">
</head>

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@
<meta httpEquiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport"
content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
<script type="module" crossorigin src="/assets/index-DL74GjLl.js"></script>
<script type="module" crossorigin src="/assets/index-jKxRCta5.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BIXROKBk.css">
</head>