Skip to content

style: fix indentation in view files #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 2 commits into from
May 30, 2022
Merged

style: fix indentation in view files #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac91663
chore: update editorconfig
kenjis May 29, 2022
8e3affb
style: replace tabs with spaces in Views
kenjis May 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
[*.yml]
indent_size = 2
40 changes: 20 additions & 20 deletions src/Views/email_2fa_verify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@
<?= $this->section('main') ?>

<div class="container d-flex justify-content-center p-5">
<div class="card col-5 shadow-sm">
<div class="card-body">
<h5 class="card-title mb-5"><?= lang('Auth.emailEnterCode') ?></h5>
<div class="card col-5 shadow-sm">
<div class="card-body">
<h5 class="card-title mb-5"><?= lang('Auth.emailEnterCode') ?></h5>

<p><?= lang('Auth.emailConfirmCode') ?></p>
<p><?= lang('Auth.emailConfirmCode') ?></p>

<?php if (session('error') !== null) : ?>
<div class="alert alert-danger"><?= session('error') ?></div>
<?php endif ?>
<?php if (session('error') !== null) : ?>
<div class="alert alert-danger"><?= session('error') ?></div>
<?php endif ?>

<form action="<?= site_url(route_to('auth-action-verify')) ?>" method="post">
<?= csrf_field() ?>
<form action="<?= site_url(route_to('auth-action-verify')) ?>" method="post">
<?= csrf_field() ?>

<!-- Code -->
<div class="mb-2">
<input type="number" class="form-control" name="token" placeholder="000000"
inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" required />
</div>
<!-- Code -->
<div class="mb-2">
<input type="number" class="form-control" name="token" placeholder="000000"
inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" required />
</div>

<div class="d-grid col-8 mx-auto m-3">
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.confirm') ?></button>
</div>
<div class="d-grid col-8 mx-auto m-3">
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.confirm') ?></button>
</div>

</form>
</div>
</div>
</form>
</div>
</div>
</div>

<?= $this->endSection() ?>
84 changes: 42 additions & 42 deletions src/Views/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@

<?= $this->section('main') ?>

<div class="container d-flex justify-content-center p-5">
<div class="card col-5 shadow-sm">
<div class="card-body">
<h5 class="card-title mb-5"><?= lang('Auth.login') ?></h5>
<div class="container d-flex justify-content-center p-5">
<div class="card col-5 shadow-sm">
<div class="card-body">
<h5 class="card-title mb-5"><?= lang('Auth.login') ?></h5>

<?php if (session('error') !== null) : ?>
<div class="alert alert-danger" role="alert"><?= session('error') ?></div>
<?php endif ?>
<?php if (session('error') !== null) : ?>
<div class="alert alert-danger" role="alert"><?= session('error') ?></div>
<?php endif ?>

<form action="<?= route_to('login') ?>" method="post">
<?= csrf_field() ?>
<form action="<?= route_to('login') ?>" method="post">
<?= csrf_field() ?>

<!-- Email -->
<div class="mb-2">
<input type="email" class="form-control" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
</div>
<!-- Email -->
<div class="mb-2">
<input type="email" class="form-control" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
</div>

<!-- Password -->
<div class="mb-2">
<input type="password" class="form-control" name="password" inputmode="text" autocomplete="current-password" placeholder="<?= lang('Auth.password') ?>" required />
</div>
<!-- Password -->
<div class="mb-2">
<input type="password" class="form-control" name="password" inputmode="text" autocomplete="current-password" placeholder="<?= lang('Auth.password') ?>" required />
</div>

<!-- Remember me -->
<?php if (setting('Auth.sessionConfig')['allowRemembering']): ?>
<div class="form-check">
<label class="form-check-label">
<input type="checkbox" name="remember" class="form-check-input" <?php if (old('remember')): ?> checked<?php endif ?>>
<?= lang('Auth.rememberMe') ?>
</label>
</div>
<?php endif; ?>

<div class="d-grid col-8 mx-auto m-3">
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.login') ?></button>
</div>

<?php if (setting('Auth.allowMagicLinkLogins')) : ?>
<p class="text-center"><?= lang('Auth.forgotPassword') ?> <a href="<?= route_to('magic-link') ?>"><?= lang('Auth.useMagicLink') ?></a></p>
<?php endif ?>

<?php if (setting('Auth.allowRegistration')) : ?>
<p class="text-center"><?= lang('Auth.needAccount') ?> <a href="<?= route_to('register') ?>"><?= lang('Auth.register') ?></a></p>
<?php endif ?>

</form>
</div>
</div>
</div>
<?php if (setting('Auth.sessionConfig')['allowRemembering']): ?>
<div class="form-check">
<label class="form-check-label">
<input type="checkbox" name="remember" class="form-check-input" <?php if (old('remember')): ?> checked<?php endif ?>>
<?= lang('Auth.rememberMe') ?>
</label>
</div>
<?php endif; ?>

<div class="d-grid col-8 mx-auto m-3">
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.login') ?></button>
</div>

<?php if (setting('Auth.allowMagicLinkLogins')) : ?>
<p class="text-center"><?= lang('Auth.forgotPassword') ?> <a href="<?= route_to('magic-link') ?>"><?= lang('Auth.useMagicLink') ?></a></p>
<?php endif ?>

<?php if (setting('Auth.allowRegistration')) : ?>
<p class="text-center"><?= lang('Auth.needAccount') ?> <a href="<?= route_to('register') ?>"><?= lang('Auth.register') ?></a></p>
<?php endif ?>

</form>
</div>
</div>
</div>

<?= $this->endSection() ?>