From 45f81c14092561f67620d46c1f8d88e05900bee9 Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Mon, 26 Sep 2022 11:26:57 +0200 Subject: [PATCH 1/3] v0.12.0 --- CHANGELOG.md | 25 +++++++++++++++++++++++++ package.json | 2 +- packages/api/package.json | 2 +- packages/discord-bot/package.json | 2 +- packages/frontend/package.json | 2 +- packages/frontend/src/model/app.ts | 2 +- packages/mongodb/package.json | 2 +- packages/setup/package.json | 2 +- 8 files changed, 32 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 527aa3a4f..5107c85c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +## [0.12.0] - 2022-09-26 + +### Added + +- **API:** Custom praise exports using transformation maps that can perform calculations on Praise data #549 #532 +- **Frontend:** New items on the main navigation #596 #430 + - Give us feedback + - Latest changes + - Docs + +### Fixed + +- **API:** Fix/evenly assign quantifiers prevent overlap #573 #535 +- **Frontend:** Custom emojis get the wrong size when displayed in Praise dashboard #592 +- **API:** Settings are now allowed to have empty values #597 +- **Frontend:** Update Search Input in dark mode #594 +- **Frontend:** Add a `replace` option to NavItem to better handle subpage navigation and backlink clicks #579 +- **Frontend:** Fix quantifier dark mode and correct onclick behaviour #588 +- **Frontend:** Better darkmode looks for analytics #570 +- **Frontend:** Show placeholder while loading avatar image #574 + +### Removed + +- **Frontend:** Removed the FAQ page #586 + ## [0.11.1] - 2022-08-24 Hotfix resolving an issue with building Docker images for production. diff --git a/package.json b/package.json index 1c543b46e..3a8d87a4f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "praise", - "version": "0.11.2", + "version": "0.12.0", "license": "GPL-3.0-or-later", "description": "Praise community contributions to build a culture of giving and gratitude.", "private": true, diff --git a/packages/api/package.json b/packages/api/package.json index e7e79db0a..c990c48a1 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "0.11.2", + "version": "0.12.0", "license": "GPL-3.0-or-later", "description": "The Praise REST API running on Node/Express, using MongoDB for storage.", "type": "commonjs", diff --git a/packages/discord-bot/package.json b/packages/discord-bot/package.json index 2877158f6..27486a80f 100644 --- a/packages/discord-bot/package.json +++ b/packages/discord-bot/package.json @@ -1,6 +1,6 @@ { "name": "discord-bot", - "version": "0.11.2", + "version": "0.12.0", "license": "GPL-3.0-or-later", "description": "The Praise Discord bot is the main way for users to interact with the Praise system.", "dependencies": { diff --git a/packages/frontend/package.json b/packages/frontend/package.json index a67dd4174..dd21da8ff 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "0.11.2", + "version": "0.12.0", "license": "GPL-3.0-or-later", "description": "The Praise dashboard built on React/Recoil/Tailwind CSS.", "private": true, diff --git a/packages/frontend/src/model/app.ts b/packages/frontend/src/model/app.ts index 14b069d08..7a84f9823 100644 --- a/packages/frontend/src/model/app.ts +++ b/packages/frontend/src/model/app.ts @@ -33,7 +33,7 @@ interface PraiseAppVersion { export const usePraiseAppVersion = (): PraiseAppVersion => { const appVersion: PraiseAppVersion = { - current: '0.11.2', //TODO: get this from package.json + current: '0.12.0', //TODO: get this from package.json latest: undefined, newVersionAvailable: false, }; diff --git a/packages/mongodb/package.json b/packages/mongodb/package.json index 6f58caaa1..575128de4 100644 --- a/packages/mongodb/package.json +++ b/packages/mongodb/package.json @@ -1,6 +1,6 @@ { "name": "mongodb", - "version": "0.11.2", + "version": "0.12.0", "license": "GPL-3.0-or-later", "description": "The Prasie data is stored in a MongoDb database." } diff --git a/packages/setup/package.json b/packages/setup/package.json index 523383711..58bbc1b4f 100644 --- a/packages/setup/package.json +++ b/packages/setup/package.json @@ -1,6 +1,6 @@ { "name": "setup", - "version": "0.11.2", + "version": "0.12.0", "license": "GPL-3.0-or-later", "type": "commonjs", "description": "Praise ENV setup scripts.", From a25dd110d832a31558bddde65bc7c584757f3153 Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Mon, 26 Sep 2022 11:42:18 +0200 Subject: [PATCH 2/3] Better Github action names --- .github/workflows/api.yml | 4 ++-- .github/workflows/discord-bot.yml | 4 ++-- .github/workflows/frontend.yml | 4 ++-- .github/workflows/package-dev-api.yml | 2 +- .github/workflows/package-dev-discord-bot.yml | 2 +- .github/workflows/package-dev-frontend.yml | 2 +- .github/workflows/package-dev-setup.yml | 2 +- .github/workflows/package-release-api.yml | 2 +- .github/workflows/package-release-discord-bot.yml | 2 +- .github/workflows/package-release-frontend.yml | 2 +- .github/workflows/package-release-setup.yml | 2 +- .../pages/Periods/Details/components/analytics/Treemap.tsx | 2 +- .../Periods/Details/components/analytics/VerticalBar.tsx | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 838555302..1c8c1e2e7 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -1,4 +1,4 @@ -name: Api +name: Api - build, lint, test on: workflow_dispatch: pull_request: @@ -22,4 +22,4 @@ jobs: - run: echo "${{secrets.DISCORDBOT_ENV_TESTING }}" > packages/discord-bot/.env - run: echo "${{secrets.FRONTEND_ENV_TESTING }}" > packages/frontend/.env - run: yarn mongodb:start - - run: yarn workspace api test \ No newline at end of file + - run: yarn workspace api test diff --git a/.github/workflows/discord-bot.yml b/.github/workflows/discord-bot.yml index b8125654a..4b732af6e 100644 --- a/.github/workflows/discord-bot.yml +++ b/.github/workflows/discord-bot.yml @@ -1,4 +1,4 @@ -name: discord-bot +name: Discord-Bot - build, lint on: workflow_dispatch: pull_request: @@ -17,4 +17,4 @@ jobs: - run: yarn install - run: yarn workspace api build - run: yarn workspace discord-bot lint - - run: yarn workspace discord-bot build \ No newline at end of file + - run: yarn workspace discord-bot build diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 11ef12b7e..15f376eeb 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -1,4 +1,4 @@ -name: frontend +name: Frontend - build, lint on: workflow_dispatch: pull_request: @@ -17,4 +17,4 @@ jobs: - run: yarn install - run: yarn workspace api build - run: yarn workspace frontend lint - - run: yarn workspace frontend build \ No newline at end of file + - run: yarn workspace frontend build diff --git a/.github/workflows/package-dev-api.yml b/.github/workflows/package-dev-api.yml index 738df15a5..912f5d1c3 100644 --- a/.github/workflows/package-dev-api.yml +++ b/.github/workflows/package-dev-api.yml @@ -1,4 +1,4 @@ -name: Development - Create and publish api Docker image +name: Api/Development - Create and publish Docker image on: push: diff --git a/.github/workflows/package-dev-discord-bot.yml b/.github/workflows/package-dev-discord-bot.yml index 707778588..00ae33f4f 100644 --- a/.github/workflows/package-dev-discord-bot.yml +++ b/.github/workflows/package-dev-discord-bot.yml @@ -1,4 +1,4 @@ -name: Development - Create and publish discord-bot Docker image +name: Discord-Bot/Development - Create and publish Docker image on: push: diff --git a/.github/workflows/package-dev-frontend.yml b/.github/workflows/package-dev-frontend.yml index 115eed958..1d6b58e0b 100644 --- a/.github/workflows/package-dev-frontend.yml +++ b/.github/workflows/package-dev-frontend.yml @@ -1,4 +1,4 @@ -name: Development - Create and publish frontend Docker image +name: Frontend/Development - Create and publish Docker image on: push: diff --git a/.github/workflows/package-dev-setup.yml b/.github/workflows/package-dev-setup.yml index 0671c555c..a975333a9 100644 --- a/.github/workflows/package-dev-setup.yml +++ b/.github/workflows/package-dev-setup.yml @@ -1,4 +1,4 @@ -name: Development - Create and publish setup Docker image +name: Setup/Development - Create and publish Docker image on: push: diff --git a/.github/workflows/package-release-api.yml b/.github/workflows/package-release-api.yml index 8aad6160d..a8d7a4592 100644 --- a/.github/workflows/package-release-api.yml +++ b/.github/workflows/package-release-api.yml @@ -1,4 +1,4 @@ -name: Release - Create and publish api Docker image +name: Api/Release - Create and publish Docker image on: release: diff --git a/.github/workflows/package-release-discord-bot.yml b/.github/workflows/package-release-discord-bot.yml index 4234ed705..867bc953e 100644 --- a/.github/workflows/package-release-discord-bot.yml +++ b/.github/workflows/package-release-discord-bot.yml @@ -1,4 +1,4 @@ -name: Release - Create and publish discord-bot Docker image +name: Discord-Bot/Release - Create and publish Docker image on: release: diff --git a/.github/workflows/package-release-frontend.yml b/.github/workflows/package-release-frontend.yml index 67a839edc..b244f59d5 100644 --- a/.github/workflows/package-release-frontend.yml +++ b/.github/workflows/package-release-frontend.yml @@ -1,4 +1,4 @@ -name: Release - Create and publish frontend Docker image +name: Frontend/Release - Create and publish Docker image on: release: diff --git a/.github/workflows/package-release-setup.yml b/.github/workflows/package-release-setup.yml index 1ea0996f7..a319c9f25 100644 --- a/.github/workflows/package-release-setup.yml +++ b/.github/workflows/package-release-setup.yml @@ -1,4 +1,4 @@ -name: Release - Create and publish setup Docker image +name: Setup/Release - Create and publish Docker image on: release: diff --git a/packages/frontend/src/pages/Periods/Details/components/analytics/Treemap.tsx b/packages/frontend/src/pages/Periods/Details/components/analytics/Treemap.tsx index 870d8e70c..514b14b64 100644 --- a/packages/frontend/src/pages/Periods/Details/components/analytics/Treemap.tsx +++ b/packages/frontend/src/pages/Periods/Details/components/analytics/Treemap.tsx @@ -2,8 +2,8 @@ import { Chart } from 'react-chartjs-2'; import { Chart as ChartJS, ChartData, ChartOptions } from 'chart.js'; import { TreemapController, - TreemapElement, TreemapDataPoint, + TreemapElement, } from 'chartjs-chart-treemap'; ChartJS.register(TreemapController, TreemapElement); diff --git a/packages/frontend/src/pages/Periods/Details/components/analytics/VerticalBar.tsx b/packages/frontend/src/pages/Periods/Details/components/analytics/VerticalBar.tsx index 7ea95570d..e150c3acf 100644 --- a/packages/frontend/src/pages/Periods/Details/components/analytics/VerticalBar.tsx +++ b/packages/frontend/src/pages/Periods/Details/components/analytics/VerticalBar.tsx @@ -1,4 +1,3 @@ -import { Bar } from 'react-chartjs-2'; import { Chart as ChartJS, CategoryScale, @@ -10,6 +9,7 @@ import { ChartData, ChartOptions, } from 'chart.js'; +import { Bar } from 'react-chartjs-2'; ChartJS.register( CategoryScale, From cc1323d44f54f102603693ed9733f125d081b48f Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Mon, 26 Sep 2022 11:52:30 +0200 Subject: [PATCH 3/3] New action names again --- .github/workflows/api.yml | 2 +- .github/workflows/discord-bot.yml | 2 +- .github/workflows/frontend.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 1c8c1e2e7..1df0e7f3e 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -1,4 +1,4 @@ -name: Api - build, lint, test +name: Api on: workflow_dispatch: pull_request: diff --git a/.github/workflows/discord-bot.yml b/.github/workflows/discord-bot.yml index 4b732af6e..cf1dc22b0 100644 --- a/.github/workflows/discord-bot.yml +++ b/.github/workflows/discord-bot.yml @@ -1,4 +1,4 @@ -name: Discord-Bot - build, lint +name: Discord-Bot on: workflow_dispatch: pull_request: diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 15f376eeb..8a4ca53bd 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -1,4 +1,4 @@ -name: Frontend - build, lint +name: Frontend on: workflow_dispatch: pull_request: