rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 3434b62674 into 077c7e08c8

Browse source
This commit is contained in:
Beatriz Rizental 2024-08-27 20:26:02 +00:00 • committed by GitHub
commit e7aa365481
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 452 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/css/popup.css
View file

@ -2395,3 +2395,18 @@ tr:hover > td > .trash-button {
.searchbar input { .searchbar input {
inline-size: 100%; inline-size: 100%;
} }
/* ----- Error ---------- */
#on-error {
margin-block: auto;
}
#on-error h2 {
font-weight: bold;
}
#on-error h2,
#on-error p {
text-align: center;
}

9
src/js/popup.js
View file

@ -74,12 +74,19 @@ const Logic = {
// Retrieve the list of identities. // Retrieve the list of identities.
const identitiesPromise = this.refreshIdentities(); const identitiesPromise = this.refreshIdentities();
const errorBlock = document.getElementById("on-error");
const successBlock = document.getElementById("on-success");
try { try {
await identitiesPromise; await identitiesPromise;
} catch (e) { } catch (e) {
throw new Error("Failed to retrieve the identities or variation. We cannot continue. ", e.message); errorBlock.style.display = "block";
successBlock.style.display = "none";
return;
} }
errorBlock.style.display = "none";
successBlock.style.display = "block";
// Routing to the correct panel. // Routing to the correct panel.
// If localStorage is disabled, we don't show the onboarding. // If localStorage is disabled, we don't show the onboarding.
const onboardingData = await browser.storage.local.get([ONBOARDING_STORAGE_KEY]); const onboardingData = await browser.storage.local.get([ONBOARDING_STORAGE_KEY]);

7
src/popup.html
View file

@ -6,6 +6,12 @@
<link rel="stylesheet" href="./css/popup.css"> <link rel="stylesheet" href="./css/popup.css">
</head> </head>
<body> <body>
<div id="on-error">
<h2 data-i18n-message-id="contextual-identities-error-title"></h2>
<p data-i18n-message-id="contextual-identities-error-description"></p>
</div>
<div id="on-success">
<div class="hide panel onboarding onboarding-panel-1"> <div class="hide panel onboarding onboarding-panel-1">
<img class="onboarding-img" alt="" src="/img/onboarding-1.png" /> <img class="onboarding-img" alt="" src="/img/onboarding-1.png" />
<h3 class="onboarding-title" data-i18n-message-id="onboarding-1-header"></h3> <h3 class="onboarding-title" data-i18n-message-id="onboarding-1-header"></h3>
@ -464,6 +470,7 @@
<button id="enable-proxy-permissions" class="primary-cta" data-tab-group="proxy-disabled" data-i18n-message-id="enable"></button> <button id="enable-proxy-permissions" class="primary-cta" data-tab-group="proxy-disabled" data-i18n-message-id="enable"></button>
</div> </div>
</div> </div>
</div>
<script src="js/utils.js"></script> <script src="js/utils.js"></script>
<script src="js/popup.js"></script> <script src="js/popup.js"></script>
<script src="js/mozillaVpn.js"></script> <script src="js/mozillaVpn.js"></script>