entry/entry.go

@@ -15,7 +15,6 @@ type Entry struct {
 	db       *db.Database
 	ID       int64
 	Slug     string
-	Title    string
 	Content  string
 	Tags     []string
 	Created  time.Time
@@ -52,18 +51,13 @@ func PrepareTable(tx *sqlx.Tx) error {
 	return nil
 }
 
-func New(db *db.Database) *Entry {
+func New(db *db.Database) Entry {
-	e := Entry{
+	return Entry{
 		db:      db,
 		ID:      -1,
 		Created: time.Now(),
 		Updated: time.Now(),
-		Tags:    []string{},
 	}
-	e.Title = e.GenerateTitle()
-	e.Slug = e.UniqueSlug()
-	e.Content = "= " + e.Title
-	return &e
 }
 
 func GetBySlug(db *db.Database, slug string) (Entry, error) {
@@ -72,7 +66,6 @@ func GetBySlug(db *db.Database, slug string) (Entry, error) {
 	if err := db.Get(&e, q, slug); err != nil {
 		return e, err
 	}
-	e.Title = e.GenerateTitle()
 	return e, e.populateTags()
 }
 
@@ -82,21 +75,19 @@ func GetByID(db *db.Database, id int64) (Entry, error) {
 	if err := db.Get(&e, q, id); err != nil {
 		return e, err
 	}
-	e.Title = e.GenerateTitle()
 	return e, e.populateTags()
 }
 
 func Search(db *db.Database, query string) ([]*Entry, error) {
 	entries := []*Entry{}
-	log.Debug().Str("query", query).Msg("searching")
 	if query != "" {
-		q := `select * from entries where content like ? order by updated desc`
+		q := `select * from entries where content like '%?%'`
-		err := db.Select(&entries, q, "%"+query+"%")
+		err := db.Select(&entries, q, query)
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		q := `select * from entries order by updated desc`
+		q := `select * from entries`
 		err := db.Select(&entries, q)
 		if err != nil {
 			return nil, err
@@ -104,7 +95,6 @@ func Search(db *db.Database, query string) ([]*Entry, error) {
 	}
 	for _, e := range entries {
 		e.db = db
-		e.Title = e.GenerateTitle()
 		e.populateTags()
 	}
 	return entries, nil
@@ -124,12 +114,12 @@ func RemoveBySlug(db *db.Database, slug string) error {
 		tx.Rollback()
 		return err
 	}
-	q = `delete from entries where id = ?`
+	q = `delete from entries where entry_id = ?`
 	if _, err := tx.Exec(q, e.ID); err != nil {
 		tx.Rollback()
 		return err
 	}
-	return tx.Commit()
+	return nil
 }
 
 func (e *Entry) populateTags() error {
@@ -151,16 +141,18 @@ func (e *Entry) removeTag(tag string) error {
 	return err
 }
 
-func (e *Entry) GenerateTitle() string {
+func (e *Entry) UniqueSlug() string {
 	candidate := strings.Split(e.Content, "\n")[0]
 	candidateNumber := 0
 
 	r := regexp.MustCompile(`[^a-zA-Z0-9 -]`)
 	candidate = r.ReplaceAllString(candidate, "")
 	candidate = strings.TrimSpace(candidate)
+	candidate = strings.ReplaceAll(candidate, " ", "-")
 	if len(candidate) == 0 {
 		candidate = "untitled"
 	}
+	candidate = strings.ToLower(candidate)
 
 	q := `select slug from entries where slug like ?`
 	slugs := []string{}
@@ -187,20 +179,6 @@ func (e *Entry) GenerateTitle() string {
 	return tmpCandidate
 }
 
-func (e *Entry) UniqueSlug() string {
-	if e.Title == "" {
-		e.Title = e.GenerateTitle()
-	}
-	candidate := e.Title
-
-	r := regexp.MustCompile(`[^a-zA-Z0-9 -]`)
-	candidate = r.ReplaceAllString(candidate, "")
-	candidate = strings.TrimSpace(candidate)
-	candidate = strings.ReplaceAll(candidate, " ", "-")
-	candidate = strings.ToLower(candidate)
-	return candidate
-}
-
 func (e *Entry) Update() error {
 	if e.ID == -1 {
 		return e.Create()

frontend/src/App.vue

@@ -7,11 +7,6 @@
         <b-nav-item to="/console">Console</b-nav-item>
         <b-nav-item to="/about">About</b-nav-item>
       </b-navbar-nav>
-      <b-navbar-nav class="ml-auto">
-        <b-nav-form>
-          <b-button @click="newFile">+</b-button>
-        </b-nav-form>
-      </b-navbar-nav>
     </b-navbar>
     <Error/>
     <router-view/>
@@ -47,16 +42,6 @@
     name: 'app',
     components: {
         Error
-    },
-    methods: {
-      newFile: function() {
-        this.$store.dispatch('newFile')
-                .catch(() => {})
-                .then(file => {
-                  this.$store.dispatch('updateSearch')
-                  this.$router.push({ name: 'console-slug', params: { slug: file.Slug }})
-                })
-      }
     }
   }
 </script>

frontend/src/components/MainEditor.vue

@@ -56,29 +56,32 @@
         this.$store.dispatch('getFile', slug)
       },
       tagUpdate: function(newTags) {
-        if (JSON.stringify(newTags) === JSON.stringify(this.$store.state.file.Tags))
+        if (JSON.stringify(newTags) === JSON.stringify(this.file.Tags))
           return
-      this.$store.commit('setTags', newTags)
+      this.file.Tags = newTags
       this.$emit('markDirty', true)
       this.save()
       },
       updateContent: function (newContent) {
         if (this.$store.state.file.Content === newContent)
           return
-        this.$store.commit('setContent', newContent)
+        this.$store.state.file.Content = newContent
         this.$emit('markDirty', true)
         this.save()
       },
       save: function () {
-        this.$store.commit('setContent', this.content)
+        this.$store.state.file.Content = this.content
-        this.$store.dispatch('saveFile')
+        console.log("Saving file: " + this.file.Slug)
+        this.$store.dispatch('saveFile', this.file)
           .then(res => {
             this.$emit('markDirty', false)
             this.$store.dispatch('updateSearch')
             if (res.data.Slug != this.$route.params.slug)
               this.$router.replace({params: { slug: res.data.Slug }})
           })
-          .catch(() => { })
+          .catch(err => {
+            console.log('err:' + err)
+          })
       }
     },
     components: {TagList, Editor}

frontend/src/components/MainView.vue

@@ -8,7 +8,7 @@
             </b-row>
             <b-row>
                 <b-col cols="10">
-                    <label for="tagList" :hidden="!tags">Tags</label>
+                    <label for="tagList" >Tags</label>
                 </b-col>
             </b-row>
             <b-row>

frontend/src/components/Search.vue

@@ -1,13 +1,13 @@
 <template>
     <b-container fluid>
         <b-row>
-            <b-input placeholder="Search" @update="getResults" v-model="queryText" />
+            <b-input placeholder="Search" @update="runQuery" v-model="queryText" />
         </b-row>
         <b-row v-for="item in results" v-bind:key="item.ID">
             <b-col>
-                <b-button :hidden="!editMode" size="sm" class="deleteLink" @click="deleteFile(item.Slug)">X</b-button> <b-link
+                <b-link
                     :to="{ name: target, params: { slug: item.Slug } }"
-                >{{item.Title}}</b-link>
+                >{{item.Slug}}</b-link>
             </b-col>
         </b-row>
     </b-container>
@@ -24,39 +24,30 @@
     },
     props: {
       target: String,
-      query: String,
+      query: String
-      editMode: Boolean
     },
     watch: {
       query: function(newValue) {
         this.queryText = newValue
-      },
-      queryText: function(newValue) {
-        this.$store.commit('setQuery', newValue)
       }
     },
     computed: {
       results: function() {
+        console.log("results:"+this.$store.state.searchResults)
         return this.$store.state.searchResults
       }
     },
     created() {
       this.getResults()
-      this.getResults = _.debounce(this.getResults, 1000)
+      this.runQuery = _.debounce(this.runQuery, 1000)
     },
     methods: {
       getResults: function () {
-        this.$store.dispatch('updateSearch')
+        this.$store.dispatch('getSearchResults', null)
       },
-      deleteFile: function(slug) {
+      runQuery: function() {
-        this.$store.dispatch('deleteBySlug', slug)
+        this.$store.dispatch('getSearchResults', this.query)
       }
     }
   }
 </script>
-
-<style scoped>
-    .deleteLink {
-        font-size: x-small;
-    }
-</style>

frontend/src/components/TagList.vue

@@ -23,7 +23,7 @@
     },
     watch: {
       tags: function (newValue) {
-        this.internalTags = newValue || []
+        this.internalTags = newValue
       }
     },
     computed: {

frontend/src/store/index.js

@@ -40,28 +40,9 @@ export default new Vuex.Store({
     },
     setFile(state, file) {
       state.file = file
-    },
-    setContent(state, content) {
-      state.file.Content = content
-    },
-    setTags(state, tags) {
-      state.file.Tags = tags
     }
   },
   actions: {
-    newFile: function({commit}) {
-      return new Promise((resolve, reject) => {
-        axios.post('/v1/entries', {})
-          .catch(err => {
-            commit('addError', err)
-            reject(err)
-          })
-          .then(res => {
-            commit('setFile', res.data)
-            resolve(res.data)
-          })
-      })
-    },
     getFile: function({ commit }, slug) {
       if (slug)
         return axios.get('/v1/entries/'+slug)
@@ -70,32 +51,29 @@ export default new Vuex.Store({
             commit('setFile', res.data)
           })
     },
+    getSearchResults: function ({dispatch, commit}, query) {
+      commit('setQuery', query)
+      dispatch('updateSearch')
+    },
     updateSearch: function ({commit, state}) {
-      return new Promise((resolve, reject) => {
+      let query = state.query
-        let query = state.query || ""
+      if (query) {
         axios.get('/v1/entries?query='+query)
-          .catch(err => {
+          .catch(err => state.addError(err))
-            state.addError(err)
-            reject(err)
-          })
           .then(res =>{
+            console.log("getSearchResults:"+res.data)
             commit('setResults', res.data)
-            resolve(res.data)
           })
-      })
+      }
-    },
+      axios.get('/v1/entries')
-    saveFile: function({state}) {
+        .catch(err => state.addError(err))
-      if (state.file)
+        .then(res =>{
-        return axios.put('/v1/entries/'+state.file.Slug, state.file)
+          console.log("getSearchResults:"+res.data)
-    },
+          commit('setResults', res.data)
-    deleteBySlug: function({dispatch,commit}, slug) {
-      axios.delete('/v1/entries/'+slug)
-        .catch(err => {
-          commit('addError', err)
-        })
-        .then(() => {
-          dispatch('updateSearch')
         })
+    },
+    saveFile: function(state, file) {
+      return axios.put('/v1/entries/'+file.Slug, file)
     }
   },
   modules: {

frontend/src/views/Console.vue

@@ -8,7 +8,7 @@
       <b-col md="5">
 
         <div>
-          <b-tabs content-class="mt-3" v-model="tabIndex">
+          <b-tabs content-class="mt-3">
             <b-tab active>
                 <template v-slot:title>
                   Editor <span v-bind:class="{ dirty: isDirty, clean: !isDirty }">&bull;</span>
@@ -25,7 +25,7 @@
       </b-col>
       <b-col md="2">
         <h2>Search Results</h2>
-        <SearchResults :editMode="true" target="console-slug" />
+        <SearchResults target="console-slug" :query="query"/>
       </b-col>
     </b-row>
   </b-container>
@@ -49,11 +49,15 @@ export default {
   data: function() {
     return {
       isDirty: false,
-      tabIndex: 0
+      query: ''
     }
   },
+  provide: {
+    update: function() {}
+  },
   methods: {
     markDirty: function(dirty) {
+      console.log('markDirty:'+dirty)
       this.isDirty = dirty
     }
   },
@@ -61,6 +65,7 @@ export default {
     // called before the route that renders this component is confirmed.
     // does NOT have access to `this` component instance,
     // because it has not been created yet when this guard is called!
+    console.log('beforeRouteEnter'+to+from)
     next()
   },
   beforeRouteUpdate (to, from, next) {
@@ -78,13 +83,13 @@ export default {
         next(false)
       }
     }
-    this.tabIndex = 0
     next()
   },
   beforeRouteLeave (to, from, next) {
     // called when the route that renders this component is about to
     // be navigated away from.
     // has access to `this` component instance.
+    console.log('beforeRouteLeave'+to+from)
     next()
   }
 }

todo.adoc

@@ -1,20 +1,27 @@
 = Todo
 :icons: font
 
-* Backend
+* Operations
-** 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]
+* Vue Frontend
+** [ ] spend some time learning about TypeScript/Vue.js style
+** Documents
+*** [x] adoc editor widget
+** Authentication
+*** [ ] some kind of user auth
+** Views
+*** [ ] editor view
+*** [ ] public index/search view
+* Backend
+** [?] save endpoint
+*** [ ] need to generate a slug for entries
+*** [ ] add authentication/authorization
+*** [ ] convert document to adoc (give format?)
+*** [x] test in frontend
+*** [ ] check for unique tags
+*** [ ] set some db fields not null
+** [ ] search endpoint
+* CLI Frontend

web/entry.go

@@ -81,11 +81,8 @@ func (web *Web) newEntry(w http.ResponseWriter, r *http.Request) {
 }
 
 func (web *Web) allEntries(w http.ResponseWriter, r *http.Request) {
-	query := ""
+	r.ParseForm()
-	items, ok := r.URL.Query()["query"]
+	query := r.Form.Get("query")
-	if ok {
-		query = items[0]
-	}
 	entries, err := entry.Search(web.db, query)
 	if err != nil {
 		w.WriteHeader(500)
@@ -130,7 +127,6 @@ func (web *Web) removeEntry(w http.ResponseWriter, r *http.Request) {
 
 	err := entry.RemoveBySlug(web.db, slug)
 	if err != nil {
-		log.Error().Msgf("Error deleting: %s", err)
 		w.WriteHeader(500)
 		fmt.Fprint(w, err)
 		return

web/routes.go

@@ -11,25 +11,25 @@ import (
 
 	"github.com/speps/go-hashids"
 
-	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/gorilla/handlers"
 	"github.com/rs/zerolog/log"
 	"github.com/stretchr/graceful"
 )
 
 type Web struct {
-	addr string
+	addr      string
-	db   *db.Database
+	db        *db.Database
-	salt string
+	salt      string
-	h    *hashids.HashID
+	h         *hashids.HashID
-	box  *packr.Box
+	box       *packr.Box
 }
 
 func New(addr string, db *db.Database, box *packr.Box) *Web {
 	w := &Web{
-		addr: addr,
+		addr:      addr,
-		db:   db,
+		db:        db,
-		box:  box,
+		box:       box,
 	}
 	if err := db.MakeDB(); err != nil {
 		log.Fatal().
@@ -44,7 +44,7 @@ func (web *Web) routeSetup() http.Handler {
 	api := r.PathPrefix("/v1/").Subrouter()
 	api.HandleFunc("/entries", web.allEntries).Methods(http.MethodGet)
 	api.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost)
-	api.HandleFunc("/entries/{slug}", web.removeEntry).Methods(http.MethodDelete)
+	api.HandleFunc("/entries", web.removeEntry).Methods(http.MethodDelete)
 	api.HandleFunc("/entries/{slug}", web.editEntry).Methods(http.MethodPut)
 	api.HandleFunc("/entries/{slug}", web.getEntry).Methods(http.MethodGet)
 	r.PathPrefix("/").HandlerFunc(web.indexHandler("/index.html"))