Make AdminLessonNav more generic #2272
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import Link from 'next/link' | ||
| import React from 'react' | ||
| import styles from '../scss/navCard.module.scss' | ||
|
|
||
| type Tab = { | ||
| text: string | ||
| url: string | ||
| } | ||
|
|
||
| type NavCardProps = { | ||
| tabSelected: number | ||
| tabs: Tab[] | ||
| } | ||
|
|
||
| const NavCard = ({ tabSelected, tabs }: NavCardProps) => { | ||
| return ( | ||
| <div className={styles.navCard__tabsNav}> | ||
| <div className={styles.navCard__tabsNav__nav}> | ||
| {tabs.map((tab, i) => ( | ||
| <NavCardItem key={i} isSelected={i === tabSelected} tab={tab} /> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| type NavCardItemProps = { | ||
| isSelected: boolean | ||
| tab: Tab | ||
| } | ||
|
|
||
| const NavCardItem = ({ isSelected, tab }: NavCardItemProps) => { | ||
| const className = | ||
| styles[ | ||
| isSelected | ||
| ? 'navCard__tabsNav__nav__item' | ||
| : 'navCard__tabsNav__nav__item--inactive' | ||
| ] | ||
|
|
||
| return ( | ||
| <Link href={tab.url}> | ||
| <a className={`${className} nav-pills`}>{tab.text.toUpperCase()}</a> | ||
| </Link> | ||
| ) | ||
| } | ||
|
|
||
| export default NavCard |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ $light: hsl(0, 0%, 98.4%); | |
| $dark_primary: color.adjust(variables.$primary, $lightness: -20%); | ||
| $light_primary: color.adjust(variables.$primary, $lightness: 28%); | ||
|
|
||
| .navCard__tabsNav { | ||
| font-family: 'PT Mono'; | ||
| max-width: fit-content; | ||
| padding: 8px 16px; | ||
|
|
@@ -20,15 +20,15 @@ $light_primary: color.adjust(variables.$primary, $lightness: 28%); | |
| border: 1px solid $light_primary; | ||
| } | ||
|
|
||
| .navCard__tabsNav__nav { | ||
| display: flex; | ||
| column-gap: 20px; | ||
| justify-content: center; | ||
| row-gap: 20px; | ||
| flex-wrap: nowrap; | ||
| } | ||
|
|
||
| .navCard__tabsNav__nav__item { | ||
| padding: 7px 16px; | ||
| border-radius: 4px; | ||
| background-color: variables.$primary; | ||
|
|
@@ -39,11 +39,11 @@ $light_primary: color.adjust(variables.$primary, $lightness: 28%); | |
| font-size: 14px; | ||
| } | ||
|
|
||
| .navCard__tabsNav__nav__item:hover { | ||
| color: white; | ||
| } | ||
|
|
||
| .navCard__tabsNav__nav__item--inactive { | ||
| padding: 7px 16px; | ||
| border-radius: 4px; | ||
| color: $dark_primary; | ||
|
|
@@ -55,12 +55,8 @@ $light_primary: color.adjust(variables.$primary, $lightness: 28%); | |
| font-size: 14px; | ||
| } | ||
|
|
||
| .navCard__tabsNav__nav__item--inactive:hover { | ||
| background-color: color.change(variables.$primary, $lightness: 95%); | ||
| color: $dark_primary; | ||
| transition: background-color 0.3s ease-out; | ||
| } | ||
|
There was a problem hiding this comment. This .lessons_tabs CSS class wasn't being used (https://github.com/garageScript/c0d3-app/search?q=lessons_tabs) so I deleted it. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { useRouter } from 'next/router' | ||
| import * as React from 'react' | ||
| import NavCard from '../../components/NavCard' | ||
|
|
||
| export default { | ||
| component: NavCard, | ||
| title: 'Components/NavCard' | ||
| } | ||
|
|
||
| export const Basic = () => { | ||
| const router = useRouter() | ||
| const pageName = router.asPath.split('/').slice(-1)[0] | ||
| const tabs = ['introduction', 'modules', 'challenges'].map(text => ({ | ||
| text, | ||
| url: `/admin/lessons/1/${text}` | ||
| })) | ||
| const tabSelected = tabs.findIndex(tab => tab.text === pageName) | ||
|
|
||
| return <NavCard tabSelected={tabSelected} tabs={tabs} /> | ||
| } | ||
|
|
||
| const parameters = { | ||
| nextRouter: { | ||
| asPath: 'c0d3.com/admin/lessons/1/introduction' | ||
| } | ||
| } | ||
|
|
||
| Basic.parameters = parameters |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This snapshot is identical to the snapshot that got removed above with the only difference being the name is now "Storyshots Components/NavCard Basic 1" instead of "Storyshots Components/AdminLessonNav Basic 1" and the classNames now use the more generic "navCard__" prefix instead of "lesson__".
I figured the name NavCard made more sense because it's a Card and it also contains Nav items and when I searched NavCard (https://github.com/garageScript/c0d3-app/search?q=NavCard), this name wasn't taken so it seemed like a nice short name that describes what it is pretty well.