diff --git a/main.go b/main.go index 2e938ca..8274bb2 100644 --- a/main.go +++ b/main.go @@ -129,7 +129,6 @@ func main() { // {{{ } http.HandleFunc("/", rootHandler) - http.HandleFunc("/notes2", pageNotes2) http.HandleFunc("/login", pageLogin) http.HandleFunc("/sync", pageSync) http.HandleFunc("/offline", pageOffline) @@ -189,8 +188,13 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { // {{{ // All URLs not specifically handled are routed to this function. // Everything going here should be a static resource. if r.URL.Path == "/" { - http.Redirect(w, r, "/notes2", http.StatusSeeOther) - return + page := NewPage("notes2") + + err := Webengine.Render(page, w, r) + if err != nil { + w.Write([]byte(err.Error())) + return + } } Webengine.StaticResource(w, r) @@ -245,15 +249,6 @@ func pageLogin(w http.ResponseWriter, r *http.Request) { // {{{ return } } // }}} -func pageNotes2(w http.ResponseWriter, r *http.Request) { // {{{ - page := NewPage("notes2") - - err := Webengine.Render(page, w, r) - if err != nil { - w.Write([]byte(err.Error())) - return - } -} // }}} func pageSync(w http.ResponseWriter, r *http.Request) { // {{{ page := NewPage("sync") diff --git a/static/js/app.mjs b/static/js/app.mjs index 7fa4dda..58cc3c9 100644 --- a/static/js/app.mjs +++ b/static/js/app.mjs @@ -249,7 +249,7 @@ class N2Crumb extends CustomHTMLElement { this.label = label this.uuid = uuid - this.elLink.href = `/notes2#${this.uuid}` + this.elLink.href = `/#${this.uuid}` this.elLink.innerText = this.label this.elLink.addEventListener('click', () => _mbus.dispatch("GO_TO_NODE", { nodeUUID: this.uuid, dontPush: false, dontExpand: true })) }// }}} diff --git a/static/js/notes2.mjs b/static/js/notes2.mjs index 7bef2ad..50286af 100644 --- a/static/js/notes2.mjs +++ b/static/js/notes2.mjs @@ -69,7 +69,7 @@ export class Notes2 extends Component { } if (!dontPush) - history.pushState({ nodeUUID }, '', `/notes2#${nodeUUID}`) + history.pushState({ nodeUUID }, '', `/#${nodeUUID}`) // New node is fetched in order to retrieve content and files. // Such data is unnecessary to transfer for tree/navigational purposes. diff --git a/static/service_worker.js b/static/service_worker.js index 806eaad..4a5f71d 100644 --- a/static/service_worker.js +++ b/static/service_worker.js @@ -1,7 +1,6 @@ const CACHE_NAME = 'notes2-{{ .VERSION }}' const CACHED_ASSETS = [ '/', - '/notes2', '/offline', '/css/{{ .VERSION }}/main.css', diff --git a/views/pages/login.gotmpl b/views/pages/login.gotmpl index 3f4406e..3e2235f 100644 --- a/views/pages/login.gotmpl +++ b/views/pages/login.gotmpl @@ -29,7 +29,7 @@ class Login { const password = document.getElementById('password').value API.authenticate(username, password) .then(ans=>{ - location.href = '/notes2' + location.href = '/' }) .catch(e=>{ setTimeout(()=>this.errorDiv.innerText = e, 75)