From d33b18557e0751711ea5c1ac6e36350faecd1827 Mon Sep 17 00:00:00 2001 From: ngn Date: Thu, 18 Jan 2024 20:01:30 +0300 Subject: [PATCH] css cleanup, added downloads page --- go.mod | 2 +- lib/util.go | 1 + main.go | 5 +- public/download.css | 37 +++++++++++ public/error.css | 14 ++++ public/global.css | 70 ++++++++++++++++++++ public/md.css | 41 +++++++++++- public/news.css | 29 +++++++++ public/post.css | 5 ++ public/style.css | 136 --------------------------------------- routes/download.go | 19 ++++++ routes/index.go | 2 +- routes/news.go | 2 +- routes/wiki.go | 2 +- templates/download.html | 44 +++++++++++++ templates/index.html | 6 +- templates/news.html | 15 +++-- templates/parts/bar.html | 1 + templates/post.html | 13 ++-- 19 files changed, 284 insertions(+), 160 deletions(-) create mode 100644 public/download.css create mode 100644 public/error.css create mode 100644 public/global.css create mode 100644 public/news.css create mode 100644 public/post.css delete mode 100644 public/style.css create mode 100644 routes/download.go create mode 100644 templates/download.html diff --git a/go.mod b/go.mod index 6886683..7dbd5f2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.matterlinux.xyz/Matterlinux/website +module git.matterlinux.xyz/Matter/website go 1.21.4 diff --git a/lib/util.go b/lib/util.go index 1c2f2cc..23757d2 100644 --- a/lib/util.go +++ b/lib/util.go @@ -34,6 +34,7 @@ func ParseMarkdown(md string) string { ext |= blackfriday.BackslashLineBreak ext |= blackfriday.Strikethrough ext |= blackfriday.Tables + ext |= blackfriday.NoEmptyLineBeforeBlock return string(blackfriday.Run([]byte(md), blackfriday.WithExtensions(ext))) } diff --git a/main.go b/main.go index baa4153..9962bd0 100644 --- a/main.go +++ b/main.go @@ -21,8 +21,8 @@ package main import ( - "git.matterlinux.xyz/Matterlinux/website/lib" - "git.matterlinux.xyz/Matterlinux/website/routes" + "git.matterlinux.xyz/Matter/website/lib" + "git.matterlinux.xyz/Matter/website/routes" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/log" "github.com/gofiber/template/html/v2" @@ -38,6 +38,7 @@ func main(){ app.Static("/assets", "./content/assets") app.Get("/", routes.IndexRoute) + app.Get("/download", routes.DownloadRoute) app.Get("/news", routes.NewsRoute) app.Get("/news/:id", routes.PostRoute) diff --git a/public/download.css b/public/download.css new file mode 100644 index 0000000..2749057 --- /dev/null +++ b/public/download.css @@ -0,0 +1,37 @@ +.list { + display: flex; + flex-direction: column; + margin: 15px 0 15px 0; + gap: 10px; +} + +.entry { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + background: var(--dark-second); + border: solid 1px var(--bright-main); + padding: 10px; +} + +.downloads { + display: flex; + flex-direction: row; + gap: 5px; +} + +.entry h1 { + color: var(--bright-main); + font-size: 20px; +} + +.entry a, .entry p { + color: var(--bright-main); + font-size: 20px; + text-decoration: none; +} + +.entry a:hover { + color: var(--bright-second); +} diff --git a/public/error.css b/public/error.css new file mode 100644 index 0000000..ebf6fd6 --- /dev/null +++ b/public/error.css @@ -0,0 +1,14 @@ +.error { + text-align: center; +} + +.error h1{ + font-size: 30px; + color: white; + margin: 50px 50px 10px 50px; +} + +.error a{ + font-size: 25px; + color: var(--bright-second); +} diff --git a/public/global.css b/public/global.css new file mode 100644 index 0000000..748ca68 --- /dev/null +++ b/public/global.css @@ -0,0 +1,70 @@ +@import url("/font.css"); + +:root { + --dark-main: black; + --dark-second: #090909; + --dark-third: #181818; + --bright-main: white; + --bright-second: #DFDFDF; + --bright-third: #777777; +} + +::selection { + background: rgba(150, 150, 150, 0.4); +} + +*{ + padding: 0; + font-family: Ubuntu; + margin: 0; +} + +body{ + background: var(--dark-main); + padding-bottom: 80px; +} + +.bar { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + background: var(--dark-second); + padding: 20px; + border-bottom: solid 1px var(--bright-main); +} + +.logo { + font-family: JetBrainsItalic; + font-size: 25px; + color: white; +} + +.links { + display: block; + text-align: right; +} + +.links a{ + margin-left: 7px; + color: var(--bright-main); + font-family: Ubuntu; + font-size: 20px; + text-decoration: none; +} + +.links a:hover { + color: var(--bright-second); +} + +main { + padding: 10px 20% 0% 20%; + color: var(--bright-second); +} + +@media only screen and (max-width: 1200px) { + main { + padding: 10px 10% 0% 10%; + color: var(--bright-second); + } +} diff --git a/public/md.css b/public/md.css index bb53650..1ef0041 100644 --- a/public/md.css +++ b/public/md.css @@ -3,13 +3,13 @@ .md h3{ font-family: JetBrainsMono; color: var(--bright-main); - margin: 30px 0px 0px 0px; font-weight: 900; } .md h1::before, .md h2::before, .md h3::before{ + font-weight: 100; color: var(--bright-third); } @@ -27,14 +27,17 @@ .md h1 { font-size: 30px; + margin-top: 50px; } .md h2 { font-size: 25px; + margin-top: 40px; } .md h3 { font-size: 20px; + margin-top: 30px; } .md p { @@ -42,6 +45,7 @@ color: var(--bright-second); line-height: 28px; letter-spacing: .01em; + margin-top: 7px; } .md strong { @@ -51,7 +55,7 @@ .md a { color: var(--bright-second); - text-decoration-thickness: 1px; + text-decoration-thickness: .01px; } .md b { @@ -108,11 +112,12 @@ .md table td{ font-size: 20px; padding: 6px 13px; + background: var(--dark-second); border: 1px solid var(--bright-second); } .md table tr { - background-color: var(--dark-second); + background-color: var(--dark-main); border-top: 1px solid var(--bright-second); } @@ -123,3 +128,33 @@ .md li { line-height: 30px; } + +.md .red { + color: #FF2020; +} + +.md .green { + color: #20FF20; +} + +.md .blue { + color: #2020FF; +} + +.md blockquote { + margin: 0; + border-left: .25em solid var(--bright-third); + background: var(--dark-second); + border-radius: 6px; + padding: 20px; + margin-top: 16px; + margin-bottom: 16px; +} + +.md blockquote>:first-child { + margin-top: 0; +} + +.md blockquote>:last-child { + margin-bottom: 0; +} diff --git a/public/news.css b/public/news.css new file mode 100644 index 0000000..e1b7b58 --- /dev/null +++ b/public/news.css @@ -0,0 +1,29 @@ +main { + display: flex; + flex-direction: column; + padding-top: 50px; + gap: 10px; +} + +@media only screen and (max-width: 1200px) { + main { + padding-top: 50px; + } +} + +.small { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + color: white; + padding: 20px; + background: var(--dark-second); + border: solid 1px var(--bright-second); + text-decoration: none; +} + +.small h1 { + font-size: 20px; + font-weight: 400; +} diff --git a/public/post.css b/public/post.css new file mode 100644 index 0000000..6d191f9 --- /dev/null +++ b/public/post.css @@ -0,0 +1,5 @@ +.subtext { + font-size: 18px; + color: var(--bright-main); + margin: 5px 0 15px 0; +} diff --git a/public/style.css b/public/style.css deleted file mode 100644 index 0947b91..0000000 --- a/public/style.css +++ /dev/null @@ -1,136 +0,0 @@ -@import url("/font.css"); - -:root { - --dark-main: black; - --dark-second: #070707; - --dark-third: #151515; - --bright-main: white; - --bright-second: #DFDFDF; - --bright-third: #777777; -} - -::selection { - background: rgba(150, 150, 150, 0.4); -} - -*{ - padding: 0; - font-family: Ubuntu; - margin: 0; -} - -body{ - background: var(--dark-main); - padding-bottom: 50px; -} - -.bar { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - background: var(--dark-second); - padding: 20px; - border-bottom: solid 1px white; -} - -.logo { - font-family: JetBrainsItalic; - font-size: 25px; - color: white; -} - -.links { - display: flex; - flex-direction: row; - gap: 10px; -} - -.links a{ - color: var(--bright-main); - font-family: Ubuntu; - font-size: 20px; - text-decoration: none; -} - -.links a:hover { - color: var(--bright-second); -} - -.readme { - padding: 25px 20% 0% 20%; - color: var(--bright-second); -} - -.post { - padding: 40px 20% 0% 20%; - color: var(--bright-second); -} - -.news { - display: flex; - flex-direction: column; - padding: 40px 20% 0% 20%; - gap: 10px; -} - -@media only screen and (max-width: 1200px) { - .readme { - padding: 25px 10% 0% 10%; - color: var(--bright-second); - } - - .post { - padding: 40px 10% 0% 10%; - color: var(--bright-second); - } - - .news { - display: flex; - flex-direction: column; - padding: 40px 10% 0% 10%; - } -} - -.new-small { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - color: white; - padding: 20px; - background: var(--dark-second); - border: solid 1px var(--bright-second); - text-decoration: none; -} - -.new-small h1 { - font-size: 20px; - font-weight: 400; -} - -.error { - text-align: center; -} - -.error h1{ - font-size: 30px; - color: white; - margin: 50px 50px 10px 50px; -} - -.error a{ - font-size: 25px; - color: var(--bright-second); -} - -.post h1 { - font-size: 30px; - color: var(--bright-main); -} - -.post p { - font-size: 18px; - color: var(--bright-main); - margin: 5px 0px 10px 0px; -} diff --git a/routes/download.go b/routes/download.go new file mode 100644 index 0000000..58248b6 --- /dev/null +++ b/routes/download.go @@ -0,0 +1,19 @@ +package routes + +import ( + "git.matterlinux.xyz/Matter/website/lib" + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/log" +) + +func DownloadRoute(c *fiber.Ctx) error{ + con, err := lib.GetContent("", "download") + if err != nil { + log.Error("GetContent -> ", err) + return lib.RenderError(c, 500) + } + + return c.Render("download", fiber.Map{ + "readme": con, + }) +} diff --git a/routes/index.go b/routes/index.go index 19661bb..61e2499 100644 --- a/routes/index.go +++ b/routes/index.go @@ -1,7 +1,7 @@ package routes import ( - "git.matterlinux.xyz/Matterlinux/website/lib" + "git.matterlinux.xyz/Matter/website/lib" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/log" ) diff --git a/routes/news.go b/routes/news.go index 172dd71..0619e68 100644 --- a/routes/news.go +++ b/routes/news.go @@ -3,7 +3,7 @@ package routes import ( "sort" - "git.matterlinux.xyz/Matterlinux/website/lib" + "git.matterlinux.xyz/Matter/website/lib" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/log" ) diff --git a/routes/wiki.go b/routes/wiki.go index db78f9e..d39add2 100644 --- a/routes/wiki.go +++ b/routes/wiki.go @@ -1,7 +1,7 @@ package routes import ( - "git.matterlinux.xyz/Matterlinux/website/lib" + "git.matterlinux.xyz/Matter/website/lib" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/log" ) diff --git a/templates/download.html b/templates/download.html new file mode 100644 index 0000000..40504e9 --- /dev/null +++ b/templates/download.html @@ -0,0 +1,44 @@ + + + + MatterLinux | Download + + + + + + + + {{template "parts/bar" .}} +
+
+

Download MatterLinux

+
+
+
+

Version

+

{{.readme.Title}}

+
+
+

Release Archive

+
+ Download +

|

+ Signature +
+
+
+

Release ISO

+
+ Download +

|

+ Signature +
+
+
+
+ {{.readme.HTML}} +
+
+ + diff --git a/templates/index.html b/templates/index.html index e7f92d8..8a24e2e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,13 +4,13 @@ MatterLinux - + {{template "parts/bar" .}} -
+
{{.readme.HTML}} -
+ diff --git a/templates/news.html b/templates/news.html index 4430637..106f831 100644 --- a/templates/news.html +++ b/templates/news.html @@ -4,17 +4,18 @@ MatterLinux | News - + + {{template "parts/bar" .}} -
- {{range $new := .news}} - -

{{$new.Date}}

-

{{$new.Title}}

+
+ {{range .news}} + +

{{.Date}}

+

{{.Title}}

 {{end}} -
+ diff --git a/templates/parts/bar.html b/templates/parts/bar.html index 66bb5ef..e9ade7a 100644 --- a/templates/parts/bar.html +++ b/templates/parts/bar.html @@ -6,5 +6,6 @@ Wiki Source Packages + Download diff --git a/templates/post.html b/templates/post.html index da26e63..2b5e6a0 100644 --- a/templates/post.html +++ b/templates/post.html @@ -4,17 +4,20 @@ MatterLinux | {{.title}} - + + {{template "parts/bar" .}} -
-

{{.post.Title}}

-

{{.post.Date}} | by {{.post.Author}}

+
+
+

{{.post.Title}}

+
+

{{.post.Date}} | by {{.post.Author}}

{{.post.HTML}}
-
+