Commit Graph

620 Commits

Author SHA1 Message Date
jojopirker f4fcee3ef9 Merge branch 'LAION-AI:main' into messageNavigation 2023-01-07 08:12:18 +01:00
AbdBarho f2d805422e Merge pull request #469 from Klotske/separate-dashboard-layout
#432 - Moved SideMenu to component & refactored layout
2023-01-07 08:03:07 +01:00
Kostia 2987ec76ff Refactor tasks into components 2023-01-07 05:13:28 +02:00
klotske 5524db5a01 Removed duplicate Box components 2023-01-07 03:50:25 +03:00
klotske d3a0bd4305 Moved SideMenu to component & refactored layout 2023-01-07 03:38:34 +03:00
Keith Stevens aa4bb41355 Delete sharp, it's not needed and breaks docker on m1 2023-01-07 08:54:50 +09:00
Keith Stevens b36d263cad Merge pull request #457 from Klotske/add-longer-response-incentive
#435 Added longer response incentive
2023-01-07 08:34:39 +09:00
Keith Stevens e8f160c4b8 Merge pull request #447 from LAION-AI/jm/tests-for-javascript-oasst-api-client
tests + fix: #354 Add tests for OasstApiClient and fix handling of OasstError
2023-01-07 07:57:06 +09:00
klotske 3449c053f6 Removed unused imports & unused variable 2023-01-07 00:08:56 +03:00
klotske 44d05ed709 Initial implementation of progressbar tracking 2023-01-07 00:06:15 +03:00
jojopirker fa7d8ecfde Update index.tsx 2023-01-06 17:01:27 +01:00
jojopirker a1b0bb5561 moved key prop 2023-01-06 16:50:25 +01:00
jojopirker ad7ccb21d8 Merge branch 'LAION-AI:main' into messageNavigation 2023-01-06 16:43:50 +01:00
Jack Michaud 239c10c2dc fix: export OasstError 2023-01-06 10:21:23 -05:00
Jack Michaud 6eca350826 Merge branch 'main' of github.com:LAION-AI/Open-Assistant into jm/tests-for-javascript-oasst-api-client 2023-01-06 10:17:47 -05:00
Jack Michaud a9a3fc4e4a fix: handle OasstError correctly in OasstApiClient 2023-01-06 10:15:07 -05:00
Jack Michaud 083e8a869b test: add unittest tests for edge cases in OasstApiClient
Fixes #354
2023-01-06 10:14:37 -05:00
jojopirker d292643ea6 (#309) pre-commit 2023-01-06 15:57:20 +01:00
jojopirker 2db310ab06 (#309) Message navigation recursive 2023-01-06 15:53:18 +01:00
chs20 667d51df55 Fix message flagging in dark mode (#434) 2023-01-06 15:31:11 +01:00
Keith Stevens d182f6f093 Merge pull request #441 from LAION-AI/236-admin-role
Creating a role field for Users #236
2023-01-06 21:21:28 +09:00
Keith Stevens 8a5b7ed80c Merge pull request #421 from Klotske/add-oasst_api-interaction
#353 - Add OasstApiClient interaction with task
2023-01-06 20:22:56 +09:00
Keith Stevens 7e517db934 Fixing the type errors when updating the jwt and session with a role 2023-01-06 20:19:02 +09:00
Keith Stevens 498daef9d3 Creating a role field for Users and seeding it everytime a user logs in based on a shortlist 2023-01-06 20:01:02 +09:00
jojopirker a822db11a7 pre-commit 2023-01-06 11:55:31 +01:00
klotske 3c330dcd13 Added the oasstApiClient global var and init 2023-01-06 13:44:46 +03:00
ericv105 bf2a5e4a46 jest setup, cypress type conflict fix 2023-01-06 01:07:27 -05:00
Yannic Kilcher 80e1014ff7 Merge pull request #424 from Vechtomov/npm-ci
Replace npm install with npm ci
2023-01-06 07:06:10 +01:00
Andrew Maguire 95158ff16d Merge pull request #423 from andrewm4894/submit-button-dynamic-color
make submit button blue for submit and green for next task
2023-01-05 23:21:02 +00:00
Keith Stevens ea83c830ed Merge pull request #345 from stephancill/main
Add warning when submitting unchanged ranking
2023-01-06 08:14:44 +09:00
Andrew Maguire 78c6333bcf make submit button blue for submit and green for next task 2023-01-05 22:05:24 +00:00
Vechtomov 6880b99ab0 npm install replaced with npm ci 2023-01-06 00:56:56 +03:00
klotske f5b49a952e Add the taskInteraction contract test 2023-01-05 23:46:39 +03:00
klotske a4e8d829b1 Implement interaction in oasst_api 2023-01-05 23:27:44 +03:00
jojopirker 1bd0336d27 bugfix 2023-01-05 19:02:00 +01:00
jojopirker 1d46b3132a hacky solution for a bug
https://dev.to/wh1zk1d/swr-dynamic-routes-in-next-js-3cbl
2023-01-05 18:54:38 +01:00
jojopirker d0bc720761 inital try for navigation messages trees
should be redone probably in a recursive way...
2023-01-05 12:17:45 +01:00
Keith Stevens 843ea1a01a Merge pull request #403 from othrayte/web-dashboard-initial-prompt
website: Add Create Initial Prompts link to the dashboard
2023-01-05 19:32:05 +09:00
Keith Stevens 64a4c4ab6c Merge pull request #401 from jojopirker/messagesPage
spacing for message dashboard (comment in #375)
2023-01-05 19:31:35 +09:00
Keith Stevens 38fec237d0 Merge pull request #342 from jack-michaud/jm/contract-tests-for-website
refactor + test: add OasstApiClient in website with tests
2023-01-05 19:30:47 +09:00
Adrian Cowan cb8fec868c website: Add Create Initial Prompts link to the dashboard. 2023-01-05 20:51:45 +11:00
jojopirker ac8ae2652e spacing for message dashboard 2023-01-05 10:33:35 +01:00
Keith Stevens 75e6e72486 Merge pull request #326 from KarthikRaju391/discord-credentials
Use Discord Credentials when available
2023-01-05 17:25:50 +09:00
AbdBarho 165e87353c Merge pull request #375 from jojopirker/messagesPage
#307 new page to display recent messages
2023-01-05 08:12:30 +01:00
Keith Stevens 34ffeb5434 Merge pull request #393 from kostiak/fix-343
Fix for #343
2023-01-05 09:28:12 +09:00
Keith Stevens 1c3314365a Merge pull request #389 from Klotske/fix-dashboard-user-link
Fixed broken link in the dashboard
2023-01-05 09:06:31 +09:00
Keith Stevens 4f681c2f34 Merge pull request #378 from chs20/dev
Fix dark mode display for some pages
2023-01-05 09:02:24 +09:00
Klotske 8fab6cfe25 Fixed broken link in the dashboard 2023-01-05 00:50:17 +03:00
jojopirker b4034e56e2 moved isLoading 2023-01-04 20:35:20 +01:00
jojopirker 8e61cef81d added getDashboardLayout 2023-01-04 20:22:06 +01:00