PeachCloud
/
peach-workspace
3
2
Fork 1
Code Issues 17 Pull Requests Projects Releases Wiki Activity

fix a test and update guide links

This commit is contained in:
glyph 2022-03-09 13:04:44 +02:00
parent 5b70353d6f
commit b7cf3c1aab
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2817,9 +2817,11 @@ dependencies = [
name = "peach-lib"
version = "1.3.2"
dependencies = [
"async-std",
"chrono",
"dirs 4.0.0",
"fslock",
"golgi",
"jsonrpc-client-core",
"jsonrpc-client-http",
"jsonrpc-core 8.0.1",

2
peach-web/Cargo.toml
View File

@ -39,7 +39,7 @@ base64 = "0.13.0"
dirs = "4.0.0"
env_logger = "0.8"
#golgi = "0.1.0"
golgi = { path = "../../../playground/rust/golgi" }
golgi = { path = "/home/glyph/Projects/playground/rust/golgi" }
lazy_static = "1.4.0"
log = "0.4"
nest = "1.0.0"

8
peach-web/src/tests.rs
View File

@ -476,13 +476,7 @@ fn scuttlebutt_settings_menu_html() {
assert_eq!(response.content_type(), Some(ContentType::HTML));
let body = response.into_string().unwrap();
assert!(body.contains("Scuttlebutt Settings"));
assert!(body.contains("Set Network Key"));
assert!(body.contains("Set Replication Hops"));
assert!(body.contains("Remove Blocked Feeds"));
assert!(body.contains("Set Database Directory"));
assert!(body.contains("Check Filesystem"));
assert!(body.contains("Repair Filesystem"));
assert!(body.contains("Restart Sbot"));
assert!(body.contains("Configure Sbot"));
}
// STATUS HTML ROUTES

8
peach-web/templates/guide.html.tera
View File

@ -7,7 +7,7 @@
<details>
<summary class="card-text link">Getting started</summary>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">The Scuttlebutt server (sbot) will be inactive when you first run PeachCloud. This is to allow configuration parameters to be set before it is activated for the first time. Navigate to the <a href="/settings/scuttlebutt/configure" class="link font-gray">Sbot Configuration</a> page to configure your system. The default configuration will be fine for most usecases.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">Once the configuration is set, navigate to the <a href="/settings/scuttlebutt" class="link font-gray">Scuttlebutt settings menu</a> to start the sbot. If the server starts successfully, you will see a green smiley face on the home page. If the face is orange and sleeping, that means the sbot is still inactive (ie. the process is not running). If the face is red and dead, that means the sbot failed to start - indicated an error. For now, the best way to gain insight into the problem is to check the systemd log. Open a terminal and enter: <code>systemctl --user status go-sbot.service</code>. The log output may give some clues about the source of the error.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">Once the configuration is set, navigate to the <strong><a href="/settings/scuttlebutt" class="link font-gray">Scuttlebutt settings menu</a></strong> to start the sbot. If the server starts successfully, you will see a green smiley face on the home page. If the face is orange and sleeping, that means the sbot is still inactive (ie. the process is not running). If the face is red and dead, that means the sbot failed to start - indicated an error. For now, the best way to gain insight into the problem is to check the systemd log. Open a terminal and enter: <code>systemctl --user status go-sbot.service</code>. The log output may give some clues about the source of the error.</p>
</details>
<!-- BUG REPORTS -->
<details>
@ -18,13 +18,13 @@
<details>
<summary class="card-text link">Share feedback & request support</summary>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">You're invited to share your thoughts and experiences of PeachCloud in the #peachcloud channel on Scuttlebutt. The channel is also a good place to ask for help.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">Alternatively, we have a <a href="https://matrix.to/#/#peachcloud:matrix.org" class="link font-gray">Matrix channel</a> for discussion about PeachCloud and you can also reach out to @glyph <a href="mailto:glyph@mycelial.technology" class="link font-gray">via email</a>.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">Alternatively, we have a <strong><a href="https://matrix.to/#/#peachcloud:matrix.org" class="link font-gray">Matrix channel</a></strong> for discussion about PeachCloud and you can also reach out to @glyph <strong><a href="mailto:glyph@mycelial.technology" class="link font-gray">via email</a></strong>.</p>
</details>
<!-- CONTRIBUTE -->
<details>
<summary class="card-text link">Contribute to PeachCloud</summary>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">PeachCloud is free, open-source software and relies on donations and grants to fund develop. Donations can be made on our <a href="https://opencollective.com/peachcloud" class="link font-gray">OpenCollective</a> page.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">Programmers, designers, artists and writers are also welcome to contribute to the project. Please visit the <a href="https://git.coopcloud.tech/PeachCloud/peach-workspace" class="link font-gray">main PeachCloud git repository</a> to find out more details or contact the team via Scuttlebutt, Matrix or email.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">PeachCloud is free, open-source software and relies on donations and grants to fund develop. Donations can be made on our <strong><a href="https://opencollective.com/peachcloud" class="link font-gray">Open Collective</a></strong> page.</p>
<p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;">Programmers, designers, artists and writers are also welcome to contribute to the project. Please visit the <strong><a href="https://git.coopcloud.tech/PeachCloud/peach-workspace" class="link font-gray">main PeachCloud git repository</a></strong> to find out more details or contact the team via Scuttlebutt, Matrix or email.</p>
</details>
</div>
<!-- FLASH MESSAGE -->