diff --git a/.dockerignore b/.dockerignore index deefb52..637c9a1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ -**/atri.dad +**/goth.stack **/.env **/airbin **/tmp diff --git a/.gitignore b/.gitignore index c2df74b..5ac3390 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -atri.dad +goth.stack main .env airbin diff --git a/README.md b/README.md index 066e9a0..c89f5aa 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,30 @@ -# atri.dad -This is my personal website! +# GOTH Stack -## Stack: -- Backend: Golang + Echo -- Rendering: Golang templates -- Style: TailwindCSS + DaisyUI -- Content format: Markdown +A modern web application stack combining: +- Go (Backend) +- HTMX (Frontend Interactivity) +- Tailwind CSS (Styling) -## Requirements: -- Golang 1.23.1 +## Features +- Server-Side Rendering +- Real-time capabilities with SSE +- Built-in tools and utilities +- API documentation with Swagger +- Modern responsive design +- Zero client-side JavaScript (optional) -## Instructions: -1. Run ```go get``` -2. Duplicate the .env.example file and call it .env -3. Fill out the required .env values -4. Run ```go install github.com/air-verse/air@latest``` to download Air for live reload -5. Run ```air``` to start the dev server (macOS and Linux only) +## Getting Started +1. Clone this repository +2. Copy `.env.example` to `.env` +3. Run `go mod download` +4. Start the server: `go run main.go` + +## API Documentation +1. Install swag by running ```go install github.com/swaggo/swag/cmd/swag@latest``` +2. Visit `/api/swagger/index.html` after starting the server + +## Example Posts +Check out the `/posts` route for blogging examples + +## License +MIT diff --git a/api/rss.go b/api/rss.go index 22f5f80..c0e9a83 100644 --- a/api/rss.go +++ b/api/rss.go @@ -15,10 +15,10 @@ import ( "strings" "time" - contentfs "atri.dad/content" - "atri.dad/lib" "github.com/gorilla/feeds" "github.com/labstack/echo/v4" + contentfs "goth.stack/content" + "goth.stack/lib" ) func RSSFeedHandler(c echo.Context) error { diff --git a/api/sse.go b/api/sse.go index 96372cd..ae54a96 100644 --- a/api/sse.go +++ b/api/sse.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "atri.dad/lib" "github.com/labstack/echo/v4" + "goth.stack/lib" ) // SSE godoc diff --git a/api/tools.resize.go b/api/tools.resize.go index f193e9f..3fbdfa3 100644 --- a/api/tools.resize.go +++ b/api/tools.resize.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "atri.dad/lib" + "goth.stack/lib" "github.com/labstack/echo/v4" ) diff --git a/api/tools.sendsse.go b/api/tools.sendsse.go index 5d32dd5..3d51a96 100644 --- a/api/tools.sendsse.go +++ b/api/tools.sendsse.go @@ -3,7 +3,7 @@ package api import ( "net/http" - "atri.dad/lib" + "goth.stack/lib" "github.com/labstack/echo/v4" ) diff --git a/content/welcome.md b/content/welcome.md index 6e7d475..57ac6d3 100644 --- a/content/welcome.md +++ b/content/welcome.md @@ -1,9 +1,105 @@ --- -name: "Welcome!" -date: "October 20 2024" -tags: ["welcome"] +name: "Welcome to GOTH Stack!" +date: "April 20 2069" +tags: ["markdown", "demo", "goth-stack"] --- -Welcome to my site! This is a place for me to share my thoughts and updates on my projects. I hope you find something interesting here. +# Welcome to GOTH Stack! -Feel free to reach out if you have any questions or comments. I'd love to hear from you! I can be reached by email at [me@atri.dad](mailto:me@atri.dad). +This is a demo post showcasing various Markdown features supported by this template. + +## Text Formatting + +You can write text in **bold**, *italic*, or ***both***. You can also use ~~strikethrough~~ and `inline code`. + +## Links and Images + +### Links +- [External Link](https://github.com/yourusername/goth.stack) +- [Internal Link](/docs) +- [Email Link](mailto:example@goth.stack) + +### Images +![GOTH Stack Logo](https://via.placeholder.com/150) + +## Lists + +### Unordered List +- First item +- Second item + - Nested item + - Another nested item +- Third item + +### Ordered List +1. First step +2. Second step + 1. Nested step + 2. Another nested step +3. Third step + +## Code Blocks + +### Inline Code +Use `go run main.go` to start the server. + +### Code Block with Syntax Highlighting +```go +package main + +import "fmt" + +func main() { + fmt.Println("Hello, GOTH Stack!") +} +``` + +## Blockquotes + +> This is a blockquote +> +> It can span multiple lines +>> And can be nested + +## Tables + +| Feature | Description | +|---------|-------------| +| Go | Backend server | +| HTMX | Frontend interactivity | +| Tailwind | Styling | + +## Task Lists + +- [x] Create project structure +- [x] Add basic documentation +- [ ] Write more examples +- [ ] Add testing + +## Horizontal Rule + +--- + +## Extended Features + +### Collapsible Section +
+Click to expand + +This content is hidden by default but can be revealed by clicking. +
+ +### Custom HTML (if enabled) +
+ This is a custom styled alert using Tailwind/DaisyUI classes +
+ +## Getting Help + +If you have questions or need assistance: +1. Visit our [GitHub repository](https://github.com/atridadl/goth.stack) +2. Contact us at [help@goth.stack](mailto:me@atri.dad) + +--- + +*This is a demo post showing the Markdown capabilities of GOTH Stack. Feel free to use it as a reference for your own content.* diff --git a/docs/docs.go b/docs/docs.go index 42d6560..7cf36a8 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -209,8 +209,8 @@ var SwaggerInfo = &swag.Spec{ Host: "localhost:3000", BasePath: "/api", Schemes: []string{}, - Title: "Atri.dad API", - Description: "This is the API for atri.dad", + Title: "GOTH Stack API", + Description: "This is the API for GOTH Stack - Go + HTMX + Tailwind", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, LeftDelim: "{{", diff --git a/docs/swagger.json b/docs/swagger.json index 54c014b..911b879 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1,8 +1,8 @@ { "swagger": "2.0", "info": { - "description": "This is the API for atri.dad", - "title": "Atri.dad API", + "description": "This is the API for GOTH Stack - Go + HTMX + Tailwind", + "title": "GOTH Stack API", "contact": {}, "version": "1.0" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 12d3e8f..71d3d07 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2,8 +2,8 @@ basePath: /api host: localhost:3000 info: contact: {} - description: This is the API for atri.dad - title: Atri.dad API + description: This is the API for GOTH Stack - Go + HTMX + Tailwind + title: GOTH Stack API version: "1.0" paths: /ping: diff --git a/fly.toml b/fly.toml index e0ccec8..3ee9fc5 100644 --- a/fly.toml +++ b/fly.toml @@ -3,7 +3,7 @@ # See https://fly.io/docs/reference/configuration/ for information about how to use this file. # -app = 'atridotdad' +app = 'gothstack' primary_region = 'ord' [build] diff --git a/go.mod b/go.mod index 58422b5..0c63165 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module atri.dad +module goth.stack go 1.23 diff --git a/lib/templates.go b/lib/templates.go index e650567..ea71bb2 100644 --- a/lib/templates.go +++ b/lib/templates.go @@ -6,7 +6,7 @@ import ( "path/filepath" "runtime" - templatefs "atri.dad/pages/templates" + templatefs "goth.stack/pages/templates" ) func RenderTemplate(w http.ResponseWriter, layout string, partials []string, props interface{}) error { diff --git a/main.go b/main.go index cb415e2..1f99126 100755 --- a/main.go +++ b/main.go @@ -6,23 +6,23 @@ import ( "fmt" "net/http" - "atri.dad/api" - "atri.dad/lib" - "atri.dad/pages" + "goth.stack/api" + "goth.stack/lib" + "goth.stack/pages" - _ "atri.dad/docs" "github.com/joho/godotenv" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" echoSwagger "github.com/swaggo/echo-swagger" + _ "goth.stack/docs" ) //go:embed public/* var PublicFS embed.FS -// @title Atri.dad API +// @title GOTH Stack API // @version 1.0 -// @description This is the API for atri.dad +// @description This is the API for GOTH Stack - Go + HTMX + Tailwind // @host localhost:3000 // @BasePath /api func main() { @@ -49,9 +49,6 @@ func main() { // Page routes e.GET("/", pages.Home) - e.GET("/projects", pages.Projects) - e.GET("/talks", pages.Talks) - e.GET("/pubs", pages.Pubs) e.GET("/posts", pages.Posts) e.GET("/posts/:post", pages.Post) e.GET("/tools", pages.Tools) diff --git a/pages/example.go b/pages/example.go index 37d75c0..0a318fb 100644 --- a/pages/example.go +++ b/pages/example.go @@ -1,7 +1,7 @@ package pages import ( - "atri.dad/lib" + "goth.stack/lib" "github.com/labstack/echo/v4" ) diff --git a/pages/home.go b/pages/home.go index c58042a..c5f10dd 100644 --- a/pages/home.go +++ b/pages/home.go @@ -3,8 +3,8 @@ package pages import ( "html/template" - "atri.dad/lib" "github.com/labstack/echo/v4" + "goth.stack/lib" ) type HomeProps struct { @@ -29,57 +29,17 @@ func Home(c echo.Context) error { }, { Name: "Github", - Href: "https://github.com/atridadl", + Href: "https://github.com/atridadl/goth.stack", Icon: template.HTML(``), }, - { - Name: "LinkedIn", - Href: "https://www.linkedin.com/in/atridadl/", - Icon: template.HTML(``), - }, - { - Name: "Twitch", - Href: "https://www.twitch.tv/himbothyswaggins", - Icon: template.HTML(``), - }, } tech := []lib.IconLink{ - { - Name: "React", - Href: "https://react.dev", - Icon: template.HTML(`React`), - }, - { - Name: "TypeScript", - Href: "https://typescriptlang.org", - Icon: template.HTML(`TypeScript`), - }, - { - Name: "Node.js", - Href: "https://nodejs.org", - Icon: template.HTML(`Node.js`), - }, - { - Name: "Bun", - Href: "https://bun.sh", - Icon: template.HTML(`Bun`), - }, { Name: "Go", Href: "https://golang.org", Icon: template.HTML(`Go`), }, - { - Name: "PostgreSQL", - Href: "https://postgresql.org", - Icon: template.HTML(`PostgreSQL`), - }, - { - Name: "Redis", - Href: "https://redis.io", - Icon: template.HTML(`Redis`), - }, { Name: "Docker", Href: "https://docker.com", @@ -89,8 +49,8 @@ func Home(c echo.Context) error { buttons := []lib.ButtonLink{ { - Name: "Resumé", - Href: "/public/files/Atridad_Lahiji_Resume.pdf", + Name: "API Documentation", + Href: "/api/swagger/index.html", Internal: false, }, { @@ -101,16 +61,13 @@ func Home(c echo.Context) error { } props := HomeProps{ - Title: "Hi, I'm Atridad", - Subtitle: "Researcher, Full-Stack Developer, and IT Professional.", + Title: "GOTH Stack", + Subtitle: "A Modern Web Application Stack: Go + HTMX + Tailwind", Socials: socials, Tech: tech, ButtonsLinks: buttons, } - // Specify the partials used by this page partials := []string{"header", "navitems", "iconlinks", "buttonlinks"} - - // Render the template return lib.RenderTemplate(c.Response().Writer, "base", partials, props) } diff --git a/pages/post.go b/pages/post.go index a8a5047..4be5c65 100644 --- a/pages/post.go +++ b/pages/post.go @@ -6,8 +6,8 @@ import ( "io/fs" "net/http" - contentfs "atri.dad/content" - "atri.dad/lib" + contentfs "goth.stack/content" + "goth.stack/lib" chromahtml "github.com/alecthomas/chroma/v2/formatters/html" "github.com/labstack/echo/v4" "github.com/yuin/goldmark" diff --git a/pages/posts.go b/pages/posts.go index 7a6d195..a40e3a4 100644 --- a/pages/posts.go +++ b/pages/posts.go @@ -8,8 +8,8 @@ import ( "strings" "time" - contentfs "atri.dad/content" - "atri.dad/lib" + contentfs "goth.stack/content" + "goth.stack/lib" "github.com/labstack/echo/v4" ) diff --git a/pages/projects.go b/pages/projects.go deleted file mode 100644 index e236f9e..0000000 --- a/pages/projects.go +++ /dev/null @@ -1,49 +0,0 @@ -package pages - -import ( - "atri.dad/lib" - "github.com/labstack/echo/v4" -) - -type ProjectProps struct { - Projects []lib.CardLink -} - -func Projects(c echo.Context) error { - projects := []lib.CardLink{ - { - Name: "Pollo", - Description: "A dead-simple real-time voting tool.", - Tags: []string{"golang", "htmx", "product"}, - Href: "https://github.com/atridadl/pollo", - }, - { - Name: "GOTH Stack", - Description: "🚀 A Web Application Template Powered by HTMX + Go + Tailwind 🚀", - Tags: []string{"golang", "htmx", "template"}, - Href: "https://github.com/atridadl/goth.stack", - }, - { - Name: "Himbot", - Description: "A discord bot written in Go. Loosly named after my username online (HimbothySwaggins).", - Tags: []string{"golang", "bot"}, - Href: "https://github.com/atridadl/HimBot", - }, - { - Name: "loadr", - Description: "A lightweight REST load testing tool with robust support for different verbs, token auth, and performance reports.", - Tags: []string{"golang", "cli"}, - Href: "https://github.com/atridadl/loadr", - }, - } - - props := ProjectProps{ - Projects: projects, - } - - // Specify the partials used by this page - partials := []string{"header", "navitems", "cardlinks"} - - // Render the template - return lib.RenderTemplate(c.Response().Writer, "base", partials, props) -} diff --git a/pages/pubs.go b/pages/pubs.go deleted file mode 100644 index 43c4a07..0000000 --- a/pages/pubs.go +++ /dev/null @@ -1,24 +0,0 @@ -package pages - -import ( - "atri.dad/lib" - "github.com/labstack/echo/v4" -) - -type PubProps struct { - Pubs []lib.CardLink -} - -func Pubs(c echo.Context) error { - pubs := []lib.CardLink{} - - props := PubProps{ - Pubs: pubs, - } - - // Specify the partials used by this page - partials := []string{"header", "navitems", "cardlinks"} - - // Render the template - return lib.RenderTemplate(c.Response().Writer, "base", partials, props) -} diff --git a/pages/talks.go b/pages/talks.go deleted file mode 100644 index 9bfc596..0000000 --- a/pages/talks.go +++ /dev/null @@ -1,39 +0,0 @@ -package pages - -import ( - "atri.dad/lib" - "github.com/labstack/echo/v4" -) - -type TalkProps struct { - Talks []lib.CardLink -} - -func Talks(c echo.Context) error { - talks := []lib.CardLink{ - { - Name: "Hypermedia as the engine of application state - an Introduction", - Description: "A talk on building reactive websites using tools like HTMX instead of JSON + JS. Will be presented at the Dev Edmonton Fabruary 2024 JS/Ruby/Python Meetup", - Href: "/public/files/hypermedia_talk_atridad.pdf", - Tags: []string{"golang", "htmx", "ssr"}, - Date: "February 01, 2024", - }, - { - Name: "Introduction to Social Network Analysis (SNA)", - Description: "Understanding Relationships in Social Structures", - Href: "/public/files/Understanding_Relationships_in_Social_Structures.pdf", - Tags: []string{"graphs", "social", "lecture"}, - Date: "October 08, 2024", - }, - } - - props := TalkProps{ - Talks: talks, - } - - // Specify the partials used by this page - partials := []string{"header", "navitems", "cardlinks"} - - // Render the template - return lib.RenderTemplate(c.Response().Writer, "base", partials, props) -} diff --git a/pages/templates/home.html b/pages/templates/home.html index d58cd3d..88005af 100644 --- a/pages/templates/home.html +++ b/pages/templates/home.html @@ -1,9 +1,9 @@ {{define "title"}} -Atridad Lahiji // Root +GOTH Stack // Root {{end}} {{define "headercontent"}} -Atridad Lahiji // Root +{{template "title" .}} {{end}} {{define "head"}} @@ -21,7 +21,7 @@ Atridad Lahiji // Root -

