From 282fc0836b36deb7feb3f00ae489f3e0aa7081f6 Mon Sep 17 00:00:00 2001 From: Junseo Park Date: Sun, 4 Jul 2021 12:56:19 +0900 Subject: [PATCH] Release v2.1 (#441) * feat: added datadog * fix(deps): update dependency yup-locales-ko to v1.2.0 * fix: prevent perm missing * fix: invalid start script * fix(deps): update dependency formik to v2.2.9 (#409) * chore: changed some header * deps: updated sentry * feat: added datadog metrix * fix: error causing at custom git url * chore: removed key file CHANGED KEY * types: holding missing flag * feat: cors header * feat: updated api docs * deps: updated deps for security * ci: handling sentry release * ci: handling sentry * Bug Fixes (#438) * fix: invalid sql * fix: fixed formatting number for null close: #433 * chore: added more margin for ad * typo: fixed typo issue * Improved Report and changed email address (#440) * feat: added report page for bot * feat: added report page for user * feat: blocking user reporting self * feat: changed emails * refactor: changed category handler style * release: version changed to v2.1 Co-authored-by: Renovate Bot Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/testing.yml | 11 +- SECURITY.md | 2 +- api-docs | 2 +- components/ReportTemplate.tsx | 78 + migrate.sql | 2 +- package.json | 18 +- pages/addbot.tsx | 2 +- pages/api/v2/bots/[id]/index.ts | 6 + .../bots/submits/[id]/[date]/approve.ts | 10 +- .../bots/submits/[id]/[date]/deny.ts | 4 +- pages/bots/[id]/index.tsx | 16 +- pages/bots/[id]/report.tsx | 140 + pages/bots/[id]/vote.tsx | 2 +- pages/pendingBots/[id]/[date].tsx | 4 +- pages/security.tsx | 4 +- pages/users/[id].tsx | 219 -- pages/users/[id]/index.tsx | 145 + pages/users/[id]/report.tsx | 143 + sentry.properties | 5 - types/index.ts | 9 +- utils/Constants.ts | 8 +- utils/ResponseWrapper.ts | 2 +- utils/Tools.ts | 6 +- yarn.lock | 2971 ++++++++--------- 24 files changed, 1962 insertions(+), 1847 deletions(-) create mode 100644 components/ReportTemplate.tsx create mode 100644 pages/bots/[id]/report.tsx delete mode 100644 pages/users/[id].tsx create mode 100644 pages/users/[id]/index.tsx create mode 100644 pages/users/[id]/report.tsx delete mode 100644 sentry.properties diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 80a1b01..3051e4b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -39,11 +39,6 @@ jobs: with: mysql database: 'discordbots' mysql root password: 'test' - - name: Wait for MySQL - run: | - while ! mysqladmin ping --host=127.0.0.1 --password=test --silent; do - sleep 1 - done - name: Run Jest run: yarn test - name: Generate RSA Key Pair @@ -56,12 +51,14 @@ jobs: run: | mv .env.demo.local .env.production.local printf 'MARIADB_ROOT_PASSWORD=YOUSHALLNOTPASS\nCOMMIT_HASH=${{ github.sha }}' > .env - - name: Create needed files - run: echo '{"tester":"DEMO_KEY"}' > secret.json + printf 'defaults.url=https://sentry.io/\ndefaults.org=koreanbots\ndefaults.project=client' > sentry.properties - name: Build run: yarn build env: CI: true + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + NEXT_PUBLIC_SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} # docker: # needs: diff --git a/SECURITY.md b/SECURITY.md index e86632c..3031997 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,4 +6,4 @@ ## English -Please [mail](mailto:koreanbots.dev@gmail.com) us! +Please [mail](mailto:team@koreanbots.dev) us! diff --git a/api-docs b/api-docs index 3636d4a..fcc3fb5 160000 --- a/api-docs +++ b/api-docs @@ -1 +1 @@ -Subproject commit 3636d4a1519f412ede7ab0b301dd8ca4bdd16a7b +Subproject commit fcc3fb57a2bce58703acb6a2e9be4cfe98929427 diff --git a/components/ReportTemplate.tsx b/components/ReportTemplate.tsx new file mode 100644 index 0000000..646b2bb --- /dev/null +++ b/components/ReportTemplate.tsx @@ -0,0 +1,78 @@ +import { FC, useState } from 'react' +import dynamic from 'next/dynamic' +import { FormikErrors, FormikTouched } from 'formik' + +const Button = dynamic(() => import('@components/Button')) +const TextArea = dynamic(() => import('@components/Form/TextArea')) + +export const Check: FC<{ checked: boolean, text: string }> = ({ checked, text }) => <> + {checked && } + {text} + + +export const SubmitButton: FC = () =>
+ +
+ +export const TextField: FC = ({ values, errors, touched, setFieldValue }) => <> +