Merge branch 'master' of https://github.com/Miodec/monkey-type

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,40 +7,41 @@ assignees: ''
 
 ---
 
-**Did you make sure to clear cache before opening an issue?**
-Sometimes your browser has old files cached and the bug you are experiencing might be already fixed, or a side effect of a new update. If you've already tried that, please delete this section. If you don't know how to do that, this website should help: https://clear-my-cache.com/
+<!-- **DID YOU MAKE SURE TO CLEAR CACHE BEFORE OPENING AN ISSUE?**
+Sometimes your browser has old files cached and the bug you are experiencing might be already fixed, or is just a side effect of a new update. If you don't know how to do that, this website should help: https://www.pcmag.com/how-to/how-to-clear-your-cache-on-any-browser -->
 
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 
 **Did it happen in incognito mode?**
-Sometimes things work in incognito mode, which allows me to further track down the issue.
+<!-- Sometimes things work in incognito mode, which allows me to further track down the issue. -->
 
 **To Reproduce**
-Steps to reproduce the behavior:
+<!-- Steps to reproduce the behavior: -->
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots to further help explain your problem. -->
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+**Desktop:** <!-- (if you encountered an issue while using Monkeytype on your computer please complete the following information) -->
+ - OS: [] <!-- e.g. Windows 10, MacOS, Linux-->
+ - Browser [] <!-- e.g. Chrome, Firefox, Safari, etc... -->
+ - Version [] <!-- e.g. 22 -->
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Smartphone:** <!-- (if you encountered an issue while using Monkeytype on your smartphone please complete the following information) -->
+ - Device: [] <!-- e.g. iPhone6, Google Pixel 4, etc... -->
+ - OS: [] <!-- e.g. IOS 8.1, Android 11, etc...  -->
+ - Browser [] <!-- e.g. stock browser, Safari, Chrome -->
+ - Version [] <!-- e.g. 22 -->
 
 **Additional context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,5 +7,4 @@ assignees: ''
 
 ---
 
-Please use GitHub Discussions:
-https://github.com/Miodec/monkeytype/discussions
+Please do not file an issue for feature requests, use [GitHub discussions (Discussions tab)](https://github.com/Miodec/monkeytype/discussions)

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-Adding a language or a theme? Make sure to edit the `_list.json` file as well, otherwise, it will not work!
+Adding a language or a theme? Make sure to edit the `_list.json` file and add the `language.json` or `theme.css` as well, otherwise, it will not work!
 
 Please reference any issues related to your pull request.
 

src/js/layouts.js

@@ -166,12 +166,12 @@ const layouts = {
     qwpr: {
         keymapShowTopRow: false,
         keys: [
-            "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+",
-            "qQ","wW","pP","rR","fF","yY","uU","kK","lL",";:","[{","]}","\\|",
-            "aA","sS","dD","tT","gG","hH","nN","iI","oO","eE","'\"",
-            "\\|","zZ","xX","cC","vV","bB","jJ","mM",",<",".>","/?",
+            "`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+",
+            "qQ", "wW", "pP", "rR", "fF", "yY", "uU", "kK", "lL", ";:", "[{", "]}", "\\|",
+            "aA", "sS", "dD", "tT", "gG", "hH", "nN", "iI", "oO", "eE", "'\"",
+            "\\|", "zZ", "xX", "cC", "vV", "bB", "jJ", "mM", ",<", ".>", "/?",
             " "
-        ],   
+        ],
     },
     prog_dvorak: {
         keymapShowTopRow: true,
@@ -240,7 +240,7 @@ const layouts = {
         keys: [
             "`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+",
             "wW", "gG", "hH", "mM", "kK", "qQ", "cC", "uU", "jJ", "'\"", "[{", "]}", "\\|",
-            "rR", "sS", "nN", "tT", "fF", "yY", "aA", "eE", "oO", "iI", ";:", 
+            "rR", "sS", "nN", "tT", "fF", "yY", "aA", "eE", "oO", "iI", ";:",
             "\\|", "xX", "bB", "lL", "dD", "vV", "zZ", "pP", ",<", ".>", "/?",
             " "
         ]
@@ -251,7 +251,7 @@ const layouts = {
             "^~", "1!", "2@", "3#", "4$", "5%", "6&", "7`", "8(", "9)", "0=", "*+", "\\|",
             "jJ", "gG", "hH", "pP", "fF", "qQ", "vV", "oO", "uU", ";:", "/?", "[{", "]}",
             "rR", "sS", "nN", "tT", "kK", "yY", "iI", "aA", "eE", "lL", "-_",
-            "\\|","zZ", "wW", "mM", "dD", "bB", "cC", ",<", "'\"", ".>", "xX",
+            "\\|", "zZ", "wW", "mM", "dD", "bB", "cC", ",<", "'\"", ".>", "xX",
             " "
         ],
     },
@@ -285,5 +285,14 @@ const layouts = {
             " "
         ]
     },
+    JCUKEN: {
+        keymapShowTopRow: true,
+        keys: [
+            "ёЁ", "1!", "2\"", "3№", "4;", "5%", "6:", "7?", "8*", "9(", "0)", "-_", "=+",
+            "йЙ", "цЦ", "уУ", "кК", "еЕ", "нН", "гГ", "шШ", "щЩ", "зЗ", "хХ", "ъЪ", "\\/",
+            "\\|", "яЯ", "чЧ", "сС", "мМ", "иИ", "тТ", "ьЬ", "бБ", "юЮ", ".,",
+            " "
+        ]
+    }
 }
 export default layouts;