esoko/rvr-nextgen
esoko/rvr-nextgen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

feature/RVRNEXT-6-transactions #36

Merged
bence merged 8 commits from feature/RVRNEXT-6-transactions into master 2023-05-01 19:28:28 +02:00
Conversation 0 Commits 8 Files Changed 23 +75 -19
13 changed files with 75 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ed01df331 - Show all commits

52
public/static/css/rvr.css
View File

@ -31,6 +31,10 @@ main {
color: #ffffff;
}
::placeholder, select > option[value=""] {
color: #8e8e8e;
}
p, h1, h2, h3, input, textarea, select, button, a, table, label {
font-family: 'Oxygen', sans-serif;
}
@ -150,6 +154,12 @@ a:hover, a:focus {
text-decoration: underline;
}
a.block {
color: initial;
font-weight: initial;
text-decoration: initial;
}
button, a.button {
cursor: pointer;
font-size: 16px;
@ -421,7 +431,6 @@ div.buttonContainer>button {
}
div.box {
width: 576px;
background-color: #eeeef4;
border-radius: 3px;
margin: 10px auto;
@ -429,6 +438,15 @@ div.box {
box-sizing: border-box;
}
div.compactBox {
width: 576px;
}
div.transaction {
display: grid;
grid-template-columns: auto auto;
}
div.gridContainer {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
@ -451,7 +469,7 @@ table.fullWidth {
}
table th {
font-weight: bold;
font-weight: 700;
}
table th, table td {
@ -467,6 +485,34 @@ table th:not(:last-child), table td:not(:last-child) {
padding-right: 3px;
}
p.paginateContainer {
font-size: 0;
}
p.paginateContainer > * {
font-size: initial;
background-color: #5e77aa;
border: solid #5e77aa 1px;
color: #ffffff;
font-weight: 700;
padding: 3px 6px;
text-align: center;
display: inline-block;
height: 25px;
line-height: 25px;
width: 25px;
}
p.paginateContainer > a:hover, p.paginateContainer > .selected {
background-color: #3b5998;
border: solid #29457f 1px;
text-decoration: none;
}
p.paginateContainer > *:not(:last-child) {
border-right: solid #869ab9 1px;
}
.choices__inner {
box-sizing: border-box;
}
@ -501,7 +547,7 @@ table th:not(:last-child), table td:not(:last-child) {
padding-left: 15px;
padding-right: 15px;
}
div.box {
div.compactBox {
width: initial;
}
}

2
views/account/account.php
View File

@ -4,7 +4,7 @@
@section(main)
<h2>Account</h2>
<div class="box">
<div class="box compactBox">
<form id="accountForm" action="<?= Container::$routeCollection->getRoute('account-action')->generateLink() ?>" method="post" data-reload-on-success="true" data-observe-inputs="email,username,password_new,password_new_confirm,nickname,phone,id_number">
<?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
<p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>

2
views/account/google_authenticate.php
View File

@ -5,7 +5,7 @@
@section(main)
<h2>Authenticate with Google</h2>
<?php if (!$success): ?>
<div class="box">
<div class="box compactBox">
<p class="error justify">
<?php if (isset($errorText)): ?>
<?= $errorText ?>

7
views/communities/community_currencies.php
View File

@ -1,8 +1,11 @@
@extends(templates/layout_normal)
@section(main)
<h2><a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> - Edit currencies</h2>
<div class="box">
<h2>
<a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
Edit currencies
</h2>
<div class="box compactBox">
<table class="fullWidth">
<thead>
<tr>

5
views/communities/community_edit.php
View File

@ -3,12 +3,13 @@
@section(main)
<h2>
<?php if (isset($community)): ?>
<a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> - Edit
<a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
Edit
<?php else: ?>
New community
<?php endif; ?>
</h2>
<div class="box">
<div class="box compactBox">
<?php
$formAction = isset($community) ?
Container::$routeCollection->getRoute('community-edit-action')->generateLink(['communityId' => $community->getId()]) :

7
views/communities/community_members.php
View File

@ -5,8 +5,11 @@
@extends(templates/layout_normal)
@section(main)
<h2><a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> - Edit members</h2>
<div class="box">
<h2>
<a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
Edit members
</h2>
<div class="box compactBox">
<table class="fullWidth">
<thead>
<tr>

7
views/communities/currency_exchange_rates.php
View File

@ -1,8 +1,11 @@
@extends(templates/layout_normal)
@section(main)
<h2><a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> - Exchange rates for <?= $currency->getCode() ?></h2>
<div class="box">
<h2>
<a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
Exchange rates for <?= $currency->getCode() ?>
</h2>
<div class="box compactBox">
<table class="fullWidth">
<thead>
<tr>

2
views/login/google_login_error.php
View File

@ -2,7 +2,7 @@
@section(main)
<h2>Login up with Google</h2>
<div class="box">
<div class="box compactBox">
<p class="error justify"><?= $error ?></p>
</div>
@endsection

2
views/login/login.php
View File

@ -2,7 +2,7 @@
@section(main)
<h2>Login</h2>
<div class="box">
<div class="box compactBox">
<form id="loginForm" action="<?= Container::$routeCollection->getRoute('login-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
<input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" required autofocus>
<input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">

2
views/login/password_reset_request.php
View File

@ -4,7 +4,7 @@
@section(main)
<h2>Request password reset</h2>
<div class="box">
<div class="box compactBox">
<form id="passwordResetForm" action="<?= Container::$routeCollection->getRoute('password-requestReset-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= Container::$routeCollection->getRoute('password-requestReset.success')->generateLink() ?>">
<input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
<?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>

2
views/login/password_reset_request_success.php
View File

@ -2,7 +2,7 @@
@section(main)
<h2>Request password reset</h2>
<div class="box">
<div class="box compactBox">
<p class="justify">Password reset was successfully requested. Please check your email and click on the link to reset your password!</p>
</div>
@endsection

2
views/login/reset_password.php
View File

@ -2,7 +2,7 @@
@section(main)
<h2>Reset password</h2>
<div class="box">
<div class="box compactBox">
<?php if ($success) : ?>
<form id="resetPasswordForm" action="<?= Container::$routeCollection->getRoute('password-reset.action')->generateLink(['token' => $token]) ?>"" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
<input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $email ?>" disabled>

2
views/oauth/oauth_error.php
View File

@ -2,7 +2,7 @@
@section(main)
<h2>OAuth error</h2>
<div class="box">
<div class="box compactBox">
<p class="error justify"><?= $error ?></p>
</div>
@endsection