Skip to content

Commit

Permalink
Merge branch 'master' into 2175-create-addexercise-hook
Browse files Browse the repository at this point in the history
  • Loading branch information
@flacial
flacial authored Aug 20, 2022
2 parents 7b7bfb3 + 14b9a56 commit bdd1a11
Show file tree
Hide file tree
Showing 14 changed files with 865 additions and 394 deletions.
213 changes: 135 additions & 78 deletions __tests__/__snapshots__/storyshots.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -908,40 +908,48 @@ exports[`Storyshots Components/AdminLessonSideNav Basic 1`] = `

exports[`Storyshots Components/Alert Info 1`] = `
<div
className="alert d-flex justify-content-between mt-3 bg-primary text-white"
className="alert d-flex justify-content-between mt-3 alert alert-primary"
role="alert"
>
<div
className="d-flex gap-3"
className="d-flex align-items-center gap-3"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/icon-tip.svg"
width={24}
/>
<div
className="info_image"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/icon-tip.svg"
width={24}
/>
</div>
Set up your computer to submit challenges.
</div>
</div>
`;

exports[`Storyshots Components/Alert Info With Link And Dismiss 1`] = `
<div
className="alert d-flex justify-content-between mt-3 bg-primary text-white"
className="alert d-flex justify-content-between mt-3 alert alert-primary"
role="alert"
>
<div
className="d-flex gap-3"
className="d-flex align-items-center gap-3"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/icon-tip.svg"
width={24}
/>
<div
className="info_image"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/icon-tip.svg"
width={24}
/>
</div>
Set up your computer to submit challenges.
<a
className="text-white noUnderline"
className="alert-link noUnderline"
href="https://www.notion.so/JS-0-Foundations-a43ca620e54945b2b620bcda5f3cf672#b45ed85a95e24c9d9fb784afb7a46bcc"
rel="noopener noreferrer"
target="_blank"
Expand All @@ -950,54 +958,65 @@ exports[`Storyshots Components/Alert Info With Link And Dismiss 1`] = `
</a>
</div>
<button
className="alert-dismiss"
className="info_image alert-dismiss"
data-testid="dismiss-info"
onClick={[Function]}
role="dismiss"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/dismiss-info.svg"
width={24}
/>
</button>
</div>
`;

exports[`Storyshots Components/Alert Urgent 1`] = `
<div
className="alert d-flex justify-content-between mt-3 alert-danger"
className="alert d-flex justify-content-between mt-3 alert alert-danger"
role="alert"
>
<div
className="d-flex gap-3"
className="d-flex align-items-center gap-3"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
<div
className=""
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
</div>
Invalid password
</div>
</div>
`;

