Commit Graph
1487 Commits
Author SHA1 Message Date
Mcat12 3e77fa827d Simplify nextID in LiveLog
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-12-17 16:12:58 -05:00
Mcat12 f5f2503f1a Add Dnsmasq log to fake API
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-12-17 16:08:17 -05:00
Mcat12 dfb1affb50 Improve state usage in LiveLog and move BlinkingCursor to its own file
One side effect is a fixed gerDerivedStateFromProps implementation, as
it previously mixed up state and props.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-12-17 16:07:58 -05:00
Mcat12 f5bbe9dafc Add return type to getTimeFromTimestamp
The test change is due to Prettier.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-12-17 15:35:17 -05:00
DL6ER e32440f84e Change separator.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-04 18:45:34 +00:00
DL6ER 0e9d69fb65 Hard-code "en-US" locale as we want to show the same format for everyone.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-04 18:43:18 +00:00
DL6ER ff3c5b2666 Reset nextId whenever component did mount. This ensures we always get all the messages FTL buffers when the window is empty.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-03 22:38:19 +00:00
DL6ER 271b13414c Add blinking cursor to show user that more output is to be expected.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-03 14:58:22 +00:00
DL6ER 4cf2705711 Only scroll when we add new data (and the checkbox is checked, obviously)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-03 13:17:08 +00:00
Adam Warner fa1e72bf95 experimient. Fully expecting Circle to fail thisSigned-off-by: Adam Warner <me@adamwarner.co.uk> 2019-12-01 14:36:05 +00:00
Adam Warner d63abe857a Some adjustments to time output
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-01 14:12:27 +00:00
Adam Warner 99b9e3e8a8 immediately scroll to bottom when enabling scrolling
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 11:38:59 +00:00
Adam Warner 5003240b04 Fix some things
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-28 20:17:34 +00:00
Adam Warner 80a5958146 Add filter as an example of filtering data. Could be expanded to filter for custom data (such as client IP)
TODO: Layout

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-27 23:41:12 +00:00
Adam Warner e82d9d502d Add scrolling toggle, and translation for the toggle
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-27 23:28:33 +00:00
Adam Warner be9dde2cb8 Scroll the log in the correct direction!
Add a unique number to each item in the ouput

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-27 19:59:20 +00:00
Adam Warner 50ebc0453b change from *.json to public/i18n/*
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-26 22:07:48 +00:00
Adam Warner 6be696eced revert change indentation in location.json, add a prettierignore and prettierrc file to root for ensuring code standards are applied across all environments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-26 20:15:16 +00:00
Adam Warner e972d56e7c let -> const
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-26 20:09:35 +00:00
Adam Warner 9325eab9a7 apply @mcat12s patch, add some fixes to it 😉
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-25 22:51:04 +00:00
Adam Warner 214ca4d97a Additonal fixes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-25 22:39:05 +00:00
Adam Warner b9709a0a91 rename humanTimestamp to getTimeFromTimestamp and add a test
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-25 20:39:09 +00:00
Adam Warner fa90f905e9 Add a test for the live log API call
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-25 20:07:43 +00:00
Adam Warner ac06be1801 lower case t in route for tools
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-25 19:54:58 +00:00
Adam Warner 255d228c19 rename helpers -> dateUtils and add header
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-25 19:53:47 +00:00
Adam Warner 43532a04d0 Address @mcat12's comments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 23:01:40 +00:00
Adam Warner 2be177c3c0 Note to self: don't just copy-paste headers
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:29 +00:00
Adam Warner fd1bb7fcbc Add react-scroll. Apply to log view
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:29 +00:00
Adam Warner fb49acf841 no need for separate view, just route to the component
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:29 +00:00
Adam Warner a3f2d753e5 Build up a list of log entries, as opposed to replacing them on screen.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:28 +00:00
Adam Warner 5fa1473ef5 prettier complaints
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:28 +00:00
Adam Warner db711a816f Add a component for the LiveLog Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:28 +00:00
Adam Warner 9194cd88e4 new interface for dnsmasq log on APISigned-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-24 22:26:28 +00:00
Mark Drobnak b6b1750c27 Merge pull request #421 from pi-hole/new/whitelist_regex_support
Review comments missed in #413
2019-11-18 23:00:21 -05:00
DL6ER 54034c186c Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-18 20:58:10 +01:00
Adam Warner 3c67b46a9f Merge pull request #420 from pi-hole/new/polyfills
IE11/Edge support
2019-11-17 21:02:44 +00:00
Adam Warner a75e1a6b8c Merge pull request #413 from pi-hole/new/whitelist_regex_support
Add support for whitelist regex + use updated FTL paths for the lists
2019-11-17 19:14:23 +00:00
Mcat12 a5388a123c Don't explicitly require core-js in package.json
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-11-17 13:57:19 -05:00
Adam Warner e2074cb1f2 Adds polyfills for IE11/Edge
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-17 18:14:20 +00:00
DL6ER 9d395104bf Merge branch 'development-FTL' into new/whitelist_regex_support
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-17 10:39:31 +01:00
DL6ER 11f74387c1 Merge pull request #419 from pi-hole/tweak/sidebar
Hide black/whitelist menu items from unauthenticated users
2019-11-17 10:37:16 +01:00
Mark Drobnak e7face8932 Merge pull request #418 from pi-hole/tweak/versions
Remove "API" version box
2019-11-16 21:41:07 -05:00
Dan Schaper 7c06ef6575 Fixes https://github.com/pi-hole/web/pull/418#issuecomment-554695826
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-11-16 18:37:07 -08:00
Dan Schaper 7410e09a1f Fixes https://github.com/pi-hole/web/pull/418#pullrequestreview-317996299
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-11-16 17:55:01 -08:00
Adam Warner ed6b5fbe81 update tests to reflect name changes in endpoints/functionsSigned-off-by: Adam Warner <me@adamwarner.co.uk> 2019-11-17 01:00:20 +00:00
Adam Warner 6a69c63a93 Make it how prettier likes it.
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-17 00:29:59 +00:00
Adam Warner b829a2bfae Don't show whitelist and blacklist menu items to an unauthenticated user
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-17 00:23:26 +00:00
Adam Warner 45c5444ecc Only need 3 version boxes
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-17 00:07:06 +00:00
Adam Warner 0324ff6efa Merge pull request #417 from pi-hole/development
Development
2019-11-16 23:52:52 +00:00
Adam Warner 504ebc1f07 Merge pull request #416 from pi-hole/new/URLOverride
Allow for custom API URL during development
2019-11-16 23:52:09 +00:00