github.com/ClimateMind/climatemind-frontend commits

Merge pull request #348 from ClimateMind/CM-1117-user-b-can-access-topics-summary-during-convo

Cm 1117 user b can access topics summary during convo

411b7ede8e6b6d7a781616adddce012eba4f3a3e authored over 2 years ago

Merge branch 'develop' into CM-1117-user-b-can-access-topics-summary-during-convo

3b23b7c8c4d4361d1e46561024dd33b0269028e5 authored over 2 years ago

Merge pull request #330 from ClimateMind/CM-1102-user-b-makes-account-from-link-after-conversation

CM-1102-user-b-makes-account-from-link-after-conversation

25f46ca03c384c5960ae50e0ea923defcbf9bc3f authored over 2 years ago

add undefined as acceptable prop

7fa71ff0b65f4ce31415ffb345579f201293c2e7 authored over 2 years ago

Delete Details.tsx

b3edc090cbf426828fbd88e1b5ebf2e0f4c08986 authored over 2 years ago

remove unused variables

8d06d9832e352c73826344c96e727143f5df2c23 authored over 2 years ago

added learn more overlay

15c617888f6d46e77e481566ce7b6e86fb0e3e40 authored over 2 years ago

add path to shared topics

ff6e6c7a832cda2f3a28d8df208f77017d8ea133 authored over 2 years ago

add path to shared topics

d6862801a406492dc0d720fe888fb4b59b02441d authored over 2 years ago

Create Details.tsx

ba9f8dae41dd833fbee2228fdb8d549102a617a2 authored over 2 years ago

Merge branch 'develop' into CM-1102-user-b-makes-account-from-link-after-conversation

2fb21e9ec83e0c9a62ac7d1822a959b02126714b authored over 2 years ago

Merge pull request #347 from ClimateMind/CM-1115_better_convo_card_initial_state_screen

CM-1115: Better convo card initial state screen

b1bf328e92872db1239ef22ab14fb4b435152283 authored over 2 years ago

update text and styling

bfa71d76ffc71c8e831d91ba78149d6b162000e9 authored over 2 years ago

The card now shows a message to wait until the userB has finished the quiz.

a469c0659a062e2f9e9467a06dec908342767f3e authored over 2 years ago

remove value text

f7c53beca38f8dc09e2a87299ed2e53bc81f7e12 authored over 2 years ago

prettier

5dfde0ab7cb04bbf19c7bbd804e8153db3f35810 authored over 2 years ago

remove rewards text

e30684995e70bfb4d26dada7e80189612155f60f authored over 2 years ago

rearranged text

adde666c43af2f2a9c3123f625d1a971e80a2166 authored over 2 years ago

rearranged text

0599317e42a3800f29c8d8be65e9a8c96c60bbe4 authored over 2 years ago

removed framing from tests

96308b6d1b4535985644229e8c2336023acc58a0 authored over 2 years ago

run prettier

0ba0c84f606f631e8d3e4de35c04c69deadf499b authored over 2 years ago

updated location type

03e7976367f1597434b34d14b1b0358a50b563e4 authored over 2 years ago

added dependency to useQuery

d0344ba17bb0a07b979f53200ea0b8087c0da4f7 authored over 2 years ago

reformat layout and add new login route

35d4cbb538182796a8c026c07561efda5aec0156 authored over 2 years ago

added useQuery dependency

edee897a88a73d0639fd25a2818f71430e10c5b3 authored over 2 years ago

added a redirection state to location

06f0e364cdca867820fa74a845e372153be06a43 authored over 2 years ago

Merge pull request #346 from ClimateMind/CM-1114_better_create_link_instructions

CM-1114: Better create link instructions

b38986c8f1219d43adc09c5330f6234d15e4cb01 authored over 2 years ago

Merge branch 'develop' into CM-1114_better_create_link_instructions

a8b52b55f59165afba7eeda28f4b02553c3e933e authored over 2 years ago

Merge branch 'CM-1114_better_create_link_instructions' of https://github.com/ClimateMind/climatemind-frontend into CM-1114_better_create_link_instructions

91e83964de2e39488b6df56116d4ad04245da3bd authored over 2 years ago

Decrease spaces so that the button fits inside the page

a7b7db64af366100fc5fcde8cd74a9817997e78b authored over 2 years ago

Merge pull request #345 from ClimateMind/CM-1114_better_create_link_instructions

CM-1114: Better create link instructions (Bugfix)

f3aa1c69cac3dc15508192522008a709576d7771 authored over 2 years ago

Merge branch 'develop' into CM-1114_better_create_link_instructions

49fc53a0b13114848f526134a8e4d0fcfb8a69e0 authored over 2 years ago

On my phone everything looked properly, but on Kamerons phone, the page wasn't scrolled to the top, so I try to enforce that it is scrolled to the top of the page.

dd07ef1389326f993aba403a4b3a42445f4217e7 authored over 2 years ago

Merge pull request #344 from ClimateMind/CM-1114_better_create_link_instructions

