Commit Graph

628 Commits

Author SHA1 Message Date
Mcat12
72e5240a2a Assert PUBLIC_URL is not null in getBasePath
An updated type definition for `process.env` added the possibility for
environment variables to be undefined.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2020-04-20 08:32:27 +03:00
XhmikosR
e8d6fe99c2 Format code
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-04-12 09:39:28 +03:00
XhmikosR
995509c346 Update prettier to v2.0.2 (#621)
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-03-26 18:39:24 +02:00
Mark Drobnak
e33fc0b618 Simplify and fix development-only redux middleware (#627)
Fixes build error introduced by #623 by indirectly instead of directly
relying on the development-only middleware.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2020-03-25 18:37:38 +02:00
XhmikosR
91bdd37ab7 Fix potentially inconsistent state update (#584)
Since `this.state` can be asynchronously updated, use the callback form

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-02-29 12:41:52 -08:00
XhmikosR
f11c22b239 store.tsx: fix return concat value
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-02-29 19:20:29 +02:00
XhmikosR
537098175d Switch to btn-block
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-28 14:18:33 +02:00
XhmikosR
11ea63e656 Remove unused SCSS and use Bootstrap's classes more
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-25 14:30:06 +02:00
XhmikosR
b18199ed3e Remove the individual sass scripts.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-31 09:53:09 +02:00
Mcat12
ab88140fdd Update i18next and fix import errors
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-12-18 16:18:56 +02:00
XhmikosR
6e7c2527f0 Remove unused dependencies.
* bootstrap is a dependency of @coreui/coreui
* @coreui/icons, @coreui/react, ionicons and simple-line-icons are unused

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-18 16:18:55 +02:00
XhmikosR
5df57c6dae Switch to @reduxjs/toolkit since redux-starter-kit has been renamed
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-18 16:18:55 +02:00
DL6ER
90ec438b55 Merge pull request #442 from pi-hole/new/cacheinfo
Add Settings -> Networking -> Cache tab.
2019-12-17 21:35:33 +01:00
DL6ER
4ef82bdbb6 Add API test for api.getCacheInfo()
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-06 11:26:54 +00:00
DL6ER
8ef87831eb Add fake API data for new settings tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-06 11:18:34 +00:00
DL6ER
a5a60ce82b Adjust tests and fake-data
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-06 08:35:44 +00:00
DL6ER
0b72291e0a Use new field "sum_queries" for displaying the total queries number on the dashboard. This avoids to necessity to sum all individual query types. Furthermore (and more important), it greatly simplifies the database queries as we do not need to count the different query types indicidually.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-06 08:28:30 +00:00
DL6ER
01915d3aa3 Add Settings -> Networking -> Cache tab.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-05 14:47:59 +00:00
Adam Warner
2210192097 Merge pull request #429 from XhmikosR/css-tweaks
Minor SCSS consistency tweaks
2019-11-27 19:47:32 +00:00
XhmikosR
a518a69d5d Minor SCSS consistency tweaks
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-27 17:00:58 +02:00
XhmikosR
31e9acb7a2 Use Bootstrap's classes when possible.
This reduces the custom CSS and style elements.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-27 16:32:15 +02:00
Adam Warner
7da13208fd Merge pull request #427 from XhmikosR/compress-logo
Compress logo.svg with the latest SVGO v1.3.2.
2019-11-26 22:02:43 +00:00
Adam Warner
86654143fb Merge pull request #426 from XhmikosR/patch-1
Make `.navbar-toggler` white
2019-11-26 22:01:55 +00:00
XhmikosR
8cae687126 Compress logo.svg with the latest SVGO v1.3.2.
Also, remove the unused IDs.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-26 17:13:31 +02:00
XhmikosR
bc59e18c47 Make .navbar-toggler white
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-26 17:10:59 +02:00
DL6ER
fa549697bb Query Types are now zero-based in FTL. This removes the extra offset of 1 everywhere.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-26 11:48:13 +01: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
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
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
045014ba6f apply @mcat12's suggestion. I agree, it is cleaner to read!
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 21:43:20 +00:00
Adam Warner
c644bb9c1b format to prettier's liking.
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 21:29:59 +00:00
Adam Warner
2908c9edf0 test for existence of REACT_APP_CUSTOM_API_URL, use that if it exists, else fallback to PUBLIC_URL
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 21:10:39 +00:00
DL6ER
928ef6ebed Add support for whitelist regex + use updated FTL paths for the lists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-16 10:45:20 +01:00
Mark Drobnak
ed62356ac2 Merge branch 'development' into friendly_language_two 2019-10-09 14:21:13 -04:00
Mcat12
9ab5c7c54f Include a single entry in languages.json while testing
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-10-09 14:17:43 -04:00
Mcat12
948c31cf4f Fix language typing in PreferenceSettings
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-10-09 14:14:13 -04:00
Mark Drobnak
0d69bcc9e8 Merge branch 'development' into bugfix/paypal-target 2019-09-12 21:22:38 -04:00
Eric Stout
fa2898a544 Fix remaining toBe
Signed-off-by: Eric Stout <ericwstout@gmail.com>
2019-09-11 22:11:13 -05:00
Eric Stout
4b7bc43f79 Address feedback from #384
Signed-off-by: Eric Stout <ericwstout@gmail.com>
2019-09-08 20:30:22 -05:00
Eric Stout
3490692f42 Address feedback from #383
Signed-off-by: Eric Stout <ericwstout@gmail.com>
2019-09-08 20:27:08 -05:00
Eric Stout
96febff5ae Update tests and create new FooterDonateLink component
Signed-off-by: Eric Stout <ericwstout@gmail.com>
2019-09-04 22:30:29 -05:00
Eric Stout
3485679a4e Fix typo in paypal link, update tests
Signed-off-by: Eric Stout <ericwstout@gmail.com>
2019-09-04 22:17:54 -05:00