exports[`Storyshots Components/Alert Urgent With Icon And Dismiss 1`] = `
<div
className="alert d-flex justify-content-between mt-3 alert-danger"
className="alert d-flex justify-content-between mt-3 alert alert-danger"
role="alert"
>
<div
className="d-flex gap-3"
className="d-flex align-items-center gap-3"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
<div
className=""
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
</div>
Please upgrade your CLI client by running npm update c0d3.
<a
className="text-danger noUnderline"
className="alert-link noUnderline"
href="https://www.npmjs.com/package/c0d3"
rel="noopener noreferrer"
target="_blank"
Expand All @@ -1006,13 +1025,16 @@ exports[`Storyshots Components/Alert Urgent With Icon And Dismiss 1`] = `
</a>
</div>
<button
className="alert-dismiss"
className=" alert-dismiss"
data-testid="dismiss-urgent"
onClick={[Function]}
role="dismiss"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/dismiss-urgent.svg"
width={24}
/>
</button>
</div>
Expand Down Expand Up @@ -5887,49 +5909,76 @@ exports[`Storyshots Components/ExercisePreview Basic 1`] = `
className="card shadow-sm col-sm-8 col-md-7 col-lg-6 col-xl-5 m-auto px-md-3 border-0 rounded"
>
<div
className="card-body pt-3 pb-3 "
className="card-body pb-3 "
>
<p
<div
className="card-text"
>
<p
className="exercise__p__bold"
className="exercise__p__bold my-4"
>
Problem
</p>
<pre
className="exercise__pre__bg rounded px-4 py-4"
<div
className="exercise__bg rounded px-4 py-4"
>
a = 1;
b = 2;
a = b;
<div>
<p>
Description here
</p>
<pre>
<code
className="lang-jsx"
>
a = 1;
b = 2;
a = b;
// What is a?
</pre>
</code>
</pre>
</div>
</div>
<p
className="exercise__p__bold"
className="exercise__p__bold my-4"
>
Choose an answer
Answer
</p>
<div
className="excercise__options overflow-auto"
className="excercise__answer overflow-auto"
>
<pre
className="exercise__pre__bg exercise__pre__answer rounded px-4 py-4"
<div
className="exercise__bg rounded px-4 py-4"
>
1
</pre>
<pre
className="exercise__pre__bg exercise__pre__answer rounded px-4 py-4"
>
2
</pre>
<pre
className="exercise__pre__bg exercise__pre__answer rounded px-4 py-4"
>
b
</pre>
</div>
</div>
</p>
<p
className="exercise__p__bold my-4"
>
Explanation
</p>
<div
className="exercise__bg rounded px-4 py-4"
>
<span>
<code>
a
</code>
is getting assigned
<code>
1
</code>
, so
<code>
a
</code>
is
<code>
1
</code>
</span>
</div>
</div>
</div>
</div>
`;
Expand Down Expand Up @@ -28031,18 +28080,22 @@ exports[`Storyshots Pages/Login Login Error 1`] = `
className="form-group"
>
<div
className="alert d-flex justify-content-between mt-3 alert-danger"
className="alert d-flex justify-content-between mt-3 alert alert-danger"
role="alert"
>
<div
className="d-flex gap-3"
className="d-flex align-items-center gap-3"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
<div
className=""
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
</div>
Please try again!
</div>
</div>
Expand Down Expand Up @@ -28504,18 +28557,22 @@ exports[`Storyshots Pages/Signup Signup Errors 1`] = `
className="card-text"
/>
<div
className="alert d-flex justify-content-between mt-3 alert-danger"
className="alert d-flex justify-content-between mt-3 alert alert-danger"
role="alert"
>
<div
className="d-flex gap-3"
className="d-flex align-items-center gap-3"
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
<div
className=""
>
<img
className="img-fluid"
height={24}
src="/assets/curriculum/icons/exclamation.svg"
width={24}
/>
</div>
UserInput Error: User does not exist
</div>
</div>
Expand Down
18 changes: 11 additions & 7 deletions __tests__/pages/__snapshots__/login.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,21 @@ exports[`Login Page Should set alert visible on invalid credentials 1`] = `
class="form-group"
>
<div
class="alert d-flex justify-content-between mt-3 alert-danger"
class="alert d-flex justify-content-between mt-3 alert alert-danger"
role="alert"
>
<div
class="d-flex gap-3"
class="d-flex align-items-center gap-3"
>
<img
height="24"
src="/assets/curriculum/icons/exclamation.svg"
width="24"
/>
<div
class=""
>
<img
height="24"
src="/assets/curriculum/icons/exclamation.svg"
width="24"
/>
</div>
User does not exist!
</div>
</div>
Expand Down
18 changes: 11 additions & 7 deletions __tests__/pages/__snapshots__/signup.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,21 @@ exports[`Signup Page Should render errors on fail 1`] = `
class="card-text"
/>
<div
class="alert d-flex justify-content-between mt-3 alert-danger"
class="alert d-flex justify-content-between mt-3 alert alert-danger"
role="alert"
>
<div
class="d-flex gap-3"
class="d-flex align-items-center gap-3"
>
<img
height="24"
src="/assets/curriculum/icons/exclamation.svg"
width="24"
/>
<div
class=""
>
<img
height="24"
src="/assets/curriculum/icons/exclamation.svg"
width="24"
/>
</div>
Server Error: Server cannot be reached. Please try again. If this problem persists, please send an email to support@c0d3.com
</div>
</div>
Expand Down
Loading

0 comments on commit bdd1a11

Please sign in to comment.