Skip to content

Commit

Permalink
Merge pull request #1246 from KhalisFoundation/dev
Browse files Browse the repository at this point in the history
version v1.10.2
  • Loading branch information
saintsoldierx authored Sep 3, 2020
2 parents be4a32f + 59b4e98 commit c4a4a7a
Show file tree
Hide file tree
Showing 23 changed files with 406 additions and 116 deletions.
1 change: 0 additions & 1 deletion client_id

This file was deleted.

1 change: 0 additions & 1 deletion cypress/integration/navigation/sundar-gutka.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { getRandomNumber } from '../../utils';
import { sanitizeBaani } from '../../../src/js/pages/SundarGutka/utils';


describe('Navigation', () => {
const sttmLarivaarAssistColor = 'rgb(243, 156, 29)';
const sundarGutkaBaanis = 104;
Expand Down
105 changes: 105 additions & 0 deletions cypress/integration/settings/sources.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@

describe('Settings', () => {
before(() => {
cy.visit('/');

cy.get('.toast-notification-close-button')
.click();

cy.get('[data-cy=random-shabad] a')
.click()
})

describe('Sources', () => {
context('Transliterations', () => {
const shabadClassNamePrefix = '.mixed-view-baani-transliteration';
const controlPrefix = '#checkbox-Transliteration';

beforeEach(() => {
cy.get('[data-cy=Display]')
.click()
.find('ul')
.first()
.as('transliterations');
})

it('should show hindi transliterations, on selecting hindi transliterations option', () => {
// hindi transliteration
cy.get('@transliterations')
.find(`${controlPrefix}-hindi`)
.click({ force: true })

cy.get(`${shabadClassNamePrefix}-hindi`).should('be.visible');

})

it('should show shahmukhi transliterations, on selecting spanish transliterations option', () => {
// shahmukhi transliteration
cy.get('@transliterations')
.find(`${controlPrefix}-shahmukhi`)
.click({ force: true })

cy.get(`${shabadClassNamePrefix}-shahmukhi`).should('be.visible');
})

it('should display english transliterations, on selecting english transliteration option', () => {
// Close english transliterations
cy.get('@transliterations')
.find(`${controlPrefix}-english`)
.click({ force: true });

// Select english transliterations
cy.get('@transliterations')
.find(`${controlPrefix}-english`)
.click({ force: true })

cy.get(`${shabadClassNamePrefix}-english`).should('be.visible');
})
})

context('Translations', () => {
const shabadClassNamePrefix = '.mixed-view-baani-translation';
const controlPrefix = '#checkbox-Translation';

beforeEach(() => {
cy.get('[data-cy=Display]')
.click()
.find('ul')
.last()
.as('translations');
})

it('should display english translation, on selecting english translation option', () => {
// Close english translations
cy.get('@translations')
.find(`${controlPrefix}-english`)
.click({ force: true });

// Select english translations
cy.get('@translations')
.find(`${controlPrefix}-english`)
.click({ force: true })

cy.get(`${shabadClassNamePrefix}-english`).should('be.visible');
})

it('should show punjabi translations, on selecting punjabi translation option', () => {
// punjabi translation
cy.get('@translations')
.find(`${controlPrefix}-punjabi`)
.click({ force: true })

cy.get(`${shabadClassNamePrefix}-punjabi`).should('be.visible');
})

it('should show spanish translations, on selecting spanish translation option', () => {
// spanish translation
cy.get('@translations')
.find(`${controlPrefix}-spanish`)
.click({ force: true })

cy.get(`${shabadClassNamePrefix}-spanish`).should('be.visible');
})
})
})
})
2 changes: 1 addition & 1 deletion cypress/support/index-page.commands.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const getRandomNumber = (max) => Math.floor(Math.random() * Math.floor(max));

Cypress.Commands.add('checkGranthIndices', function checkGranthIndices({ granthIndex, indices, source }) {
Cypress.Commands.add('checkGranthIndices', ({ granthIndex, indices, source }) => {
const randomIndex = getRandomNumber(indices.length);

cy.get('.granthIndex')
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/sundar-gutka.commands.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cypress.Commands.add('checkSgCard', function checkGranthIndices({ childNo, english, gurmukhi }) {
Cypress.Commands.add('checkSgCard', ({ childNo, english, gurmukhi }) => {
const sttmBlue = 'rgb(1, 102, 155)';
const em = 18; //no of pixel

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sttm/web",
"version": "1.10.1",
"version": "1.10.2",
"description": "Sevadaars are currently working hard to build a newer version of SikhiToTheMax website using modern web technologies.",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 2 additions & 0 deletions src/js/components/Controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
toggleTransliterationOptions,
toggleSplitViewOption,
toggleDarkMode,
toggleSehajPaathMode,
toggleAutoScrollMode,
toggleParagraphMode,
toggleVisraams,
Expand Down Expand Up @@ -184,6 +185,7 @@ const dispatchToProps = {
toggleTransliterationOptions,
toggleSplitViewOption,
toggleParagraphMode,
toggleSehajPaathMode,
toggleDarkMode,
toggleAutoScrollMode,
toggleVisraams,
Expand Down
150 changes: 101 additions & 49 deletions src/js/components/Meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Meta extends React.PureComponent {
* @property {array} transliterationLanguages
* @property {object} nav
* @property {boolean} isUnicode
* @property {boolean} isArrowsHidden
*
* @static
* @memberof Meta
Expand All @@ -45,37 +46,24 @@ class Meta extends React.PureComponent {
previous: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
next: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
}),
isArrowsHidden: PropTypes.bool
};

render() {
renderLeftArrow() {
const {
nav = {},
type,
info,
isUnicode,
translationLanguages,
transliterationLanguages,
nav = {},
isArrowsHidden,
} = this.props;

const link = toNavURL(this.props);
const Item = ({ children, last = false }) =>
children ? (
<React.Fragment>
{children}
{last ? '' : ' - '}
</React.Fragment>
) : null;

const shouldShowEnglishInHeader =
translationLanguages.includes('english') ||
transliterationLanguages.includes('english');

const contentType = isUnicode ? 'unicode' : 'gurmukhi'
const isShowPreviousArrow = isFalsy(nav.previous) === false;
const isSync = type === 'sync';
const isHukamnama = type === 'hukamnama';
// const isShabad = type === 'shabad';
return (
<div id="metadata" className={`metadata-${type}`}>
{isFalsy(nav.previous) === false ? (

if (!isArrowsHidden) {
if (isShowPreviousArrow) {
return (
<div className="shabad-nav left">
<Link to={link + nav.previous}>
{isHukamnama ? (
Expand All @@ -88,7 +76,10 @@ class Meta extends React.PureComponent {
)}
</Link>
</div>
) : type !== 'sync' ? (
)
}
if (!isSync) {
return (
<div className="shabad-nav left disabled-nav">
<a>
{isHukamnama ? (
Expand All @@ -98,7 +89,91 @@ class Meta extends React.PureComponent {
)}
</a>
</div>
) : ''}
)
}
}

return '';
}


renderRightArrow() {
const {
type,
nav = {},
isArrowsHidden,
} = this.props;

const isShowNextArrow = isFalsy(nav.next) === false
const isSync = type === 'sync';
const isHukamnama = type === 'hukamnama';

if (!isArrowsHidden) {

if (isShowNextArrow) {
return (
<div className="shabad-nav right">
<a role="button" aria-label="next" onClick={this.goToNextAng}>
{isHukamnama ? (
<div className='hukamnama-nav-icon'>
<Hour24 direction='next' />
<span>{dateMath.expand(nav.next, false)}</span>
</div>
) : (
<Chevron direction={Chevron.DIRECTIONS.RIGHT} />
)}
</a>
</div>
)
}

if (!isSync) {
return (
<div className="shabad-nav right disabled-nav">
<a>
{isHukamnama ? (
<Hour24 direction='next' />
) : (
<Chevron direction={Chevron.DIRECTIONS.RIGHT} />
)}
</a>
</div>
)
}
}

return '';
}

render() {
const {
type,
info,
isUnicode,
translationLanguages,
transliterationLanguages,
} = this.props;

const Item = ({ children, last = false }) =>
children ? (
<React.Fragment>
{children}
{last ? '' : ' - '}
</React.Fragment>
) : null;

const shouldShowEnglishInHeader =
translationLanguages.includes('english') ||
transliterationLanguages.includes('english');

const contentType = isUnicode ? 'unicode' : 'gurmukhi'
const isHukamnama = type === 'hukamnama';

// const isShabad = type === 'shabad';
return (
<div id="metadata" className={`metadata-${type}`}>
{this.renderLeftArrow()}

<div className="meta">
{isHukamnama && (
<h4>
Expand Down Expand Up @@ -158,30 +233,7 @@ class Meta extends React.PureComponent {
)}
</div>

{isFalsy(nav.next) === false ? (
<div className="shabad-nav right">
<a role="button" aria-label="next" onClick={this.goToNextAng}>
{isHukamnama ? (
<div className='hukamnama-nav-icon'>
<Hour24 direction='next' />
<span>{dateMath.expand(nav.next, false)}</span>
</div>
) : (
<Chevron direction={Chevron.DIRECTIONS.RIGHT} />
)}
</a>
</div>
) : type !== 'sync' ? (
<div className="shabad-nav right disabled-nav">
<a>
{isHukamnama ? (
<Hour24 direction='next' />
) : (
<Chevron direction={Chevron.DIRECTIONS.RIGHT} />
)}
</a>
</div>
) : ''}
{this.renderRightArrow()}
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions src/js/components/ShabadContent/ShabadContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ class Shabad extends React.PureComponent {
)}
{isShowMetaData && (
<Meta
isArrowsHidden={isMultiPage}
isUnicode={unicode}
info={info}
nav={nav}
Expand Down
Loading

0 comments on commit c4a4a7a

Please sign in to comment.