mirror of
https://github.com/arsvendg/Stirling-PDF.git
synced 2026-09-13 04:08:22 +02:00
Prettier 2: Electric Boogaloo (#6113)
# Description of Changes When I added Prettier formatting in #6052, my aim was to use just the default settings in Prettier. Turns out, Prettier looks _really hard_ for any config files if it's not explicitly given one, which means that if a developer has some sort of Prettier config file lying around on their system, Prettier might find it and use it. Also, Prettier changes its defaults based on stuff in `.editorconfig` without any good way of disabling that behaviour explicitly in its config file. To solve both of these issues, I've introduced a `.prettierrc` file which sets Prettier's defaults explicitly, and then reformatted all our code _again_ in Prettier's actual default settings. This should achieve the aim of #6052 and remove the possibility for it breaking on different dev computers.
This commit is contained in:
@@ -40,12 +40,16 @@ export const SaaSLoginScreen: React.FC<SaaSLoginScreenProps> = ({
|
||||
const handleEmailPasswordSubmit = async () => {
|
||||
// Validation
|
||||
if (!email.trim()) {
|
||||
setValidationError(t("setup.login.error.emptyEmail", "Please enter your email"));
|
||||
setValidationError(
|
||||
t("setup.login.error.emptyEmail", "Please enter your email"),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!password) {
|
||||
setValidationError(t("setup.login.error.emptyPassword", "Please enter your password"));
|
||||
setValidationError(
|
||||
t("setup.login.error.emptyPassword", "Please enter your password"),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -61,7 +65,10 @@ export const SaaSLoginScreen: React.FC<SaaSLoginScreenProps> = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<LoginHeader title={t("setup.saas.title", "Sign in to Stirling Cloud")} onClose={onClose} />
|
||||
<LoginHeader
|
||||
title={t("setup.saas.title", "Sign in to Stirling Cloud")}
|
||||
onClose={onClose}
|
||||
/>
|
||||
|
||||
<ErrorMessage error={displayError} />
|
||||
|
||||
@@ -96,7 +103,10 @@ export const SaaSLoginScreen: React.FC<SaaSLoginScreenProps> = ({
|
||||
submitButtonText={t("setup.login.submit", "Login")}
|
||||
/>
|
||||
|
||||
<div className="navigation-link-container" style={{ marginTop: "0.5rem", textAlign: "right" }}>
|
||||
<div
|
||||
className="navigation-link-container"
|
||||
style={{ marginTop: "0.5rem", textAlign: "right" }}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
@@ -113,8 +123,16 @@ export const SaaSLoginScreen: React.FC<SaaSLoginScreenProps> = ({
|
||||
<SelfHostedLink onClick={onSelfHostedClick} disabled={loading} />
|
||||
|
||||
{onSkipSignIn && (
|
||||
<div className="navigation-link-container" style={{ marginTop: "0.5rem", textAlign: "center" }}>
|
||||
<button type="button" onClick={onSkipSignIn} className="navigation-link-button" disabled={loading}>
|
||||
<div
|
||||
className="navigation-link-container"
|
||||
style={{ marginTop: "0.5rem", textAlign: "center" }}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onSkipSignIn}
|
||||
className="navigation-link-button"
|
||||
disabled={loading}
|
||||
>
|
||||
{t("setup.login.skipSignIn", "Continue without signing in")}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user