Commit graph

567 commits

Author SHA1 Message Date
Miodec 6a237dfd64 sending 404 early to avoid logging all the query params 2022-03-11 23:30:03 +01:00
Miodec fa634e0426 stopping rank command from running if leaderboard is updating 2022-03-11 15:20:43 +01:00
Jack 5bccc789aa
added curly rule, fixed all errors (#2677) 2022-03-10 21:56:45 +01:00
Jack 9e41df2158
Leaderboard update flag (#2676)
* blocking leaderboard get requests if lb is updating

* locking lb while its updating

* brackets
2022-03-10 21:34:20 +01:00
Bruce Berrios 6b12ba3900
Include error id (#2671) 2022-03-10 21:30:16 +01:00
Miodec 1cfe1e79eb more incorrect paths aaaaaaaaa 2022-03-10 15:31:52 +01:00
Miodec 123acaecec path 2022-03-10 15:28:58 +01:00
Miodec bc9209e15e storing path in const 2022-03-10 15:26:01 +01:00
Miodec b54cf2b03f incorrect path 2022-03-10 15:24:30 +01:00
Miodec 71a8936bfb fixed incorrect path 2022-03-10 15:20:05 +01:00
Bruce Berrios 95a8a32008
Add user permissions for ape keys (#2665)
* Add user permissions for ape keys

* Optional

* Rename
2022-03-09 20:41:50 +01:00
Jack 34e730c6fc
Custom themes storage (#2660)
* Fixed typo

* Created method for adding theme in the UserDAO:

* Created function for checking if custom theme object is valid

* Exported the isThemeValid function

* Added controller for adding customTheme

* Created route for adding custom theme

* Created rateLimit for adding customTheme

* Fixed typo

* Fixed incorrect color length

* Added method for removing, getting and editing custom themes on the backend

* Moved validations from controllers to routes and some aesthetic changes in the user dao

* Started working on frontend and some minor changes in the backend

- Commandline support for custom themes
- Allow user to shift to their custom theme using Shift-click
- Updated the backend to be compatible with some changes
- Create a new custom theme for users with old system to prevent their custom theme loss

* Fixed custom theme type in ape and now new custom theme is created if user clicks the custom tab and doesn't already have one

* Fixed ape type issue

* Format html file

* Fixed wrong tab being active

* Created new custom theme edit section

* Fixed bug where user theme would have impact on icons with custom theme

* Update customThemes API

* Updated the custom theme sharing option to work with multiple custom themes

* Started working on the UI for custom theme buttons

* Added DOM event for clicking custom theme buttons

* Updated the updateActiveButton to work with multiple custom themes

* Removed favorite button for themes and fixed bug where double theme buttons were being added

* Fixed bug where preset theme buttons were not appearing if user has applied custom theme on website load and refreshed

* Moved DOM event for sharing custom theme to more appropriate place

* Integrated the save custom theme button with the changes

* Fixed bug with custom theme tab buttons and theme buttons

* Fixed commented div

* Replaced 'sds' with a meaningful message for custom theme buttons

* Integrated the delete button for deleting custom themes and fixed bug where id of newly added custom theme was not set properly

* Integrated the add button and name field for custom themes editing

* Added addCustomThemeWrapper element

I added it before but seems like vscode and other editors can't handle large files

* Removed some debug statements

* Removed some more debug statements

* Used parial types for custom theme. Thanks Bruce

* Removed unnecssary try catch blocks. Thanks Bruce

* Rephrased custom theme API messages

* Set new theme fields explicitly to prevent validtion failures and rephrased API message

* Replaced let with const

* Replaced let with const for _id

* Replaced let with const and used nullish coalescing

* Improved code quality in User DAO

* Strict equality in user DAO

* Moved validation scheme to a variables at the top of file

* Fixed bugs with strict equality checks

* Renamed themeId to themeID for consistency

* Made customThemes a required type in db to remove unnecessary undefined checks

* Uncommented GET API endpoint

* Prevent colorId being updated on custom theme name chnage

* Removed debug log

* Added loader on api calls

* Commenced shift from customThemeIndex to customThemeId

* Added required to themeColors schema

* Temp fix for validation fail for customThemeId

* Changed default value of customThemeId back to ''

* Temp fix for validation fail for customThemeId

* Fixed minor bug

* Fixed bug where account-controller would pass undefined to ThemeController.set

* Created methods in db.ts for adding, deleting and editing custom themes. Created new interface for raw custom themes and renamed ape methods

* Removed repeating code in account-controller

* Removed repeating code in theme-picker

* Removed setThemes in config

* Fixed minor bug

* Removed repeating code in user DAO

* Made custom themes available to registered users only

* Fixed minor bug

* Removed debug log and updated custom theme commands before showing list

* Added popup for confirming custom theme deletion

* Added custom option for random theme

* Minor improvement

* Workaround for local config firing before firebase initalization

* Removed debug log and created workaround for migration

* Added legacy customTheme config field

* Replaced workaround

* Changed put to patch

* Changed put to patch

* Added customTheme field back

* Integrated customTheme into to feature

* Added notifications for users when they access custom theme cmd option without being logged in

* Removed debug logs and comments

* Replaced literals with constant. Thanks Bruception

* Fixed wrong querySelector parameters and reset custom theme colors after deleting a custom theme

* added notification on save

* duplicating object instead of referencing

* Added return type on function

* Fixed wrong notification code

* spreading default config instead of referencing

* added index, psas, configs, presets

* camel_case

* added ape keys, leaderboards, results, quotes

* Modified setCustomTheme

* Modified setCustomThemeId

* Added tip for random themes settings

* Modified setCustomThemeId

* Now load custom theme before account loading

* Added custom theme compatibility for non-logged in users to theme-controller

* Now update tabs and buttons on custom theme config value change and modified boolean checks to use customTheme instead of customThemeId

* Fixed bug

* Refactoring in theme-controller.ts

* Enable custom theme support in commandline for logged out users

* More refactoring in theme-controller.ts

* Added custom theme compatibility for logged out users

* Removed double events in settings.ts and now turn on custom theme upon applying

* Fixed bug and recursive call

* Fixed bug

* Fixed random theme custom option

* Fix jquery wrong syntax

* Readded notification upon custom theme edit

* One notification upon error only

* Change notification type

* New custom themes now have default colors

* Notification on custom theme edit for non-logged in users

* Refresh buttons upon settings load

* missing gitignore

* updated message

* updated message

* setting config to unchanged when logging in to avoid issues with applying db config

* reverted some over complicated code, excessive auth checks

* removed customthemeid from config

* not setting custom theme id

* removed all customthemeid references

* removed commented code

* removed name field

* added edit button

* unused file

* removed popup

* removed add button, removed text

* removed duplicate code

* added simple popup checkbox support

* whitespace

* added custom theme popups

* removed warning when no custom themes were found

* removed add button click handler

* added function to save custom theme

* saving current theme not default

* removed custom theme id from default config

* not creating new theme by default, just applying

* reacting to customThemeColors save

* unnecessary function call

* removed unused code

* small refactor

* spacing

* unnecessary code

* turned off warnings for non null asertion

* showing theme name when randomising customs

* Revert "turned off warnings for non null asertion"

This reverts commit 433e1dc767.

* optional with default instead

* fixed custom theme colors always loaded on page load

* fixed custom theme buttons not showing up

* fixed various loading issues

* fixed custom theme edit styles

* showing custom in footer, removed unused code

* savaing custom theme colors
fixed typos

* changing theme

* updated custom theme buttons styling

* scaling custom theme buttons on hover

* not updating settings on theme event

* fixed quote id

* only showing custom themes when logged in

* updating save button text depending on auth state

* fixed double notification when trying to save too many custom themes

* fixed custom theme saving when signed out

* removed user check from db

* fixed exception when signed out user tried to open the custom themes command line

* ignoring file when compiling

* typo

* avoiding href errors

* setting href to an existing file
this fixes firefox custom themes not working

* better hex color regex

* spacing

* renamed function

* typo

* destructuring request

* removed unused function

* removed unused code

* removed unused code

* type fix

* removed non capturing group

* saving colors to config before saving custom theme

* encoding in base64

* added handler that can load themes in the old and new format from the url

Co-authored-by: Rizwan Mustafa <rizwanmustafa0000@gmail.com>
Co-authored-by: Rizwan Mustafa <69350358+rizwanmustafa@users.noreply.github.com>
2022-03-09 19:48:22 +01:00
Bruce Berrios 7fa2827a60
Final touches/tuning for ApeKeys (#2663)
* Final touches/tuning to ApeKeys

* Add rate limiting note

* Add malformed status
2022-03-09 19:40:35 +01:00
Bruce Berrios 2dba957adc
Add public api docs (#2656) by bruce
* Add public documentation

* typo

* added hard limit on the leaderboards

* ignoring worker when compiling

* added leaderboard routes

* leaderboards accept apekeys

* Fix docs

* Fix

* Specify parse base

* Add ape rate limiter

* added documentation link

* updated message

Co-authored-by: Miodec <bartnikjack@gmail.com>
2022-03-09 13:02:37 +01:00
Bruce Berrios 79a6cb86ed
Migrate presets to TS (#2662) by bruce 2022-03-09 12:51:20 +01:00
Bruce Berrios 9dfb352a40
Update ape keys data model (#2655) by bruce
* Update ape keys data model

* Add use count

* Add safer check
2022-03-08 00:41:04 +01:00
Bruce Berrios 61ebf2cc39
Add error handling for bad requests (#2654) by bruce
* Add error handling for bad requests

* Fix status code

* Update

* Tidy status codes
2022-03-07 22:16:42 +01:00
Bruce Berrios f4bfb938b2
Consolidate personal bests endpoints (#2653) 2022-03-07 11:25:12 -05:00
Bruce Berrios 3240abc22e
Enable strict null checks in backend (#2639)
* Enable strict null checks in backend

* Fix

* Use non-null assertion

* Add none
2022-03-07 11:10:07 -05:00
Miodec 0ff1d347a6 fixed ignore 2022-03-07 14:39:09 +01:00
Miodec 44c75552ad renamed 2022-03-07 14:37:53 +01:00
Miodec 88d1529706 added worker to ignore 2022-03-07 14:36:55 +01:00
Miodec 8af10af599 added enpoints for getting personal bests 2022-03-06 18:33:36 +01:00
Miodec 83c1e8adf5 added rate limiting for ape key endpoints 2022-03-06 18:33:20 +01:00
Miodec 08d7ded235 changed error code 2022-03-06 18:13:58 +01:00
Miodec 16a982e71e added decoded token types 2022-03-06 17:16:33 +01:00
Bruce Berrios 5ae8ff0759
Remove quote languages check (#2645) 2022-03-06 13:33:53 +01:00
Bruce Berrios 7d19f54828
Add last used on logic (#2643)
* Add last used on logic

* Remove lodash
2022-03-05 21:25:30 -05:00
Bruce Berrios 6645c2d4bd
Fix (#2641) 2022-03-06 02:09:06 +01:00
Bruce Berrios 5aa6fd7621
Remove mongo types (#2637) 2022-03-04 19:20:40 -06:00
Bruce Berrios f479e87c16
Remove artifact (#2636) 2022-03-04 19:10:46 -06:00
Bruce Berrios 1df8388e2d
Migrate utils pb to ts (#2631)
* Migrate utils pb to ts

* Fix

* Move to separate function
2022-03-04 23:24:10 +01:00
Bruce Berrios 3566992e45
Migrate some DAO to ts (#2633)
* Migrate some DAO to ts

* Oops

* Added constant name
2022-03-04 22:50:15 +01:00
Bruce Berrios 2f6a1eb586
Add summaries for api (#2630)
* Add summaries for api

* Add security definitions

* Add description
2022-03-04 11:50:45 -05:00
Bruce Berrios 7ef0c424d6
Migrate some utils to TS (#2625)
* Migrate some utils to TS

* Add argument type

* Fix logic

* Refactor math functions

* Rename function
2022-03-04 16:25:24 +01:00
Miodec b473606309 fixed responses 2022-03-04 16:03:28 +01:00
Miodec 9b34728629 using swagger spec 2022-03-04 15:57:52 +01:00
Miodec 615f284983 added ape keys, leaderboards, results, quotes 2022-03-04 15:49:31 +01:00
Miodec 8809f5957a added index, psas, configs, presets 2022-03-04 15:49:25 +01:00
Miodec c27caa68af missing message 2022-03-04 00:36:40 +01:00
Miodec d4b7ab90ca converted to ts 2022-03-04 00:29:06 +01:00
Miodec 5b0f170b10 converted to ts 2022-03-04 00:20:29 +01:00
Miodec 6370f6a624 moved is test too short check to validation 2022-03-04 00:10:49 +01:00
Miodec 9962edd020 added result types 2022-03-04 00:10:35 +01:00
Miodec 9de4019b80 reducing nesting 2022-03-04 00:09:31 +01:00
Miodec 16bb753601 reduced user db calls 2022-03-03 23:25:30 +01:00
Miodec 6752b6086a optimising promises, reduced await use 2022-03-03 23:24:19 +01:00
Bruce Berrios 374a2089c3
Rename handlers to utils (#2620) 2022-03-03 16:31:57 -05:00
Bruce Berrios 0429c560ee
Migrate users controller (#2618)
* Migrate users controller + other things

* Undo import rename

* Fix return type

* Change status code

* Fix spacing
2022-03-03 14:50:06 -05:00
Miodec 2d4df4edf3 using collation for name checking 2022-03-03 20:41:03 +01:00
Miodec 042d9dd9a2 actually fixed name check 2022-03-03 19:24:09 +01:00
Miodec 6f235a2479 fixed name checking regex 2022-03-03 19:06:23 +01:00
Miodec 70d0639fc7 added regex escaping function 2022-03-03 19:06:06 +01:00
Jack 226de70e36
Added monkey status codes (#2613)
* test code

* added some monkey status codes

* adding status message to response

* added more codes

* using all new codes
2022-03-02 02:14:32 +01:00
Bruce Berrios d792844473
Add ape key authentication (#2610)
* Add ape key authentication

* Move ape key config to server config

* Remove full stops

* Fix
2022-03-01 17:43:22 -05:00
Bruce Berrios 3017f8808d
Fix errors (#2609) 2022-03-01 17:21:06 +01:00
Bruce Berrios 2f70d1ab8a
Add ApeKeys CRUD (#2606)
* Add ApeKeys CRUD

* Fix

* Omit ape key data

* Encode id + key
2022-03-01 11:11:01 -05:00
Miodec 5adb03a360 updated result schema once more 2022-03-01 00:33:32 +01:00
Miodec 55f60d0788 updated result custom text schema 2022-03-01 00:30:27 +01:00
Miodec c448769401 temporary/initial solution to seeing response message in swagger stats 2022-02-28 22:58:28 +01:00
Miodec 258fd433b5 added user routes
part of #2605
2022-02-28 21:17:37 +01:00
Miodec 97d87554e4 increased apdex threshold 2022-02-28 20:24:06 +01:00
Miodec 6d58497422 added temporary route to notify users of outdated website 2022-02-28 20:14:20 +01:00
Jack c91dd52f88
Partial config save (#2604)
* saving key by key instead to support partial config

* using new savefullconfig funciton

* moved default config to its own file

* using full config update function

* merging potentially partial config from the db with default config

* added partial saving
moved default config to another file

* refactored with lodash

* removed unnecessary json parse

* changed parameter types
2022-02-28 19:53:55 +01:00
Miodec 2c05a1ccc1 added basic swagger spec
part of #2605
2022-02-28 19:53:07 +01:00
Bruce Berrios 999e8636e1
Remove pii (#2602)
* Remove JWT tokens and ip addresses from records

* Use save exact

* Fix

* Fix

* Rename

* Downgrade status code

* Check if dev

* Make server stats still accessible in maintenance

Co-authored-by: Jack <jack@monkeytype.com>
2022-02-28 15:13:59 +01:00
Miodec 053ca05d00 removed duplicate validation 2022-02-28 12:44:46 +01:00
Bruce Berrios 182d0b6b22
Add ape keys routing and configuration (#2599)
* Add ape keys routing and configuration

* Fix

* Add 404 route
2022-02-28 12:37:05 +01:00
Miodec d958b2b48a we good 2022-02-28 00:49:11 +01:00
Miodec b0c2e3e024 added prom client 2022-02-28 00:39:44 +01:00
Miodec e3840d63c9 PICNIC 2022-02-28 00:21:35 +01:00
Miodec 962eeeec45 back to testing 2022-02-28 00:14:07 +01:00
Miodec c71c8a3054 PICNIC 2022-02-28 00:10:46 +01:00
Miodec c3b517cf10 added stats package 2022-02-28 00:06:12 +01:00
Bruce Berrios bbc8c837df
Move quote moderation logic to quotes (#2590)
* Move quote moderation logic to quotes

* Add note

* Fix issue
2022-02-27 18:37:51 +01:00
Ferotiq 34ac755630
Add dynamic keymap legend style (#2592) by Ferotiq
* Add dynamic keymap legend style

* Speed

* make it work with all layouts

* Fix bug

* Update layout-emulator.js

* Update layout-emulator.js

* mac fix

* we didn't need layout state

* make quote show up

* remove some

* Rename

Co-authored-by: Miodec <bartnikjack@gmail.com>
2022-02-27 01:11:52 +01:00
Miodec 0390fa8319 converted to ts 2022-02-26 22:59:22 +01:00
Miodec 160f2b830f converted to ts 2022-02-26 22:54:16 +01:00
Bruce Berrios 6b1e9efe73
Fix quote ratings (#2586) by Bruception
* Fix quote ratings

* Reorder logic

* Update message

* Fix consistency
2022-02-25 19:22:44 +01:00
Bruce Berrios 4daf76e7d9
Migrate config client to ts (#2588) by Bruception 2022-02-25 19:20:38 +01:00
Bruce Berrios 8b23cdd7dc
Migrate some controller files (#2584)
* Migrate some controller files

* Rename variable
2022-02-24 13:14:33 +01:00
Bruce Berrios 7a1596d562
Migrate routes (#2582) 2022-02-23 22:44:49 -06:00
Bruce Berrios 8c5b88ef5d
Migrate files to ts (#2581) 2022-02-23 22:17:17 -06:00
Ferotiq 8620b45ea7
fix some backend errors (#2580) 2022-02-23 21:54:38 -06:00
Bruce Berrios 8dbf0966d1
Upgrade mongo library to 4.x.x (#2576) 2022-02-23 14:23:54 -05:00
Miodec efea8afab2 logging database name 2022-02-23 18:40:14 +01:00
Bruce Berrios 1ba7a76b86
Migrate middlewares to TypeScript (#2574)
* Migrate middlewares

* Update workflow

* Fix ignore

* Fix

* Fix

* Remove babel loader from root dependencies

* Remove mongoDb
2022-02-23 10:03:38 -05:00
Miodec c71baadc9b commented out worker file to avoid it producing errors and warnings 2022-02-23 13:24:53 +01:00
Miodec f00bc98db8 moved database down message to the top of the if stack 2022-02-23 13:07:18 +01:00
Miodec ad250d7f5c Merge branch 'master' of https://github.com/Miodec/monkeytype 2022-02-22 23:39:25 +01:00
Miodec 80f822c76a removed unnecessary types 2022-02-22 23:39:21 +01:00
Bruce Berrios 61f16584c9
Action anti cheat step (#2570)
* Add anti-cheat check

* Add anti-cheat step

* Test

* Revert

* .

* Fix
2022-02-22 23:02:37 +01:00
Miodec 91657fd53f reenabled helmet 2022-02-22 23:00:27 +01:00
Miodec e18da7da87 added log message
using implemented checking function
2022-02-22 22:58:00 +01:00
Miodec 8c3c6d004d added anticheat stub 2022-02-22 22:50:47 +01:00
Miodec 96323f2af5 new anticheat import 2022-02-22 22:41:01 +01:00
Miodec 9b7b0e257e disabled helmet middleware 2022-02-22 21:03:50 +01:00
Bruce Berrios f9d6f52c15
Api overhaul (#2555) by Bruception
* Feat:Update response structure (#2427)

* Fix:response and error structure

* update:response message

* update:response class

* update

* Update response message

Co-authored-by: Mustafiz Kaifee Mumtaz <mustafiz.mumtaz@freecharge.com>

* Add MonkeyToken foundation (#2487) by Bruception

* Api changes (#2492)

* API changes

* Remove unused import

* Add Ape client (#2513)

* Add all endpoints (#2514)

* Merged backend typescript into api overhaul (#2515)

* Install typescript and add backend tsconfig

Cannot yet build due to a number of compilation errors in JS code

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Fix typescript compilation errors

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Migrated backend to ES modules

Switched to import export syntax

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Add typescript declaration for anticheat

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Rename top level files to .ts

Fix service account json file typing

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Add dev build scripts for backend typescript

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Removed empty lines and switched to using db

Cleaned up imports by removing needless empty lines and migrated to the new db.js instead of mongodb.js.

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Fixed backend commonjs syntax to ES module syntax

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Add build to backend start script

Signed-off-by: Brian Evans <ebrian101@gmail.com>

* Migrate some endpoints to Ape

* Strict equals

* Remove artifact

* ape -> Ape

* Ape migration p2 (#2522)

* Migrate leaderboard endpoints to ape

* Fixed comment

* Init backend types

* Fail

* Return

* Migrate Quotes to Ape (#2528)

* Migrate quotes to Ape

* Fix backend response

* Fix issue

* Fix rate limit (#2533)

* fix rate limit

* Fix import

* Fix issues

* Ape migration p4 (#2547)

* Migrate results endpoints to ape

* Remove unused import

* Remove unused import

* Fix loaders

* Make function async

* Hide try saving results

* Migrate some users endpoints to Ape (#2548)

* Complete Ape Migration (#2553)

* Complete ape migration

* Fix preset

* Return preset data

* Add typings

* Move captcha reset

* Read from params

* Fix result tags endpoint

* Fix stuck loader

* fixed lb memory not saving

* fixed quote rating popup not showing up for new users

Co-authored-by: Mustafiz Kaifee <49086821+Mustafiz04@users.noreply.github.com>
Co-authored-by: Mustafiz Kaifee Mumtaz <mustafiz.mumtaz@freecharge.com>
Co-authored-by: Brian Evans <53117772+mrbrianevans@users.noreply.github.com>
Co-authored-by: Miodec <bartnikjack@gmail.com>
2022-02-22 20:55:48 +01:00
Miodec 6cf1f06d0d temporairly accepting both strings and numbers 2022-02-21 13:56:25 +01:00
Octahedron a0f911961f
added "show average" setting (#2551) by octahedronv2
* added "show average" setting

hopefully this doesn't break everything :)

* Delete config-schema.js

* Delete commandline-lists.ts

* Delete config.ts

* Delete db.ts

* Delete index.html

* Delete modes-notice.ts

* Delete settings.ts

* Delete types.d.ts

* added show average setting

* changed the capitalization of ONE character

* Rounded the wpm calculation when mode is PB or AVG

* Only display average if user is logged in

* Only display average if wpm > 0

and by extension, only when the user is logged in.

* changed look of average display

Co-authored-by: Jack <jack@monkeytype.com>
2022-02-21 02:49:33 +01:00