Places I exist:

+

Links:

{{range .Socials}} {{template "iconlinks" .}} @@ -30,7 +30,7 @@ Atridad Lahiji // Root -

Stuff I Use:

+

Tech Stack:

{{range .Tech}} diff --git a/pages/templates/partials/navitems.html b/pages/templates/partials/navitems.html index ddde84e..0c6f7eb 100644 --- a/pages/templates/partials/navitems.html +++ b/pages/templates/partials/navitems.html @@ -3,13 +3,7 @@ Home
  • - Projects -
    • -
  • - Publications -
    • -
  • - Talks + API Documentation
  • Posts diff --git a/pages/templates/post.html b/pages/templates/post.html index 18fefa9..3c81616 100644 --- a/pages/templates/post.html +++ b/pages/templates/post.html @@ -1,9 +1,9 @@ {{define "title"}} -Atridad Lahiji // Post +GOTH Stack // Post {{end}} {{define "headercontent"}} -Atridad Lahiji // Post +{{template "title" .}} {{end}} {{define "head"}} diff --git a/pages/templates/posts.html b/pages/templates/posts.html index 6c96f49..46a7044 100644 --- a/pages/templates/posts.html +++ b/pages/templates/posts.html @@ -1,9 +1,9 @@ {{define "title"}} -Atridad Lahiji // Blog +GOTH Stack // Blog {{end}} {{define "headercontent"}} -Atridad Lahiji // Blog +{{template "title" .}} {{end}} {{define "head"}} diff --git a/pages/templates/projects.html b/pages/templates/projects.html deleted file mode 100644 index 794b0c5..0000000 --- a/pages/templates/projects.html +++ /dev/null @@ -1,34 +0,0 @@ -{{define "title"}} -Atridad Lahiji // Projects -{{end}} - -{{define "headercontent"}} -Atridad Lahiji // Projects -{{end}} - -{{define "head"}} - -{{end}} - -{{define "main"}} - -{{if .Projects}} -
    - {{range .Projects}} - {{template "cardlinks" .}} - {{end}} -
    -{{end}} - -{{if not .Projects}} -
    -

    - Nothing to see here (yet)! -

    -
    -{{end}} - -{{end}} - -{{define "foot"}} -{{end}} diff --git a/pages/templates/pubs.html b/pages/templates/pubs.html index 0e5942d..cea55c2 100644 --- a/pages/templates/pubs.html +++ b/pages/templates/pubs.html @@ -1,9 +1,9 @@ {{define "title"}} -Atridad Lahiji // Publications +GOTH Stack // Publications {{end}} {{define "headercontent"}} -Atridad Lahiji // Publications +{{template "title" .}} {{end}} {{define "head"}} diff --git a/pages/templates/talks.html b/pages/templates/talks.html deleted file mode 100644 index c36c0b9..0000000 --- a/pages/templates/talks.html +++ /dev/null @@ -1,34 +0,0 @@ -{{define "title"}} -Atridad Lahiji // Talks -{{end}} - -{{define "headercontent"}} -Atridad Lahiji // Talks -{{end}} - -{{define "head"}} - -{{end}} - -{{define "main"}} - -{{if .Talks}} -
    - {{range .Talks}} - {{template "cardlinks" .}} - {{end}} -
    -{{end}} - -{{if not .Talks}} -
    -

    - Nothing to see here (yet)! -

    -
    -{{end}} - -{{end}} - -{{define "foot"}} -{{end}} diff --git a/pages/templates/tools.html b/pages/templates/tools.html index 4aab138..2c9900a 100644 --- a/pages/templates/tools.html +++ b/pages/templates/tools.html @@ -1,9 +1,9 @@ {{define "title"}} -Atridad Lahiji // Tools +GOTH Stack // Tools {{end}} {{define "headercontent"}} -Atridad Lahiji // Tools +{{template "title" .}} {{end}} {{define "head"}} diff --git a/pages/templates/tools.resize.html b/pages/templates/tools.resize.html index 3067911..07ad3c1 100644 --- a/pages/templates/tools.resize.html +++ b/pages/templates/tools.resize.html @@ -1,9 +1,9 @@ {{define "title"}} -Atridad Lahiji // Tools // Resizer +GOTH Stack // Tools // Resizer {{end}} {{define "headercontent"}} -Atridad Lahiji // Tools // Resizer +{{template "title" .}} {{end}} {{define "head"}} @@ -28,4 +28,4 @@ Atridad Lahiji // Tools // Resizer {{end}} {{define "foot"}} -{{end}} \ No newline at end of file +{{end}} diff --git a/pages/templates/tools.ssedemo.html b/pages/templates/tools.ssedemo.html index b1afe35..20b37f2 100644 --- a/pages/templates/tools.ssedemo.html +++ b/pages/templates/tools.ssedemo.html @@ -1,7 +1,7 @@ -{{define "title"}}Atridad Lahiji // Tools // SSE Demo{{end}} +{{define "title"}}GOTH Stack // Tools // SSE Demo{{end}} {{define "headercontent"}} -Atridad Lahiji // Tools // SSE Demo +{{template "title" .}} {{end}} {{define "head"}} diff --git a/pages/tools.go b/pages/tools.go index 0ffa9d1..f500873 100644 --- a/pages/tools.go +++ b/pages/tools.go @@ -1,7 +1,7 @@ package pages import ( - "atri.dad/lib" + "goth.stack/lib" "github.com/labstack/echo/v4" ) diff --git a/pages/tools.resize.go b/pages/tools.resize.go index 9d244fa..05f5dac 100644 --- a/pages/tools.resize.go +++ b/pages/tools.resize.go @@ -1,8 +1,8 @@ package pages import ( - "atri.dad/lib" "github.com/labstack/echo/v4" + "goth.stack/lib" ) type ResizeProps struct { @@ -22,12 +22,12 @@ func Resize(c echo.Context) error { Name: "Hypermedia as the engine of application state - an Introduction", Description: "A talk on building reactive websites using tools like HTMX instead of JSON + JS. Will be presented at the Dev Edmonton Fabruary 2024 JS/Ruby/Python Meetup", // Href: lib.GeneratePublicURL("hypermedia_talk_atridad.pdf"), - Tags: []string{"golang", "htmx", "ssr"}, - Date: "February 01, 2024", + Tags: []string{"golang", "htmx", "ssr"}, + Date: "February 01, 2024", }, } - props := TalkProps{ + props := ResizeProps{ Talks: talks, } diff --git a/pages/tools.ssedemo.go b/pages/tools.ssedemo.go index d085fa1..741e704 100644 --- a/pages/tools.ssedemo.go +++ b/pages/tools.ssedemo.go @@ -1,7 +1,7 @@ package pages import ( - "atri.dad/lib" + "goth.stack/lib" "github.com/labstack/echo/v4" )