Cleanup

api/stripe.pay.go

@@ -1,26 +0,0 @@
-package api
-
-import (
-	"net/http"
-
-	"atri.dad/lib"
-	"github.com/labstack/echo/v4"
-)
-
-type PayRequest struct {
-	SuccessUrl string `json:"successUrl"`
-	CancelUrl  string `json:"cancelUrl"`
-	PriceId    string `json:"priceId"`
-}
-
-func Pay(c echo.Context) error {
-	payReq := new(PayRequest)
-
-	if err := c.Bind(payReq); err != nil {
-		return c.JSON(http.StatusBadRequest, map[string]string{"error": "Invalid request payload"})
-	}
-
-	lib.CreateCheckoutSession(c.Response().Writer, c.Request(), payReq.SuccessUrl, payReq.CancelUrl, payReq.PriceId)
-
-	return c.String(http.StatusOK, "Checkout session created")
-}

go.mod

@@ -28,7 +28,6 @@ require (
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/stripe/stripe-go/v76 v76.25.0
 	github.com/yuin/goldmark v1.7.4
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	golang.org/x/crypto v0.26.0 // indirect

go.sum

@@ -52,8 +52,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stripe/stripe-go/v76 v76.25.0 h1:kmDoOTvdQSTQssQzWZQQkgbAR2Q8eXdMWbN/ylNalWA=
-github.com/stripe/stripe-go/v76 v76.25.0/go.mod h1:rw1MxjlAKKcZ+3FOXgTHgwiOa2ya6CPq6ykpJ0Q6Po4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
@@ -68,23 +66,17 @@ golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn5
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
 golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys=
-golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
 golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

lib/stripe.go

@@ -1,40 +0,0 @@
-package lib
-
-import (
-	"net/http"
-	"os"
-
-	"github.com/joho/godotenv"
-	"github.com/stripe/stripe-go/v76"
-	"github.com/stripe/stripe-go/v76/checkout/session"
-)
-
-// init function
-func init() {
-	godotenv.Load(".env")
-	stripe.Key = os.Getenv("STRIPE_SECRET_KEY")
-}
-
-func CreateCheckoutSession(w http.ResponseWriter, r *http.Request, successUrl string, cancelUrl string, priceId string) {
-	params := &stripe.CheckoutSessionParams{
-		LineItems: []*stripe.CheckoutSessionLineItemParams{
-			{
-				// Provide the exact Price ID (for example, pr_1234) of the product you want to sell
-				Price:    stripe.String(priceId),
-				Quantity: stripe.Int64(1),
-			},
-		},
-		Mode:         stripe.String(string(stripe.CheckoutSessionModePayment)),
-		SuccessURL:   stripe.String(successUrl),
-		CancelURL:    stripe.String(cancelUrl),
-		AutomaticTax: &stripe.CheckoutSessionAutomaticTaxParams{Enabled: stripe.Bool(true)},
-	}
-
-	s, err := session.New(params)
-
-	if err != nil {
-		LogError.Printf("session.New: %v", err)
-	}
-
-	http.Redirect(w, r, s.URL, http.StatusSeeOther)
-}

main.go

@@ -45,8 +45,8 @@ func main() {
 	e.GET("/projects", pages.Projects)
 	e.GET("/talks", pages.Talks)
 	e.GET("/testimonials", pages.Testimonials)
-	e.GET("/blog", pages.Blog)
+	e.GET("/posts", pages.Posts)
-	e.GET("/post/:post", pages.Post)
+	e.GET("/posts/:post", pages.Post)
 	e.GET("/tools", pages.Tools)
 	e.GET("/tools/resize", pages.Resize)
 	e.GET("/tools/ssedemo", pages.SSEDemo)
@@ -54,7 +54,6 @@ func main() {
 	// API Routes:
 	apiGroup := e.Group("/api")
 	apiGroup.GET("/ping", api.Ping)
-	apiGroup.POST("/pay", api.Pay)
 	apiGroup.GET("/rss", api.RSSFeedHandler)
 	apiGroup.GET("/post/copy", api.PostCopy)
 

pages/home.go

@@ -114,9 +114,9 @@ func Home(c echo.Context) error {
 			Internal: true,
 		},
 		{
-			Name:     "Support 🩵",
+			Name:     "Posts",
-			Href:     "https://donate.stripe.com/8wMeVF25c78L0V2288",
+			Href:     "/posts",
-			Internal: false,
+			Internal: true,
 		},
 	}
 

pages/posts.go

@@ -13,11 +13,11 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-type BlogProps struct {
+type PostsProps struct {
 	Posts []lib.CardLink
 }
 
-func Blog(c echo.Context) error {
+func Posts(c echo.Context) error {
 	var posts []lib.CardLink
 
 	files, err := fs.ReadDir(contentfs.FS, ".")
@@ -36,7 +36,7 @@ func Blog(c echo.Context) error {
 				return nil
 			}
 
-			frontMatter.Href = "post/" + strings.TrimSuffix(file.Name(), ".md")
+			frontMatter.Href = "posts/" + strings.TrimSuffix(file.Name(), ".md")
 			frontMatter.Internal = true
 
 			posts = append(posts, frontMatter)
@@ -59,7 +59,7 @@ func Blog(c echo.Context) error {
 		return iDate.Before(jDate)
 	})
 
-	props := BlogProps{
+	props := PostsProps{
 		Posts: posts,
 	}
 

pages/templates/layouts/post.html

@@ -42,7 +42,7 @@
             <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-copy"><rect width="14" height="14" x="8" y="8" rx="2" ry="2"/><path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"/></svg>
           </button>
 
-          <a href="/blog" class="btn btn-primary btn-outline">
+          <a href="/posts" class="btn btn-primary btn-outline">
             <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-undo-2"><path d="M9 14 4 9l5-5"/><path d="M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5v0a5.5 5.5 0 0 1-5.5 5.5H11"/></svg>
             Back
           </a>