Skip to content

Commit 5129219

Browse files
committed
Moves internals into seperate folder
Resolves brave/brave-browser#4003
1 parent 25db8f9 commit 5129219

19 files changed

+26
-11
lines changed

browser/resources/resource_ids

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"includes": [38700],
6868
},
6969
# This file is generated during the build.
70+
"<(ROOT_GEN_DIR)/brave/web-ui-brave_rewards_internals/brave_rewards_internals.grd": {
71+
"includes": [38750],
72+
},
73+
# This file is generated during the build.
7074
"<(ROOT_GEN_DIR)/brave/web-ui-brave_tip/brave_tip.grd": {
7175
"includes": [38800],
7276
},

browser/ui/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ source_set("ui") {
241241

242242
deps += [
243243
"//brave/components/brave_rewards/resources:page_generated_resources",
244+
"//brave/components/brave_rewards/resources:internals_generated_resources",
244245
"//brave/components/brave_rewards/resources:tip_generated_resources",
245246
]
246247
}

browser/ui/webui/brave_rewards_internals_ui.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "content/public/browser/web_ui_message_handler.h"
2020

2121
#if !defined(OS_ANDROID)
22-
#include "brave/components/brave_rewards/resources/grit/brave_rewards_generated_map.h"
22+
#include "brave/components/brave_rewards/resources/grit/brave_rewards_internals_generated_map.h"
2323
#include "brave/components/brave_rewards/resources/grit/brave_rewards_resources.h"
2424
#else
2525
#include "components/brave_rewards/settings/resources/grit/brave_rewards_settings_generated_map.h"
@@ -148,8 +148,8 @@ BraveRewardsInternalsUI::BraveRewardsInternalsUI(content::WebUI* web_ui,
148148
: BasicUI(web_ui,
149149
name,
150150
#if !defined(OS_ANDROID)
151-
kBraveRewardsGenerated,
152-
kBraveRewardsGeneratedSize,
151+
kBraveRewardsInternalsGenerated,
152+
kBraveRewardsInternalsGeneratedSize,
153153
#else
154154
kBraveRewardsSettingsGenerated,
155155
kBraveRewardsSettingsGeneratedSize,

components/brave_rewards/resources/BUILD.gn

+11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ pack_web_resources("page_generated_resources") {
1313
]
1414
}
1515

16+
pack_web_resources("internals_generated_resources") {
17+
resource_name = "brave_rewards_internals"
18+
output_dir = "$root_gen_dir/brave/components/brave_rewards/resources"
19+
# need webpack and GRD generation first
20+
deps = [
21+
"internals"
22+
]
23+
}
24+
1625
pack_web_resources("tip_generated_resources") {
1726
resource_name = "brave_tip"
1827
output_dir = "$root_gen_dir/brave/components/brave_rewards/resources"
@@ -46,12 +55,14 @@ grit("static_resources") {
4655
repack("resources") {
4756
public_deps = [
4857
":page_generated_resources",
58+
":internals_generated_resources",
4959
":tip_generated_resources",
5060
":static_resources",
5161
]
5262

5363
sources = [
5464
"$root_gen_dir/brave/components/brave_rewards/resources/brave_rewards_page_generated.pak",
65+
"$root_gen_dir/brave/components/brave_rewards/resources/brave_rewards_internals_generated.pak",
5566
"$root_gen_dir/brave/components/brave_rewards/resources/brave_tip_generated.pak",
5667
"$root_gen_dir/brave/components/brave_rewards/resources/brave_rewards_static.pak",
5768
]

components/brave_rewards/resources/brave_rewards_static_resources.grd

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<include name="IDR_BRAVE_REWARDS_NICEWARE_LIST" file="../../../vendor/bat-native-ledger/niceware/wordlist" type="BINDATA" />
1818

1919
<!-- WebUI Brave Rewards Internals resources -->
20-
<include name="IDR_BRAVE_REWARDS_INTERNALS_HTML" file="page/internals/brave_rewards_internals.html" type="BINDATA" />
20+
<include name="IDR_BRAVE_REWARDS_INTERNALS_HTML" file="internals/brave_rewards_internals.html" type="BINDATA" />
2121

2222
<!-- WebUI tip resources -->
2323
<include name="IDR_BRAVE_TIP_BG_1" file="img/tip_bg_1.svg" type="BINDATA" />

components/brave_rewards/resources/page/internals/BUILD.gn renamed to components/brave_rewards/resources/internals/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ transpile_web_ui("internals") {
55
["brave_rewards_internals", rebase_path("brave_rewards_internals.tsx")]
66
]
77

8-
resource_name = "brave_rewards_page"
8+
resource_name = "brave_rewards_internals"
99
}

components/brave_rewards/resources/page/internals/components/app.tsx renamed to components/brave_rewards/resources/internals/components/app.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { KeyInfoSeed } from './keyInfoSeed'
1212
import { WalletPaymentId } from './walletPaymentId'
1313

1414
// Utils
15-
import { getLocale } from '../../../../../common/locale'
15+
import { getLocale } from '../../../../common/locale'
1616
import * as rewardsInternalsActions from '../actions/rewards_internals_actions'
1717

1818
interface Props {

components/brave_rewards/resources/page/internals/components/currentReconcile.tsx renamed to components/brave_rewards/resources/internals/components/currentReconcile.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import * as React from 'react'
66

77
// Utils
8-
import { getLocale } from '../../../../../common/locale'
8+
import { getLocale } from '../../../../common/locale'
99

1010
interface Props {
1111
currentReconcile: RewardsInternals.CurrentReconcile

components/brave_rewards/resources/page/internals/components/keyInfoSeed.tsx renamed to components/brave_rewards/resources/internals/components/keyInfoSeed.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import * as React from 'react'
66

77
// Utils
8-
import { getLocale } from '../../../../../common/locale'
8+
import { getLocale } from '../../../../common/locale'
99

1010
interface Props {
1111
isKeyInfoSeedValid: boolean

components/brave_rewards/resources/page/internals/storage.ts renamed to components/brave_rewards/resources/internals/storage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
import { debounce } from '../../../../common/debounce'
5+
import { debounce } from '../../../common/debounce'
66

77
const keyName = 'rewards-internals-data'
88

components/brave_rewards/resources/page/BUILD.gn

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import("//brave/components/common/typescript.gni")
33
transpile_web_ui("page") {
44
# what is the output bundle called and what is the entry point file
55
entry_points = [
6-
["brave_rewards_page", rebase_path("brave_rewards_page.tsx")],
7-
["brave_rewards_internals", rebase_path("internals/brave_rewards_internals.tsx")]
6+
["brave_rewards_page", rebase_path("brave_rewards_page.tsx")]
87
]
98

109
# what is the directory / pack name

0 commit comments

Comments
 (0)