CM-1114: Better create link instructions

3eb651c2c2e469c58b8bcf9a758f0d557fdd841e authored over 2 years ago

Fix small things

94ba70903bf8bf43c4048e5fc1d459e0b3079980 authored over 2 years ago

Implementing feedback from Kameron

b58b838d57d592209d12e6f7969a6525c7e6ba20 authored over 2 years ago

Copy / pasted new text from the Jira ticket and because it is a lot more text than before, I also increased the minimum size of the page, so that all the content can be seen.

28aa8526d36ab550f2cfc1ccac16feba61600ab2 authored over 2 years ago

Add missing space

a74811d32b270bf8e83277e1752c67491d2964e5 authored over 2 years ago

Add the space

4beb35bcaa021f57f7ec8953888e5e0699922df0 authored over 2 years ago

added dependencies to useEffect

c757c740fc6bfd45744b0b6dc9b90316d2f25843 authored over 2 years ago

fixed consent for cypress test

923f76aee2dd85135d04d3ac715b71cd25aa129c authored over 2 years ago

run prettier

0dff0a2acf9e256149961326623d37a56d596f02 authored over 2 years ago

fixed unused variables

ca4126d194e538fa9ef9a75afe917eb8e9de32a7 authored over 2 years ago

run prettier

7192d2cfa4f463f3da4417eb9516cb7ed5ebaecb authored over 2 years ago

Merge branch 'develop' into CM-1102-user-b-makes-account-from-link-after-conversation

8a445884e360bff263c9aaa90b06d4fe99573377 authored over 2 years ago

Merge pull request #341 from ClimateMind/CM-1113-access-specific-conversation-from-link-user-a

Cm 1113 access specific conversation from link user a

cd60180f4492ece5155d1d69f7aea96c6878f45e authored over 2 years ago

Merge branch 'develop' into CM-1113-access-specific-conversation-from-link-user-a

76f95bcf8531be43d877b67d14ea521ee050a4df authored over 2 years ago

Merge pull request #338 from ClimateMind/CM-1071_intersection_of_ids_auth

Cm 1071 intersection of ids auth

999f2c02dd3eb8a825e814c5662c8866a55749ad authored over 2 years ago

Merge branch 'develop' into CM-1071_intersection_of_ids_auth

fd08e883d70259c50a3b0f3c650c7b028afaa557 authored over 2 years ago

Merge branch 'develop' into CM-1113-access-specific-conversation-from-link-user-a

39050284cd8a397ae0e0ed39a3129874c9c9d51a authored over 2 years ago

run prettier

f00fbafcff74f217efc7e3bc700f569355eb3cdb authored over 2 years ago

removed access token in api request

ecc3b3ebfceac7a338411e31c4abfc1cd577af30 authored over 2 years ago

Merge pull request #340 from ClimateMind/CM-1093_design_updates_for_talk_page_to_create_link_1

CM-1093: Design updates for Talk page to create link

343ac8db9e0435af8e00b9c99ceb052ebfb5d1af authored over 2 years ago

run prettier

4da4d1e99abc2f993d433b4f9a3c0c2f6db11920 authored over 2 years ago

removed unused variables

69302004ea6b0d9d33abcdf5b9d574f36d8e2f93 authored over 2 years ago

CM-1113-access-specific-conversation-from-link-user-a

** added an isLoading param in the auth context

fd7f1b38b985143ed84ea0a39acd16bc71954683 authored over 2 years ago

Make the Drawer button fixed to the bottom of the page, so that it stays there when scrolling.

Adapting the margins between the text on the site and setting a min height.

7360b5ab53f76fe377ee6fbf1db077ca415f793f authored over 2 years ago

Fixed tests

285c08004c986c432c84d15a7e8981c9b12c9348 authored over 2 years ago

fixed expected url

57c5dc9be1e4f1eba90909c0535a121fa9ae7e91 authored over 2 years ago

added type for location

23318acde029b46a65f4703cf2b22d9d03f7f125 authored over 2 years ago

run prettier

ebf8fe8716a99b4151ce0195c67117967a0f04f7 authored over 2 years ago

Merge branch 'develop' into CM-1071_intersection_of_ids_auth

e7eecee6f0f5ebf00973a2f884d5d04991c1eeb8 authored over 2 years ago

Fixed Test

1e726d27bf15212e3c988d6bea4d338b92766f5c authored over 2 years ago

run prettier

e492646ecfa39e9897b903300d012dfa57dfd844 authored over 2 years ago

CM-1071_intersection_of_ids_auth

* Added conversation ID to url routes for user B's journey

* Fixed Cypress and Jest tests

* Im...

89be841cc50fc733ce48b2742ee58092dacc6aed authored over 2 years ago

Merge pull request #337 from ClimateMind/CM-1093_design_updates_for_talk_page_to_create_link

CM-1093: Design updates for Talk page to create link

5cf08ceb33f928ab91817e85943a7e6cec53927a authored over 2 years ago

Merge branch 'develop' into CM-1093_design_updates_for_talk_page_to_create_link

