merge

.drone.yml

@@ -7,7 +7,7 @@ steps:
   - name: run tests
     image: golang
     commands:
-      - go mod download
+      - go build
       - go test -p 1 -v ./...
 
 trigger:
@@ -23,7 +23,7 @@ steps:
   - name: run tests
     image: golang
     commands:
-      - go mod download
+      - go build
       - go test -p 1 -v ./...
   - name: docker
     image: plugins/docker
@@ -44,8 +44,6 @@ steps:
       port: 22
       command_timeout: 2m
       script:
-        - cd /etc/docker/compose/hatecomputers-club
-        - docker compose pull
         - systemctl restart docker-compose@hatecomputers-club
 
 trigger:

.env.example

@@ -1,13 +1,8 @@
-CLOUDFLARE_TOKEN=dumb
-CLOUDFLARE_ZONE=dumb
+CLOUDFLARE_TOKEN=
+CLOUDFLARE_ZONE=
 
-# OAUTH_CLIENT_ID=hatecomputers-club
-# OAUTH_CLIENT_SECRET=
+OAUTH_CLIENT_ID
+OAUTH_CLIENT_SECRET
 OAUTH_SCOPES=profile,openid,email
 OAUTH_AUTH_URL=https://auth.hatecomputers.club/ui/oauth2
-OAUTH_TOKEN_URL=https://auth.hatecomputers.club/oauth2/token
-
-OAUTH_CLIENT_ID=hatecomputers-club-dev
-OAUTH_CLIENT_SECRET=asdf
-OAUTH_REDIRECT_URI=https://dev.arm.internal.simponic.xyz/auth
-OAUTH_USER_INFO_URI=https://auth.hatecomputers.club/oauth2/openid/hatecomputers-club-dev/userinfo
+OAUTH_TOKEN_URL=https://auth.hatecomputers.club/oauth2/token

api/serve.go

@@ -173,7 +173,7 @@ func MakeServer(argv *args.Arguments, dbConn *sql.DB) *http.Server {
 		LogRequestContinuation(requestContext, r, w)(auth.VerifySessionContinuation, FailurePassingContinuation)(hcaptcha.CaptchaVerificationContinuation, hcaptcha.CaptchaVerificationContinuation)(guestbook.SignGuestbookContinuation, FailurePassingContinuation)(guestbook.ListGuestbookContinuation, guestbook.ListGuestbookContinuation)(hcaptcha.CaptchaArgsContinuation, hcaptcha.CaptchaArgsContinuation)(template.TemplateContinuation("guestbook.html", true), template.TemplateContinuation("guestbook.html", true))(LogExecutionTimeContinuation, LogExecutionTimeContinuation)(IdContinuation, IdContinuation)
 	})
 
-	mux.HandleFunc("GET /kennel", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("GET /kennel/", func(w http.ResponseWriter, r *http.Request) {
 		requestContext := makeRequestContext()
 		LogRequestContinuation(requestContext, r, w)(kennel.GetKennelContinuation, FailurePassingContinuation)(LogExecutionTimeContinuation, LogExecutionTimeContinuation)(IdContinuation, IdContinuation)
 	})

static/css/club.css

@@ -1,55 +1,48 @@
 .club-members {
-  display: grid;
-  gap: 1rem;
-  grid-template-columns: repeat(auto-fill, minmax(24rem, 1fr));
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: left;
+  gap: 20px;
+  padding: 20px;
 }
 
 .club-member {
+  flex: 1;
   background-color: var(--background-color-2);
   border: 1px solid var(--border-color);
-}
-
-.club-member-name {
-  font-size: 1.5em;
-  font-weight: bold;
+  padding: 10px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+  gap: 10px;
+  max-width: 500px;
+  min-width: 300px;
+  line-break: anywhere;
 }
 
 .club-bio {
-  padding: .5rem;
-  min-height: 3rem;
+  white-space: pre-wrap;
+  border-top: 1px solid var(--border-color);
 }
 
 .avatar {
-  float: left;
-  width: 40%;
-  margin: .5rem;
-  margin-bottom: -.6rem;
-  padding-bottom: .6rem;
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
-.avatar > img {
-  width: -moz-available;
-  width: -webkit-fill-available; /* we live in a society */
-  border-radius: 1rem;
+.avatar div {
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: cover;
+  width: 120px;
+  height: 120px;
+  border-radius: 25%;
 }
 
 .about {
-  background: var(--text-color);
-  color: var(--background-color);
-  font-weight: bold;
-  padding: .5rem;
+  flex: 3;
 }
-
-.about a, .about a:visited {
-  color: var(--background-color);
-  text-decoration: underline dotted;
-}
-
-.text-muted {
-  opacity: .8;
-  font-weight: normal;
-}
-
-.bolder {
-  font-weight: bolder;
-}

static/css/styles.css

@@ -10,18 +10,14 @@
   src: url("/static/font/comicsans.ttf");
 }
 
-/* global style */
-html {
+* {
+  box-sizing: border-box;
   margin: 0;
   padding: 0;
   color: var(--text-color);
   font-family: "ComicSans", sans-serif;
 }
 
-* {
-  box-sizing: border-box;
-}
-
 /* i just cannot get this to look good on firefox... */
 @supports not (-moz-appearance: none) {
   * {

templates/home.html

@@ -5,15 +5,15 @@
   {{ range $user := .Users }}
   <div class="club-member">
     <div class="avatar">
-      <img src="{{ $user.Avatar }}" alt="Profile picture for {{ $user.Username }}">
+      <div style="background-image: url('{{ $user.Avatar }}')"></div>
     </div>
     <div class="about">
-      <div class="club-member-name">{{ $user.Username }}</div>
-      <div><span class="text-muted">pronouns:</span> <span class="bolder">{{ $user.Pronouns }}</span></div>
-      <div><span class="text-muted">location:</span> <span class="bolder">{{ $user.Location }}</span></div>
-      <div><span class="text-muted">www:</span> <span class="bolder"><a href="{{ $user.Website }}">{{ $user.Website }}</a></span></div>
+      <div>name: {{ $user.Username }}</div>
+      <div>pronouns: {{ $user.Pronouns }}</div>
+      <div>location: {{ $user.Location }}</div>
+      <div>www: <a href="{{ $user.Website }}">{{ $user.Website }}</a></div>
+      <div class="club-bio">{{ $user.Bio }}</div>
     </div>
-    <div class="club-bio">{{ $user.Bio }}</div>
   </div>
   {{ end }}
 </div>