Fixed the Dockerfile

# Conflicts:
#	fe_calckey/frontend/package.json

Dockerfile

@@ -1,20 +1,9 @@
-FROM docker.io/alpine:3.18 as build_fe
-
-RUN apk add --no-cache --no-progress git alpine-sdk nodejs-current npm
-
-WORKDIR /fe_calckey
-COPY ./fe_calckey/frontend ./frontend
-WORKDIR /fe_calckey/frontend
-
-RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm i --frozen-lockfile
-
-RUN env NODE_ENV=production sh -c "pnpm run build && pnpm run gulp"
-
-
 FROM docker.io/rust:1.71-bullseye as build
 
 RUN update-ca-certificates
 
+RUN apt install -y git nodejs npm
+
 ENV USER=magnetar
 ENV UID=10001
 
@@ -32,6 +21,14 @@ COPY ./ .
 
 RUN cargo build --release --locked --workspace --bins
 
+WORKDIR /fe_calckey
+COPY ./fe_calckey/frontend ./frontend
+WORKDIR /fe_calckey/frontend
+
+RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm i --frozen-lockfile
+
+RUN env NODE_ENV=production sh -c "pnpm run build && pnpm run gulp"
+
 FROM docker.io/debian:bullseye-slim
 
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

fe_calckey/frontend/client/src/pages/user/home.vue

@@ -147,7 +147,12 @@
                                     "
                                     class="followed"
                                 >
-                                    {{ i18n.ts.followRequestYou }}
+                                    {{ i18n.ts.followRequestYou }}:
+                                    <MkFollowApproveButton
+                                        :user="user"
+                                        @refresh="emit('refresh')"
+                                        class="koudoku"
+                                    />
                                 </span>
                                 <div v-if="$i?.isModerator || $i?.isAdmin">
                                     <span
@@ -559,6 +564,7 @@ onUnmounted(() => {
 
                         > .nameColumn {
                             display: block;
+
                             > .name {
                                 margin: 0;
                                 line-height: 32px;
@@ -824,11 +830,21 @@ onUnmounted(() => {
                     display: block;
                     border-bottom: 0;
                     padding-bottom: 0;
+
                     > .bottom {
                         > .username {
                             margin-right: 0;
                         }
                     }
+
+                    > .nameColumn {
+                        display: flex;
+                        flex-wrap: wrap;
+                        align-items: baseline;
+                        flex-direction: row;
+                        justify-content: center;
+                        gap: 0.5em 0.1em;
+                    }
                 }
 
                 > .avatar {

fe_calckey/frontend/locales/cs-CZ.yml

@@ -78,7 +78,7 @@ note: "Příspěvek"
 notes: "Příspěvky"
 following: "Sledovaní"
 followers: "Sledující"
-followsYou: "Sledují vás"
+followsYou: "Sledujě tě"
 followRequestYou: "Žádá tě o sledování"
 createList: "Vytvořit seznam"
 manageLists: "Spravovat seznam"

fe_calckey/frontend/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "calckey-magnetar",
 	"version": "0.3.0-alpha",
-	"codename": "aqua",
+	"codename": "aglais",
 	"repository": {
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"