Skip to content

Commit

Permalink
Merge branch 'main' into all-contributors/add-janvi01
Browse files Browse the repository at this point in the history
Signed-off-by: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com>
  • Loading branch information
priyankarpal committed Feb 16, 2024
2 parents 591b4ae + 52882cd commit 25c4020
Show file tree
Hide file tree
Showing 13 changed files with 350 additions and 64 deletions.
27 changes: 27 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,33 @@
"name": "Janvi Bajoria",
"avatar_url": "https://avatars.githubusercontent.com/u/34344234?v=4",
"profile": "https://github.com/janvi01",
"contributions": [
"code"
]
},
{
"login": "chhakuli123",
"name": "Chhakuli Zingare",
"avatar_url": "https://avatars.githubusercontent.com/u/103095813?v=4",
"profile": "http://chhakuli-zingare.netlify.app/",
"contributions": [
"code"
]
},
{
"login": "clevercoderjoy",
"name": "clevercoderjoy",
"avatar_url": "https://avatars.githubusercontent.com/u/74505057?v=4",
"profile": "http://clevercoderjoy.bio.link",
"contributions": [
"code"
]
},
{
"login": "priyankarpal",
"name": "Priyankar Pal",
"avatar_url": "https://avatars.githubusercontent.com/u/88102392?v=4",
"profile": "http://priyank.live",
"contributions": [
"code"
]
Expand Down
31 changes: 31 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name-template: 'v$RESOLVED_VERSION 🌈'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: '🚀 Features'
labels:
- '✨ goal: improvement'
- '⭐ goal: addition'
- title: '🐛 Bug Fixes'
labels:
- '🛠 goal: fix'
- title: '🧰 Maintenance'
labels:
- 'chore'
- '🛠 goal: refactor'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
patch:
labels:
- 'patch'
default: patch
template: |
## Changes
$CHANGES
41 changes: 41 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Release Drafter

on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- main
# pull_request event is required only for autolabeler
pull_request:
# Only following types are handled by the action, but one can default to all as well
types: [opened, reopened, synchronize]
# pull_request_target event is required for autolabeler to support PRs from forks
# pull_request_target:
# types: [opened, reopened, synchronize]

permissions:
contents: read

jobs:
update_release_draft:
permissions:
# write permission is required to create a github release
contents: write
# write permission is required for autolabeler
# otherwise, read permission is required at least
pull-requests: write
runs-on: ubuntu-latest
steps:
# (Optional) GitHub Enterprise requires GHE_HOST variable set
#- name: Set GHE_HOST
# run: |
# echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV

# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
# with:
# config-name: my-config.yml
# disable-autolabeler: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ReactPlay(Repo: `react-play`)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-75-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-76-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

<p align="center">
Expand Down Expand Up @@ -369,8 +369,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zulalnb"><img src="https://avatars.githubusercontent.com/u/33003721?v=4?s=100" width="100px;" alt="Zülal Nebin"/><br /><sub><b>Zülal Nebin</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=zulalnb" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nrshnaik"><img src="https://avatars.githubusercontent.com/u/25747434?v=4?s=100" width="100px;" alt="nrshnaik"/><br /><sub><b>nrshnaik</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=nrshnaik" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/FreemRL"><img src="https://avatars.githubusercontent.com/u/66525499?v=4?s=100" width="100px;" alt="Jannik Schmidtke"/><br /><sub><b>Jannik Schmidtke</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=freemrl" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/saddam-selise"><img src="https://avatars.githubusercontent.com/u/113901460?v=4?s=100" width="100px;" alt="Md. Saddam Hossain"/><br /><sub><b>Md. Saddam Hossain</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=saddam-selise" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/janvi01"><img src="https://avatars.githubusercontent.com/u/34344234?v=4?s=100" width="100px;" alt="Janvi Bajoria"/><br /><sub><b>Janvi Bajoria</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=janvi01" title="Code">💻</a></td>
<td align="center" valign="top" width="1a href="https://github.com/saddam-selise"><img src="https://avatars.githubusercontent.com/u/113901460?v=4?s=100" width="100px;" alt="Md. Saddam Hossain"/><br /><sub><b>Md. Saddam Hossain</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=saddam-selise" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://chhakuli-zingare.netlify.app/"><img src="https://avatars.githubusercontent.com/u/103095813?v=4?s=100" width="100px;" alt4.28%"><="Chhakuli Zingare"/><br /><sub><b>Chhakuli Zingare</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=chhakuli123" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://clevercoderjoy.bio.link"><img src="https://avatars.githubusercontent.com/u/74505057?v=4?s=100" width="100px;" alt="clevercoderjoy"/><br /><sub><b>clevercoderjoy</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=clevercoderjoy" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://priyank.live"><img src="https://avatars.githubusercontent.com/u/88102392?v=4?s=100" width="100px;" alt="Priyankar Pal"/><br /><sub><b>Priyankar Pal</b></sub></a><br /><a href="https://github.com/reactplay/react-play/commits?author=priyankarpal" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
21 changes: 21 additions & 0 deletions src/common/footer/ExtendedFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { MdManageSearch } from 'react-icons/md';
import { FaDiscord } from 'react-icons/fa';
import { BsGithub } from 'react-icons/bs';
import { FaXTwitter } from 'react-icons/fa6';
import { FaMeetup } from 'react-icons/fa6';
import { FaLinkedin } from 'react-icons/fa';
import { FaInstagram } from 'react-icons/fa6';
import LogoLight from 'images/img-logo-light.svg';
import { useSearchContext } from 'common/search/search-context';
import { CREATE_PLAY_DOC_LINK } from 'constants';
Expand Down Expand Up @@ -34,6 +37,24 @@ const ExtendedFooter = () => {
url: 'https://blog.reactplay.io/',
icon: <IoLogoRss className="icon" />,
title: 'Blog Page'
},
{
name: 'Meetup',
url: 'https://www.meetup.com/reactplay-bengaluru/',
icon: <FaMeetup className="icon" />,
title: 'Meetup Page'
},
{
name: 'Linkedin',
url: 'https://www.linkedin.com/company/reactplay/',
icon: <FaLinkedin className="icon" />,
title: 'Linkedin Page'
},
{
name: 'Instagram',
url: 'https://www.instagram.com/reactplayio/',
icon: <FaInstagram className="icon" />,
title: 'Instagram Page'
}
];

