github.com/ClimateMind/climatemind-frontend commits

Resolve merge hell 👹

2c0554be14956ed4dbe642355a6fb1b48f2b283a authored over 4 years ago by Nick Callaghan <[email protected]>

remove styles not needed

d1d3a468408cdb6629d4dcead8d61a63e8b1fe01 authored over 4 years ago by Nick Callaghan <[email protected]>

fix merge conflicts

32fa66c8bc368f532ca755d2f691c08ee4fcd335 authored over 4 years ago by Nick Callaghan <[email protected]>

updated questionnaire

66347f656f09dd07bf0b5c7af09fa7c518368607 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge branch 'master' into 174788437-use-answers-v2

58e3cf7541888f8dc76d6293b96662bc3d3229e3 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #31 from ClimateMind/174680377-add-csp-typekit

174680377 add csp typekit

c22547dc50a7e804ace5d1374d12e5a1da5139d9 authored over 4 years ago by Thiyagarajan Angappan <[email protected]>

fix failing test

8449708be260851fa684df02fde566003f6b4da8 authored over 4 years ago by Nick Callaghan <[email protected]>

fix failing test

5c344b97c320b7119b5cec4d5bfab5c556353c89 authored over 4 years ago by Nick Callaghan <[email protected]>

Updated QuestionsContext to use answers v2

b467966a3398d2090664d41de26f5f016c32b836 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #26 from ClimateMind/174682557-questionaire-progress

174682557 questionaire progress

5f2fbf9493ada18043216e34da17e88ff3219ee4 authored over 4 years ago by Nick Callaghan <[email protected]>

update csp in nginx config

952b2fbbd165e0b3a0608b20d6e08a3faae519cb authored over 4 years ago by thiyagarajan-angappan <[email protected]>

add csp for styles from typekit

c398ad8e77bb288f044be4fad69e37f61f2e44b9 authored over 4 years ago by thiyagarajan-angappan <[email protected]>

Merge branch 'master' into 174657172/questionnaire-cypress-test

5c969e5684e6ff04206db5ee328cb684b00650fd authored over 4 years ago by Matt Charlton <[email protected]>

Merge pull request #29 from ClimateMind/upgrade-cypress-5.1

upgrade cypress to 5.1

ccfb58d9c34a7c2fc0fcf169ed0c8d628af9aeab authored over 4 years ago by Matt Charlton <[email protected]>

upgrade cypress to 5.1

1e383828fec6dfde725118da85c1fea672bd4932 authored over 4 years ago by Matt Charlton <[email protected]>

Merge branch 'master' into 174657172/questionnaire-cypress-test

2788f65de7cbdf8992f8ae56724f1a38d7d7c1f5 authored over 4 years ago by Matt Charlton <[email protected]>

Merge pull request #20 from ClimateMind/cypress-start-page

Add cypress test for start page

392a629d3840e9bd686f1fb89dda105f75c5ab7b authored over 4 years ago by Matt Charlton <[email protected]>

need to route to mocked /questionnaire before each test

d2c37d9ff15e938035b1e770d675f3ef85a7fe47 authored over 4 years ago by Matt Charlton <[email protected]>

complete the questionnaire

699afe740053efdcae32ab04b60d6c8d3068cafe authored over 4 years ago by Matt Charlton <[email protected]>

add test for answering a question

dc7c6b081114dc1f7e4389e2237ef63a63f97fa4 authored over 4 years ago by Matt Charlton <[email protected]>

add test for opening questionnaire

1de95336085a56bc179aee8b85a1f9e7aeaad33d authored over 4 years ago by Matt Charlton <[email protected]>

add questions fixture file

f5a52bd7b2c0ce12c2fd6803a96a8eb99afc404b authored over 4 years ago by Matt Charlton <[email protected]>

fix test

078b795ed2d40976bce37b8760068e36d86f9b91 authored over 4 years ago by Matt Charlton <[email protected]>

correct some titles

218bd5fa5bad5a284ed843b65df1cd42dc78ec1a authored over 4 years ago by Matt Charlton <[email protected]>

quiz is now questionnaire

