Skip to content

Commit

Permalink
Merge pull request #1528 from KhalisFoundation/dev
Browse files Browse the repository at this point in the history
Release v1.12.1
  • Loading branch information
saintsoldierx committed May 13, 2022
2 parents baac9ac + 2fb1544 commit 3ee629c
Show file tree
Hide file tree
Showing 68 changed files with 23,852 additions and 1,547 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ yarn.lock
.idea/
cypress/screenshots/**/*.*
cypress/videos/**/*.*
.env
.env.develop
5 changes: 5 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm test
npm run test:lint
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
14
41 changes: 16 additions & 25 deletions common/seo.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,45 @@ import { BASIC_META_DESCRIPTION } from './constants';
export default {
'/': {
createTitle: () => suffixAppName(),
createDescription: () => `SikhiToTheMax, online Gurbani Searcher. ${BASIC_META_DESCRIPTION}`,
createDescription: () =>
`SikhiToTheMax, online Gurbani Searcher. ${BASIC_META_DESCRIPTION}`,
},
'/404': {
createTitle: () => suffixAppName('Page not found'),
createDescription: () => 'Page not found.'
createDescription: () => 'Page not found.',
},
'/terms-of-service': {
createTitle: () => suffixAppName('Terms Of Service'),
createDescription: () => 'Terms of Service of SikhiToTheMax.'
createDescription: () => 'Terms of Service of SikhiToTheMax.',
},
'/about': {
createTitle: () => suffixAppName('About'),
createDescription: () => 'SikhiToTheMax is backed by a non-profit organization named Khalis Foundation.'
createDescription: () =>
'SikhiToTheMax is backed by a non-profit organization named Khalis Foundation.',
},
'/ang': {
createTitle: (title = 'Ang') => suffixAppName(title),
createDescription: (description = 'Read page number ') => description,
},
'/index': {
createTitle: () => suffixAppName('Index'),
createDescription: () => 'Index page of Sri Guru Granth Sahib Jee, Sri Dasam Granth. Read Asa Ki Vaar, Raag Dhanasari, Ramkali Ki Vaar Rai Balvand, Shalok Sehskritee, Shalok Vaaran Te Vadeek, Salok Mahalla 9, Raag Maala, Akaal Ustat, Vaar Sri Bhagouti Jee kee, Sri Shastar Naam Mala, Zafarnamah, Khalsa Mahima, Sri Charitropakhyan',
},
'/index/sri-guru-granth-sahib': {
createTitle: () => suffixAppName('Index Sri Guru Granth Sahib Jee'),
createDescription: () => 'Index page of Sri Guru Granth Sahib Jee.',
},
'/index/sri-dasam-granth-sahib': {
createTitle: () => suffixAppName('Index Sri Dasam Granth Sahib'),
createDescription: () => 'Index page of Sri Dasam Granth Sahib.',
},
'/index/bhai-nand-lal-vaaran': {
createTitle: () => suffixAppName('Index Bhai Nand Lal Ji Vaaran'),
createDescription: () => 'Index page of Bhai Nand Lal Ji Vaaran.',
},
'/index/amrit-keertan': {
createTitle: () => suffixAppName('Index Amrit Keertan'),
createDescription: () => 'Index page of Amrit Keertan.',
createDescription: () =>
'Index page of Sri Guru Granth Sahib Jee, Sri Dasam Granth. Read Asa Ki Vaar, Raag Dhanasari, Ramkali Ki Vaar Rai Balvand, Shalok Sehskritee, Shalok Vaaran Te Vadeek, Salok Mahalla 9, Raag Maala, Akaal Ustat, Vaar Sri Bhagouti Jee kee, Sri Shastar Naam Mala, Zafarnamah, Khalsa Mahima, Sri Charitropakhyan',
},
'/help': {
createTitle: () => suffixAppName('Help'),
createDescription: () => 'Needs help in understanding how to use SikhiTheMax?'
createDescription: () =>
'Needs help in understanding how to use SikhiTheMax?',
},
'/hukamnama': {
createTitle: () => suffixAppName('Hukamanama'),
createDescription: () => `Read Sri Mukhwaakh Hukamnama of today from Sri Darbar Sahib, Harmandir Sahib (Golden Temple) Amritsar online now. ${BASIC_META_DESCRIPTION}`,
createDescription: () =>
`Read Sri Mukhwaakh Hukamnama of today from Sri Darbar Sahib, Harmandir Sahib (Golden Temple) Amritsar online now. ${BASIC_META_DESCRIPTION}`,
},
'/search': {
createTitle: () => suffixAppName('Search Results'),
createDescription: () => 'Search Sri Guru Granth Sahib Jee, Sri Dasam Granth Sahib, Bhai Gurdas Vaaran and Gurbani by Sikh Gurus; Guru Nanak Dev, Guru Angad Dev, Guru Amardas, Guru Ramdass, Guru Arjan Dev, Guru Tegh Bahadur, Guru Gobind Singh and Bhagats like Bhagat Kabir Jee, Sheikh Fareed Jee, Bhagat Jaidev, Bhagat Naamdev, Bhagat Ravidaas, Bhagat Ramanand, Bhagat Parmanand, Bhagat Trilochan, Bhagat Surdas.'
createDescription: () =>
'Search Sri Guru Granth Sahib Jee, Sri Dasam Granth Sahib, Bhai Gurdas Vaaran and Gurbani by Sikh Gurus; Guru Nanak Dev, Guru Angad Dev, Guru Amardas, Guru Ramdass, Guru Arjan Dev, Guru Tegh Bahadur, Guru Gobind Singh and Bhagats like Bhagat Kabir Jee, Sheikh Fareed Jee, Bhagat Jaidev, Bhagat Naamdev, Bhagat Ravidaas, Bhagat Ramanand, Bhagat Parmanand, Bhagat Trilochan, Bhagat Surdas.',
},
'/shabad': {
createTitle: (title = 'Shabad') => suffixAppName(title),
Expand All @@ -64,6 +54,7 @@ export default {
},
'/sundar-gutka': {
createTitle: () => suffixAppName('Sundar Gutka'),
createDescription: () => 'Read Nitnem Baanies like Japji Sahib, Jaap Sahib, Tva Prasad Sawaiye, Benit Chaupayee Sahib, Anand Sahib, Rehiraas Sahib, Aartee, Ardaas, Kirtan Sohilla Sahib with translations, transliterations and larivaar options online right now from Sundar Gutka.',
createDescription: () =>
'Read Nitnem Baanies like Japji Sahib, Jaap Sahib, Tva Prasad Sawaiye, Benit Chaupayee Sahib, Anand Sahib, Rehiraas Sahib, Aartee, Ardaas, Kirtan Sohilla Sahib with translations, transliterations and larivaar options online right now from Sundar Gutka.',
},
};
2 changes: 1 addition & 1 deletion cypress/integration/multiview/search.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Multi View', () => {
.scrollIntoView()
.click({ force: true })

cy.get('.search-results-display li:first-child button[data-cy=add-shabad]').as('result')
cy.get('.search-results-display li:first-child button[data-cy=add-shabad]').as('result')

cy.get('@result').click().then(() => {
cy.get('.multiple-shabads-display ul li').should('have.length', 1)
Expand Down
2 changes: 1 addition & 1 deletion jest/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { presets, plugins } = require('../.babelrc');

module.exports = require('babel-jest').createTransformer({
// we don't need any config for `@babel/preset-env`
presets: presets.map(p =>
presets: presets.map((p) =>
Array.isArray(p) && p[0] === '@babel/preset-env'
? [
p[0],
Expand Down
Loading

0 comments on commit 3ee629c

Please sign in to comment.