Merge pull request #844 from KhalisFoundation/dev

Release 1.5.2
KhalisFoundation · Nov 14, 2019 · 0b65d2e · 0b65d2e
2 parents 8defd6f + 2514d4f
commit 0b65d2e
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sttm/web",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Sevadaars are currently working hard to build a newer version of SikhiToTheMax website using modern web technologies.",
   "main": "index.js",
   "scripts": {

diff --git a/public/assets/fonts/PrabhkiTrue.ttf b/public/assets/fonts/PrabhkiTrue.ttf
diff --git a/src/js/components/GurmukhiKeyboardv2.js b/src/js/components/GurmukhiKeyboardv2.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import ArrowIcon from './Icons/Arrow';
 import SpaceBar from './Icons/Spacebar';
+import { SEARCH_TYPES } from '@/constants.ts'
 
 const defaultMatraValue = {
   w: 'Aw',
@@ -62,15 +63,6 @@ const withMatra = [
   ['X', 'r', 'l', 'v', 'V', 'R', '^', 'space', 'meta'],
 ];
 
-const keyboardGrid = [
-  [withoutMatra], // Keyboard for First letter each word from start (Gurmukhi)
-  [withoutMatra], // Keyboard for First letter each word from Anywhere (Gurmukhi)
-  [withMatra], // Keyboard for Full Word (Gurmukhi)
-  [], // Keyboard for Full Word Translation (English)
-  [], // Keyboard for Romanized Gurmukhi (English)
-  [], // Keyboard for Ang
-];
-
 export default class EnhancedGurmukhiKeyboard extends React.PureComponent {
   static propTypes = {
     value: PropTypes.string.isRequired,
@@ -154,6 +146,11 @@ export default class EnhancedGurmukhiKeyboard extends React.PureComponent {
       </button>
     );
 
+    const keys = parseInt(this.props.searchType) === SEARCH_TYPES['GURMUKHI_WORD']
+      ? withMatra : withoutMatra;
+
+    const keyboardGrid = [keys];
+
     const meta = (
       <span>
         <button
@@ -169,6 +166,7 @@ export default class EnhancedGurmukhiKeyboard extends React.PureComponent {
         </Link>
       </span>
     );
+
     return (
       <div
         className={`gurmukhi-keyboard gurbani-font ${
@@ -177,7 +175,7 @@ export default class EnhancedGurmukhiKeyboard extends React.PureComponent {
         onClick={this.click}
       >
         {
-          keyboardGrid[parseInt(this.props.searchType)].map(
+          keyboardGrid.map(
             (rows, index) => {
               return (
                 <div

diff --git a/src/js/components/SearchResults/Result.js b/src/js/components/SearchResults/Result.js
@@ -5,8 +5,14 @@ import { Link } from 'react-router-dom';
 import Larivaar from '../../components/Larivaar';
 import { toShabadURL, getHighlightIndices } from '../../util';
 import {
-  getAng, getSource, getUnicodeVerse,
-  getGurmukhiVerse, translationMap, transliterationMap, getRaag, getWriter
+  getAng,
+  getSource,
+  getUnicodeVerse,
+  getGurmukhiVerse,
+  translationMap,
+  transliterationMap,
+  getRaag,
+  getWriter,
 } from '@/util/api/shabad';
 
 export default class SearchResult extends React.PureComponent {
@@ -73,18 +79,18 @@ export default class SearchResult extends React.PureComponent {
                 </Larivaar>
               </div>
             ) : (
-                <div className={`gurlipi ${larivaar ? 'larivaar' : ''}`}>
-                  <Larivaar
-                    larivaarAssist={larivaarAssist}
-                    enable={larivaar}
-                    startIndex={highlightStartIndex}
-                    endIndex={higlightEndIndex}
-                    query={q}
-                  >
-                    {getGurmukhiVerse(shabad)}
-                  </Larivaar>
-                </div>
-              )}
+              <div className={`gurlipi ${larivaar ? 'larivaar' : ''}`}>
+                <Larivaar
+                  larivaarAssist={larivaarAssist}
+                  enable={larivaar}
+                  startIndex={highlightStartIndex}
+                  endIndex={higlightEndIndex}
+                  query={q}
+                >
+                  {getGurmukhiVerse(shabad)}
+                </Larivaar>
+              </div>
+            )}
           </Link>
 
           <div className="clear" />
@@ -117,13 +123,13 @@ export default class SearchResult extends React.PureComponent {
             <blockquote className="translation punjabi gurbani-font">
               {unicode ? (
                 <div className="unicode">
-                  {translationMap["punjabi"](shabad).unicode}
+                  {translationMap['punjabi'](shabad).unicode}
                 </div>
               ) : (
-                  <div className="gurlipi">
-                    {translationMap["punjabi"](shabad).gurmukhi}
-                  </div>
-                )}
+                <div className="gurlipi">
+                  {translationMap['punjabi'](shabad).gurmukhi}
+                </div>
+              )}
             </blockquote>
           )}
 
@@ -145,11 +151,11 @@ export default class SearchResult extends React.PureComponent {
             <a href="#">{getWriter(shabad)['english']}</a>
 
             {getRaag(shabad)['english'] === 'No Raag' ||
-              getRaag(shabad)['english'] === null ? (
-                ''
-              ) : (
-                <a href="#">{getRaag(shabad)['english']}</a>
-              )}
+            getRaag(shabad)['english'] === null ? (
+              ''
+            ) : (
+              <a href="#">{getRaag(shabad)['english']}</a>
+            )}
           </div>
         </li>
       </React.Fragment>

diff --git a/src/js/constants.ts b/src/js/constants.ts
@@ -164,6 +164,7 @@ export const FONT_OPTIONS = {
   gurmukhi_normal: 'Gurbani Akhar',
   gurmukhi_heavy: 'Gurbani Akhar Heavy',
   gurmukhi_thick: 'Gurbani Akhar Thick',
+  prabhki: 'Prabhki',
   unicode_font: 'Unicode',
 };
 

diff --git a/src/js/features/actions/index.js b/src/js/features/actions/index.js
@@ -6,6 +6,7 @@ import {
   DEFAULT_FONT_SIZE,
   DEFAULT_FONT_FAMILY,
   DEFAULT_CENTER_ALIGN_GURBANI,
+  DEFAULT_SPLIT_VIEW,
 } from '../../constants';
 
 export const createAction = (type, meta) => payload => ({
@@ -68,11 +69,15 @@ export const setTransliterationLanguages = createAction(
 export const SET_DARK_MODE = 'SET_DARK_MODE';
 export const setDarkMode = createAction(SET_DARK_MODE);
 
+export const SET_SPLIT_VIEW = 'SET_SPLIT_VIEW';
+export const setSplitView = createAction(SET_SPLIT_VIEW);
+
 export const resetDisplayOptions = () => dispatch => {
   dispatch(setTransliterationLanguages(DEFAULT_TRANSLITERATION_LANGUAGES));
   dispatch(setTranslationLanguages(DEFAULT_TRANSLATION_LANGUAGES));
   dispatch(setDarkMode(DEFAULT_DARK_MODE));
   dispatch(setCenterAlignOption(DEFAULT_CENTER_ALIGN_GURBANI));
+  dispatch(setSplitView(DEFAULT_SPLIT_VIEW));
 };
 
 export const CHANGE_FONT = 'CHANGE_FONT';

diff --git a/src/js/features/reducers/index.js b/src/js/features/reducers/index.js
@@ -15,6 +15,7 @@ import {
   SET_TRANSLITERATION_LANGUAGES,
   SET_ONLINE_MODE,
   SET_DARK_MODE,
+  SET_SPLIT_VIEW,
   CHANGE_FONT,
 } from '../actions';
 import {
@@ -224,6 +225,18 @@ export default function reducer(state, action) {
         darkMode,
       };
     }
+    case SET_SPLIT_VIEW: {
+      const splitView = action.payload || false;
+      clickEvent({
+        action: SET_SPLIT_VIEW,
+        label: splitView ? true : false,
+      });
+      saveToLocalStorage(LOCAL_STORAGE_KEY_FOR_SPLIT_VIEW, splitView);
+      return {
+        ...state,
+        splitView,
+      };
+    }
     case SET_CENTER_ALIGN_OPTION: {
       const centerAlignGurbani = action.payload;
 

diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss
@@ -9,13 +9,14 @@
 }
 
 $fontlist: (
-  gurmukhi_normal:"GurbaniAkharTrue.ttf",
-  gurmukhi_heavy: "GurbaniAkharHeavyTrue.ttf",
-  gurmukhi_thick: "GurbaniAkharThickTrue.ttf",
-  anmol_lipi: "AnmolLipiSG.ttf",
-  anmol_bold: "AnmolLipiBoldTrue.ttf",
-  notosans:"NotoSansGurmukhiTrue.ttf",
-  notosans_bold: "NotoSansGurmukhiBoldTrue.ttf",
+  gurmukhi_normal: 'GurbaniAkharTrue.ttf',
+  gurmukhi_heavy: 'GurbaniAkharHeavyTrue.ttf',
+  gurmukhi_thick: 'GurbaniAkharThickTrue.ttf',
+  anmol_lipi: 'AnmolLipiSG.ttf',
+  anmol_bold: 'AnmolLipiBoldTrue.ttf',
+  notosans: 'NotoSansGurmukhiTrue.ttf',
+  notosans_bold: 'NotoSansGurmukhiBoldTrue.ttf',
+  prabhki: 'PrabhkiTrue.ttf',
 );
 
 @each $name, $file in $fontlist {