cb1885002aece72a7ebefb66e79e91b30494fd64 authored over 2 years ago

Fix Tests

a9632087a17b681e706e2985277a7c8311c8e35e authored over 2 years ago

Fix Tests

938ae4c5ff19cf1cd95a6855bd14953bc4dafd58 authored over 2 years ago

Run prettier

01ceb276a5c85d893767aa7db698a73eae4e5082 authored over 2 years ago

fix test

361193ac6f1fc8b7b7aed8bc038add1e7630c1d3 authored over 2 years ago

Fix test

2fb467638b2f7da43bad78ef6e020ae832f6f95f authored over 2 years ago

Fix typo

4970d7b48068b19fd8993f2c297a9d4ae09b7447 authored over 2 years ago

Make request changes from design team

ed7789b49b5c8fabfc1526c60f192c2c747185bf authored over 2 years ago

Merge pull request #336 from ClimateMind/fix_no_thanks_button_route

Fix 'No thanks' buttons route

f03fb6d4d2c8628ba2db66906115e6621a2055a2 authored over 2 years ago

CM-1102-user-b-makes-account-from-link-after-conversation

Remove console.log

c1616a2806ef954bab1838f5b6324ad047e399f7 authored over 2 years ago

CM-1071_intersection_of_ids_auth

Comment out last test

1ab31f9964a2ba8e8bfbee4c087ae6d95830387d authored over 2 years ago

CM-1071_intersection_of_ids_auth

run prettier

2e9b62e8555e9ee9c2b035950fec47c5827b30fc authored over 2 years ago

CM-1071_intersection_of_ids_auth

Fixed Jest tests

9d5ed472cf26f1a77546329698419e74542dd430 authored over 2 years ago

run prettier

c0b97ce88eb8458d9d18e1e0c95782d24c53791e authored over 2 years ago

Make requested changes from design team

42087f99b1f3dcecdf51acc66c87279ee8c9c0c2 authored over 2 years ago

Merge branch 'CM-1071_intersection_of_ids_auth' of https://github.com/ClimateMind/climatemind-frontend into CM-1071_intersection_of_ids_auth

0e50b2e9c20e6693df3804ddc8787b1402e8d0c1 authored over 2 years ago

Run unittests locally on docker

45f2e527f2d6f227057aa0819779e7d0acb59db1 authored over 2 years ago

Merge branch 'develop' into fix_no_thanks_button_route

64cd7d52bbf2b151a93f689e9cd8628d017a44c2 authored over 2 years ago

Adapt test

f9c3a6df36fadefab246f9baf661eb68cbab0134 authored over 2 years ago

Make route to go back to dependent on the route that led to the page

142de192027d1ccaedbdd5d29dfa32d7698b2b58 authored over 2 years ago

Merge pull request #335 from ClimateMind/CM-566_user_can_reset_their_forgotten_password

CM-566: User can reset their forgotten password

327cd59cd73879ac2670b97ec47c8b778d095307 authored over 2 years ago

Merge branch 'CM-566_user_can_reset_their_forgotten_password' of https://github.com/ClimateMind/climatemind-frontend into CM-566_user_can_reset_their_forgotten_password

c7ff0de4761f397134509f27748dd2d22c20a289 authored over 2 years ago

Revert url change

644e4a4cacc1bfe566c487b6aecf6ff6c7856699 authored over 2 years ago

remove QueryClient

7129c06c77a7b968c8449291652c377a5369fbe4 authored over 2 years ago

mock useRefresh

d7f54d8be1d83994e1b4b3a06086b7662d7a9375 authored over 2 years ago

remove QueryClient

f13ddeeb5debcf0dc7eb5b8e16241b2329b90577 authored over 2 years ago

mock useUserB

72c771ea7aa35150adf878794a4c54f28512fe07 authored over 2 years ago

Delete QueryClient

70ff2a64c47d80b40364c5031a5e2aa1dfd2fba7 authored over 2 years ago

add session context

f40561bf57e45952d6db49b0660708fd60e7e6fa authored over 2 years ago

Merge pull request #334 from ClimateMind/CM-566_user_can_reset_their_forgotten_password

CM-566: User can reset their forgotten password

ad3db6b8666f65ceb4f3cbcab63d245398f2b26c authored over 2 years ago

Merge branch 'develop' into CM-566_user_can_reset_their_forgotten_password

7da28be84187a1ddaf153c50977d55516a811d16 authored over 2 years ago

test different url

ee21998c09eba199f7c30965379ce2e397de70e4 authored over 2 years ago

Merge pull request #333 from ClimateMind/CM-566_user_can_reset_their_forgotten_password

CM-566: User can resest their forgotton password

a0427c6579e6cdd65f0eda48f5915a2e4eb286a3 authored over 2 years ago

Get sessionId explicitly

ccc9509bb010d7e8dc66c06281f67a0ec404ed60 authored over 2 years ago

Ecosyste.ms: OpenCollective

github.com/ClimateMind/climatemind-frontend