cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #328 from velour/dynamic-nav 

web: remove go template dependency
This commit is contained in:
Chris Sexton 2021-01-09 13:53:23 -05:00 committed by GitHub
parent 92da19e5a8 bbf5b27790
commit f1aa4ebeb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 81 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bot/bot.go
View File

@ -61,7 +61,8 @@ type bot struct {
}
type EndPoint struct {
Name, URL string
Name string `json:"name"`
URL string `json:"url"`
}
// Variable represents a $var replacement
@ -104,6 +105,7 @@ func New(config *config.Config, connector Connector) Bot {
bot.RefreshPluginWhitelist()
http.HandleFunc("/", bot.serveRoot)
http.HandleFunc("/nav", bot.serveNav)
connector.RegisterEvent(bot.Receive)

29
bot/web.go
View File

@ -1,16 +1,24 @@
package bot
import (
"html/template"
"encoding/json"
"fmt"
"net/http"
"strings"
)
func (b *bot) serveRoot(w http.ResponseWriter, r *http.Request) {
context := make(map[string]interface{})
context["Nav"] = b.GetWebNavigation()
t := template.Must(template.New("rootIndex").Parse(rootIndex))
t.Execute(w, context)
fmt.Fprint(w, rootIndex)
}
func (b *bot) serveNav(w http.ResponseWriter, r *http.Request) {
enc := json.NewEncoder(w)
err := enc.Encode(b.GetWebNavigation())
if err != nil {
jsonErr, _ := json.Marshal(err)
w.WriteHeader(500)
w.Write(jsonErr)
}
}
// GetWebNavigation returns a list of bootstrap-vue <b-nav-item> links
@ -54,7 +62,7 @@ var rootIndex = `
<b-navbar>
<b-navbar-brand>catbase</b-navbar-brand>
<b-navbar-nav>
<b-nav-item v-for="item in nav" :href="item.URL">{{ "{{ item.Name }}" }}</b-nav-item>
<b-nav-item v-for="item in nav" :href="item.url">{{ item.name }}</b-nav-item>
</b-navbar-nav>
</b-navbar>
</div>
@ -64,8 +72,15 @@ var rootIndex = `
el: '#app',
data: {
err: '',
nav: {{ .Nav }},
nav: [],
},
mounted: function() {
axios.get('/nav')
.then(resp => {
this.nav = resp.data;
})
.catch(err => console.log(err))
}
})
</script>
</body>

5
plugins/admin/admin.go
View File

