Skip to content

Commit

Permalink
Merge branch 'master' into 2208-lesson-submissions-to-review-badge-0-…
Browse files Browse the repository at this point in the history
…submissions
  • Loading branch information
flacial authored Sep 10, 2022
2 parents d7a8637 + ab249a9 commit d9dc26e
Show file tree
Hide file tree
Showing 29 changed files with 793 additions and 556 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,15 @@
"contributions": [
"code"
]
},
{
"login": "HS-90",
"name": "HS-90",
"avatar_url": "https://avatars.githubusercontent.com/u/77421872?v=4",
"profile": "https://github.com/HS-90",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,6 @@ package-lock.json

# Jetbrains ide config files
.idea

# Storybook JS bundles and other static files
storybook-static/
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# c0d3.com

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)

[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

![CI](https://github.com/garageScript/c0d3.com/workflows/CI/badge.svg)
Expand Down Expand Up @@ -72,6 +70,7 @@ Thanks goes to these wonderful people
<td align="center"><a href="http://www.thomasJherzog.com"><img src="https://avatars.githubusercontent.com/u/17365077?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Herzog</b></sub></a><br /><a href="https://github.com/garageScript/c0d3-app/commits?author=tomrule007" title="Code">💻</a> <a href="https://github.com/garageScript/c0d3-app/commits?author=tomrule007" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/mino323"><img src="https://avatars.githubusercontent.com/u/86011419?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mino323</b></sub></a><br /><a href="https://github.com/garageScript/c0d3-app/commits?author=mino323" title="Code">💻</a> <a href="https://github.com/garageScript/c0d3-app/commits?author=mino323" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/flacial"><img src="https://avatars.githubusercontent.com/u/35906419?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Flacial</b></sub></a><br /><a href="https://github.com/garageScript/c0d3-app/commits?author=flacial" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/HS-90"><img src="https://avatars.githubusercontent.com/u/77421872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HS-90</b></sub></a><br /><a href="https://github.com/garageScript/c0d3-app/commits?author=HS-90" title="Code">💻</a></td>
</tr>
</table>

Expand Down
122 changes: 60 additions & 62 deletions __tests__/__snapshots__/storyshots.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ exports[`Storyshots Components/AdminLessonExerciseCard Basic 1`] = `
[email protected]
</span>
<button
className="btn borderless btn-outline-primary btn-outline-bg-primary"
className="btn borderless btn-outline-primary onFocusBgFix btn-outline-bg-primary"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -320,7 +320,7 @@ exports[`Storyshots Components/AdminLessonExerciseCard Basic 1`] = `
noob#123
</span>
<button
className="btn borderless btn-outline-primary btn-outline-bg-primary"
className="btn borderless btn-outline-primary onFocusBgFix btn-outline-bg-primary"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -866,46 +866,6 @@ Array [
]
`;

exports[`Storyshots Components/AdminLessonNav Basic 1`] = `
<div>
<div
className="lessons_tabsNav"
>
<div
className="lessons__tabsNav__nav"
>
<a
className="lessons_tabsNav__nav__item--inactive nav-pills"
href="/admin/lessons/1/introduction"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
INTRODUCTION
</a>
<a
className="lessons_tabsNav__nav__item--inactive nav-pills"
href="/admin/lessons/1/modules"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
MODULES
</a>
<a
className="lessons_tabsNav__nav__item--inactive nav-pills"
href="/admin/lessons/1/challenges"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
CHALLENGES
</a>
</div>
</div>
</div>
`;

exports[`Storyshots Components/AdminLessonSideNav Basic 1`] = `
<div
className="container"
Expand Down Expand Up @@ -1913,7 +1873,7 @@ exports[`Storyshots Components/ChallengeMaterial With Comments 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -2782,7 +2742,7 @@ exports[`Storyshots Components/ChallengeMaterial With Diff 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -4057,7 +4017,7 @@ exports[`Storyshots Components/ContributorCard Basic 1`] = `

exports[`Storyshots Components/CopyButton Basic 1`] = `
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -4136,7 +4096,7 @@ exports[`Storyshots Components/DiffView Closed 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -4529,7 +4489,7 @@ exports[`Storyshots Components/DiffView Default 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -12205,6 +12165,44 @@ exports[`Storyshots Components/ModalCard Small 1`] = `
</button>
`;

exports[`Storyshots Components/NavCard Basic 1`] = `
<div
className="navCard__tabsNav"
>
<div
className="navCard__tabsNav__nav"
>
<a
className="navCard__tabsNav__nav__item--inactive nav-pills"
href="/admin/lessons/1/introduction"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
INTRODUCTION
</a>
<a
className="navCard__tabsNav__nav__item--inactive nav-pills"
href="/admin/lessons/1/modules"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
MODULES
</a>
<a
className="navCard__tabsNav__nav__item--inactive nav-pills"
href="/admin/lessons/1/challenges"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
CHALLENGES
</a>
</div>
</div>
`;

exports[`Storyshots Components/NavLink Active Link 1`] = `
Array [
<a
Expand Down Expand Up @@ -12338,7 +12336,7 @@ exports[`Storyshots Components/ProfileImageInfo Profile Image Info 1`] = `
</span>
</div>
<button
className="btn borderless btn-outline-danger btn-outline-bg-danger"
className="btn borderless btn-outline-danger onFocusBgFix btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -13978,7 +13976,7 @@ exports[`Storyshots Components/ReviewCard Active Card 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -15404,7 +15402,7 @@ exports[`Storyshots Components/ReviewCard No Last Name 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -16828,7 +16826,7 @@ exports[`Storyshots Components/ReviewCard With Long Comment 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -18252,7 +18250,7 @@ exports[`Storyshots Components/ReviewCard Without Comment 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -19676,7 +19674,7 @@ exports[`Storyshots Components/ReviewCard Without Username 1`] = `
</label>
</div>
<button
className="btn borderless btn-outline-mute btn-outline-bg-mute"
className="btn borderless btn-outline-mute onFocusBgFix btn-outline-bg-mute"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -21621,7 +21619,7 @@ Array [
</div>
<div>
<button
className="btn borderless btn-outline-danger btn-outline-bg-danger"
className="btn borderless btn-outline-danger onFocusBgFix btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -21691,7 +21689,7 @@ Array [
</div>
<div>
<button
className="btn borderless btn-outline-danger btn-outline-bg-danger"
className="btn borderless btn-outline-danger onFocusBgFix btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -21761,7 +21759,7 @@ Array [
</div>
<div>
<button
className="btn borderless btn-outline-danger btn-outline-bg-danger"
className="btn borderless btn-outline-danger onFocusBgFix btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
Expand Down Expand Up @@ -28598,7 +28596,7 @@ exports[`Storyshots Theme/Button Margined Button 1`] = `
exports[`Storyshots Theme/Button Outlined Button 1`] = `
Array [
<button
className="btn borderless btn-outline-primary btn-outline-bg-primary"
className="btn borderless btn-outline-primary onFocusBgFix btn-outline-bg-primary"
onClick={[Function]}
style={
Object {
Expand All @@ -28609,7 +28607,7 @@ Array [
Outlined Primary Button
</button>,
<button
className="btn borderless btn-outline-success btn-outline-bg-success"
className="btn borderless btn-outline-success onFocusBgFix btn-outline-bg-success"
onClick={[Function]}
style={
Object {
Expand All @@ -28620,7 +28618,7 @@ Array [
Outlined Success Button
</button>,
<button
className="btn borderless btn-outline-danger btn-outline-bg-danger"
className="btn borderless btn-outline-danger onFocusBgFix btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
Expand All @@ -28636,7 +28634,7 @@ Array [
exports[`Storyshots Theme/Button Outlined With Border Button 1`] = `
Array [
<button
className="btn btn-outline-primary btn-outline-bg-primary"
className="btn btn-outline-primary onFocusBgFix btn-outline-bg-primary"
onClick={[Function]}
style={
Object {
Expand All @@ -28647,7 +28645,7 @@ Array [
Outlined Primary Button
</button>,
<button
className="btn btn-outline-success btn-outline-bg-success"
className="btn btn-outline-success onFocusBgFix btn-outline-bg-success"
onClick={[Function]}
style={
Object {
Expand All @@ -28658,7 +28656,7 @@ Array [
Outlined Success Button
</button>,
<button
className="btn btn-outline-danger btn-outline-bg-danger"
className="btn btn-outline-danger onFocusBgFix btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
Expand Down
8 changes: 2 additions & 6 deletions __tests__/pages/__snapshots__/curriculum.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,14 @@ exports[`Curriculum Page Should render with basic dummy data 1`] = `
<div
aria-expanded="false"
class="nav-user-toggle dropdown-toggle"
data-testid="user-info-image"
id="user_nav_toggle"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image user-icon"
>
A
</div>
<span>
Fakeusername
</span>
<svg
aria-hidden="true"
class="octicon octicon-chevron-down"
Expand Down Expand Up @@ -1773,16 +1771,14 @@ exports[`Curriculum Page Should render with lessonStatus data 1`] = `
<div
aria-expanded="false"
class="nav-user-toggle dropdown-toggle"
data-testid="user-info-image"
id="user_nav_toggle"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image user-icon"
>
A
</div>
<span>
Fakeusername
</span>
<svg
aria-hidden="true"
class="octicon octicon-chevron-down"
Expand Down
Loading

0 comments on commit d9dc26e

Please sign in to comment.