From d2fa13c51a88fd89f65d7a62120f845faa96b8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= Date: Sat, 8 Jan 2022 02:16:16 +0100 Subject: [PATCH] Added pleroma --- Dockerfile | 1 + application/package.json | 3 ++- application/prisma/schema.prisma | 4 ++-- application/src/public/software/pleroma.svg | 11 +++++++++++ application/src/styles/global.scss | 5 ++++- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 application/src/public/software/pleroma.svg diff --git a/Dockerfile b/Dockerfile index e1e1cda..8099496 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ WORKDIR /srv COPY application/package*.json ./ COPY application/prisma ./prisma/ RUN npm install --frozen-lockfile +RUN npm run prisma:generate COPY application/. . RUN npm run build diff --git a/application/package.json b/application/package.json index 7fdf3d9..2c991a6 100644 --- a/application/package.json +++ b/application/package.json @@ -10,7 +10,8 @@ "dev": "next dev ./src --hostname 0.0.0.0", "build": "next build ./src", "start": "next start ./src", - "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix" + "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix", + "prisma:generate": "npx prisma generate" }, "dependencies": { "@datapunt/matomo-tracker-js": "^0.5.1", diff --git a/application/prisma/schema.prisma b/application/prisma/schema.prisma index 67a1633..833b9a6 100644 --- a/application/prisma/schema.prisma +++ b/application/prisma/schema.prisma @@ -60,8 +60,8 @@ model Feed { feedToTags FeedToTag[] fields Field[] emails Email[] - followersCount Int - followingCount Int + followersCount Int? + followingCount Int? statusesCount Int? bot Boolean? url String diff --git a/application/src/public/software/pleroma.svg b/application/src/public/software/pleroma.svg new file mode 100644 index 0000000..09efcb4 --- /dev/null +++ b/application/src/public/software/pleroma.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/application/src/styles/global.scss b/application/src/styles/global.scss index e60b1b8..3b7f6c9 100644 --- a/application/src/styles/global.scss +++ b/application/src/styles/global.scss @@ -254,11 +254,13 @@ img { grid-column: main / end; grid-row: start ; margin: 0; + word-break: break-word; } .address { grid-column: main / end; grid-row: address; + word-break: break-word; } .badges{ @@ -304,6 +306,7 @@ img { border: 1px solid var(--main-bg-color); border-radius: 0.3em; padding: 0.3em; + word-break: break-word; } th { @@ -314,7 +317,7 @@ img { .description { grid-column: start/end; grid-row: span 1; - + word-break: break-word; p { margin: 0 0 1em 0;