diff --git a/cmd/main.go b/cmd/main.go index aa1c38f..2318010 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1,6 +1,7 @@ package main import ( + "flag" "fmt" "math/rand" "net/http" @@ -28,6 +29,14 @@ type StatsFormData struct { var linkMap = map[string]*models.Link{} +var baseurl *string + +func init() { + baseurl = flag.String("url", "127.0.0.1:8080", "The url (domain) that the server is running on") + + flag.Parse() +} + func main() { e := echo.New() @@ -86,7 +95,7 @@ func SubmitHandler(c echo.Context) error { linkMap[id] = &models.Link{Id: id, Url: data.Url} - return views.Submission(id).Render(c.Request().Context(), c.Response()) + return views.Submission(id, *baseurl).Render(c.Request().Context(), c.Response()) } func StatsHandler(c echo.Context) error { diff --git a/docker-compose.yml b/docker-compose.yml index 64779d4..139f93b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,4 +6,5 @@ services: dockerfile: Dockerfile ports: - "8080:8080" - restart: unless-stopped \ No newline at end of file + restart: unless-stopped + command: ["/shortr", "--url", "app.4rkal.com"] diff --git a/views/submit.templ b/views/submit.templ index 2c43841..7016910 100644 --- a/views/submit.templ +++ b/views/submit.templ @@ -1,9 +1,9 @@ package views -templ Submission(url string){ +templ Submission(url, baseurl string){ @Base() { -

Your url is: {url}

+

Your url is: {baseurl + "/" + url}

diff --git a/views/submit_templ.go b/views/submit_templ.go index 72c102f..3081533 100644 --- a/views/submit_templ.go +++ b/views/submit_templ.go @@ -8,7 +8,7 @@ package views import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -func Submission(url string) templ.Component { +func Submission(url, baseurl string) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { @@ -41,20 +41,20 @@ func Submission(url string) templ.Component { }() } ctx = templ.InitializeContext(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Your url is: ") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Your url is: ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var3 string - templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(url) + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(baseurl + "/" + url) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views/submit.templ`, Line: 6, Col: 25} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views/submit.templ`, Line: 6, Col: 47} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("