Merge branch 'develop'

asciinema · Mar 24, 2024 · 1477c3e · 1477c3e
2 parents 990da58 + 39b5843
commit 1477c3e
Show file tree

Hide file tree

Showing 100 changed files with 2,989 additions and 2,160 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,18 +18,12 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
-
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-
-      - name: Push image
+      - name: Set up outputs
+        id: vars
         run: |
           IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
           # Strip git ref prefix from version
@@ -38,7 +32,26 @@ jobs:
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
           # Use Docker `latest` tag convention
           [ "$VERSION" == "main" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          echo IMAGE_ID=$IMAGE_ID >> $GITHUB_OUTPUT
+          echo VERSION=$VERSION >> $GITHUB_OUTPUT
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.vars.outputs.IMAGE_ID }}:${{ steps.vars.outputs.VERSION }}
+          labels: runnumber=${{ github.run_id }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          platforms: linux/amd64,linux/arm64
diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,7 @@ npm-debug.log
 .iex-history
 .m2
 .projectile
+.direnv
 /.vagrant
 /config/custom.exs
 /priv/native

diff --git a/Dockerfile b/Dockerfile
@@ -8,6 +8,7 @@ ARG ELIXIR_VERSION=1.14.3
 FROM docker.io/hexpm/elixir:${ELIXIR_VERSION}-erlang-${ERLANG_OTP_VERSION}-alpine-${ALPINE_VERSION} as builder
 
 ARG MIX_ENV=prod
+ENV ERL_FLAGS="+JPperf true"
 
 WORKDIR /opt/app
 

diff --git a/assets/css/_recording_card.scss b/assets/css/_recording_card.scss
@@ -1,6 +1,7 @@
 div.asciicast-card {
   margin-bottom: 30px;
   overflow: hidden;
+  border: 1px solid #eee;
 
   .thumbnail-link {
     display: block;
@@ -31,6 +32,7 @@ div.asciicast-card {
           width: 4rem;
           margin-left: -2rem;
           margin-top: -2rem;
+          filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.4));
         }
       }
     }
@@ -53,28 +55,24 @@ div.asciicast-card {
   }
 
   .thumbnail {
+    min-height: calc(1.333333 * 16em);
+    font-size: 14px;
+    font-family: Consolas, Menlo, 'Bitstream Vera Sans Mono', monospace, 'Powerline Symbols';
+    overflow: hidden;
     padding: 0;
     background-color: #000;
-    border: 0;
     border-radius: 3px;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
-
-    .ap-terminal {
-      .ap-line {
-        height: 1.3333333333em;
-      }
-    }
   }
 
   .info {
     background-color: #fff;
     padding: 10px;
     border-bottom-left-radius: 3px;
     border-bottom-right-radius: 3px;
-    border: 1px solid #eee;
     border-bottom: 1px solid #ddd;
-    border-top-width: 0;
+    border-top: 1px solid #eee;
 
     .author-avatar {
       float: left;

diff --git a/assets/css/_recording_list.scss b/assets/css/_recording_list.scss
@@ -1,5 +1,5 @@
 .c-recording {
-  &.a-category {
+  &.a-public, &.a-featured, &.a-auto {
     main {
       .nav {
         .nav-link {
@@ -18,6 +18,10 @@
           margin-right: 0.5rem;
           font-size: 0.875rem;
         }
+
+        a {
+          border-color: #d3d9df;
+        }
       }
 
       .pagination {

diff --git a/assets/css/_user_edit.scss b/assets/css/_user_edit.scss
@@ -1,5 +1,15 @@
 .c-user.a-edit {
   .user-form {
-    margin-bottom: 3em;
+    form {
+      margin-bottom: 2em;
+    }
+  }
+
+  .install-ids {
+    margin: 2em 0;
+
+    .revoked {
+      opacity: 0.7;
+    }
   }
 }