Commit bdfdb827 authored by Grant's avatar Grant
Browse files

Merge branch 'feat-homepage' into 'main' 

Feat: homepage

See merge request !1
parents 48b6e955 c2a7d172

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -37,3 +37,4 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json 
src/types/openapi.d.ts

/src/generated/prisma

/data

/public/docs.html
 
 No newline at end of file

.vscode/extensions.json

0 → 100644
+8 −0
Original line number Diff line number Diff line 
{

  "recommendations": [

    "redhat.vscode-yaml",

    "dbaeumer.vscode-eslint",

    "esbenp.prettier-vscode",

    "prisma.prisma"

  ]

}
 
 No newline at end of file

.vscode/settings.json

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{

  "yaml.schemas": {

    "https://raw.githubusercontent.com/docker/vscode-extension/6a88caada42b57090df7ce91ec2a6561b422afe1/misc/empty.json": [

      "compose*y*ml",

      "docker-compose*y*ml"

    ],

    "https://www.schemastore.org/openapi-3.X.json": "/openapi/spec.yml"

  }

}
 
 No newline at end of file

Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ RUN bunx prisma generate 
RUN bun run dev:api-ts

ARG VERSION

RUN bun run build

RUN bun run build:api-doc



# copy production dependencies and source code into final image

FROM base AS release
@@ -35,6 +36,7 @@ COPY --from=install /temp/prod/node_modules node_modules 
COPY prisma ./prisma

COPY --from=prerelease /usr/src/app/src/demo-data/events.json ./src/demo-data/events.json

COPY --from=prerelease /usr/src/app/src/generated ./src/generated

COPY --from=prerelease /usr/src/app/public ./public

COPY --from=prerelease /usr/src/app/dist ./dist

COPY --from=prerelease /usr/src/app/package.json .

bun.lock

+1 −0
Original line number Diff line number Diff line 
{

  "lockfileVersion": 1,

  "configVersion": 0,

  "workspaces": {

    "": {

      "name": "fediverse.events-api",