diff --git a/web/static/fonts/Roboto-VariableFont.ttf b/web/static/fonts/Roboto-VariableFont.ttf new file mode 100644 index 0000000..bba55f6 Binary files /dev/null and b/web/static/fonts/Roboto-VariableFont.ttf differ diff --git a/web/static/styling/basic-styling.templ b/web/static/styling/basic-styling.templ index f3d0e30..21d1dd5 100644 --- a/web/static/styling/basic-styling.templ +++ b/web/static/styling/basic-styling.templ @@ -8,11 +8,11 @@ Be aware that class names in final html page will be random. */ -var mainColor = "#ffb37f" -var bgColor = "#272727" -var bgVariation = "#1f1f1f" // Color simmilar to bg -var contrastColor = "#92ffd1" // Contrast to mainColor -var textColor = "#FFFFFF"; +var mainColor = "#3B749F" +var contrastColor = "#749F3B" // Contrast to mainColor +var bgColor = "#1e1e1e" +var bgVariation = "#1B1B1B" // Color simmilar to bg +var textColor = "#dadada"; css BlogFormInput() { width: 70%; @@ -50,8 +50,12 @@ css Textcontainer() { } css BlogContainer() { - border: 2px dashed gray; - margin: 20px; + font-size: 16px; + font-family: Roboto; + margin-right: 150px; + margin-left: 150px; + position: relative; + color: { textColor }; } css HelloContainer() { @@ -101,3 +105,31 @@ css CenterContainer() { justify-content: center; align-items: center; } + +css BlogHeading() { + display: flex; + flex-grow: 1; + height: 30px; + position: relative; +} + +css BlogHeadingLeft() { + position: absolute; + display: flex; + flex-wrap: wrap; + top: 0px; + left: 0px; +} + +css BlogHeadingRight() { + position: absolute; + display: flex; + flex-wrap: wrap; + right: 0px; + top: 0px; +} + +css BubbleContainer() { + background-color: {bgVariation}; + border-radius: 10px; +} \ No newline at end of file diff --git a/web/static/styling/basic-styling_templ.go b/web/static/styling/basic-styling_templ.go index 8c53787..f7d441f 100644 --- a/web/static/styling/basic-styling_templ.go +++ b/web/static/styling/basic-styling_templ.go @@ -15,11 +15,11 @@ Currently all elements are not sorted. Be aware that class names in final html page will be random. */ -var mainColor = "#ffb37f" -var bgColor = "#272727" -var bgVariation = "#1f1f1f" // Color simmilar to bg -var contrastColor = "#92ffd1" // Contrast to mainColor -var textColor = "#FFFFFF" +var mainColor = "#3B749F" +var contrastColor = "#749F3B" // Contrast to mainColor +var bgColor = "#1e1e1e" +var bgVariation = "#1B1B1B" // Color simmilar to bg +var textColor = "#dadada" func BlogFormInput() templ.CSSClass { templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() @@ -88,8 +88,12 @@ func Textcontainer() templ.CSSClass { func BlogContainer() templ.CSSClass { templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() - templ_7745c5c3_CSSBuilder.WriteString(`border:2px dashed gray;`) - templ_7745c5c3_CSSBuilder.WriteString(`margin:20px;`) + templ_7745c5c3_CSSBuilder.WriteString(`font-size:16px;`) + templ_7745c5c3_CSSBuilder.WriteString(`font-family:Roboto;`) + templ_7745c5c3_CSSBuilder.WriteString(`margin-right:150px;`) + templ_7745c5c3_CSSBuilder.WriteString(`margin-left:150px;`) + templ_7745c5c3_CSSBuilder.WriteString(`position:relative;`) + templ_7745c5c3_CSSBuilder.WriteString(string(templ.SanitizeCSS(`color`, textColor))) templ_7745c5c3_CSSID := templ.CSSID(`BlogContainer`, templ_7745c5c3_CSSBuilder.String()) return templ.ComponentCSSClass{ ID: templ_7745c5c3_CSSID, @@ -181,4 +185,56 @@ func CenterContainer() templ.CSSClass { } } +func BlogHeading() templ.CSSClass { + templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() + templ_7745c5c3_CSSBuilder.WriteString(`display:flex;`) + templ_7745c5c3_CSSBuilder.WriteString(`flex-grow:1;`) + templ_7745c5c3_CSSBuilder.WriteString(`height:30px;`) + templ_7745c5c3_CSSBuilder.WriteString(`position:relative;`) + templ_7745c5c3_CSSID := templ.CSSID(`BlogHeading`, templ_7745c5c3_CSSBuilder.String()) + return templ.ComponentCSSClass{ + ID: templ_7745c5c3_CSSID, + Class: templ.SafeCSS(`.` + templ_7745c5c3_CSSID + `{` + templ_7745c5c3_CSSBuilder.String() + `}`), + } +} + +func BlogHeadingLeft() templ.CSSClass { + templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() + templ_7745c5c3_CSSBuilder.WriteString(`position:absolute;`) + templ_7745c5c3_CSSBuilder.WriteString(`display:flex;`) + templ_7745c5c3_CSSBuilder.WriteString(`flex-wrap:wrap;`) + templ_7745c5c3_CSSBuilder.WriteString(`top:0px;`) + templ_7745c5c3_CSSBuilder.WriteString(`left:0px;`) + templ_7745c5c3_CSSID := templ.CSSID(`BlogHeadingLeft`, templ_7745c5c3_CSSBuilder.String()) + return templ.ComponentCSSClass{ + ID: templ_7745c5c3_CSSID, + Class: templ.SafeCSS(`.` + templ_7745c5c3_CSSID + `{` + templ_7745c5c3_CSSBuilder.String() + `}`), + } +} + +func BlogHeadingRight() templ.CSSClass { + templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() + templ_7745c5c3_CSSBuilder.WriteString(`position:absolute;`) + templ_7745c5c3_CSSBuilder.WriteString(`display:flex;`) + templ_7745c5c3_CSSBuilder.WriteString(`flex-wrap:wrap;`) + templ_7745c5c3_CSSBuilder.WriteString(`right:0px;`) + templ_7745c5c3_CSSBuilder.WriteString(`top:0px;`) + templ_7745c5c3_CSSID := templ.CSSID(`BlogHeadingRight`, templ_7745c5c3_CSSBuilder.String()) + return templ.ComponentCSSClass{ + ID: templ_7745c5c3_CSSID, + Class: templ.SafeCSS(`.` + templ_7745c5c3_CSSID + `{` + templ_7745c5c3_CSSBuilder.String() + `}`), + } +} + +func BubbleContainer() templ.CSSClass { + templ_7745c5c3_CSSBuilder := templruntime.GetBuilder() + templ_7745c5c3_CSSBuilder.WriteString(string(templ.SanitizeCSS(`background-color`, bgVariation))) + templ_7745c5c3_CSSBuilder.WriteString(`border-radius:10px;`) + templ_7745c5c3_CSSID := templ.CSSID(`BubbleContainer`, templ_7745c5c3_CSSBuilder.String()) + return templ.ComponentCSSClass{ + ID: templ_7745c5c3_CSSID, + Class: templ.SafeCSS(`.` + templ_7745c5c3_CSSID + `{` + templ_7745c5c3_CSSBuilder.String() + `}`), + } +} + var _ = templruntime.GeneratedTemplate diff --git a/web/templates/blog.templ b/web/templates/blog.templ index 3d339e8..ca2963e 100644 --- a/web/templates/blog.templ +++ b/web/templates/blog.templ @@ -36,20 +36,32 @@ templ runMarked(markdown string) { } templ blogHeader() { -

