Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

app: show multiple poke notes #710

Merged
merged 2 commits into from
Oct 5, 2020
Merged

app: show multiple poke notes #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d8fb9
show multiple poke notes
buck54321 Sep 30, 2020
21df3db
review followup
buck54321 Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions client/core/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3125,13 +3125,11 @@ func (c *Core) handleConnectEvent(host string, connected bool) {
}
c.connMtx.Unlock()
statusStr := "connected"
lvl := db.Success
if !connected {
statusStr = "disconnected"
lvl = db.WarningLevel
}
details := fmt.Sprintf("DEX at %s has %s", host, statusStr)
c.notify(newConnEventNote(fmt.Sprintf("DEX %s", statusStr), host, connected, details, lvl))
c.notify(newConnEventNote(fmt.Sprintf("DEX %s", statusStr), host, connected, details, db.Poke))
c.refreshUser()
}

Expand Down
30 changes: 30 additions & 0 deletions client/webserver/live_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var (
forceDisconnectWallet bool
wipeWalletBalance bool
gapWidthFactor = 1.0 // Should be 0 < gapWidthFactor <= 1.0
randomPokes = false
)

func dummySettings() map[string]string {
Expand Down Expand Up @@ -925,6 +926,31 @@ out:
}
}

func (c *TCore) runRandomPokes() {
nextWait := func() time.Duration {
return time.Duration(float64(time.Second)*rand.Float64()) * 5
}
chars := []byte("abcd efgh ijkl mnop qrst uvwx yz123")
numChars := len(chars)
randStr := func(maxLen int) string {
strLen := rand.Intn(maxLen)
b := make([]byte, 0, strLen)
for i := 0; i < strLen; i++ {
b = append(b, chars[rand.Intn(numChars)])
}
return string(b)
}
for {
select {
case <-time.NewTimer(nextWait()).C:
note := db.NewNotification(randStr(20), randStr(20), randStr(100), db.Poke)
c.noteFeed <- &note
case <-tCtx.Done():
return
}
}
}

func TestServer(t *testing.T) {
// Register dummy drivers for unimplemented assets.
asset.Register(22, &TDriver{}) // mona
Expand All @@ -939,6 +965,7 @@ func TestServer(t *testing.T) {
register := true
forceDisconnectWallet = true
gapWidthFactor = 0.2
randomPokes = true

var shutdown context.CancelFunc
tCtx, shutdown = context.WithCancel(context.Background())
Expand Down Expand Up @@ -968,5 +995,8 @@ func TestServer(t *testing.T) {
t.Fatalf("Connect error: %v", err)
}
go tCore.runEpochs()
if randomPokes {
go tCore.runRandomPokes()
}
cm.Wait()
}
25 changes: 12 additions & 13 deletions client/webserver/site/src/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,30 +249,29 @@ div.note-indicator.warn {
div.poke-note {
position: fixed;
right: 20px;
top: 100%;
height: 30px;
transition: top 1s;
background-color: black;
color: $font-color-dark;
border-radius: 5px 5px 0 0;
bottom: 0;
display: flex;
flex-direction: column;
align-items: flex-end;
border-radius: 4px;
z-index: 1000;
border-width: 1px;
border-style: solid;
border-color: #444;
max-width: 90%;

& > span {
display: inline-block;
background-color: black;
color: $font-color-dark;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 15px;
border-bottom: 1px solid #7777;
padding: 4px 10px;
line-height: 1;
margin: 3px 0 0;
}
}

div.poke-note.active {
top: calc(100% - 30px);
}

#noteBox,
#profileBox {
position: absolute;
Expand Down
3 changes: 1 addition & 2 deletions client/webserver/site/src/css/main_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,9 @@ body.dark {
border-color: white;
}

div.poke-note {
div.poke-note > span {
background-color: white;
color: $font-color-light;
border-color: #aaa;
}

.buycolor {
Expand Down
4 changes: 3 additions & 1 deletion client/webserver/site/src/html/bodybuilder.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<link href="/css/style.css?v=Ueawg" rel="stylesheet">
</head>
<body {{if .UserInfo.DarkMode}} class="dark"{{end}}>
<div class="poke-note px-2 fs14 d-flex align-items-center" id="pokeNote"><span>Here is a poke note.</span></div>
<div class="poke-note" id="pokeNote">
<span data-tmpl="note"></span>
</div>
<div id="tooltip" class="flex-center"></div>
{{template "header" .}}
{{end}}
Expand Down
22 changes: 12 additions & 10 deletions client/webserver/site/src/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ export default class Application {
*/
attachHeader () {
this.header = idel(document.body, 'header')
this.pokeNote = idel(document.body, 'pokeNote')
this.pokeNotes = idel(document.body, 'pokeNote')
this.pokeTmpl = Doc.tmplElement(this.pokeNotes, 'note')
this.pokeTmpl.remove()
this.tooltip = idel(document.body, 'tooltip')
const pg = this.page = Doc.parsePage(this.header, [
'noteIndicator', 'noteBox', 'noteList', 'noteTemplate',
Expand Down Expand Up @@ -428,15 +430,15 @@ export default class Application {
if (note.severity < ntfn.POKE) return
// Poke notifications have their own display.
if (note.severity === ntfn.POKE) {
this.pokeNote.firstChild.textContent = `${note.subject}: ${note.details}`
this.pokeNote.classList.add('active')
if (this.pokeNote.timer) {
clearTimeout(this.pokeNote.timer)
}
this.pokeNote.timer = setTimeout(() => {
this.pokeNote.classList.remove('active')
delete this.pokeNote.timer
}, 5000)
const span = this.pokeTmpl.cloneNode(true)
span.textContent = `${note.subject}: ${note.details}`
this.pokeNotes.appendChild(span)
setTimeout(async () => {
await Doc.animate(500, progress => {
span.style.opacity = 1 - progress
})
span.remove()
}, 6000)
return
}
// Success and higher severity go to the bell dropdown.
Expand Down