Merge branch 'master' into theme-adjustments

public/css/style.scss

@@ -1043,7 +1043,7 @@ key {
     &.fontSize .buttons{
       grid-template-columns: 1fr 1fr 1fr 1fr;
     }
-    &.themes, &.languages{
+    &.themes, &.languages, &.layouts{
       grid-template-columns: 1fr;
       grid-template-areas: "title"
                             "buttons";
@@ -1054,7 +1054,7 @@ key {
         display: grid;
         grid-template-columns: 1fr 1fr 1fr 1fr;
         gap: .5rem;
-        .theme, .language{
+        .theme, .language, .layout{
           color: var(--text-color);
           cursor: pointer;
           transition: .25s;
@@ -1230,7 +1230,7 @@ key {
           background: var(--main-color);
         }
       }
-      &.languages{
+      &.languages, &.layouts{
         grid-template-columns: repeat(4,1fr);
         grid-auto-flow: unset;
       }

public/index.html

@@ -360,6 +360,12 @@
           <div class="buttons">
           </div>
         </div>
+
+        <div class="section layouts">
+          <h1>layouts</h1>
+          <div class="buttons">
+          </div>
+        </div>
         <div class="section themes">
           <h1>theme</h1>
           <div class="buttons">
@@ -589,7 +595,7 @@
 
 <!-- Initialize Firebase -->
 <script src="/__/firebase/init.js"></script>
-<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
+<script src="js/jquery-3.5.1.min.js"></script>
 <script src="js/easing.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
@@ -597,6 +603,7 @@
 <script src="js/chart.js"></script>
 <script src="js/chartjs-plugin-trendline.js"></script>
 <script src="js/words.js?v=2"></script>
+<script src="js/layouts.js"></script>
 <script src="js/db.js?v=2"></script>
 <script src="js/userconfig.js?v=2"></script>
 <script src="js/commandline.js?v=2"></script>

public/js/commandline.js

@@ -114,6 +114,15 @@ let commands = {
                 showCommandLine();
             }
         },
+        {
+            id: "changeLayout",
+            display: "Change layout...",
+            subgroup: true,
+            exec: () => {
+                currentCommands.push(commandsLayouts);
+                showCommandLine();
+            }
+        },
         {
             id: "changeFontSize",
             display: "Change font size...",
@@ -473,6 +482,32 @@ if (Object.keys(words).length > 0) {
     })
 }
 
+let commandsLayouts = {
+    title: "Change layout...",
+    list: [
+        {
+            id: "couldnotload",
+            display: "Could not load the layouts list :("
+        }
+    ]
+};
+
+
+if (Object.keys(layouts).length > 0) {
+    commandsLayouts.list = [];
+    Object.keys(layouts).forEach(layout => {
+        commandsLayouts.list.push({
+            id: "changeLayout" + capitalizeFirstLetter(layout),
+            display: layout.replace('_', ' '),
+            exec: () => {
+                changeLayout(layout);
+                restartTest();
+                saveConfigToCookie();
+            }
+        })
+    })
+}
+
 $("#commandLine input").keyup((e) => {
     if (e.keyCode == 38 || e.keyCode == 40 || e.keyCode == 13) return;
     updateSuggestedCommands();

public/js/layouts.js

@@ -0,0 +1,23 @@
+const layouts = {
+    qwerty: [
+        "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+",
+        "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}","\\|",
+        "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"",
+        "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?",
+        " "
+    ],
+    dvorak: [
+        "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0(","[{","]}",
+        "'\"",",<",".>","pP","yY","fF","gG","cC","rR","lL","/?","=+","\\|",
+        "aA","oO","eE","uU","iI","dD","hH","tT","nN","sS","-_",
+        ";:","qQ","jJ","kK","xX","bB","mM","wW","vV","zZ",
+        " "
+    ],
+    colemak:[
+        "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+",
+        "qQ","wW","fF","pP","gG","jJ","lL","uU","yY",";:","[{","]}","\\|",
+        "aA","rR","sS","tT","dD","hH","nN","eE","iI","oO","'\"",
+        "zZ","xX","cC","vV","bB","Kk","mM",",<",".>","/?",
+        " "
+    ]
+}

public/js/script.js

@@ -145,6 +145,33 @@ function initWords() {
   showWords();
 }
 
+function emulateLayout(event){
+  if (config.layout == "qwerty")
+    return event;
+  let layoutMap = layouts[config.layout];
+  let qwertyMap = layouts["qwerty"];
+
+  let mapIndex;
+  let newKey;
+  let shift = false;
+  for (let i = 0; i < qwertyMap.length; i++) {
+    const key = qwertyMap[i];
+    let keyIndex = key.indexOf(event.key);
+    if (keyIndex != -1){
+      mapIndex = i;
+      shift = keyIndex;
+    }
+  }
+
+  newKey = layoutMap[mapIndex][shift];
+  event.keyCode = newKey.charCodeAt(0);
+  event.charCode = newKey.charCodeAt(0);
+  event.which = newKey.charCodeAt(0);
+  event.code = `key${newKey}`;
+  event.key = newKey;
+  return event;
+}
+
 function punctuateWord(previousWord, currentWord, index, maxindex){
 
   let word = currentWord;
@@ -1197,6 +1224,7 @@ $(document).mousemove(function(event) {
 
 //keypresses for the test, using different method to be more responsive
 $(document).keypress(function(event) {
+  event = emulateLayout(event);
   if (!$("#wordsInput").is(":focus")) return;
   if (event["keyCode"] == 13) return;
   if (event["keyCode"] == 32) return;

public/js/settings.js

@@ -7,9 +7,15 @@ function updateSettingsPage(){
 
     let langEl = $(".pageSettings .section.languages .buttons").empty();
     Object.keys(words).forEach(language => {
-        langEl.append(`<div class="language" language='${language}'>${language.replace('_', ' ')}</div>`); 
+        langEl.append(`<div class="language" language='${language}'>${language.replace('_', ' ')}</div>`);
     })
 
+    let layoutEl = $(".pageSettings .section.layouts .buttons").empty();
+    Object.keys(layouts).forEach(layout => {
+        layoutEl.append(`<div class="layout button" layout='${layout}'>${layout.replace('_', ' ')}</div>`);
+    });
+    
+
     setSettingsButton('smoothCaret', config.smoothCaret);
     setSettingsButton('quickTab', config.quickTab);
     setSettingsButton('liveWpm', config.showLiveWpm);
@@ -23,6 +29,7 @@ function updateSettingsPage(){
 
     setActiveThemeButton();
     setActiveLanguageButton();
+    setActiveLayoutButton();
     setActiveFontSizeButton();
     setActiveDifficultyButton();
     setActiveCaretStyleButton();
@@ -41,6 +48,11 @@ function setActiveThemeButton() {
     $(`.pageSettings .section.themes .theme[theme=${config.theme}]`).addClass('active');
 }
 
+function setActiveLayoutButton(){
+    $(`.pageSettings .section.layouts .layout`).removeClass('active');
+    $(`.pageSettings .section.layouts .layout[layout=${config.layout}]`).addClass('active');
+}
+
 function setActiveFontSizeButton() {
     $(`.pageSettings .section.fontSize .buttons .button`).removeClass('active');
     $(`.pageSettings .section.fontSize .buttons .button[fontsize=`+config.fontSize+`]`).addClass('active');
@@ -185,6 +197,16 @@ $(document).on("click",".pageSettings .section.languages .language", (e) => {
     setActiveLanguageButton();
 })
 
+//layouts
+$(document).on("click",".pageSettings .section.layouts .layout", (e) => {
+    console.log("clicked")
+    let layout = $(e.currentTarget).attr('layout');
+    changeLayout(layout);
+    showNotification('Layout changed', 1000);
+    restartTest();
+    setActiveLayoutButton();
+})
+
 //fontsize
 $(document).on("click",".pageSettings .section.fontSize .button", (e) => {
     let fontSize = $(e.currentTarget).attr('fontsize');

public/js/userconfig.js

@@ -17,7 +17,8 @@ let config = {
     blindMode: false,
     quickEnd: false,
     caretStyle: "default",
-    flipTestColors: false
+    flipTestColors: false,
+    layout:"qwerty"
 }
 
 //cookies
@@ -44,6 +45,7 @@ function loadConfigFromCookie() {
         changeWordCount(newConfig.words,true);
         changeMode(newConfig.mode,true);
         changeLanguage(newConfig.language,true);
+        changeLayout(newConfig.layout, true);
         changeFontSize(newConfig.fontSize,true);
         setFreedomMode(newConfig.freedomMode,true);
         setCaretStyle(newConfig.caretStyle,true);
@@ -356,6 +358,22 @@ function changeLanguage(language, nosave) {
     if(!nosave) saveConfigToCookie();
 }
 
+function changeLayout(layout, nosave){
+    if (layout == null || layout == undefined){
+        layout = "qwerty"
+    }
+
+    config.layout = layout;
+    try{
+        firebase.analytics().logEvent('changedLanguage', {
+            language: language
+        });
+    }catch(e){
+        console.log("Analytics unavailable");
+    }
+    if(!nosave) saveConfigToCookie();
+}
+
 function changeFontSize(fontSize, nosave) {
     if (fontSize == null || fontSize == undefined) {
         fontSize = 1;

public/themes/gruvbox_dark.css

@@ -0,0 +1,9 @@
+:root {
+    --bg-color: #282828;
+    --main-color: #d79921;
+    --caret-color: #458588;
+    --sub-color: #b8bb26;
+    --text-color: #ebdbb2;
+    --error-color: #fb4934 ;
+    --extra-error-color: #cc241d;
+}

public/themes/gruvbox_light.css

@@ -0,0 +1,9 @@
+:root {
+    --bg-color: #fbf1c7;
+    --main-color: #d79921;
+    --caret-color: #458588;
+    --sub-color: #98971a;
+    --text-color: #3c3836;
+    --error-color: #cc241d;
+    --extra-error-color: #9d0006;
+}

public/themes/list.json

@@ -153,5 +153,20 @@
         "name": "taro",
         "bgColor": "#b3baff",
         "textColor": "#130f1a"
+    },
+    {
+        "name": "striker",
+        "bgColor": "#124883",
+        "textColor": "#d6dbd9"
+    },
+    {
+        "name": "gruvbox_dark",
+        "bgColor": "#282828",
+        "textColor": "#ebdbb2"
+    },
+    {
+        "name": "gruvbox_light",
+        "bgColor": "#fbf1c7",
+        "textColor": "#458588"
     }
 ]

public/themes/striker.css

@@ -0,0 +1,9 @@
+:root {
+    --bg-color: #124883;
+    --main-color: #d7dcda;
+    --caret-color: #d7dcda;
+    --sub-color: #0f2d4e;
+    --text-color: #d6dbd9;
+    --error-color: #fb4934;
+    --extra-error-color: #cc241d;
+}