extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-26 06:52:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix CSS + gofmt

Browse Source
This commit is contained in:
David Dworken 2022-04-06 23:17:58 -07:00
parent 581231d0ef
commit a8d7ee2cc8
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@ -152,7 +152,7 @@ func export() {
lib.CheckFatalError(retrieveAdditionalEntriesFromRemote(db))
data, err := shared.Search(db, "", 0)
lib.CheckFatalError(err)
for i := len(data)-1; i >= 0; i-- {
for i := len(data) - 1; i >= 0; i-- {
fmt.Println(data[i].Command)
}
}

11
client/client_test.go
View File

@ -2,15 +2,15 @@ package main
import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"os/exec"
"regexp"
"strings"
"testing"
"encoding/json"
"net/http"
"github.com/ddworken/hishtory/shared"
)
@ -28,7 +28,7 @@ func RunInteractiveBashCommands(t *testing.T, script string) string {
if strings.Contains(outStr, "hishtory fatal error:") {
t.Fatalf("Ran command, but hishtory had a fatal error! out=%#v", outStr)
}
return outStr
return outStr
}
func TestIntegration(t *testing.T) {
@ -138,7 +138,7 @@ func TestIntegrationWithNewDevice(t *testing.T) {
}
// Manually submit an event that isn't in the local DB, and then we'll
// check if we see it when we do a query without ever having done an init
// check if we see it when we do a query without ever having done an init
newEntry := shared.MakeFakeHistoryEntry("othercomputer")
encEntry, err := shared.EncryptHistoryEntry(userSecret, newEntry)
shared.Check(t, err)
@ -149,7 +149,7 @@ func TestIntegrationWithNewDevice(t *testing.T) {
if resp.StatusCode != 200 {
t.Fatalf("failed to submit result to backend, status_code=%d", resp.StatusCode)
}
// Now check if that is in there when we do hishtory query
// Now check if that is in there when we do hishtory query
out = RunInteractiveBashCommands(t, `hishtory query`)
if !strings.Contains(out, "othercomputer") {
t.Fatalf("hishtory query doesn't contain cmd run on another machine! out=%#v", out)
@ -242,4 +242,3 @@ func testIntegration(t *testing.T) string {
return userSecret
}

19
web/landing/www/index.html
View File

@ -47,7 +47,7 @@
<a class="nav-link js-scroll-trigger" href="#setup">Setup</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#contact">FAQ</a>
<a class="nav-link js-scroll-trigger" href="#faq">FAQ</a>
</li>
</ul>
</div>
@ -86,7 +86,7 @@
<section class="page-section" id="setup">
<div class="container">
<style>
li.nav-item>:not([active]) {
li.install-nav-item>:not([active]) {
background-color: #f7f7f9
}
</style>
@ -95,11 +95,11 @@
<p class="text-black-50 mb-4">
<div style="border: solid #f7f7f9; border-width: 2px;border-radius:10px;padding:2%">
<ul class="nav nav-tabs nav-pills nav-justified" id="myTab" role="tablist" style="/*border: solid #f7f7f9; border-width: 2px;*/">
<li class="nav-item">
<a class="nav-link active" id="install-online-tab" data-toggle="tab" href="#install-online" role="tab" style="margin: 10px">Install (Online Mode)</a>
<li class="nav-item install-nav-item">
<a class="nav-link active" id="install-first-tab" data-toggle="tab" href="#install-first" role="tab" style="margin: 10px">First Installation</a>
</li>
<li class="nav-item">
<a class="nav-link" id="install-offline-tab" data-toggle="tab" href="#install-offline" role="tab" style="margin: 10px">Install (Offline Mode)</a>
<li class="nav-item install-nav-item">
<a class="nav-link" id="install-second-tab" data-toggle="tab" href="#install-second" role="tab" style="margin: 10px">Installation on additional computers</a>
</li>
</ul>
<div class="tab-content">
@ -107,9 +107,9 @@
<br>To install hishtory on your first machine:
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <code>curl -o hishtory https://hishtory.dev/binaries/hishtory-linux; chmod +x hishtory; ./hishtory install</code>
</div>
<div class="tab-pane" id="install-offline" role="tabpanel" aria-labelledby="profile-tab">
<div class="tab-pane" id="install-second" role="tabpanel" aria-labelledby="profile-tab">
<br>To install hishtory on your second machine, you must first retrieve your secret key from first first machine. To do so, run <code>hishtory status</code> and copy your "Secret Key".
<br> Then to install it on your second machine:
Then to install it on your second machine:
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <code>curl -o hishtory https://hishtory.dev/binaries/hishtory-linux; chmod +x hishtory; ./hishtory install $YOUR_HISHTORY_SECRET</code>
</div>
</div>
@ -117,8 +117,7 @@
</p>
</div>
</section>
<!-- Contact Section -->
<section class="page-section" id="contact">
<section class="page-section" id="faq">
<div class="container">
<div class="row justify-content-center">
<div class="col-lg-8 text-center">