Commit Graph

104 Commits

Author SHA1 Message Date
AbdBarho c2efbf2400 Merge pull request #147 from AAYUSH-droid/linkcomment1
Hide summarize story & rate summary tasks in the frontend
2022-12-29 14:58:53 +01:00
aayush f96fb36182 Commented TaskOption for summerize story & rate summary 2022-12-29 19:23:46 +05:30
aayush f2d6739a11 commented links 2022-12-29 18:55:00 +05:30
Yannic Kilcher 0acacf33fe Merge branch 'main' into add-debug-skip-password-env 2022-12-29 13:34:28 +01:00
Keith Stevens 2046b32b92 Merge pull request #138 from jojopirker/newLoading
New loading screen component
2022-12-29 20:22:06 +09:00
jojopirker cb317ebccb Initial Storybook setup (#110)
* Storybook setup

Storybook can be started using `npm run storybook`

* moved files and bugfix

Moved component files into their own directory and moved stories next to them. Fixed a bug with loading images

* prettier and bugfix

* prettier and bugfix

* Absolute Import in Header.tsx

* import fix

some imports did not work after merging

* Storybook update for chakra ui to properly work

* Prettier main.js

* comment in preview.js about hacky solution

* webpack final update and prettier update to preview

* Updated website/readme to include storybook description

* prettier...

* Delete docker-compose 2.yaml
2022-12-29 10:44:14 +01:00
jojopirker 205ff7971c deleted comment 2022-12-29 08:12:34 +01:00
jojopirker 7725297eb2 Merge branch 'LAION-AI:main' into newLoading 2022-12-29 08:01:45 +01:00
jojopirker 29bd355529 Ran prettier and fixed permanent loadingScreen in assistant_reply 2022-12-29 08:01:19 +01:00
Yannic Kilcher 0ee3196064 added sleep instead of true containers in compose 2022-12-29 00:38:12 +01:00
jojopirker d4887e0054 new LoadingScreen to replace old loading divs 2022-12-28 20:49:03 +01:00
rsandb 62f326f51a clean up changes 2022-12-28 13:01:02 -06:00
rsandb 9404654672 Merge remote-tracking branch 'upstream/main' 2022-12-28 12:26:17 -06:00
rsandb 6f2688b6a7 fix global layout issue on edit and account pages 2022-12-28 12:23:14 -06:00
rsandb f534def85d fixed merge issues 2022-12-28 12:21:17 -06:00
rsandb 223c07e8e3 format changes, fixed authenticated page height 2022-12-28 12:08:55 -06:00
Yannic Kilcher cbcbe8d708 added environment variable DEBUG_LOGIN to display debug credentials provider even in production mode 2022-12-28 17:33:33 +01:00
AbdBarho 4fe45e3651 Implement rank_initial_prompts for web 2022-12-28 11:58:35 +01:00
AbdBarho 072190145b Add global layout
with the ability to be overridden per-page
2022-12-28 10:03:03 +01:00
Keith Stevens bc235b5f51 Closing issue 113 by fixing the landing page links for two tasks 2022-12-28 17:24:25 +09:00
Keith Stevens a1f7d919c0 Fixing imports from merges in the signup page 2022-12-28 17:08:04 +09:00
Andreas Köpf 6a0d3b5f85 Force merge remote-tracking branch 'origin/65-consistent-paths-plus-ui' into main 2022-12-28 08:21:42 +01:00
rsandb 5e27695c47 Merge remote-tracking branch 'upstream/main' 2022-12-27 17:29:11 -06:00
Keith Stevens f3ef32c26b fixing whitespace on signup page 2022-12-28 08:07:34 +09:00
Keith Stevens 5ad18f61f9 Merge branch 'main' into 24-web-deploy-aws 2022-12-28 08:04:23 +09:00
Keith Stevens 0ac0ff9b59 Merge branch 'main' into 65-consistent-paths-plus-ui 2022-12-28 07:56:42 +09:00
Keith Stevens 35f5770e17 Merge pull request #69 from seyfeddinenecib/Open-Assistant-67
fix bug Open-Assistant #67 : submit form on enter
2022-12-28 07:43:49 +09:00
Lucian Petri cea73ad1c4 Merge pull request #75 from LucianPetri/prettier-userchoice
Prettier User Choice on index page
2022-12-28 00:40:50 +02:00
seyf eddine necib 11b9df32f3 prettier formating for 67 2022-12-27 22:49:16 +01:00
seyf eddine necib 6df13ebf04 adding form element to signup 2022-12-27 21:15:50 +01:00
seyf eddine necib c680757042 fix bug Open-Assistant #67 : submit form on enter 2022-12-27 20:39:38 +01:00
Riley Sandborg dc48861f59 Update 404.tsx
Removed quotation marks from the content. Were previously from being commented out.
2022-12-27 13:38:32 -06:00
rsandb de869033bf updated avatar component name, added ability to change username (only works server side for now), updated signin page, updated Footer
Still working on the account settings page but didn't want to get behind on commits.
2022-12-27 13:00:32 -06:00
Lucian Petri ea47c08e4d typo fix 2022-12-27 18:39:19 +02:00
Lucian Petri b87dd9c732 fixing pre-commit on TaskSelection 2022-12-27 16:30:24 +02:00
Semen Zhydenko 7dc4fba5cd Fixed typo: publically -> publicly 2022-12-27 14:14:29 +01:00
Yannic Kilcher c70c9d191c Merge pull request #68 from LAION-AI/66-create-a-set-of-fake-default-users-for-the-website
created debug credentials provider
2022-12-27 14:01:15 +01:00
Yannic Kilcher d8a5937b9a removed boolean dependency 2022-12-27 13:59:00 +01:00
Yannic Kilcher 2a814b5b0b Update website/src/pages/api/auth/[...nextauth].ts
Co-authored-by: Ville Lahdenvuo <tuhoojabotti@gmail.com>
2022-12-27 13:57:55 +01:00
Lucian Petri 6896674476 adding new Tasks 2022-12-27 14:14:29 +02:00
Lucian Petri 3f084c73d0 Merge branch 'main' of https://github.com/LAION-AI/Open-Assistant into prettier-userchoice 2022-12-27 14:09:29 +02:00
Lucian Petri 32a0f14d8a Refactor to TaskSelection 2022-12-27 13:56:01 +02:00
Lucian Petri 33af6fce40 removing UserChoice 2022-12-27 13:55:19 +02:00
Keith Stevens 38266dd76b Merge pull request #81 from AbdBarho/reply
Implement `*_reply` for the web
2022-12-27 20:20:37 +09:00
Lucian Petri b075e62893 Merge https://github.com/LAION-AI/Open-Assistant into prettier-userchoice 2022-12-27 12:52:40 +02:00
AbdBarho 0987a64a85 Implement *_reply for the web
Also, start extracting shared components
2022-12-27 11:36:20 +01:00
poipiii fba75a7942 Merge branch 'main' of https://github.com/LAION-AI/Open-Assistant 2022-12-27 16:42:01 +08:00
poipiii 61d8f3bc5a fixed minor style issues 2022-12-27 16:12:40 +08:00
poipiii d629fe0f42 [fix] fixed issues in pr and added pre commit 2022-12-27 14:58:43 +08:00
Keith Stevens 530599d59f Setting a simpler task path structure, Adding some layout to the task types, and fixing a ui bug in the rating task 2022-12-27 11:04:17 +09:00