Merge branch 'main' of https://github.com/LAION-AI/Open-Assistant into upstream

.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"

README.md

@@ -66,17 +66,24 @@ 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
+1.  Package up a small bit of work that solves part of the problem
-    Request and send it out for review
+    [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
-    [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.

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

website/src/pages/auth/signin.tsx

@@ -60,7 +60,7 @@ export default function Signin({ csrfToken, providers }) {
               size="lg"
               leftIcon={<FaDiscord />}
               color="white"
-              onClick={() => signIn(discord, { callbackUrl: "/" })}
+              onClick={() => signIn(discord.id, { callbackUrl: "/" })}
               // isDisabled="false"
             >
               Continue with Discord