diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 925606ba..b0e80b68 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,11 @@ -- **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...) +# What kind of change does this PR introduce? -- **Why was this change needed?** (You can also link to an open issue here) +eg: Bug fix, feature, docs update, ... -- **Other information**: \ No newline at end of file +# Why was this change needed? + +Please link to related issues when possible. + +# Other information: + +eg: Did you discuss this change with anybody before working on it (not required, but can be a good idea for bigger changes). Any plans for the future, etc? diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 2e7b116a..a3dfadc1 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -39,5 +39,11 @@ jobs: docker tag localhost/postiz ghcr.io/gitroomhq/postiz-app:${{ env.DATE }} docker push ghcr.io/gitroomhq/postiz-app:${{ env.DATE }} + docker tag ghcr.io/gitroomhq/postiz-app:${{ env.DATE }} ghcr.io/gitroomhq/postiz-app:latest + docker push ghcr.io/gitroomhq/postiz-app:latest + docker tag localhost/postiz-devcontainer ghcr.io/gitroomhq/postiz-devcontainer:${{ env.DATE }} docker push ghcr.io/gitroomhq/postiz-devcontainer:${{ env.DATE }} + + docker tag ghcr.io/gitroomhq/postiz-devcontainer:${{ env.DATE }} ghcr.io/gitroomhq/postiz-devcontainer:latest + docker push ghcr.io/gitroomhq/postiz-devcontainer:latest diff --git a/.gitignore b/.gitignore index a45f48df..9c12a0b3 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ testem.log Thumbs.db .nx/cache +.nx/workspace-data # Next.js .next diff --git a/Dockerfile.dev b/Dockerfile.dev index deb667e4..fc85c023 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -16,6 +16,11 @@ ENV NEXT_TELEMETRY_DISABLED=1 RUN apk add --no-cache \ bash=5.2.21-r0 \ supervisor=4.2.5-r4 \ + pkgconfig \ + gcc \ + pixman-dev \ + cairo-dev \ + pango-dev \ make \ build-base diff --git a/README.md b/README.md index 2de7204a..52d15c8e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,12 @@ Follow me +
+ + + DevFest + +

diff --git a/apps/backend/project.json b/apps/backend/project.json index c7147dd0..89d8ac2a 100644 --- a/apps/backend/project.json +++ b/apps/backend/project.json @@ -37,7 +37,8 @@ "executor": "@nx/js:node", "defaultConfiguration": "development", "options": { - "buildTarget": "backend:build" + "buildTarget": "backend:build", + "inspect": false }, "configurations": { "development": { diff --git a/apps/backend/src/api/routes/analytics.controller.ts b/apps/backend/src/api/routes/analytics.controller.ts index 35d4913a..257df0a8 100644 --- a/apps/backend/src/api/routes/analytics.controller.ts +++ b/apps/backend/src/api/routes/analytics.controller.ts @@ -82,19 +82,21 @@ export class AnalyticsController { const { accessToken, expiresIn, refreshToken } = await integrationProvider.refreshToken(getIntegration.refreshToken!); - await this._integrationService.createOrUpdateIntegration( - getIntegration.organizationId, - getIntegration.name, - getIntegration.picture!, - 'social', - getIntegration.internalId, - getIntegration.providerIdentifier, - accessToken, - refreshToken, - expiresIn - ); + if (accessToken) { + await this._integrationService.createOrUpdateIntegration( + getIntegration.organizationId, + getIntegration.name, + getIntegration.picture!, + 'social', + getIntegration.internalId, + getIntegration.providerIdentifier, + accessToken, + refreshToken, + expiresIn + ); - getIntegration.token = accessToken; + getIntegration.token = accessToken; + } } const getIntegrationData = await ioRedis.get( @@ -122,7 +124,10 @@ export class AnalyticsController { return loadAnalytics; } catch (e) { if (e instanceof RefreshToken) { - await this._integrationService.disconnectChannel(org.id, getIntegration); + await this._integrationService.disconnectChannel( + org.id, + getIntegration + ); return []; } } diff --git a/apps/commands/project.json b/apps/commands/project.json index 6d6207f4..bd2b0ad9 100644 --- a/apps/commands/project.json +++ b/apps/commands/project.json @@ -26,6 +26,7 @@ "defaultConfiguration": "development", "options": { "buildTarget": "commands:build", + "inspect": false, "command": "cd dist/apps/commands && node main.js" }, "configurations": { diff --git a/apps/frontend/project.json b/apps/frontend/project.json index 43ce2c57..51be52e4 100644 --- a/apps/frontend/project.json +++ b/apps/frontend/project.json @@ -43,13 +43,6 @@ "buildTarget": "frontend:build:production" } }, - "test": { - "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], - "options": { - "jestConfig": "apps/frontend/jest.config.ts" - } - }, "lint": { "executor": "@nx/eslint:lint", "outputs": ["{options.outputFile}"] diff --git a/apps/frontend/src/components/launches/add.edit.model.tsx b/apps/frontend/src/components/launches/add.edit.model.tsx index b4de0725..e4996b45 100644 --- a/apps/frontend/src/components/launches/add.edit.model.tsx +++ b/apps/frontend/src/components/launches/add.edit.model.tsx @@ -31,7 +31,6 @@ import { useExpend } from '@gitroom/frontend/components/launches/helpers/use.exp import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component'; import { PickPlatforms } from '@gitroom/frontend/components/launches/helpers/pick.platform.component'; import { ProvidersOptions } from '@gitroom/frontend/components/launches/providers.options'; -import { v4 as uuidv4 } from 'uuid'; import useSWR from 'swr'; import { useToaster } from '@gitroom/react/toaster/toaster'; import { UpDownArrow } from '@gitroom/frontend/components/launches/up.down.arrow'; @@ -48,6 +47,7 @@ import { AddPostButton } from '@gitroom/frontend/components/launches/add.post.bu import { useStateCallback } from '@gitroom/react/helpers/use.state.callback'; import { CopilotPopup } from '@copilotkit/react-ui'; import { useUser } from '@gitroom/frontend/components/layout/user.context'; +import { makeId } from '@gitroom/nestjs-libraries/services/make.is'; export const AddEditModal: FC<{ date: dayjs.Dayjs; @@ -319,7 +319,7 @@ export const AddEditModal: FC<{ }), }); - existingData.group = uuidv4(); + existingData.group = makeId(10); mutate(); toaster.show( diff --git a/apps/frontend/src/components/launches/calendar.tsx b/apps/frontend/src/components/launches/calendar.tsx index 6844f708..c06fa655 100644 --- a/apps/frontend/src/components/launches/calendar.tsx +++ b/apps/frontend/src/components/launches/calendar.tsx @@ -339,7 +339,7 @@ export const CalendarColumn: FC<{ const addProvider = useAddProvider(); return ( -
+
{display === 'month' && (
{getDate.date()} @@ -433,6 +433,7 @@ const CalendarItem: FC<{ ); return (