2614a90efe493ec675e9f905a76563dfc7b65dd3 authored over 4 years ago by Matt Charlton <[email protected]>

Merge pull request #25 from ClimateMind/174677404-Frontend-use-deployed-api

fix: added support for reading api endpoints from environment variables

06349b525c322610ef91b332c1b7c87a9d097e2f authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #27 from ClimateMind/fix/cypress-viewport-size

Cypress viewport size

3581d9df975ca012c4dadd7c2aef7bd2ed72a8ad authored over 4 years ago by Matt Charlton <[email protected]>

define viewport in cypress.json

b183c470128bae088955cd41986137c96c8a9504 authored over 4 years ago by Matt Charlton <[email protected]>

remove viewport defined in specific test

b23c92eea6faa85f578d4d9cbd6c8631569d0b6c authored over 4 years ago by Matt Charlton <[email protected]>

Merge branch 'master' into cypress-start-page

ec6ec407ed2a07eee36c594ec06bd1b2632c852d authored over 4 years ago by Matt Charlton <[email protected]>

tidy up comments

ceaa909aa81874f39b4c693ccfaaf46a274fbce0 authored over 4 years ago by Nick Callaghan <[email protected]>

fix broken test

7ba7625d458907d8dc56b39d7da414ac7930a256 authored over 4 years ago by Nick Callaghan <[email protected]>

finished styling

35b7425e3206d2b66f2ce0b3dfb222c62f7a510a authored over 4 years ago by Nick Callaghan <[email protected]>

fix styling

227141531d6cdf8e4e43bc71a19bee36739cdeef authored over 4 years ago by Nick Callaghan <[email protected]>

Adding missing dep

e54a86acf136f502333dc337f0072906c9b282ee authored over 4 years ago by Nick Callaghan <[email protected]>

remove snapshot

245f30ce8f76941f2be678978589fda459d4dc36 authored over 4 years ago by Nick Callaghan <[email protected]>

fix: added support for reading api endpoints from environment variables

185e9d87305ad8d81958492e6c03fa443aabfd18 authored over 4 years ago by Johan Olsson <[email protected]>

fix missing id

a65778b6edb9078e89a25207ac5a7cf6fc56538d authored over 4 years ago by Nick Callaghan <[email protected]>

removed snapshot

6225863ca6bbc75c1aae3bbb8758116140a6bd87 authored over 4 years ago by Nick Callaghan <[email protected]>

remove snapshot

d7f48d55e89e492df7610109a8d88608158e755d authored over 4 years ago by Nick Callaghan <[email protected]>

remove unused styles

65fa5f44ae7fafa102dc927935733c72538c6179 authored over 4 years ago by Nick Callaghan <[email protected]>

working on mobile

f560ff007ae079d3b83d128f6928a477eed0a72c authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #24 from ClimateMind/#174682522-submit-questionnaire-screen

#174682522 submit questionnaire screen

3d1e26431fba9450a014c25d60d68f8bc49078e4 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #23 from ClimateMind/174610297-first-ten-questions

174610297 first ten questions

e2a2259029ee041930fe0fa543d3dd622fdd6dc6 authored over 4 years ago by Nick Callaghan <[email protected]>

just chnages a comment

b39ed42767acba8c4ce2784795c0822f4dd87fe0 authored over 4 years ago by Nick Callaghan <[email protected]>

fix warning

1bb41099bdfb10ce1908553077d33eea1c661e9c authored over 4 years ago by Nick Callaghan <[email protected]>

remove ranomisation for now

922e8d03047c47788529c7c212fd9cb26d0b923e authored over 4 years ago by Nick Callaghan <[email protected]>

randomise questions

d2c81b13a14c55b322b9fa65121c9cd698d80bf8 authored over 4 years ago by Nick Callaghan <[email protected]>

implement stack

d3d3d2ab67c41320a42e6706b423431d2c9f9f04 authored over 4 years ago by Nick Callaghan <[email protected]>

removing snapshots - covered by percy

0cbf620cefb896bbb3d1dbe1d308dcc60ab2c057 authored over 4 years ago by Nick Callaghan <[email protected]>