@ -5,7 +5,6 @@ package admin
import (
"encoding/json"
"fmt"
"html/template"
"net/http"
"os"
"regexp"
@ -328,10 +327,8 @@ func (p *AdminPlugin) registerWeb() {
p.bot.RegisterWeb("/vars", "Variables")
}
var tpl = template.Must(template.New("factoidIndex").Parse(varIndex))
func (p *AdminPlugin) handleWeb(w http.ResponseWriter, r *http.Request) {
tpl.Execute(w, struct{ Nav []bot.EndPoint }{p.bot.GetWebNavigation()})
fmt.Fprint(w, varIndex)
}
func (p *AdminPlugin) handleWebAPI(w http.ResponseWriter, r *http.Request) {

11
plugins/admin/index.go
View File

@ -24,7 +24,7 @@ var varIndex = `
<b-navbar>
<b-navbar-brand>Variables</b-navbar-brand>
<b-navbar-nav>
<b-nav-item v-for="item in nav" :href="item.URL" :active="item.Name === 'Variables'">{{ "{{ item.Name }}" }}</b-nav-item>
<b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'Variables'">{{ item.name }}</b-nav-item>
</b-navbar-nav>
</b-navbar>
<b-alert
@ -32,7 +32,7 @@ var varIndex = `
variant="error"
v-if="err"
@dismissed="err = ''">
{{ "{{ err }}" }}
{{ err }}
</b-alert>
<b-container>
<b-table
@ -48,7 +48,7 @@ var varIndex = `
el: '#app',
data: {
err: '',
nav: {{ .Nav }},
nav: [],
vars: [],
sortBy: 'key',
fields: [
@ -58,6 +58,11 @@ var varIndex = `
},
mounted() {
this.getData();
axios.get('/nav')
.then(resp => {
this.nav = resp.data;
})
.catch(err => console.log(err))
},
methods: {
getData: function() {

5
plugins/cli/cli.go
View File

@ -5,7 +5,6 @@ package cli
import (
"encoding/json"
"fmt"
"html/template"
"net/http"
"time"
@ -91,10 +90,8 @@ func (p *CliPlugin) handleWebAPI(w http.ResponseWriter, r *http.Request) {
w.Write(data)
}
var tpl = template.Must(template.New("factoidIndex").Parse(indexHTML))
func (p *CliPlugin) handleWeb(w http.ResponseWriter, r *http.Request) {
tpl.Execute(w, struct{ Nav []bot.EndPoint }{p.bot.GetWebNavigation()})
fmt.Fprint(w, indexHTML)
}
// Completing the Connector interface, but will not actually be a connector

13
plugins/cli/index.go
View File

@ -24,14 +24,14 @@ var indexHTML = `
<b-navbar>
<b-navbar-brand>CLI</b-navbar-brand>
<b-navbar-nav>
<b-nav-item v-for="item in nav" :href="item.URL" :active="item.Name === 'CLI'">{{ "{{ item.Name }}" }}</b-nav-item>
<b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'CLI'">{{ item.name }}</b-nav-item>
</b-navbar-nav>
</b-navbar>
<b-alert
dismissable
variant="error"
:show="err">
{{ "{{ err }}" }}
{{ err }}
</b-alert>
<b-container>
<b-row>
@ -80,13 +80,20 @@ var indexHTML = `
el: '#app',
data: {
err: '',
nav: {{ .Nav }},
nav: [],
answer: '',
correct: 0,
textarea: [],
user: '',
input: '',
},
mounted: function() {
axios.get('/nav')
.then(resp => {
this.nav = resp.data;
})
.catch(err => console.log(err))
},
computed: {
authenticated: function() {
if (this.user !== '')

5
plugins/counter/counter.go
View File

@ -4,7 +4,6 @@ import (
"database/sql"
"encoding/json"
"fmt"
"html/template"
"math/rand"
"net/http"
"regexp"
@ -626,10 +625,8 @@ func (p *CounterPlugin) registerWeb() {
p.Bot.RegisterWeb("/counter", "Counter")
}
var tpl = template.Must(template.New("factoidIndex").Parse(html))
func (p *CounterPlugin) handleCounter(w http.ResponseWriter, r *http.Request) {
tpl.Execute(w, struct{ Nav []bot.EndPoint }{p.Bot.GetWebNavigation()})
fmt.Fprint(w, html)
}
func (p *CounterPlugin) handleCounterAPI(w http.ResponseWriter, r *http.Request) {

17
plugins/counter/html.go
View File

@ -22,14 +22,14 @@ var html = `
<b-navbar>
<b-navbar-brand>Counters</b-navbar-brand>
<b-navbar-nav>
<b-nav-item v-for="item in nav" :href="item.URL" :active="item.Name === 'Counter'">{{ "{{ item.Name }}" }}</b-nav-item>
<b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'Counter'">{{ item.name }}</b-nav-item>
</b-navbar-nav>
</b-navbar>
<b-alert
dismissable
:show="err"
variant="error">
{{ "{{ err }}" }}
{{ err }}
</b-alert>
<b-container>
<b-row>
@ -37,14 +37,14 @@ var html = `
<b-col><b-input v-model="answer"></b-col>
</b-row>
<b-row v-for="(counter, user) in counters">
{{ "{{ user }}" }}:
{{ user }}:
<b-container>
<b-row v-for="(count, thing) in counter">
<b-col offset="1">
{{ "{{ thing }}" }}:
{{ thing }}:
</b-col>
<b-col>
{{ "{{ count }}" }}
{{ count }}
</b-col>
<b-col cols="2">
<button @click="subtract(user,thing,count)">-</button>
@ -72,12 +72,17 @@ var html = `
el: '#app',
data: {
err: '',
nav: {{ .Nav }},
nav: [],
answer: '',
correct: 0,
counters: {}
},
mounted() {
axios.get('/nav')
.then(resp => {
this.nav = resp.data;
})
.catch(err => console.log(err))
axios.get('/counter/api')
.then(resp => (this.counters = convertData(resp.data)))
.catch(err => (this.err = err));

4
plugins/fact/factoid.go
View File

@ -842,8 +842,6 @@ func (p *FactoidPlugin) serveAPI(w http.ResponseWriter, r *http.Request) {
w.Write(data)
}
var tpl = template.Must(template.New("factoidIndex").Parse(factoidIndex))
func (p *FactoidPlugin) serveQuery(w http.ResponseWriter, r *http.Request) {
tpl.Execute(w, struct{ Nav []bot.EndPoint }{p.Bot.GetWebNavigation()})
fmt.Fprint(w, factoidIndex)
}

11
plugins/fact/webTemplates.go
View File

@ -32,7 +32,7 @@ var factoidIndex = `
<b-navbar>
<b-navbar-brand>Factoids</b-navbar-brand>
<b-navbar-nav>
<b-nav-item v-for="item in nav" :href="item.URL" :active="item.Name === 'Factoid'">{{ "{{ item.Name }}" }}</b-nav-item>
<b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'Factoid'">{{ item.name }}</b-nav-item>
</b-navbar-nav>
</b-navbar>
<b-alert
@ -40,7 +40,7 @@ var factoidIndex = `
variant="error"
v-if="err"
@dismissed="err = ''">
{{ "{{ err }}" }}
{{ err }}
</b-alert>
<b-form @submit="runQuery">
<b-container>
@ -74,7 +74,7 @@ var factoidIndex = `
router,
data: {
err: '',
nav: {{ .Nav }},
nav: [],
query: '',
results: [],
fields: [
@ -85,6 +85,11 @@ var factoidIndex = `
]
},
mounted() {
axios.get('/nav')
.then(resp => {
this.nav = resp.data;
})
.catch(err => console.log(err))
if (this.$route.query.query) {
this.query = this.$route.query.query;
this.runQuery()

1
plugins/git/git.go
View File

@ -80,5 +80,4 @@ func (p *GitPlugin) registerWeb() {
http.HandleFunc("/git/gitea/event", p.giteaEvent)
http.HandleFunc("/git/github/event", p.githubEvent)
http.HandleFunc("/git/gitlab/event", p.gitlabEvent)
p.b.RegisterWeb("/git", "Git")
}

15
plugins/meme/web.go
View File

@ -25,7 +25,7 @@ var memeIndex = `
<b-navbar>
<b-navbar-brand>Memes</b-navbar-brand>
<b-navbar-nav>
<b-nav-item v-for="item in nav" :href="item.URL" :active="item.Name === 'Meme'">{{ "{{ item.Name }}" }}</b-nav-item>
<b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'Meme'">{{ item.name }}</b-nav-item>
</b-navbar-nav>
</b-navbar>
<b-alert
@ -33,7 +33,7 @@ var memeIndex = `
variant="error"
v-if="err"
@dismissed="err = ''">
{{ "{{ err }}" }}
{{ err }}
</b-alert>
<b-form @submit="addMeme">
<b-container>
@ -58,7 +58,7 @@ var memeIndex = `
:items="results"
:fields="fields">
<template v-slot:cell(config)="data">
<pre>{{ "{{data.item.config}}" }}</pre>
<pre>{{data.item.config}}</pre>
</template>
<template v-slot:cell(image)="data">
<b-img :src="data.item.url" rounded block fluid />
@ -80,7 +80,7 @@ var memeIndex = `
router,
data: {
err: '',
nav: {{ .Nav }},
nav: [],
name: "",
url: "",
config: "",
@ -93,10 +93,13 @@ var memeIndex = `
]
},
mounted() {
axios.get('/nav')
.then(resp => {
this.nav = resp.data;
})
.catch(err => console.log(err))
this.refresh();
},
computed: {
},
methods: {
refresh: function() {
axios.get('/meme/all')

4
plugins/meme/webHandlers.go
View File

@ -3,7 +3,6 @@ package meme
import (
"encoding/json"
"fmt"
"html/template"
"net/http"
"net/url"
"path"
@ -130,8 +129,7 @@ func (p *MemePlugin) addMeme(w http.ResponseWriter, r *http.Request) {
}
func (p *MemePlugin) webRoot(w http.ResponseWriter, r *http.Request) {
var tpl = template.Must(template.New("factoidIndex").Parse(string(memeIndex)))
tpl.Execute(w, struct{ Nav []bot.EndPoint }{p.bot.GetWebNavigation()})
fmt.Fprint(w, memeIndex)
}
func (p *MemePlugin) img(w http.ResponseWriter, r *http.Request) {