cws
/
cabinet
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Merge branch 'master' into users 

* master:
  slug: create slug from md every time
  add dockerfile
  fix a few package issues for docker build
  remove todo file
  update todo
  update todo
  frontend theming; md content-types
This commit is contained in:
Chris Sexton 2020-03-15 07:03:25 -04:00
parent 98d9d8a899 2fdf9ce7e6
commit b3eda2c3cf
15 changed files with 2327 additions and 2441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
docker/Dockerfile Normal file
View File

@ -0,0 +1,34 @@
FROM alpine:edge
RUN apk add --no-cache git
RUN apk add --no-cache musl-dev
RUN apk add --no-cache gcc
RUN apk add --no-cache sqlite
RUN apk add --no-cache go
RUN apk add --no-cache make
RUN apk add --no-cache npm
RUN apk add --no-cache yarn
VOLUME /app/var
EXPOSE 5673
ARG gomaxprocs="8"
WORKDIR /app
ENV SRC_DIR=/app/src/
ENV GOMAXPROCS=${gomaxprocs}
RUN git clone https://code.chrissexton.org/cws/cabinet.git $SRC_DIR
RUN apk add --no-cache tzdata
ENV TZ America/New_York
# RUN yarn global add @vue/cli
RUN cd $SRC_DIR/frontend; yarn && yarn build
RUN go get -u github.com/gobuffalo/packr/v2/packr2
RUN cd $SRC_DIR; $HOME/go/bin/packr2
RUN cd $SRC_DIR; go get ./...; go build -o /app/cabinet
ENTRYPOINT ["/app/cabinet", "-httpAddr=0.0.0.0:5673", "-db=/app/var/cabinet.db"]

8
entry/entry.go
View File

@ -52,6 +52,14 @@ func PrepareTable(tx *sqlx.Tx) error {
return nil return nil
} }
func NewFromMd(db *db.Database, body string) *Entry {
e := New(db)
e.Content = body
e.Title = e.GenerateTitle()
e.Slug = e.UniqueSlug()
return e
}
func New(db *db.Database) *Entry { func New(db *db.Database) *Entry {
e := Entry{ e := Entry{
db: db, db: db,

6
frontend/package.json
View File

@ -11,8 +11,11 @@
"@vue/cli": "^4.0.5", "@vue/cli": "^4.0.5",
"asciidoctor": "^2.0.3", "asciidoctor": "^2.0.3",
"axios": "^0.19.0", "axios": "^0.19.0",
"jquery": "^1.9.1",
"popper.js": "^1.14.7",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"bootstrap-vue": "^2.0.4", "bootstrap-vue": "^2.0.4",
"bootswatch": "^4.3.1",
"brace": "latest", "brace": "latest",
"core-js": "^3.3.2", "core-js": "^3.3.2",
"lodash": "^4.17.15", "lodash": "^4.17.15",
@ -30,6 +33,9 @@
"babel-eslint": "^10.0.3", "babel-eslint": "^10.0.3",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0", "eslint-plugin-vue": "^5.0.0",
"sass": "^1.23.0",
"sass-loader": "^8.0.0",
"webpack": "^4.36.0",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10"
} }
} }

2
frontend/public/index.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>frontend</title> <title>Cabinet</title>
</head> </head>
<body> <body>
<noscript> <noscript>

25
frontend/src/App.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div id="app"> <div id="app">
<b-navbar type="dark" variant="dark"> <b-navbar type="dark" variant="primary" class="navbar">
<b-navbar-brand>🗄 Cabinet</b-navbar-brand> <b-navbar-brand>🗄 Cabinet</b-navbar-brand>
<b-navbar-nav> <b-navbar-nav>
<b-nav-item to="/">Home</b-nav-item> <b-nav-item to="/">Home</b-nav-item>
@ -18,25 +18,10 @@
</div> </div>
</template> </template>
<style> <style lang="scss">
#app { .navbar {
font-family: 'Avenir', Helvetica, Arial, sans-serif; padding: 0.5em !important;
-webkit-font-smoothing: antialiased; margin-bottom: 1em;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
}
#nav {
padding: 30px;
}
#nav a {
font-weight: bold;
color: #2c3e50;
}
#nav a.router-link-exact-active {
color: #42b983;
} }
</style> </style>

11
frontend/src/components/Editor.vue
View File

@ -1,6 +1,13 @@
<template> <template>
<div> <div>
<editor ref="myEditor" v-model="text" @init="editorInit" lang="asciidoc" theme="github" width="100%" height="500" /> <editor
ref="myEditor"
v-model="text"
@init="editorInit"
lang="asciidoc"
theme="tomorrow_night"
width="100%"
height="500" />
</div> </div>
</template> </template>
@ -32,7 +39,7 @@
editorInit: function () { editorInit: function () {
require('brace/ext/language_tools') //language extension prerequsite... require('brace/ext/language_tools') //language extension prerequsite...
require('brace/mode/asciidoc') //language require('brace/mode/asciidoc') //language
require('brace/theme/github') require('brace/theme/tomorrow_night')
} }
} }
} }