Adding unit tests

43ff24f33106ea68206f9bd15c133d6843204ba7 authored over 4 years ago by Nick Callaghan <[email protected]>

updated snapshot

186fb8b188c9537b911e74b6323cd43a839fe375 authored over 4 years ago by Nick Callaghan <[email protected]>

layout complete

4093a1cb0faa43e5eee15bd08bf19afa0a92ab25 authored over 4 years ago by Nick Callaghan <[email protected]>

first pass

373d39564636001761d2e318c267c44892301804 authored over 4 years ago by Nick Callaghan <[email protected]>

updated snapshot

ee3a7c9b07cdce966617d52d91c518d3c2ce50d0 authored over 4 years ago by Nick Callaghan <[email protected]>

styling improvments

ea7814961d3b503ff2593a84f8fd607653aa3b3f authored over 4 years ago by Nick Callaghan <[email protected]>

spelling mistake

d4020e928df7e85a0c5cb627ae02032a80e7131e authored over 4 years ago by Nick Callaghan <[email protected]>

calrify variable names and fix loader

176b90116b825ec439fb4f6956841a0a97082d3b authored over 4 years ago by Nick Callaghan <[email protected]>

Merge branch 'master' into 174610297-first-ten-questions

b623a7ff470a721e41859a3c7f48eb3898e6b84d authored over 4 years ago by Nick Callaghan <[email protected]>

updating snapshot

4f6b249134fd0ddb31a6a35ba2183e05ee9f3bd0 authored over 4 years ago by Nick Callaghan <[email protected]>

Adding Green Radio

cfa53b9ef3360bd65f43f943a1718e33eb18d0c0 authored over 4 years ago by Nick Callaghan <[email protected]>

Clicking the button

b953e00e36de0e80ccdd49c84a02ba9bce6a5a2b authored over 4 years ago by Nick Callaghan <[email protected]>

adding first tests

58b55bc249d0a5f0e35376b67e8b8bb3b468dc69 authored over 4 years ago by Nick Callaghan <[email protected]>

quiz can be completed

1335aa858068d216d5773f765004a483031d3e5d authored over 4 years ago by Nick Callaghan <[email protected]>

tidy styles

8a36cec0c4591921be6cb8d00ab96a86bbe799eb authored over 4 years ago by Nick Callaghan <[email protected]>

adding key prop

dc450706756389fffda36af224b09ed7406d476a authored over 4 years ago by Nick Callaghan <[email protected]>

first working version

707fd01c21a2e3139eb9c028c9003ea932c07288 authored over 4 years ago by Nick Callaghan <[email protected]>

adding the real api

892577677bd8e59c569ea6df247ad6db80d270a4 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #22 from ClimateMind/174561987-Get-Questions-from-API

174561987 get questions from api

d5ebbe731fc644aed9cf55784c416ae27d77dbb6 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #21 from ClimateMind/174266052-mui-custom-theme

174266052 mui custom theme

74cd7c5d767024449fc1c5db9ee2e7f7989c7a1b authored over 4 years ago by Thiyagarajan Angappan <[email protected]>

Merge branch '174561987-Get-Questions-from-API' into 174610297-first-ten-questions

506ea6a76b85f25d4a5ff35e109fe5d9f20d1f1c authored over 4 years ago by Nick Callaghan <[email protected]>

renaming some stuff

2a8c8d7490d474294cf751a3d564d65e1ab654c7 authored over 4 years ago by Nick Callaghan <[email protected]>

renaming stuff

bad96adc5de1bc11c3fac5c93dedcf8da0fbc329 authored over 4 years ago by Nick Callaghan <[email protected]>

added hook for data fetching

171d1d0c5ecf05586cc177a282c9274a4659bf95 authored over 4 years ago by Johan Olsson <[email protected]>

merge with mui theme branch

49e336759f445a319084436863735dbcb1be88af authored over 4 years ago by Nick Callaghan <[email protected]>

Merge branch '174266052-mui-custom-theme' into 174610297-first-ten-questions

2ca52935d1881943351d86c340dbcdacb4edd13e authored over 4 years ago by Nick Callaghan <[email protected]>