Блог дихуса

-

Вернуться Домой

-
+
+
+

+ Блог нуля +

+
+
+
+
+

Вернуться Домой

+
+
+ + } templ ShowPost(post repositories.Post){ @BasicPageBlock() @blogHeader() - -
-

- {post.Header} -

-
+

+ {post.Header} +

+
+ + +
@runMarked(post.Content) diff --git a/web/templates/blog_templ.go b/web/templates/blog_templ.go index 8dad66f..ea3eb86 100644 --- a/web/templates/blog_templ.go +++ b/web/templates/blog_templ.go @@ -114,12 +114,12 @@ func blogHeader() templ.Component { templ_7745c5c3_Var3 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var templ_7745c5c3_Var4 = []any{styling.FileHeader()} + var templ_7745c5c3_Var4 = []any{styling.BlogHeading()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var4...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "

Блог дихуса

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var6 = []any{styling.PostScriptum()} + var templ_7745c5c3_Var6 = []any{styling.BubbleContainer(), styling.BlogHeadingLeft()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var6...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "

Вернуться Домой

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var8 = []any{styling.Header()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var8...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "

Блог нуля

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var10 = []any{styling.BubbleContainer(), styling.BlogHeadingRight()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var10...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var12 = []any{styling.Header()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var12...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Вернуться Домой

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -163,100 +229,6 @@ func blogHeader() templ.Component { } func ShowPost(post repositories.Post) 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 { - return templ_7745c5c3_CtxErr - } - templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) - if !templ_7745c5c3_IsBuffer { - defer func() { - templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) - if templ_7745c5c3_Err == nil { - templ_7745c5c3_Err = templ_7745c5c3_BufErr - } - }() - } - ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var8 := templ.GetChildren(ctx) - if templ_7745c5c3_Var8 == nil { - templ_7745c5c3_Var8 = templ.NopComponent - } - ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = BasicPageBlock().Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = blogHeader().Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var9 = []any{styling.BlogContainer(), styling.CenterContainer(), styling.Textcontainer()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var9...) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var11 = []any{styling.Header(), styling.HighlightText()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var11...) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var13 string - templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(post.Header) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 50, Col: 18} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = runMarked(post.Content).Render(ctx, templ_7745c5c3_Buffer) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - return nil - }) -} - -func ShowBlogPage(posts []repositories.Post) 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 { @@ -285,70 +257,186 @@ func ShowBlogPage(posts []repositories.Post) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } + var templ_7745c5c3_Var15 = []any{styling.FileHeader(), styling.HighlightText()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var15...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var17 string + templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(post.Header) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 59, Col: 16} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var18 = []any{styling.BlogContainer()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var18...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var20 = []any{} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var20...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = runMarked(post.Content).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func ShowBlogPage(posts []repositories.Post) 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 { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var22 := templ.GetChildren(ctx) + if templ_7745c5c3_Var22 == nil { + templ_7745c5c3_Var22 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Err = BasicPageBlock().Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = blogHeader().Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } for i := len(posts) - 1; i >= 0; i-- { - var templ_7745c5c3_Var15 = []any{styling.Textcontainer(), styling.BlogContainer()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var15...) + var templ_7745c5c3_Var23 = []any{styling.Textcontainer(), styling.BlogContainer()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var23...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var17 = []any{styling.Header()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...) + var templ_7745c5c3_Var25 = []any{styling.Header()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var25...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var20 string - templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(posts[i].Header) + var templ_7745c5c3_Var28 string + templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(posts[i].Header) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 67, Col: 36} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 79, Col: 36} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -358,51 +446,51 @@ func ShowBlogPage(posts []repositories.Post) templ.Component { postWords := strings.Fields(posts[i].Content) postCap := int(math.Sqrt(float64(len(postWords)) * 5)) shortStr := postWords[:postCap] - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var21 string - templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(shortStr, " ")) + var templ_7745c5c3_Var29 string + templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(shortStr, " ")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 80, Col: 62} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/blog.templ`, Line: 92, Col: 62} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "...

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "...

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var22 = []any{styling.HighlightText()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var22...) + var templ_7745c5c3_Var30 = []any{styling.HighlightText()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var30...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "Читать полностью...
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\">Читать полностью...") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/web/templates/constructionBlocks.templ b/web/templates/constructionBlocks.templ index 21b57bb..b723d88 100644 --- a/web/templates/constructionBlocks.templ +++ b/web/templates/constructionBlocks.templ @@ -6,17 +6,8 @@ package templates import "github.com/dixxe/personal-website/web/static/styling" -// Use this block in every page. It contains dependecies and reduces boilerplate -templ BasicPageBlock() { - - - - - - - - - + @font-face { + font-family: Roboto; + src: url("/static/fonts/Roboto-VariableFont.ttf"); + } + + +} + +// Use this block in every page. It contains dependecies and reduces boilerplate +templ BasicPageBlock() { + + + + + + + + + @loadFontsBlock() nullmax17's website diff --git a/web/templates/constructionBlocks_templ.go b/web/templates/constructionBlocks_templ.go index 70f1c21..1578142 100644 --- a/web/templates/constructionBlocks_templ.go +++ b/web/templates/constructionBlocks_templ.go @@ -21,8 +21,7 @@ import templruntime "github.com/a-h/templ/runtime" import "github.com/dixxe/personal-website/web/static/styling" -// Use this block in every page. It contains dependecies and reduces boilerplate -func BasicPageBlock() templ.Component { +func loadFontsBlock() 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 { @@ -43,7 +42,45 @@ func BasicPageBlock() templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "nullmax17's website") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +// Use this block in every page. It contains dependecies and reduces boilerplate +func BasicPageBlock() 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 { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var2 := templ.GetChildren(ctx) + if templ_7745c5c3_Var2 == nil { + templ_7745c5c3_Var2 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = loadFontsBlock().Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "nullmax17's website") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -68,30 +105,30 @@ func UsefulLinks() templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var2 := templ.GetChildren(ctx) - if templ_7745c5c3_Var2 == nil { - templ_7745c5c3_Var2 = templ.NopComponent + templ_7745c5c3_Var3 := templ.GetChildren(ctx) + if templ_7745c5c3_Var3 == nil { + templ_7745c5c3_Var3 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var templ_7745c5c3_Var3 = []any{styling.BlockContainer(), styling.PostScriptum()} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var3...) + var templ_7745c5c3_Var4 = []any{styling.BlockContainer(), styling.PostScriptum()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var4...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "

You can find source code of this website here.

Telegram - \"@nullmax17\"

Signal - \"nullmax.17\"

My friends: Lunf Madam_ovi

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\">

You can find source code of this website here.

Telegram - \"@nullmax17\"

Signal - \"nullmax.17\"

My friends: Lunf Madam_ovi

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/web/templates/index.templ b/web/templates/index.templ index 9d948b3..ab9fb48 100644 --- a/web/templates/index.templ +++ b/web/templates/index.templ @@ -13,7 +13,7 @@ templ IndexPage() {

Greetings! I'm
- nullmax17 + nullmax17
and this is my
diff --git a/web/templates/index_templ.go b/web/templates/index_templ.go index 18a15a0..10f75a0 100644 --- a/web/templates/index_templ.go +++ b/web/templates/index_templ.go @@ -64,16 +64,16 @@ func IndexPage() templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\">

Greetings! I'm
nullmax17
and this is my
personal website

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\">

Greetings! I'm
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var4 = []any{styling.Textcontainer(), styling.CenterContainer()} + var templ_7745c5c3_Var4 = []any{styling.Header()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var4...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\">nullmax17
and this is my
personal website

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var6 = []any{styling.Header()} + var templ_7745c5c3_Var6 = []any{styling.Textcontainer(), styling.CenterContainer()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var6...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "

About me

I'm ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\" style=\"font-size: 20px;\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var8 = []any{styling.HighlightText()} + var templ_7745c5c3_Var8 = []any{styling.Header()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var8...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "16 years old junior software engineer.
Born & live in Russia 🇷🇺
U budućnosti želim da se preselim u Srbiju! 🇷🇸
I speak native Russian and English(B2)
Currently I'm changing my username
but you can know me as d1xxe

I have skills in ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "\" style=\"font-family: Disket-Mono;\">About me

I'm ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -152,7 +152,7 @@ func IndexPage() templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\">Go, Java, Rust, C# and ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\">16 years old junior software engineer.
Born & live in Russia 🇷🇺
U budućnosti želim da se preselim u Srbiju! 🇷🇸
I speak native Russian and English(B2)
Currently I'm changing my username
but you can know me as d1xxe

I have skills in ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -174,16 +174,16 @@ func IndexPage() templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\">Linux

I have a passion to learn new, complex things.
Currently I'm learning C#, ASP.NET, Avalonia

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\">Go, Java, Rust, C# and ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var14 = []any{styling.CenterContainer(), styling.Textcontainer()} + var templ_7745c5c3_Var14 = []any{styling.HighlightText()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var14...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\">Linux

I have a passion to learn new, complex things.
Currently I'm learning C#, ASP.NET, Avalonia

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var16 = []any{styling.Header()} + var templ_7745c5c3_Var16 = []any{styling.CenterContainer(), styling.Textcontainer()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var16...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

My projects

Vanilla minecraft launcher

Minecraft mods

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\" style=\"font-size: 20px;\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var18 = []any{styling.HighlightText()} + var templ_7745c5c3_Var18 = []any{styling.Header()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var18...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "

Heavy WIP

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\" style=\"font-family: Disket-Mono;\">My projects

Vanilla minecraft launcher

Minecraft mods

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var20 = []any{styling.CenterContainer(), styling.Textcontainer()} + var templ_7745c5c3_Var20 = []any{styling.HighlightText()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var20...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">Heavy WIP

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var22 = []any{styling.Header()} + var templ_7745c5c3_Var22 = []any{styling.CenterContainer(), styling.Textcontainer()} templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var22...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "

More stuff from me

Personal blog") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\">") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var24 = []any{styling.Header()} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var24...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "

More stuff from me

Personal blog") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }