monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2024-09-20 23:36:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Miodec:master' into master

Browse source
This commit is contained in:
Oscar MacKenzie 2021-05-08 07:42:34 +10:00
parent 8fa497e832 7e2f57f14c
commit 2790a66afc
11 changed files with 116 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.github/ISSUE_TEMPLATE/bug_report.md vendored
View file

@ -6,47 +6,47 @@ labels: bug
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 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 -->
<!--
**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. -->
**Describe the bug** <!-- 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: -->
**To Reproduce** <!-- Steps to reproduce the behavior: -->
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
**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**
**Screenshots** <!-- If applicable, add screenshots to further help explain your problem. -->
<!-- If applicable, add screenshots to further help explain your problem. -->
**Desktop:** <!-- (if you encountered an issue while using Monkeytype on your computer please complete the following information) -->
**Desktop:** <!-- if you encountered an issue while using Monkeytype on your computer please complete the following information, delete this section if not-->
- OS: [] <!-- e.g. Windows 10, MacOS, Linux-->
- Browser [] <!-- e.g. Chrome, Firefox, Safari, etc... -->
- Version [] <!-- e.g. 22 -->
**Smartphone:** <!-- (if you encountered an issue while using Monkeytype on your smartphone please complete the following information) -->
**Smartphone:** <!-- if you encountered an issue while using Monkeytype on your smartphone please complete the following information, delete this section if not -->
- 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. -->
**Additional context** <!-- Add any other context about the problem here. -->

27
code_r.json Normal file
View file

@ -0,0 +1,27 @@
{
"name": "code_r",
"leftToRight": true,
"words": [
"if",
"for",
"FALSE",
"NA_integer_",
"return",
"else",
"in",
"NULL",
"NA_real_",
"repeat",
"next",
"Inf",
"NA_complex_",
"while",
"break",
"NaN",
"NA_character_",
"function",
"TRUE",
"NA",
"..."
]
}

19
src/js/popups/word-filter-popup.js
View file

@ -65,15 +65,15 @@ async function filter(language) {
return filteredWords;
}
async function apply() {
async function apply(set) {
let language = $("#wordFilterPopup .languageInput").val();
let filteredWords = await filter(language);
let customText = "";
filteredWords.forEach((word) => {
customText += word + " ";
});
let customText = filteredWords.join(" ");
$("#customTextPopup textarea").val(
(index, val) => (set ? "" : val + " ") + customText
);
hide();
$("#customTextPopup textarea").val(customText);
}
$("#wordFilterPopupWrapper").mousedown((e) => {
@ -90,8 +90,9 @@ $("#wordFilterPopupWrapper .button").mousedown((e) => {
$("#wordFilterPopupWrapper .loadingIndicator").removeClass("hidden");
$("#wordFilterPopupWrapper .button").addClass("hidden");
setTimeout(() => {
apply();
$("#wordFilterPopupWrapper .loadingIndicator").addClass("hidden");
$("#wordFilterPopupWrapper .button").removeClass("hidden");
apply($(e.target).is("#set")).then(() => {
$("#wordFilterPopupWrapper .loadingIndicator").addClass("hidden");
$("#wordFilterPopupWrapper .button").removeClass("hidden");
});
}, 1);
});

7
static/index.html
View file

@ -202,10 +202,15 @@
Use the above filters to include and exclude words or characters
(separated by spaces)
</div>
<div class="tip">
"Set" replaces the current custom word list with the filter result, "Add"
appends the filter result to the current custom word list
</div>
<i
class="fas fa-fw fa-spin fa-circle-notch hidden loadingIndicator"
></i>
<div class="button">ok</div>
<div class="button" id="set">set</div>
<div class="button">add</div>
</div>
</div>
<div id="customWordAmountPopupWrapper" class="hidden">

3
static/languages/_groups.json
View file

@ -164,7 +164,8 @@
"code_java",
"code_go",
"code_rust",
"code_ruby"
"code_ruby",
"code_r"
]
},
{

1
static/languages/_list.json
View file

@ -92,4 +92,5 @@
,"code_go"
,"code_rust"
,"code_ruby"
,"code_r"
]

1
static/languages/english_25k.json
View file

@ -8599,7 +8599,6 @@
"cashed",
"kama",
"rumba",
"niggers",
"satyr",
"wineglass",
"keynes",

6
static/languages/lithuanian_3k.json
View file

@ -2266,7 +2266,7 @@
"paskaita",
"pavaizduoti",
"plunksna",
"profesonalus",
"profesionalus",
"reguliavimas",
"spaudimas",
"stebuklas",
@ -2589,7 +2589,7 @@
"vertybinis",
"absoliučiai",
"aprašymas",
"abribojimas",
"apribojimas",
"atstumas",
"cukrus",
"delnas",
@ -3008,4 +3008,4 @@
"demokratinis",
"dėžutė"
]
}
}

69
static/privacy-policy.html
View file

