diff --git a/hswaw/site/main.go b/hswaw/site/main.go index 7def3c85..49be42ed 100644 --- a/hswaw/site/main.go +++ b/hswaw/site/main.go @@ -122,4 +122,5 @@ func (s *service) registerHTTP(mux *http.ServeMux) { mux.HandleFunc("/event/", s.handleEvent) mux.HandleFunc("/robots.txt", s.handleRobotsTxt) mux.HandleFunc("/", s.handleIndex) + mux.HandleFunc("/merch", s.handleMerch) } diff --git a/hswaw/site/static/landing.css b/hswaw/site/static/landing.css index 21cedb40..8a5e0807 100644 --- a/hswaw/site/static/landing.css +++ b/hswaw/site/static/landing.css @@ -73,12 +73,6 @@ body { } } -.about img { - width: 100%; - display: block; - margin: 0 auto; -} - #top { display: flex; flex-direction: row; @@ -229,16 +223,11 @@ body { } .img-wrapper { - position: relative; - height: 0; - padding-bottom: 60%; } .img-wrapper > img { - position: absolute; width: 100%; height: 100%; - left: 0; object-fit: contain; } @@ -248,11 +237,11 @@ body { padding: 0; margin: 0; justify-content: center; - flex-wrap: wrap; } .gallery-nav > li { margin: 0; padding: 0; + display: block; } .gallery-nav > li:hover { background-color: var(--darkbgaccent); @@ -268,6 +257,31 @@ body { padding-top: 7px; } +.gallery-img { + margin-top: 5px; + gap: 10px; +} + +.gallery-img > li > a { + display: block; + text-decoration: none; + padding: 0; + width: 100%; + height: auto; +} + +.gallery-img > li > a > img { + width: 100%; +} + +.gallery-img > li:hover { + background-color: initial; + opacity: 70%; +} +.gallery-img > li.active { + background-color: initial; +} + .bottom { display: flex; flex-direction: column; @@ -404,3 +418,19 @@ li i { animation: none !important; } } + +.button { + display: flex; + justify-content: center; + align-items: center; + font-size: 30px; + height: 60px; + width: 200px; + background-color: var(--secondary); + margin: 20px auto; + +} + +.button:hover{ + color: var(--primary100); +} \ No newline at end of file diff --git a/hswaw/site/static/tshirt-1.jpg b/hswaw/site/static/tshirt-1.jpg new file mode 100644 index 00000000..e643778e Binary files /dev/null and b/hswaw/site/static/tshirt-1.jpg differ diff --git a/hswaw/site/static/tshirt-2.jpg b/hswaw/site/static/tshirt-2.jpg new file mode 100644 index 00000000..d316981b Binary files /dev/null and b/hswaw/site/static/tshirt-2.jpg differ diff --git a/hswaw/site/static/tshirt-3.jpg b/hswaw/site/static/tshirt-3.jpg new file mode 100644 index 00000000..ec009031 Binary files /dev/null and b/hswaw/site/static/tshirt-3.jpg differ diff --git a/hswaw/site/static/tshirt-4.jpg b/hswaw/site/static/tshirt-4.jpg new file mode 100644 index 00000000..bcb203f3 Binary files /dev/null and b/hswaw/site/static/tshirt-4.jpg differ diff --git a/hswaw/site/templates/BUILD.bazel b/hswaw/site/templates/BUILD.bazel index 07f51127..c3f503e8 100644 --- a/hswaw/site/templates/BUILD.bazel +++ b/hswaw/site/templates/BUILD.bazel @@ -5,6 +5,8 @@ go_embed_data( name = "templates", srcs = [ "index.html", + "merch.html", + "base.html", ], package = "templates", ) diff --git a/hswaw/site/templates/base.html b/hswaw/site/templates/base.html new file mode 100644 index 00000000..019a2070 --- /dev/null +++ b/hswaw/site/templates/base.html @@ -0,0 +1,72 @@ + + + +Warszawski Hackerspace + + + + + +
+
+
+
+
+
+
+
+ +
+

Warszawski Hackerspace

+
+
+ +
+ {{ block "content" . }} {{ end }} +
+
+ +{{ block "footer" . }} {{ end }} + + diff --git a/hswaw/site/templates/index.html b/hswaw/site/templates/index.html index 583133e1..27622f93 100644 --- a/hswaw/site/templates/index.html +++ b/hswaw/site/templates/index.html @@ -1,43 +1,4 @@ - - - -Warszawski Hackerspace - - - - - -
-
-
-
-
-
-
-
- -
-

Warszawski Hackerspace

-
-
- -
+{{ block "content" . }}
-
+{{ end }} +{{ block "footer" . }} - +{{ end }} \ No newline at end of file diff --git a/hswaw/site/templates/merch.html b/hswaw/site/templates/merch.html new file mode 100644 index 00000000..5e85b94d --- /dev/null +++ b/hswaw/site/templates/merch.html @@ -0,0 +1,34 @@ +{{ block "content" . }} +
+

Koszulki "Dekompilacja"

+

+

+ W związku z Pewną Aferą, postanowiliśmy wydać serię pierwszych (albo no, pierwszych od dawna) t-shirtów naszego spejsu. +

+ Nie wiesz o co chodzi? Czytaj tu. +

+

+ Koszulki są do kupienia u naszego partnera. Każdy t-shirt wspiera Hackerspace! +

+
+
+ +
+ +
+ +

+ KUP TUTAJ +

+ +

+ Zastanawiasz się czy warto wspierać kulturę hackerską? Przekonaj się tutaj! +

+ +
+{{ end }} diff --git a/hswaw/site/views.go b/hswaw/site/views.go index 7483afc0..6daa911a 100644 --- a/hswaw/site/views.go +++ b/hswaw/site/views.go @@ -43,7 +43,8 @@ func parseTemplates(names ...string) (*template.Template, error) { } var ( - tmplIndex = template.Must(parseTemplates("index")) + tmplIndex = template.Must(parseTemplates("index", "base")) + tmplMerch = template.Must(parseTemplates("merch", "base")) ) // render attempts to render a given Go template with data into the HTTP @@ -74,6 +75,17 @@ func (s *service) handleIndex(w http.ResponseWriter, r *http.Request) { }) } +func (s *service) handleMerch(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + atStatus, atError := getAt(ctx) + + render(w, tmplMerch, map[string]interface{}{ + "AtStatus": atStatus, + "AtError": atError, + }) +} + func (s *service) handleRobotsTxt(w http.ResponseWriter, r *http.Request) { // Allow everyone everywhere. We don't really host much on hackerspace.pl anyway. fmt.Fprintf(w, "User-agent: *\n")