2
frontend/src/components/MainEditor.vue
View File

@ -75,7 +75,7 @@
.then(res => { .then(res => {
this.$emit('markDirty', false) this.$emit('markDirty', false)
this.$store.dispatch('updateSearch') this.$store.dispatch('updateSearch')
if (res.data.Slug != this.$route.params.slug) if (res.data.Slug !== this.$route.params.slug)
this.$router.replace({params: { slug: res.data.Slug }}) this.$router.replace({params: { slug: res.data.Slug }})
}) })
.catch(() => { }) .catch(() => { })

23
frontend/src/components/MainView.vue
View File

@ -1,22 +1,15 @@
<template> <template>
<div :hidden="!content"> <div :hidden="!content">
<b-container fluid>
<b-row>
<b-col>
<Viewer :content="content" /> <Viewer :content="content" />
</b-col> <b-card-group :hidden="!tags">
</b-row> <b-card
<b-row> style="max-width: 50%"
<b-col cols="10"> header="Tags"
<label for="tagList" :hidden="!tags">Tags</label> header-tag="header"
</b-col> >
</b-row>
<b-row>
<b-col cols="10">
<TagList id="tagList" :tags="tags" :readOnly="true" /> <TagList id="tagList" :tags="tags" :readOnly="true" />
</b-col> </b-card>
</b-row> </b-card-group>
</b-container>
</div> </div>
</template> </template>

13
frontend/src/components/Search.vue
View File

@ -1,11 +1,15 @@
<template> <template>
<b-container fluid> <b-container fluid>
<b-row> <b-row>
<b-col class="searchBox">
<b-input placeholder="Search" @update="getResults" v-model="queryText" /> <b-input placeholder="Search" @update="getResults" v-model="queryText" />
</b-col>
</b-row> </b-row>
<b-row v-for="item in results" v-bind:key="item.ID"> <b-row v-for="item in results" v-bind:key="item.ID">
<b-col> <b-col>
<b-button :hidden="!editMode" size="sm" class="deleteLink" @click="deleteFile(item.Slug)">X</b-button> <b-link <b-button :hidden="!editMode" size="sm" class="deleteLink" @click="deleteFile(item.Slug)">X</b-button>
<b-link
class="searchLink"
:to="{ name: target, params: { slug: item.Slug } }" :to="{ name: target, params: { slug: item.Slug } }"
>{{item.Title}}</b-link> >{{item.Title}}</b-link>
</b-col> </b-col>
@ -59,4 +63,11 @@
.deleteLink { .deleteLink {
font-size: x-small; font-size: x-small;
} }
.searchBox {
margin-bottom: 1em;
}
.searchLink {
margin-left: 1em;
color: var(--info);
}
</style> </style>

6
frontend/src/main.js
View File

@ -5,7 +5,11 @@ import store from './store'
import BootstrapVue from 'bootstrap-vue' import BootstrapVue from 'bootstrap-vue'
import 'bootstrap/dist/css/bootstrap.css' // import "bootswatch/dist/darkly/variables";
// import "bootstrap/scss/bootstrap";
import "bootswatch/dist/darkly/bootstrap.css";
// import 'bootstrap/dist/css/bootstrap.css'
import 'bootstrap-vue/dist/bootstrap-vue.css' import 'bootstrap-vue/dist/bootstrap-vue.css'
Vue.config.productionTip = false Vue.config.productionTip = false

21
frontend/src/views/Console.vue
View File

@ -2,9 +2,18 @@
<b-container fluid> <b-container fluid>
<b-row> <b-row>
<b-col md="5"> <b-col md="5">
<h2>Scratchpad</h2> <div>
<b-tabs content-class="mt-3">
<b-tab active>
<template v-slot:title>
Scratchpad
</template>
<ScratchPad /> <ScratchPad />
</b-tab>
</b-tabs>
</div>
</b-col> </b-col>
<b-col md="5"> <b-col md="5">
<div> <div>
@ -24,8 +33,16 @@
</b-col> </b-col>
<b-col md="2"> <b-col md="2">
<h2>Search Results</h2> <div>
<b-tabs content-class="mt-3">
<b-tab active>
<template v-slot:title>
Search
</template>
<SearchResults :editMode="true" target="console-slug" /> <SearchResults :editMode="true" target="console-slug" />
</b-tab>
</b-tabs>
</div>
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>

