-
-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #446 from Mindgamesnl/development
Development
- Loading branch information
Showing
48 changed files
with
2,811 additions
and
951 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,6 @@ | |
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
|
|
||
| # Million Lint | ||
| .million | ||
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"buildMajor":1,"buildMinor":125,"buildRevision":251,"buildTag":"dev","buildDate":"Tue Jul 09 2024","build":"1.125.251 dev"} | ||
| {"buildMajor":1,"buildMinor":125,"buildRevision":266,"buildTag":"dev","buildDate":"Fri Aug 02 2024","build":"1.125.266 dev"} |
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
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,39 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import './oabutton.css'; | ||
|
|
||
| export function VoicePageButton(props) { | ||
| return ( | ||
| <button | ||
| type="button" | ||
| className={ | ||
| `oa-button-modern ${ | ||
| props.highlighted && props.highlightRed ? 'button-off ' : '' | ||
| }${props.highlighted && props.highlightGreen ? 'button-on ' : '' | ||
| }${props.isDisabled ? 'disabled ' : ''}` | ||
| } | ||
| onClick={props.onClick} | ||
| disabled={props.isEnabled} | ||
| > | ||
| <div className="content"> | ||
| {props.children} | ||
| </div> | ||
| </button> | ||
| ); | ||
| } | ||
|
|
||
| // default props | ||
| VoicePageButton.defaultProps = { | ||
| isDisabled: false, | ||
| highlightRed: false, | ||
| highlightGreen: false, | ||
| }; | ||
|
|
||
| VoicePageButton.propTypes = { | ||
| highlighted: PropTypes.bool.isRequired, | ||
| isDisabled: PropTypes.bool, | ||
| onClick: PropTypes.func.isRequired, | ||
|
|
||
| highlightRed: PropTypes.bool, | ||
| highlightGreen: PropTypes.bool, | ||
| }; |
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,60 @@ | ||
| :root { | ||
| --theme-primary-off: color-mix(in srgb, var(--primary-accent), red 75%); | ||
| --theme-secondary-off: color-mix(in srgb, var(--dark-primary-background), red 25%); | ||
| --theme-secondary-ON: color-mix(in srgb, var(--dark-primary-background), green 50%); | ||
| --theme-primary-hover: color-mix(in srgb, var(--primary-accent), #336699 50%); | ||
| } | ||
|
|
||
| .oa-button-modern { | ||
| background-color: var(--dark-primary-background); | ||
| color: #fff; | ||
| cursor: pointer; | ||
| display: inline-block; | ||
| font-size: 16px; | ||
| font-weight: 500; | ||
| margin: 2px; | ||
| padding: 14px 20px; | ||
| text-align: center; | ||
| text-decoration: none; | ||
| text-transform: uppercase; | ||
| transition: all 0.15s ease-in-out; | ||
| border-radius: 8px; | ||
| box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); | ||
| } | ||
|
|
||
| .oa-button-modern .disabled { | ||
| background-color: #e0e0e0; | ||
| color: #808080; | ||
| cursor: not-allowed; | ||
| opacity: 0.7; | ||
| box-shadow: none; | ||
| } | ||
|
|
||
| .oa-button-modern:hover { | ||
| background-color: var(--theme-primary-hover); | ||
| box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15); | ||
| } | ||
|
|
||
| .oa-button-modern.button-off { | ||
| box-shadow: inset 0 0 0 2px red; | ||
| background-color: var(--theme-secondary-off); | ||
| } | ||
|
|
||
| .oa-button-modern.button-on { | ||
| box-shadow: inset 0 0 0 2px green; | ||
| background-color: var(--theme-secondary-ON); | ||
| } | ||
|
|
||
| .oa-button-modern .content .icon { | ||
| margin-right: 8px; | ||
| vertical-align: middle; | ||
| font-size: 18px; | ||
| height: 32px; | ||
| color: #fff; | ||
| } | ||
|
|
||
| .oa-button-modern .content { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| } |
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 |
|---|---|---|
| @@ -1,53 +1,43 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| export function VoiceMicButton(props) { | ||
| export function VoiceMicButtonContent(props) { | ||
| if (props.muted) { | ||
| return ( | ||
| <button className="content-pill status-button red" onClick={props.onClick} type="button"> | ||
| <svg | ||
| className="h-8 text-white ml-1" | ||
| fill="none" | ||
| viewBox="0 0 19 24" | ||
| stroke="currentColor" | ||
| strokeWidth="2" | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| > | ||
| <line x1="1" y1="1" x2="23" y2="23" /> | ||
| <path d="M9 9v3a3 3 0 0 0 5.12 2.12M15 9.34V4a3 3 0 0 0-5.94-.6" /> | ||
| <path d="M17 16.95A7 7 0 0 1 5 12v-2m14 0v2a7 7 0 0 1-.11 1.23" /> | ||
| <line x1="12" y1="19" x2="12" y2="23" /> | ||
| <line x1="8" y1="23" x2="16" y2="23" /> | ||
| </svg> | ||
| </button> | ||
| <svg | ||
| className="icon" | ||
| viewBox="0 0 19 24" | ||
| width="95%" | ||
| stroke="currentColor" | ||
| strokeWidth="2" | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| > | ||
| <line x1="1" y1="1" x2="23" y2="23" /> | ||
| <path d="M9 9v3a3 3 0 0 0 5.12 2.12M15 9.34V4a3 3 0 0 0-5.94-.6" fill="transparent" /> | ||
| <path d="M17 16.95A7 7 0 0 1 5 12v-2m14 0v2a7 7 0 0 1-.11 1.23" fill="transparent" /> | ||
| <line x1="12" y1="19" x2="12" y2="23" /> | ||
| <line x1="8" y1="23" x2="16" y2="23" /> | ||
| </svg> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <button | ||
| className="content-pill status-button green text-center" | ||
| onClick={props.onClick} | ||
| type="button" | ||
| > | ||
| <svg className="h-8 text-gray-900 ml-1" fill="none" viewBox="0 0 19 24" stroke="currentColor"> | ||
| <path | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| strokeWidth="2" | ||
| d="M19 11a7 7 0 01-7 7m0 0a7 7 0 01-7-7m7 7v4m0 0H8m4 0h4m-4-8a3 3 0 01-3-3V5a3 3 0 116 0v6a3 3 0 01-3 3z" | ||
| /> | ||
| </svg> | ||
| </button> | ||
| <svg className="icon" fill="none" viewBox="0 0 19 24" stroke="currentColor"> | ||
| <path | ||
| strokeLinecap="round" | ||
| strokeLinejoin="round" | ||
| strokeWidth="2" | ||
| d="M19 11a7 7 0 01-7 7m0 0a7 7 0 01-7-7m7 7v4m0 0H8m4 0h4m-4-8a3 3 0 01-3-3V5a3 3 0 116 0v6a3 3 0 01-3 3z" | ||
| /> | ||
| </svg> | ||
| ); | ||
| } | ||
|
|
||
| VoiceMicButton.defaultProps = { | ||
| onClick: () => {}, | ||
| VoiceMicButtonContent.defaultProps = { | ||
| muted: false, | ||
| }; | ||
|
|
||
| VoiceMicButton.propTypes = { | ||
| onClick: PropTypes.func, | ||
| VoiceMicButtonContent.propTypes = { | ||
| muted: PropTypes.bool, | ||
| }; |
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 |
|---|---|---|
| @@ -1,36 +1,26 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| export function VoiceDeafenButton(props) { | ||
| export function VoiceDeafenButtonContent(props) { | ||
| if (props.deafened) { | ||
| return ( | ||
| <button className="content-pill status-button red ml-2" onClick={props.onClick} type="button"> | ||
| <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" aria-hidden="true" className="h-8 pl-1 text-white ml-1"> | ||
| <path strokeLinecap="round" strokeLinejoin="round" d="M17.25 9.75L19.5 12m0 0l2.25 2.25M19.5 12l2.25-2.25M19.5 12l-2.25 2.25m-10.5-6l4.72-4.72a.75.75 0 011.28.531V19.94a.75.75 0 01-1.28.53l-4.72-4.72H4.51c-.88 0-1.704-.506-1.938-1.354A9.01 9.01 0 012.25 12c0-.83.112-1.633.322-2.395C2.806 8.757 3.63 8.25 4.51 8.25H6.75z" /> | ||
| </svg> | ||
| </button> | ||
| <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" aria-hidden="true" className="icon"> | ||
| <path strokeLinecap="round" strokeLinejoin="round" d="M17.25 9.75L19.5 12m0 0l2.25 2.25M19.5 12l2.25-2.25M19.5 12l-2.25 2.25m-10.5-6l4.72-4.72a.75.75 0 011.28.531V19.94a.75.75 0 01-1.28.53l-4.72-4.72H4.51c-.88 0-1.704-.506-1.938-1.354A9.01 9.01 0 012.25 12c0-.83.112-1.633.322-2.395C2.806 8.757 3.63 8.25 4.51 8.25H6.75z" /> | ||
| </svg> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <button | ||
| className="content-pill status-button green text-center ml-2" | ||
| onClick={props.onClick} | ||
| type="button" | ||
| > | ||
| <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" aria-hidden="true" className="h-8 pl-1 text-gray-900 ml-1"> | ||
| <path strokeLinecap="round" strokeLinejoin="round" d="M19.114 5.636a9 9 0 010 12.728M16.463 8.288a5.25 5.25 0 010 7.424M6.75 8.25l4.72-4.72a.75.75 0 011.28.53v15.88a.75.75 0 01-1.28.53l-4.72-4.72H4.51c-.88 0-1.704-.507-1.938-1.354A9.01 9.01 0 012.25 12c0-.83.112-1.633.322-2.396C2.806 8.756 3.63 8.25 4.51 8.25H6.75z" /> | ||
| </svg> | ||
| </button> | ||
| <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" aria-hidden="true" className="icon"> | ||
| <path strokeLinecap="round" strokeLinejoin="round" d="M19.114 5.636a9 9 0 010 12.728M16.463 8.288a5.25 5.25 0 010 7.424M6.75 8.25l4.72-4.72a.75.75 0 011.28.53v15.88a.75.75 0 01-1.28.53l-4.72-4.72H4.51c-.88 0-1.704-.507-1.938-1.354A9.01 9.01 0 012.25 12c0-.83.112-1.633.322-2.396C2.806 8.756 3.63 8.25 4.51 8.25H6.75z" /> | ||
| </svg> | ||
| ); | ||
| } | ||
|
|
||
| VoiceDeafenButton.defaultProps = { | ||
| onClick: () => {}, | ||
| VoiceDeafenButtonContent.defaultProps = { | ||
| deafened: false, | ||
| }; | ||
|
|
||
| VoiceDeafenButton.propTypes = { | ||
| onClick: PropTypes.func, | ||
| VoiceDeafenButtonContent.propTypes = { | ||
| deafened: PropTypes.bool, | ||
| }; |
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
Oops, something went wrong.