More WIP

Signed-off-by: jolheiser <john.olheiser@gmail.com>

router/oauth.go

@@ -19,6 +19,13 @@ func (a *App) login(w http.ResponseWriter, r *http.Request) {
 	}
 	http.Redirect(w, r, a.Domain, http.StatusFound)
 }
+func (a *App) logout(w http.ResponseWriter, r *http.Request) {
+	if err := a.store.Logout(w, r); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	http.Redirect(w, r, a.Domain, http.StatusFound)
+}
 
 func (a *App) loginCallback(w http.ResponseWriter, r *http.Request) {
 	user, err := gothic.CompleteUserAuth(w, r)

router/router.go

@@ -54,6 +54,7 @@ func New(app App) *chi.Mux {
 
 		r.Route("/auth", func(r chi.Router) {
 			r.Get("/login", app.login)
+			r.Get("/logout", app.logout)
 			r.Get("/callback", app.loginCallback)
 		})
 	})

router/session/session.go

@@ -22,6 +22,7 @@ type Store struct {
 }
 
 type Info struct {
+	User  string
 	Org   string
 	Token string
 }
@@ -96,12 +97,23 @@ func (s *Store) CompleteAuth(w http.ResponseWriter, r *http.Request, token strin
 	}
 
 	sess.Values[infoKey] = &Info{
+		User:  profile.UserName,
 		Org:   org,
 		Token: token,
 	}
 	return s.Store.Save(r, w, sess)
 }
 
+func (s *Store) Logout(w http.ResponseWriter, r *http.Request) error {
+	sess, err := s.Store.Get(r, sessionCookie)
+	if err != nil {
+		return err
+	}
+	sess.Options.MaxAge = -1
+	sess.Values = make(map[any]any)
+	return s.Store.Save(r, w, sess)
+}
+
 func (s *Store) Repos(r *http.Request) ([]*gitea.Repository, error) {
 	info, err := s.Info(r)
 	if err != nil {

static/css/gistea.css

@@ -1,11 +1,19 @@
+:root {
+    --border-radius: 10px;
+}
+
 .form-input {
-    border-radius: 10px;
+    border-radius: var(--border-radius);
     margin: 1em 0;
 }
 
 .form-head {
     border: black solid thin;
-    border-top-left-radius: 10px;
+    border-top-left-radius: var(--border-radius);
-    border-top-right-radius: 10px;
+    border-top-right-radius: var(--border-radius);
     padding: 0 1em;
+}
+
+.btn {
+    border-radius: var(--border-radius);
 }

static/js/monaco.js

@@ -23,6 +23,7 @@ require(["vs/editor/editor.main"], function () {
         let $editor = monaco.editor.create(elem, {
             language: 'text',
             theme: 'vs-dark',
+            fontSize: "12px"
         });
         elem.classList.remove("loading", "loading-lg");
         let $filename = $filenames[idx];
@@ -30,8 +31,15 @@ require(["vs/editor/editor.main"], function () {
             "filename": $filename,
             "editor": $editor
         });
-        $filename.addEventListener('change', () => {
+        $filename.addEventListener('keyup', () => {
-            monaco.editor.setModelLanguage($editor.getModel(), $filename.value.split(".").pop());
+            let value = $editor.getValue();
+            $editor.getModel().dispose();
+            let $model = monaco.editor.createModel(
+                value,
+                undefined,
+                monaco.Uri.file($filename.value)
+            )
+            $editor.setModel($model);
         });
     })
 

static/templates/base.tmpl

@@ -15,13 +15,15 @@
         <section class="navbar-section">
             <a href="{{.Domain}}" class="navbar-brand mr-2">Gistea</a>
             <a href="{{.GiteaURL}}" class="btn btn-link">Back to Gitea</a>
-            {{if .Session}}<a href="/" class="btn btn-link">Your gists</a>{{end}}
+            {{if .Session}}<a href="{{.Domain}}/{{.Session.User}}" class="btn btn-link">Your gists</a>{{end}}
         </section>
-        {{if not .Session}}
         <section class="navbar-section">
+            {{if .Session}}
+            <a href="{{.Domain}}/_/auth/logout" class="navbar-brand mr-2">Logout</a>
+            {{else}}
             <a href="{{.Domain}}/_/auth/login" class="navbar-brand mr-2">Login</a>
+            {{end}}
         </section>
-        {{end}}
     </header>
     <div class="divider"></div>
     {{tmpl .Page .}}

static/templates/new.tmpl

@@ -15,5 +15,14 @@
         </div>
     </div>
 </div>
+<br/>
+<div class="container">
+    <div class="columns">
+        <div class="column col-6 col-mx-auto">
+            <button class="btn">Add File</button>
+            <button class="btn btn-success float-right">Create Gist</button>
+        </div>
+    </div>
+</div>
 <script type="text/javascript" src="https://unpkg.com/monaco-editor@latest/min/vs/loader.js"></script>
 <script src="{{.Domain}}/_/js/monaco.js"></script>