4538
frontend/yarn.lock
View File

File diff suppressed because it is too large Load Diff

20
todo.adoc
View File

@ -1,20 +0,0 @@
= Todo
:icons: font
* Backend
** Authentication
*** [ ] some kind of user auth
** save endpoint
*** [ ] add authentication/authorization
*** [ ] convert document to adoc (give format?)
*** [ ] check for unique tags
** [ ] search endpoint
*** [ ] search for tags
*** [ ] fulltext search
**** with link:https://blevesearch.com/docs/Getting%20Started/[Bleve]
* [ ] CLI Frontend
* [ ] Operations
** [ ] dockerize the build
** [ ] integrate CI/CD
** [ ] run on https://cabinet.chrissexton.org[cabinet.chrissexton.org]
** [ ] create redirect or https://cab.chrissexton.org[cab.chrissexton.org]

35
web/entry.go
View File

@ -3,6 +3,7 @@ package web
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"time" "time"
@ -16,13 +17,16 @@ func (web *Web) editEntry(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
slug := vars["slug"] slug := vars["slug"]
dec := json.NewDecoder(r.Body) dec := json.NewDecoder(r.Body)
newEntry := entry.New(web.db) req := struct {
err := dec.Decode(&newEntry) Content string
}{}
err := dec.Decode(&req)
if err != nil { if err != nil {
w.WriteHeader(500) w.WriteHeader(500)
fmt.Fprint(w, err) fmt.Fprint(w, err)
return return
} }
newEntry := entry.NewFromMd(web.db, req.Content)
oldEntry, err := entry.GetBySlug(web.db, slug) oldEntry, err := entry.GetBySlug(web.db, slug)
if err != nil { if err != nil {
@ -32,6 +36,8 @@ func (web *Web) editEntry(w http.ResponseWriter, r *http.Request) {
} }
oldEntry.Content = newEntry.Content oldEntry.Content = newEntry.Content
oldEntry.Title = newEntry.Title
oldEntry.Slug = newEntry.UniqueSlug()
oldEntry.Tags = newEntry.Tags oldEntry.Tags = newEntry.Tags
oldEntry.Updated = time.Now() oldEntry.Updated = time.Now()
@ -48,8 +54,31 @@ func (web *Web) editEntry(w http.ResponseWriter, r *http.Request) {
return return
} }
log.Debug().Interface("oldEntry", oldEntry).Msg("Got a PUT") w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp))
}
func (web *Web) newMarkdownEntry(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
newEntry := entry.NewFromMd(web.db, string(body))
err = newEntry.Create()
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
resp, err := json.Marshal(newEntry)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
w.Header().Set("content-type", "application/json") w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp)) fmt.Fprint(w, string(resp))
} }

12
web/routes.go
View File

@ -70,13 +70,13 @@ func (web *Web) routeSetup() http.Handler {
// curl 'http://127.0.0.1:8080/v1/test' -X POST -H 'Accept: application/json, text/plain, */*' --compressed -H 'Content-Type: application/json;charset=utf-8' --data '{ "test": 1 }' // curl 'http://127.0.0.1:8080/v1/test' -X POST -H 'Accept: application/json, text/plain, */*' --compressed -H 'Content-Type: application/json;charset=utf-8' --data '{ "test": 1 }'
api.HandleFunc("/entries", web.allEntries).Methods(http.MethodGet) api.HandleFunc("/entries", web.allEntries).Methods(http.MethodGet)
authedApi.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost) api.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost)
authedApi.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost). api.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost).
HeadersRegexp("Content-Type", "application/(text|json).*") HeadersRegexp("Content-Type", "application/(text|json).*")
//authedApi.HandleFunc("/entries", web.newMarkdownEntry).Methods(http.MethodPost). api.HandleFunc("/entries", web.newMarkdownEntry).Methods(http.MethodPost).
// HeadersRegexp("Content-Type", "application/markdown.*") HeadersRegexp("Content-Type", "application/markdown.*")
authedApi.HandleFunc("/entries/{slug}", web.removeEntry).Methods(http.MethodDelete) api.HandleFunc("/entries/{slug}", web.removeEntry).Methods(http.MethodDelete)
authedApi.HandleFunc("/entries/{slug}", web.editEntry).Methods(http.MethodPut) api.HandleFunc("/entries/{slug}", web.editEntry).Methods(http.MethodPut)
api.HandleFunc("/entries/{slug}", web.getEntry).Methods(http.MethodGet) api.HandleFunc("/entries/{slug}", web.getEntry).Methods(http.MethodGet)
api.HandleFunc("/auth", web.auth).Methods(http.MethodPost) api.HandleFunc("/auth", web.auth).Methods(http.MethodPost)