Skip to content

Commit 48e9e74

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/types/node-22.13.10
2 parents a0f6d3c + 9f2be07 commit 48e9e74

File tree

58 files changed

+2158
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2158
-559
lines changed

esbuild.cronjobs.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ import { build } from "esbuild";
1414
// own issues in Next.js. Thus, esbuild is a compromise that can resolve these
1515
// import specifiers for us.
1616
build({
17-
entryPoints: ["./src/scripts/cronjobs/**/*.tsx", "./src/scripts/cronjobs/**/*.ts"],
17+
entryPoints: [
18+
"./src/scripts/cronjobs/**/*.tsx",
19+
"./src/scripts/cronjobs/**/*.ts",
20+
],
1821
tsconfig: "tsconfig.cronjobs.json",
1922
bundle: true,
2023
platform: "node",

locales-pending/settings-premium.ftl

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ settings-cancel-plus-title = Cancel { -brand-monitor-plus } subscription
88
settings-cancel-plus-details = Your subscription will revert to a free account after the current billing cycle ends. Your data broker scan results will be permanently deleted, and you may be re-added to those sites.
99
settings-cancel-plus-link-label = Cancel from your { -brand-mozilla-account }
1010
11+
## Sidebar navigation
12+
13+
# Label for a navigation bar link to settings for updating the users scan profile info – “update” is used as a verb.
14+
settings-tab-label-update-scan-info = Update scan info
15+
1116
## Cancel Plus subscription - flow with a cancellation survey
1217

1318
settings-cancel-plus-survey-button-label = Cancel your subscription

package-lock.json

+160-171
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+8-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"dev:cron:monthly-activity-free": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/monthlyActivityFree.tsx",
1414
"dev:cron:monthly-activity-plus": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/monthlyActivityPlus.tsx",
1515
"dev:cron:breach-alerts": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/emailBreachAlerts.tsx",
16-
"dev:task:breach-alerts": "LOOP='true' tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/emailBreachAlerts.tsx",
1716
"dev:cron:db-delete-unverified-subscribers": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/deleteUnverifiedSubscribers.ts",
1817
"dev:cron:db-pull-breaches": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/syncBreaches.ts",
1918
"dev:cron:db-pull-data-brokers": "tsx --tsconfig tsconfig.cronjobs.json src/scripts/cronjobs/syncOnerepDataBrokers.ts",
@@ -35,7 +34,6 @@
3534
"cron:monthly-activity-free": "node dist/scripts/cronjobs/monthlyActivityFree.js",
3635
"cron:monthly-activity-plus": "node dist/scripts/cronjobs/monthlyActivityPlus.js",
3736
"cron:breach-alerts": "node dist/scripts/cronjobs/emailBreachAlerts.js",
38-
"task:breach-alerts": "LOOP='true' node dist/scripts/cronjobs/emailBreachAlerts.js",
3937
"cron:db-delete-unverified-subscribers": "node dist/scripts/cronjobs/deleteUnverifiedSubscribers.js",
4038
"cron:db-pull-breaches": "node dist/scripts/cronjobs/syncBreaches.js",
4139
"cron:db-pull-data-brokers": "node dist/scripts/cronjobs/syncOnerepDataBrokers.js",
@@ -120,15 +118,15 @@
120118
},
121119
"devDependencies": {
122120
"@faker-js/faker": "^9.5.0",
123-
"@google-cloud/bigquery": "^7.9.1",
121+
"@google-cloud/bigquery": "^7.9.2",
124122
"@playwright/test": "^1.50.1",
125-
"@storybook/addon-a11y": "^8.5.8",
126-
"@storybook/addon-actions": "^8.5.8",
127-
"@storybook/addon-essentials": "^8.5.8",
128-
"@storybook/addon-interactions": "^8.5.8",
129-
"@storybook/addon-links": "^8.5.8",
130-
"@storybook/nextjs": "^8.5.8",
131-
"@storybook/react": "^8.5.8",
123+
"@storybook/addon-a11y": "^8.6.4",
124+
"@storybook/addon-actions": "^8.6.4",
125+
"@storybook/addon-essentials": "^8.6.4",
126+
"@storybook/addon-interactions": "^8.6.4",
127+
"@storybook/addon-links": "^8.6.4",
128+
"@storybook/nextjs": "^8.6.4",
129+
"@storybook/react": "^8.6.4",
132130
"@storybook/test": "^8.5.2",
133131
"@testing-library/jest-dom": "^6.6.3",
134132
"@testing-library/react": "^16.2.0",
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,34 @@
11
@use "../../../../../tokens";
22

33
.wrapper {
4+
background-color: tokens.$color-grey-05;
45
display: flex;
56
flex-direction: column;
6-
gap: tokens.$spacing-2xl;
7-
background-color: tokens.$color-grey-05;
8-
height: 100%;
7+
gap: tokens.$layout-md;
8+
min-height: 100%;
99
padding: tokens.$layout-lg tokens.$layout-2xl;
1010

1111
@media screen and (max-width: tokens.$screen-lg) {
1212
padding: tokens.$spacing-lg;
1313
}
14+
15+
section {
16+
display: flex;
17+
flex-direction: column;
18+
gap: tokens.$spacing-lg;
19+
}
20+
21+
table {
22+
border-collapse: collapse;
23+
font: tokens.$text-body-sm;
24+
25+
th,
26+
td {
27+
border: 1px solid tokens.$color-grey-60;
28+
padding: tokens.$spacing-xs tokens.$spacing-sm;
29+
text-align: left;
30+
}
31+
}
1432
}
1533

1634
.header {
@@ -25,15 +43,14 @@
2543
.form {
2644
display: flex;
2745
flex-direction: column;
28-
gap: tokens.$spacing-2xl;
46+
gap: tokens.$spacing-lg;
2947

3048
.userPicker {
3149
flex: 1 0 auto;
3250
align-items: center;
3351
display: flex;
3452
flex-wrap: wrap;
35-
gap: tokens.$spacing-2xl;
36-
min-height: tokens.$layout-2xl;
53+
gap: tokens.$spacing-lg;
3754

3855
label {
3956
display: flex;
@@ -47,16 +64,12 @@
4764
font: tokens.$text-body-md;
4865
}
4966
}
67+
}
5068

51-
.actions {
52-
display: flex;
53-
flex-wrap: wrap;
54-
gap: tokens.$spacing-xl;
55-
56-
button {
57-
flex: 1 1 25%;
58-
}
59-
}
69+
.actions {
70+
display: flex;
71+
flex-wrap: wrap;
72+
gap: tokens.$spacing-sm;
6073
}
6174

6275
.status {
@@ -66,3 +79,15 @@
6679
padding: tokens.$spacing-md tokens.$spacing-lg;
6780
font: tokens.$text-body-md;
6881
}
82+
83+
.content {
84+
display: flex;
85+
gap: tokens.$spacing-lg;
86+
}
87+
88+
.editInputs {
89+
display: grid;
90+
font: tokens.$text-body-sm;
91+
gap: tokens.$spacing-md;
92+
grid-template-columns: repeat(2, 1fr);
93+
}

0 commit comments

Comments
 (0)