diff --git a/.gitignore b/.gitignore index 04a0ccf..820ba0b 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ dist # End of https://www.toptal.com/developers/gitignore/api/node +node_modules diff --git a/compose.yml b/compose.yml index f220045..9ba3626 100644 --- a/compose.yml +++ b/compose.yml @@ -9,7 +9,7 @@ services: ports: - "9312:9312" restart: on-failure - command: "client --auth=${CHISEL_AUTH} ${CHISEL_SERVER} R:8899:cluster0:9094 R:8901:link2cid:3939 R:8900:strapi:1337 R:8902:next:3000 R:8903:uppy:3020" + command: "client --auth=${CHISEL_AUTH} ${CHISEL_SERVER} R:8899:cluster0:9094 R:8901:link2cid:3939 R:8900:strapi:1337 R:8902:next:3000 R:8903:uppy:3020 R:8904:uppy:8888" link2cid: container_name: fp-link2cid @@ -126,6 +126,29 @@ services: # - /app/.next # - /app/.pnpm-store - ./packages/next/app:/app/app + + + + bot: + container_name: fp-bot + build: + context: . + dockerfile: ./packages/bot/Dockerfile + target: dev + restart: on-failure + environment: + REST_HOST: localhost + REST_PORT: 8888 + DISCORD_TOKEN: ${DISCORD_TOKEN} + DISCORD_GUILD_ID: ${DISCORD_GUILD_ID} + ports: + - "8888:8888" + volumes: + - ./packages/bot/package.json:/app/package.json + - ./packages/bot/src:/app/src + + + db: diff --git a/packages/next/app/components/pager.tsx b/packages/next/app/components/pager.tsx index 01f67ab..915d1b5 100644 --- a/packages/next/app/components/pager.tsx +++ b/packages/next/app/components/pager.tsx @@ -9,11 +9,22 @@ interface IPagerProps { export default function Pager({ baseUrl, page, pageCount }: IPagerProps): React.JSX.Element { const pageNumbers = Array.from({ length: pageCount }, (_, i) => i + 1); - const getPagePath = (page: any) => { + const getPagePath = (page: any): string => { const pageNumber = parseInt(page); + console.log(`pageNumber=${pageNumber}`) return `${baseUrl}/${pageNumber}`; }; + const getNextPagePath = (page: any): string => { + const pageNumber = parseInt(page); + return `${baseUrl}/${pageNumber+1}`; + } + + const getPreviousPagePath = (page: any): string => { + const pageNumber = parseInt(page); + return `${baseUrl}/${pageNumber-1}` + } + // Define the number of page links to show around the current page const maxPageLinksToShow = 3; @@ -25,12 +36,12 @@ export default function Pager({ baseUrl, page, pageCount }: IPagerProps): React.