Expand Down
145 changes: 83 additions & 62 deletions src/common/header/HeaderNav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from 'react';
import { Link } from 'react-router-dom';
import { BsGithub, BsTrophyFill } from 'react-icons/bs';
import { FaLightbulb } from 'react-icons/fa';
import { FaXTwitter } from 'react-icons/fa6';
import { FaXTwitter, FaDiscord } from 'react-icons/fa6';
import { BiMoney } from 'react-icons/bi';
import { IoAddSharp, IoShareSocial, IoHeartSharp } from 'react-icons/io5';
import { MdManageSearch, MdClose, MdEvent } from 'react-icons/md';
Expand Down Expand Up @@ -30,6 +30,64 @@ const HeaderNav = ({ showBrowse }) => {

const modalClose = () => setShowShareModal(!showShareModal);

const NavLinks = [
{
type: 'Link',
testId: 'leaderboard-btn',
title: 'Leader Board',
to: '/leaderboard',
icon: BsTrophyFill,
iconClass: 'icon idea-icon',
label: 'Leader Board'
},
{
type: 'Link',
testId: 'ideas-btn',
title: 'Play Ideas',
to: '/ideas',
icon: FaLightbulb,
iconClass: 'icon idea-icon',
label: 'Idea'
},
{
type: 'a',
testId: 'github-btn',
event: 'github-button',
href: 'https://github.com/reactplay/react-play',
title: 'GitHub page',
icon: BsGithub,
iconClass: 'icon github-icon',
label: 'GitHub'
},
{
type: 'a',
testId: 'twitter-btn',
href: 'https://twitter.com/reactplayio',
title: 'Twitter Page',
icon: FaXTwitter,
iconClass: 'icon twitter-icon',
label: 'Twitter'
},
{
type: 'a',
testId: 'discord-btn',
href: 'https://discord.gg/9nFHKdfWMx',
title: 'Discord',
icon: FaDiscord,
iconClass: 'icon discord-icon',
label: 'Discord'
},
{
type: 'button',
testId: 'share-btn',
title: 'Show love',
onClick: handleClick,
icon: IoHeartSharp,
iconClass: 'icon share-icon',
label: 'Share'
}
];

return (
<nav>
<Modal open={showShareModal} onClose={modalClose}>
Expand Down Expand Up @@ -92,7 +150,7 @@ const HeaderNav = ({ showBrowse }) => {
<a
className="app-header-btn app-header-btn--secondary"
data-testid="events-btn"
href="https://hustles.reactplay.io/"
href="https://www.meetup.com/reactplay-bengaluru/events/"
target="_blank"
>
<MdEvent className="icon" />
Expand Down Expand Up @@ -124,66 +182,29 @@ const HeaderNav = ({ showBrowse }) => {
</a>
)}
</li>
<li>
<Link
className="app-header-btn app-header-btn--default"
data-testid="leaderboard-btn"
title="Leader Board"
to="/leaderboard"
>
<BsTrophyFill className="icon idea-icon" />
<span className="btn-label">Leader Board</span>
</Link>
</li>
<li>
<Link
className="app-header-btn app-header-btn--default"
data-testid="ideas-btn"
title="Play Ideas"
to="/ideas"
>
<FaLightbulb className="icon idea-icon" />
<span className="btn-label">Idea</span>
</Link>
</li>
<li>
<a
className="app-header-btn app-header-btn--default"
data-testid="github-btn"
data-umami-event="github-button"
href="https://github.com/reactplay/react-play"
rel="noopener noreferrer"
target="_blank"
title="GitHub page"
>
<BsGithub className="icon github-icon" />
<span className="btn-label">GitHub</span>
</a>
</li>
<li>
<a
className="app-header-btn app-header-btn--default"
data-testid="twitter-btn"
href="https://twitter.com/reactplayio"
rel="noopener noreferrer"
target="_blank"
title="Twitter Page"
>
<FaXTwitter className="icon twitter-icon" />
<span className="btn-label">Twitter</span>
</a>
</li>
<li>
<button
className="app-header-btn app-header-btn--default"
data-testid="share-btn"
title="Show love"
onClick={handleClick}
>
<IoHeartSharp className="icon share-icon" />
<span className="btn-label">Share</span>
</button>
</li>
{NavLinks.map((restNavLink, index) => {
const { icon: Icon, ...NavLink } = restNavLink;
const Component = NavLink.type === 'Link' ? Link : NavLink.type;

return (
<li key={index}>
<Component
className="app-header-btn app-header-btn--default"
data-testid={NavLink.testId}
data-umami-event={NavLink.event}
href={NavLink.href}
rel="noopener noreferrer"
target="_blank"
title={NavLink.title}
to={NavLink.to}
onClick={NavLink.onClick}
>
<Icon className={NavLink.iconClass} />
<span className="btn-label">{NavLink.label}</span>
</Component>
</li>
);
})}
<Menu anchorEl={anchorEl} open={open} onClose={handleClose}>
<Box sx={{ p: 4, pt: 2, borderRadius: 2, width: '360px' }}>
<h3 className="section-title">Show Love</h3>
Expand Down
4 changes: 4 additions & 0 deletions src/common/header/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@
fill: #ffffff;
}

.header-links > li > .app-header-btn:hover .discord-icon {
fill: #7289da;
}

.header-links > li > .app-header-btn .btn-label {
font-size: var(--fs-sm);
font-weight: var(--fw-semibold);
Expand Down
38 changes: 38 additions & 0 deletions src/plays/accordian/Accordian.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React, { useState } from 'react';
import PlayHeader from 'common/playlists/PlayHeader';
import AccordionData from './AccordianData';
import './styles.css';
import { accordionData } from './data';

// WARNING: Do not change the entry componenet name
function Accordian(props) {
const [activeAccordion, setActiveAccordion] = useState(null);
const handleAccordionClick = (index) => {
setActiveAccordion(index === activeAccordion ? null : index);
};

return (
<>
<div className="play-details">
<PlayHeader play={props} />
<div className="play-details-body">
{/* Your Code Starts Here */}
<div className="accordion">
{accordionData.map(({ title, content }, index) => (
<AccordionData
content={content}
isActive={index === activeAccordion}
key={index}
title={title}
onClick={() => handleAccordionClick(index)}
/>
))}
</div>
{/* Your Code Ends Here */}
</div>
</div>
</>
);
}

export default Accordian;

0 comments on commit 25c4020

Please sign in to comment.