Merge branch 'master' into 174561987-Get-Questions-from-API

cb8752b99cd3030fe1564dde2f7462a2823dd71c authored over 4 years ago by Johan Olsson <[email protected]>

fix: cypress home page test

86129677ee078ddaf011ab7ece59436e2bce54e4 authored over 4 years ago by thiyagarajan-angappan <[email protected]>

global mui theme

8342087f98926746175917401f247c2b8ea0d732 authored over 4 years ago by thiyagarajan-angappan <[email protected]>

Merge pull request #18 from ClimateMind/circleci-deploy

deploy to Azure

a6f3f9eba47e210c7f72b611362f6a5e606c2e4b authored over 4 years ago by Roland Oldengarm <[email protected]>

moved helper file

92989f5150c237fc368d1be7f586d9b1186a189e authored over 4 years ago by Nick Callaghan <[email protected]>

Begining logic around the quiz

7c088502d8b4fd6520d46a6aa3004b4ee941d022 authored over 4 years ago by Nick Callaghan <[email protected]>

Merge pull request #19 from ClimateMind/dependabot/npm_and_yarn/bl-4.0.3

[Security] Bump bl from 4.0.2 to 4.0.3

33321453622d4f01aa5a918e2d191a271962f71d authored over 4 years ago by Matt Charlton <[email protected]>

add start page test

5db7f8215bc698660d4895ddc31264b1b25934e3 authored over 4 years ago by Matt Charlton <[email protected]>

expand homepage test now the button does something

efc5d025ee948ec83ef6256853725e1906fa9b34 authored over 4 years ago by Matt Charlton <[email protected]>

expect a parameter in the checkAccessibility function

9d00274486447704d7d5d7d2d64172d7c8b2df9e authored over 4 years ago by Matt Charlton <[email protected]>

Adding Loading Comonent and grid

b1ad0258388dec4ea85820ca1dc00b4b575fed74 authored over 4 years ago by Nick Callaghan <[email protected]>

[Security] Bump bl from 4.0.2 to 4.0.3

Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3. **This update includes a security f...

bbdf87d92fbba8d6eaf3ef1320fbbbd1130917c2 authored over 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

first commit

9e4c6fbed252ac6258f98569b0e1e3b91177127b authored over 4 years ago by Johan Olsson <[email protected]>

first commit

a13a1814f15cd999fcf99a91f3fbf53370114df1 authored over 4 years ago by Johan Olsson <[email protected]>

use frontend as name

b9b3da2db4af6f6c40635ddc3835548de3570a53 authored over 4 years ago by Roland Oldengarm <[email protected]>

indenting

e3fb66668336aa5309b35c72ec4066109637e885 authored over 4 years ago by Roland Oldengarm <[email protected]>

only deploy on master

026db664454a32fcb737d2e0c9f39a6059a8be7c authored over 4 years ago by Roland Oldengarm <[email protected]>

add context

675a7d21506dd711ff36b54de4f27e22fd632ea7 authored over 4 years ago by Roland Oldengarm <[email protected]>

typo in orb

f8ab9a75ea2ae30837f20bcf3a7bee8649319a1f authored over 4 years ago by Roland Oldengarm <[email protected]>

add orb

0c5ecc0cbc3646f5d13b39f7a7ce12b9323e8b3d authored over 4 years ago by Roland Oldengarm <[email protected]>

remove duplicate workflows

b62eaa40610243f4dc639c0ab414a6d233960234 authored over 4 years ago by Roland Oldengarm <[email protected]>

deploy to Azure

520b5312b080690a836a1b18673c2a9f544672b6 authored over 4 years ago by Roland Oldengarm <[email protected]>

Question Component First pass

6013b73daa3af32f80ef3c94844eeabf452821b6 authored over 4 years ago by Nick Callaghan <[email protected]>

Question component first pass

aa6220ad9e64bb30606fa04105639a228bf6d6de authored over 4 years ago by Nick Callaghan <[email protected]>

Ecosyste.ms: OpenCollective

github.com/ClimateMind/climatemind-frontend