Skip to content

Commit bdd1a11

Browse files
flacialflacial
authored
Merge branch 'master' into 2175-create-addexercise-hook
2 parents 7b7bfb3 + 14b9a56 commit bdd1a11

File tree

14 files changed

+865
-394
lines changed

14 files changed

+865
-394
lines changed

‎__tests__/__snapshots__/storyshots.test.js.snap‎

Lines changed: 135 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -908,40 +908,48 @@ exports[`Storyshots Components/AdminLessonSideNav Basic 1`] = `
908908

909909
exports[`Storyshots Components/Alert Info 1`] = `
910910
<div
911-
className="alert d-flex justify-content-between mt-3 bg-primary text-white"
911+
className="alert d-flex justify-content-between mt-3 alert alert-primary"
912912
role="alert"
913913
>
914914
<div
915-
className="d-flex gap-3"
915+
className="d-flex align-items-center gap-3"
916916
>
917-
<img
918-
className="img-fluid"
919-
height={24}
920-
src="/assets/curriculum/icons/icon-tip.svg"
921-
width={24}
922-
/>
917+
<div
918+
className="info_image"
919+
>
920+
<img
921+
className="img-fluid"
922+
height={24}
923+
src="/assets/curriculum/icons/icon-tip.svg"
924+
width={24}
925+
/>
926+
</div>
923927
Set up your computer to submit challenges.
924928
</div>
925929
</div>
926930
`;
927931

928932
exports[`Storyshots Components/Alert Info With Link And Dismiss 1`] = `
929933
<div
930-
className="alert d-flex justify-content-between mt-3 bg-primary text-white"
934+
className="alert d-flex justify-content-between mt-3 alert alert-primary"
931935
role="alert"
932936
>
933937
<div
934-
className="d-flex gap-3"
938+
className="d-flex align-items-center gap-3"
935939
>
936-
<img
937-
className="img-fluid"
938-
height={24}
939-
src="/assets/curriculum/icons/icon-tip.svg"
940-
width={24}
941-
/>
940+
<div
941+
className="info_image"
942+
>
943+
<img
944+
className="img-fluid"
945+
height={24}
946+
src="/assets/curriculum/icons/icon-tip.svg"
947+
width={24}
948+
/>
949+
</div>
942950
Set up your computer to submit challenges.
943951
<a
944-
className="text-white noUnderline"
952+
className="alert-link noUnderline"
945953
href="https://www.notion.so/JS-0-Foundations-a43ca620e54945b2b620bcda5f3cf672#b45ed85a95e24c9d9fb784afb7a46bcc"
946954
rel="noopener noreferrer"
947955
target="_blank"
@@ -950,54 +958,65 @@ exports[`Storyshots Components/Alert Info With Link And Dismiss 1`] = `
950958
</a>
951959
</div>
952960
<button
953-
className="alert-dismiss"
961+
className="info_image alert-dismiss"
954962
data-testid="dismiss-info"
955963
onClick={[Function]}
956964
role="dismiss"
957965
>
958966
<img
967+
className="img-fluid"
968+
height={24}
959969
src="/assets/curriculum/icons/dismiss-info.svg"
970+
width={24}
960971
/>
961972
</button>
962973
</div>
963974
`;
964975

965976
exports[`Storyshots Components/Alert Urgent 1`] = `
966977
<div
967-
className="alert d-flex justify-content-between mt-3 alert-danger"
978+
className="alert d-flex justify-content-between mt-3 alert alert-danger"
968979
role="alert"
969980
>
970981
<div
971-
className="d-flex gap-3"
982+
className="d-flex align-items-center gap-3"
972983
>
973-
<img
974-
className="img-fluid"
975-
height={24}
976-
src="/assets/curriculum/icons/exclamation.svg"
977-
width={24}
978-
/>
984+
<div
985+
className=""
986+
>
987+
<img
988+
className="img-fluid"
989+
height={24}
990+
src="/assets/curriculum/icons/exclamation.svg"
991+
width={24}
992+
/>
993+
</div>
979994
Invalid password
980995
</div>
981996
</div>
982997
`;
983998