@ -56,9 +56,14 @@
}
</style>
<script defer>
// TODO: Add banner that appears when username copy is successful
function copyUserName() {
navigator.clipboard.writeText("Miodec#1512");
// alert("Copied To Clipboard!");
if (true) {
navigator.clipboard.writeText("Miodec#1512");
alert("Copied To Clipboard!");
} else {
alert("Unable to copy username");
}
}
</script>
</head>
@ -81,25 +86,24 @@
This privacy policy explains how Monkeytype uses the data we collect
from you when you use our website.
</p>
<p>Table of Contents</p>
<ul>
<li>What data do we collect?</li>
<li>How do we collect your data?</li>
<li>How will we use your data?</li>
<li>How do we store your data?</li>
<li>What are your data protection rights?</li>
<li>What are cookies?</li>
<li>How do we use cookies?</li>
<li>What types of cookies do we use?</li>
<li>How to manage your cookies</li>
<li>Privacy policies of other websites</li>
<li>Changes to our privacy policy</li>
<li>How to contact us</li>
<li>How to contact the appropriate authorities</li>
<li><a href="#topic1">What data do we collect?</a></li>
<li><a href="#topic2">How do we collect your data?</a></li>
<li><a href="#topic3">How will we use your data?</a></li>
<li><a href="#topic4">How do we store your data?</a></li>
<li><a href="#topic5">What are your data protection rights?</a></li>
<li><a href="#topic6">What log data do we collect?</a></li>
<li><a href="#topic7">What are cookies?</a></li>
<li><a href="#topic8">How do we use cookies?</a></li>
<li><a href="#topic9">What types of cookies do we use?</a></li>
<li><a href="#topic10">How to manage your cookies</a></li>
<li><a href="#end">Privacy policies of other websites</a></li>
<li><a href="#end">Changes to our privacy policy</a></li>
<li><a href="#end">How to contact us</a></li>
</ul>
<h1>What data do we collect?</h1>
<h1 id="topic1">What data do we collect?</h1>
<p>Monkeytype collects the following data:</p>
<ul>
<li>Email</li>
@ -110,7 +114,7 @@
<li>How long you've been typing on the website</li>
</ul>
<h1>How do we collect your data?</h1>
<h1 id="topic2">How do we collect your data?</h1>
<p>
You directly provide most of the data we collect. We collect data and
@ -122,7 +126,7 @@
<li>Change settings on the website</li>
</ul>
<h1>How do we use your data?</h1>
<h1 id="topic3">How do we use your data?</h1>
<p>Monkeytype collects your data so that we can:</p>
<ul>
@ -138,10 +142,10 @@
<li>Display leaderboards</li>
</ul>
<h1>How do we store your data?</h1>
<h1 id="topic4">How do we store your data?</h1>
<p>Monkeytype securely stores your data using Firebase Firestore.</p>
<h1>What are your data protection rights?</h1>
<h1 id="topic5">What are your data protection rights?</h1>
<p>
Monkeytype would like to make sure you are fully aware of all of your
data protection rights. Every user is entitled to the following:
@ -180,7 +184,7 @@
</ul>
<!-- <p>If you make a request, we have one month to respond to you. If you would like to exercise any of these rights, please contact us at our email: jack@monkeytype.com</p> -->
<h1>Log Data</h1>
<h1 id="topic6">What log data do we collect?</h1>
<p>
Like most websites, Monkeytype collects information that your browser
sends whenever you visit the website. This data may include internet
@ -196,7 +200,7 @@
</p>
<p>In our case, this service is provided by Google Analytics.</p>
<h1>Cookies</h1>
<h1 id="topic7">Cookies</h1>
<p>
Cookies are text files placed on your computer to collect standard
Internet log information and visitor behavior information. When you
@ -215,7 +219,7 @@
.
</p>
<h1>How do we use cookies?</h1>
<h1 id="topic8">How do we use cookies?</h1>
<p>
Monkeytype uses cookies in a range of ways to improve your experience
on our website, including:
@ -225,25 +229,21 @@
<li>Remembering your active settings</li>
<li>Remembering your active tags</li>
</ul>
<h1>What types of cookies do we use?</h1>
<h1 id="topic9">What types of cookies do we use?</h1>
<p>
There are a number of different types of cookies, however, our website
uses:
uses functionality cookies. Monkeytype uses these cookies so we
recognize you on our website and remember your previously selected
settings.
</p>
<ul>
<li>
Functionality – Monkeytype uses these cookies so we recognize
you on our website and remember your previously selected settings.
</li>
</ul>
<h1>How to manage cookies</h1>
<h1 id="topic10">How to manage cookies</h1>
<p>
You can set your browser not to accept cookies, and the above website
tells you how to remove cookies from your browser. However, in a few
cases, some of our website features may behave unexpectedly or fail to
function as a result.
</p>
<h1>Privacy policies of other websites</h1>
<h1 id="end">Privacy policies of other websites</h1>
<p>
Monkeytype contains links to other websites.
<b>
@ -295,5 +295,6 @@
</span>
</div>
</div>
<!-- TODO: Add image to go back to top of page -->
</body>
</html>

5
static/themes/_list.json
View file

@ -533,5 +533,10 @@
"name": "bouquet",
"bgColor": "#38564a",
"textColor": "#ffbdb2"
},
{
"name": "midnight",
"bgColor": "#0c0e12",
"textColor": "#525f7a"
}
]

11
static/themes/midnight.css Normal file
View file

@ -0,0 +1,11 @@
:root {
--bg-color: #0c0e12;
--main-color: #708bc2;
--caret-color: #708bc2;
--sub-color: #29303d;
--text-color: #525f7a;
--error-color: #c27070;
--error-extra-color: #c28b70;
--colorful-error-color: #c27070;
--colorful-error-extra-color: #c28b70;
}