From 7c187bbfabd118aaefb4403f3807340c95fd0ebf Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Fri, 30 Dec 2022 10:16:43 +0900 Subject: [PATCH 1/7] Fixing discord signin --- website/src/pages/auth/signin.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/pages/auth/signin.tsx b/website/src/pages/auth/signin.tsx index 1dcbf211..1f1b0323 100644 --- a/website/src/pages/auth/signin.tsx +++ b/website/src/pages/auth/signin.tsx @@ -60,7 +60,7 @@ export default function Signin({ csrfToken, providers }) { size="lg" leftIcon={} color="white" - onClick={() => signIn(discord, { callbackUrl: "/" })} + onClick={() => signIn(discord.id, { callbackUrl: "/" })} // isDisabled="false" > Continue with Discord From 97c7541fea49cece164aeb3edad45ab1069454ec Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Fri, 30 Dec 2022 10:24:51 +0900 Subject: [PATCH 2/7] Also fixing the .env for local development to be inline with the docker compose setup --- website/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/.env b/website/.env index e4f3a202..9544836b 100644 --- a/website/.env +++ b/website/.env @@ -1,5 +1,5 @@ # The database created by running the jobs in /scripts/frontend-development/docker-compose.yaml -DATABASE_URL=postgres://postgres:postgres@localhost:5433/ocgpt_website +DATABASE_URL=postgres://postgres:postgres@localhost:5433/oasst_web # The FastAPI backend found by running the jobs in /scripts/frontend-development/docker-compose.yaml FASTAPI_URL=http://localhost:8080 From c4e2e75404975ba54f2080d7054978b0f23c5b51 Mon Sep 17 00:00:00 2001 From: kiritowu Date: Fri, 30 Dec 2022 11:57:30 +0800 Subject: [PATCH 3/7] Update README to include github collaboration guide --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f6672a2a..589c9671 100644 --- a/README.md +++ b/README.md @@ -66,11 +66,13 @@ Discord and someone can help clarify the issue with more detail. We're all working on different parts of Open Assistant together. To make contributions smoothly we recommend the following: +1. [Fork this project repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) and clone it to your local machine (Read more [About Forks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)). +1. Before working on any changes, try to [sync the forked repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to keep it up-to-date with the upstream repository. 1. Work on a small focused change that only touches on a few files. 1. Run `pre-commit` and make sure all files have formatting fixed. This simplifies life for reviewers. -1. Package up a small bit of work that solves part of the problem into a Pull - Request and send it out for review +1. Package up a small bit of work that solves part of the problem [into a Pull + Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) and send it out for review 1. If you're lucky, we can merge your change into `main` without any problems. If there's changes to files you're working on, resolve them by: 1. First try rebase as suggested From 99bfa02ebafef88ad0222f856aae35a254aec3db Mon Sep 17 00:00:00 2001 From: kiritowu Date: Fri, 30 Dec 2022 12:05:55 +0800 Subject: [PATCH 4/7] Break instructions to multiple lines for improved readibility --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 589c9671..4b680b6f 100644 --- a/README.md +++ b/README.md @@ -66,13 +66,18 @@ Discord and someone can help clarify the issue with more detail. We're all working on different parts of Open Assistant together. To make contributions smoothly we recommend the following: -1. [Fork this project repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) and clone it to your local machine (Read more [About Forks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)). -1. Before working on any changes, try to [sync the forked repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to keep it up-to-date with the upstream repository. +1. [Fork this project repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) + and clone it to your local machine. + (Read more [About Forks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)). +1. Before working on any changes, try to + [sync the forked repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) + to keep it up-to-date with the upstream repository. 1. Work on a small focused change that only touches on a few files. 1. Run `pre-commit` and make sure all files have formatting fixed. This simplifies life for reviewers. -1. Package up a small bit of work that solves part of the problem [into a Pull - Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) and send it out for review +1. Package up a small bit of work that solves part of the problem + [into a Pull Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) + and [send it out for review](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review). 1. If you're lucky, we can merge your change into `main` without any problems. If there's changes to files you're working on, resolve them by: 1. First try rebase as suggested From fd33a8b6c730614ee3d8550d648a8e42ab436f67 Mon Sep 17 00:00:00 2001 From: kiritowu Date: Fri, 30 Dec 2022 12:08:31 +0800 Subject: [PATCH 5/7] Ensure consistency for the use of full stop in README/Submitting Work --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4b680b6f..8dbdff86 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ contributions smoothly we recommend the following: 1. [Fork this project repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) and clone it to your local machine. - (Read more [About Forks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)). + (Read more [About Forks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks)) 1. Before working on any changes, try to [sync the forked repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to keep it up-to-date with the upstream repository. @@ -81,9 +81,9 @@ contributions smoothly we recommend the following: 1. If you're lucky, we can merge your change into `main` without any problems. If there's changes to files you're working on, resolve them by: 1. First try rebase as suggested - [in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-rebase) + [in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-rebase). 1. If rebase feels too painful, merge as suggested - [in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-merge) + [in these instructions](https://timwise.co.uk/2019/10/14/merge-vs-rebase/#should-you-merge). 1. Once you've resolved any conflicts, finish the review and merge into `main`. 1. Merge in your change and move onto a new issue or the second step of your current issue. From 7bcf0be8a258eb34123c344962929ad6af752a21 Mon Sep 17 00:00:00 2001 From: Yannic Kilcher Date: Fri, 30 Dec 2022 14:09:22 +0100 Subject: [PATCH 6/7] using double quotes in pre-commit bash for windows --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index de06c7ba..d105e209 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -60,4 +60,4 @@ repos: types_or: [javascript, jsx, ts, tsx] language: system pass_filenames: false - entry: bash -c 'cd website && npm ci && npm run lint' + entry: bash -c "cd website && npm ci && npm run lint" From f6bdce4da021b8dcd5eb17b13e646a9a36957eee Mon Sep 17 00:00:00 2001 From: Yannic Kilcher Date: Fri, 30 Dec 2022 14:10:25 +0100 Subject: [PATCH 7/7] going back to npm install for lint --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d105e209..72955162 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -60,4 +60,4 @@ repos: types_or: [javascript, jsx, ts, tsx] language: system pass_filenames: false - entry: bash -c "cd website && npm ci && npm run lint" + entry: bash -c "cd website && npm install && npm run lint"