984999
exports[`Storyshots Components/Alert Urgent With Icon And Dismiss 1`] = `
9851000
<div
986-
className="alert d-flex justify-content-between mt-3 alert-danger"
1001+
className="alert d-flex justify-content-between mt-3 alert alert-danger"
9871002
role="alert"
9881003
>
9891004
<div
990-
className="d-flex gap-3"
1005+
className="d-flex align-items-center gap-3"
9911006
>
992-
<img
993-
className="img-fluid"
994-
height={24}
995-
src="/assets/curriculum/icons/exclamation.svg"
996-
width={24}
997-
/>
1007+
<div
1008+
className=""
1009+
>
1010+
<img
1011+
className="img-fluid"
1012+
height={24}
1013+
src="/assets/curriculum/icons/exclamation.svg"
1014+
width={24}
1015+
/>
1016+
</div>
9981017
Please upgrade your CLI client by running npm update c0d3.
9991018
<a
1000-
className="text-danger noUnderline"
1019+
className="alert-link noUnderline"
10011020
href="https://www.npmjs.com/package/c0d3"
10021021
rel="noopener noreferrer"
10031022
target="_blank"
@@ -1006,13 +1025,16 @@ exports[`Storyshots Components/Alert Urgent With Icon And Dismiss 1`] = `
10061025
</a>
10071026
</div>
10081027
<button
1009-
className="alert-dismiss"
1028+
className=" alert-dismiss"
10101029
data-testid="dismiss-urgent"
10111030
onClick={[Function]}
10121031
role="dismiss"
10131032
>
10141033
<img
1034+
className="img-fluid"
1035+
height={24}
10151036
src="/assets/curriculum/icons/dismiss-urgent.svg"
1037+
width={24}
10161038
/>
10171039
</button>
10181040
</div>
@@ -5887,49 +5909,76 @@ exports[`Storyshots Components/ExercisePreview Basic 1`] = `
58875909
className="card shadow-sm col-sm-8 col-md-7 col-lg-6 col-xl-5 m-auto px-md-3 border-0 rounded"
58885910
>
58895911
<div
5890-
className="card-body pt-3 pb-3 "
5912+
className="card-body pb-3 "
58915913
>
5892-
<p
5914+
<div
58935915
className="card-text"
58945916
>
58955917
<p
5896-
className="exercise__p__bold"
5918+
className="exercise__p__bold my-4"
58975919
>
58985920
Problem
58995921
</p>
5900-
<pre
5901-
className="exercise__pre__bg rounded px-4 py-4"
5922+
<div
5923+
className="exercise__bg rounded px-4 py-4"
59025924
>
5903-
a = 1;
5904-
b = 2;
5905-
a = b;
5925+
<div>
5926+
<p>
5927+
Description here
5928+
</p>
5929+
<pre>
5930+
<code
5931+
className="lang-jsx"
5932+
>
5933+
a = 1;
5934+
b = 2;
5935+
a = b;
59065936
// What is a?
5907-
</pre>
5937+
</code>
5938+
</pre>
5939+
</div>
5940+
</div>
59085941
<p
5909-
className="exercise__p__bold"
5942+
className="exercise__p__bold my-4"
59105943
>
5911-
Choose an answer
5944+
Answer
59125945
</p>
59135946
<div
5914-
className="excercise__options overflow-auto"
5947+
className="excercise__answer overflow-auto"
59155948
>
5916-
<pre
5917-
className="exercise__pre__bg exercise__pre__answer rounded px-4 py-4"
5949+
<div
5950+
className="exercise__bg rounded px-4 py-4"
59185951
>
59195952
1
5920-
</pre>
5921-
<pre
5922-
className="exercise__pre__bg exercise__pre__answer rounded px-4 py-4"
5923-
>
5924-
2
5925-
</pre>
5926-
<pre
5927-
className="exercise__pre__bg exercise__pre__answer rounded px-4 py-4"
5928-
>
5929-
b
5930-
</pre>
5953+
</div>
59315954
</div>
5932-
</p>
5955+
<p
5956+
className="exercise__p__bold my-4"
5957+
>
5958+
Explanation
5959+
</p>
5960+
<div
5961+
className="exercise__bg rounded px-4 py-4"
5962+
>
5963+
<span>
5964+
<code>
5965+
a
5966+
</code>
5967+
is getting assigned
5968+
<code>
5969+
1
5970+
</code>
5971+
, so
5972+
<code>
5973+
a
5974+
</code>
5975+
is
5976+
<code>
5977+
1
5978+
</code>
5979+
</span>
5980+
</div>
5981+
</div>
59335982
</div>
59345983
</div>
59355984
`;
@@ -28031,18 +28080,22 @@ exports[`Storyshots Pages/Login Login Error 1`] = `
2803128080
className="form-group"
2803228081
>
2803328082
<div
28034-
className="alert d-flex justify-content-between mt-3 alert-danger"
28083+
className="alert d-flex justify-content-between mt-3 alert alert-danger"
2803528084
role="alert"
2803628085
>
2803728086
<div
28038-
className="d-flex gap-3"
28087+
className="d-flex align-items-center gap-3"
2803928088
>
28040-
<img
28041-
className="img-fluid"
28042-
height={24}
28043-
src="/assets/curriculum/icons/exclamation.svg"
28044-
width={24}
28045-
/>
28089+
<div
28090+
className=""
28091+
>
28092+
<img
28093+
className="img-fluid"
28094+
height={24}
28095+
src="/assets/curriculum/icons/exclamation.svg"
28096+
width={24}
28097+
/>
28098+
</div>
2804628099
Please try again!
2804728100
</div>
2804828101
</div>
@@ -28504,18 +28557,22 @@ exports[`Storyshots Pages/Signup Signup Errors 1`] = `
2850428557
className="card-text"
2850528558
/>
2850628559
<div
28507-
className="alert d-flex justify-content-between mt-3 alert-danger"
28560+
className="alert d-flex justify-content-between mt-3 alert alert-danger"
2850828561
role="alert"
2850928562
>
2851028563
<div
28511-
className="d-flex gap-3"
28564+
className="d-flex align-items-center gap-3"
2851228565
>
28513-
<img
28514-
className="img-fluid"
28515-
height={24}
28516-
src="/assets/curriculum/icons/exclamation.svg"
28517-
width={24}
28518-
/>
28566+
<div
28567+
className=""
28568+
>
28569+
<img
28570+
className="img-fluid"
28571+
height={24}
28572+
src="/assets/curriculum/icons/exclamation.svg"
28573+
width={24}
28574+
/>
28575+
</div>
2851928576
UserInput Error: User does not exist
2852028577
</div>
2852128578
</div>

