sophuwu.site > myweb 
i forgot what i done but it's probably progress
sophuwu sophie@skisiel.com
Thu, 05 Dec 2024 01:08:10 +0100
commit

2fddbc191f1e245c887f54650e6b2c73540dd8af

parent

f82b1294744e938beeb9f82213c888041e7a9d53

9 files changed, 67 insertions(+), 32 deletions(-)

jump to
D blogs.go 
@@ -1,17 +0,0 @@ 
-package main
-
-import "time"
-
-type BlogPost struct {
-	BlogID  string    `storm:"blogID"`
-	Title   string    `storm:"title"`
-	Date    time.Time `storm:"date"`
-	Summary string    `storm:"summary"`
-}
-type BlogComment struct {
-	CommentID string    `storm:"commentID"`
-	BlogID    string    `storm:"blogID"`
-	Comment   string    `storm:"comment"`
-	Date      time.Time `storm:"date"`
-	Name      string    `storm:"name"`
-}
M config/config.go → config/config.go 
@@ -10,7 +10,6 @@ 
 var (
 	ListenAddr string
 	WebRoot    string
-	DbPath     string
 	StaticPath string
 	MediaPath  string
 	Templates  string

@@ -54,7 +53,6 @@ WebRoot = mm["webroot"]
 	} else {
 		WebRoot = filepath.Join(filepath.Dir(os.Args[1]), mm["webroot"])
 	}
-	DbPath = path("data.db")
 	StaticPath = path("static")
 	MediaPath = path("media")
 	Templates = path("templates/*")
M go.mod → go.mod 
@@ -2,4 +2,9 @@ module sophuwu.site/myweb
 
 go 1.22.5
 
-require gopkg.in/yaml.v3 v3.0.1 // indirect
+require github.com/asdine/storm/v3 v3.2.1
+
+require (
+	go.etcd.io/bbolt v1.3.4 // indirect
+	golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect
+)
M go.sum → go.sum 
@@ -1,3 +1,37 @@ 
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM=
+github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
+github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863 h1:BRrxwOZBolJN4gIwvZMJY1tzqBvQgpaZiQRuIDD40jM=
+github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM=
+github.com/asdine/storm/v3 v3.2.1 h1:I5AqhkPK6nBZ/qJXySdI7ot5BlXSZ7qvDY1zAn5ZJac=
+github.com/asdine/storm/v3 v3.2.1/go.mod h1:LEpXwGt4pIqrE/XcTvCnZHT5MgZCV6Ub9q7yQzOFWr0=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
+github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
+go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
+go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20191105084925-a882066a44e0 h1:QPlSTtPE2k6PZPasQUbzuK3p9JbS+vMXYVto8g/yrsg=
+golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
M main.go → main.go 
@@ -1,9 +1,13 @@ 
 package main
 
 import (
+	"context"
+	"errors"
 	"html/template"
 	"log"
 	"net/http"
+	"os"
+	"os/signal"
 	"sophuwu.site/myweb/config"
 )
 

@@ -38,6 +42,17 @@ http.HandleFunc("/", HttpIndex)
 	HttpFS("/static/", config.StaticPath)
 	HttpFS("/media/", config.MediaPath)
 
-	http.ListenAndServe(config.ListenAddr, nil)
-
+	server := http.Server{Addr: config.ListenAddr, Handler: nil}
+	go func() {
+		err := server.ListenAndServe()
+		if err != nil && !errors.Is(err, http.ErrServerClosed) {
+			log.Fatalf("Error starting server: %v", err)
+		}
+	}()
+	sigchan := make(chan os.Signal)
+	signal.Notify(sigchan)
+	s := <-sigchan
+	println("stopping: got signal", s.String())
+	server.Shutdown(context.Background())
+	println("stopped")
 }
M webhome/myweb.conf → webhome/myweb.conf 
@@ -2,7 +2,7 @@ ## The port to listen for http requests.
 port=8085
 
 ## The address to listen for http requests.
-address=127.0.0.1
+address=0.0.0.0
 
 ## The path to the directory containing the website files.
 ## Absolute or relative to the directory containing this file.
M webhome/static/scripts.js → webhome/static/scripts.js 
@@ -23,7 +23,7 @@ }
 
 function check_theme() {
     let theme = getCookie("light_theme");
-    if (theme === "light") {
+    if (theme == "light") {
         document.getElementById("csstheme").href = "/static/style_light.css";
     } else {
         document.getElementById("csstheme").href = "/static/style_dark.css";

@@ -32,10 +32,12 @@ }
 
 function toggle_theme() {
     let theme = getCookie("light_theme");
-    if (theme === "light") {
+    if (theme == "light") {
         setCookie("light_theme", "dark", 30);
     } else {
         setCookie("light_theme", "light", 30);
     }
     check_theme();
-}+}
+
+check_theme();
M webhome/templates/header.html → webhome/templates/header.html 
@@ -7,7 +7,7 @@ <a href="/" ><button ><b class="icon">u</b> About</button></a>
             <a href="/blog/"><button ><b class="icon">b</b> Blog</button></a>
             <a href="/animations/"><button ><b class="icon">a</b> Art</button></a>
             <a href="//sophuwu.site/"><button ><b class="icon">g</b> Git</button></a>
-            <button onclick="toggle_theme()"><b class="icon">s&leftrightarrow;m</b></button>
+            <button onclick="toggle_theme()"><b class="icon">s m</b></button>
         </nav>
     </div>
     <hr >
M webhome/templates/index.html → webhome/templates/index.html 
@@ -13,8 +13,6 @@ <p>
         Welcome to my website! I'm a software engineer and I love to code.
     </p>
 
-    <textarea style="height: 2000%;"></textarea>
-
 
 
 </main>