‎__tests__/pages/__snapshots__/login.test.js.snap‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,21 @@ exports[`Login Page Should set alert visible on invalid credentials 1`] = `
2727
class="form-group"
2828
>
2929
<div
30-
class="alert d-flex justify-content-between mt-3 alert-danger"
30+
class="alert d-flex justify-content-between mt-3 alert alert-danger"
3131
role="alert"
3232
>
3333
<div
34-
class="d-flex gap-3"
34+
class="d-flex align-items-center gap-3"
3535
>
36-
<img
37-
height="24"
38-
src="/assets/curriculum/icons/exclamation.svg"
39-
width="24"
40-
/>
36+
<div
37+
class=""
38+
>
39+
<img
40+
height="24"
41+
src="/assets/curriculum/icons/exclamation.svg"
42+
width="24"
43+
/>
44+
</div>
4145
User does not exist!
4246
</div>
4347
</div>

‎__tests__/pages/__snapshots__/signup.test.js.snap‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,21 @@ exports[`Signup Page Should render errors on fail 1`] = `
2020
class="card-text"
2121
/>
2222
<div
23-
class="alert d-flex justify-content-between mt-3 alert-danger"
23+
class="alert d-flex justify-content-between mt-3 alert alert-danger"
2424
role="alert"
2525
>
2626
<div
27-
class="d-flex gap-3"
27+
class="d-flex align-items-center gap-3"
2828
>
29-
<img
30-
height="24"
31-
src="/assets/curriculum/icons/exclamation.svg"
32-
width="24"
33-
/>
29+
<div
30+
class=""
31+
>
32+
<img
33+
height="24"
34+
src="/assets/curriculum/icons/exclamation.svg"
35+
width="24"
36+
/>
37+
</div>
3438
Server Error: Server cannot be reached. Please try again. If this problem persists, please send an email to [email protected]
3539
</div>
3640
</div>

0 commit comments

Comments
 (0)