- Some bugfixes were made and annotations were converted into attributes

This commit is contained in:
mcndave committed 2023-01-21 20:27:08 +00:00
1 parent 9c8f9903fc
commit 6ff29a576c
14 files changed
+247 -113

No files matched your search

+6 -2
View File
@@ -10,7 +10,9 @@
[class^="btn-"], [class~=" btn-"] { display: inline-block; font-weight: 400; text-align: center; white-space: nowrap; vertical-align: middle; user-select: none; border: 1px solid transparent; padding: .375rem .75rem; font-size: 1rem; line-height: 1.5; border-radius: .25rem; cursor:pointer; transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; background:rgba(0,0,0,0.3); color:rgba(255,255,255,0.8); }
[class^="btn-"]:hover, [class~=" btn-"]:hover {border-color: rgba(0, 0, 0, 0.5);text-decoration: underline;}
.btn-red {background: rgba(255,0,0,0.5);color: rgba(255, 255, 255, 0.9);}
.btn-red {background: rgba(155,0,0,0.5);color: rgba(255, 255, 255, 0.9);}
.btn-green {background: rgba(0,155,0,0.5);color: rgba(255, 255, 255, 0.9);}
.btn-blue {background: rgba(0,0,155,0.5);color: rgba(255, 255, 255, 0.9);}
code {white-space:pre;font-family:monospace;color: #e6e6e6;background: #343537;display: block;padding: 1rem;line-height: 1.5em;border: 1px solid #2e2e30;}
h1 {font-size:2rem;color:#525960}
@@ -40,4 +42,6 @@ summary {cursor:pointer;}
#main-content {padding:4vh 2vw;border-top:2px solid #7d7d7d;width:100%;}
#main-content section {border-radius:4px;box-shadow: 1px 1px 3px rgba(0,0,0,0.5)}
#main-content section article {background:#fff;padding:2vh 1vw;}
#main-content section header {background:#e8e8e8;padding:2vh 1vw;}
#main-content section header {background:#e8e8e8;padding:2vh 1vw;font-size:1.4em;color: #4b4848
}
#main-content section footer {background:#f9f9f9;padding:2vh 1vw;}
+12 -16
View File
@@ -9,15 +9,10 @@
{% endsection %}
{% section "content" %}
<section>
{% if $connections %}
{% foreach $connections as $connection %}
{% if $connections %}
{% foreach $connections as $connection %}
<section>
{% php $conf = $connection->getConfiguration(); %}
<header>
<h1>{{ $connection->name }}</h1>
</header>
<article class="databases">
<strong class="grid db-grid">
<div class="col db-connection">{% _ 'database.connection' %}</div>
@@ -28,11 +23,11 @@
</strong>
<div class="grid db-grid">
<div class="col db-connection"></div>
<div class="col db-adapter">{{ $conf['adapter'] ?? '-' }}</div>
<div class="col db-host">{{ $conf['host'] ?? '-' }}:{{ $conf['port'] ?? '-' }}</div>
<div class="col db-name">{{ $conf['database'] ?? '-' }}</div>
<div class="col db-username">{{ $conf['username'] ?? '-' }}</div>
<div class="col db-connection">{{ $connection->name }}</div>
<div class="col db-adapter">{{ $connection->adapter()::class }}</div>
<div class="col db-host">{{ $connection->adapter()->hostname ?? '-' }}:{{ $connection->adapter()->port ?? '-' }}</div>
<div class="col db-name">{{ $connection->adapter()->database ?? '-' }}</div>
<div class="col db-username">{{ $connection->adapter()->username ?? '-' }}</div>
</div>
<div class="tables">
@@ -86,9 +81,9 @@
{% ui.endform %}
</div>
</article>
{% endforeach %}
{% endif %}
</section>
</section>
{% endforeach %}
{% endif %}
<style>
.databases strong.grid {background:#181818;color:#fff}
@@ -103,5 +98,6 @@
.tables {background: #2d3137;margin: 0 -8px 0 -8px;color: #fff;padding: 2px 10px;}
.tables label {padding:10px 5px;display:block}
section + section { margin-top:15px; }
</style>
{% endsection %}
@@ -0,0 +1,71 @@
{% extends "lean-console/base/layout" %}
{% language.set "lean.storage" %}
{% title _("title") %}
{% section "header" %}
<div class="page-title">{% _ "page-title" %}</div>
{% endsection %}
{% section "content" %}
{% if $connections %}
{% ui.form.post "database.import" %}
<section>
<header>Import data from a connection into another</header>
<article class="databases">
{% if ! $context->source %}
{% php $select = array_combine(array_column($connections, 'name'), array_column($connections, 'name')) %}
<div class="db-grid">
Source connection: {% ui.select "source", $select %}
</div>
<div class="db-grid">
Destination connection: {% ui.select "destination", $select %}
</div>
{% else %}
{% ui.hidden 'source', $context->source %}
{% ui.hidden 'destination', $context->destination %}
<div class="db-grid">
COPY DATA FROM → TO:
{% php $dest = array_filter($migrations->entities, fn($e, $key) => $key::repository()->adapter->name === $context->destination, ARRAY_FILTER_USE_BOTH); %}
{% foreach $dest as $key => $value %}
<div class="db-grid">
<span>{% ui.select "copy[$key]", [ null => '' ] + $context->sourceTables->buildArray('entityClass', 'entityClass') %}</span>
<span>→</span>
<span>{{ sprintf('%s (%s)', $key, $value->tableName()) }}</span>
</div>
{% endforeach %}
</div>
{% endif %}
</article>
<footer class="text-center">
<button type="submit" class="btn-blue">Copy</button>
<a href="{% route 'lean.console:storage.database' %}" class="btn-red">Cancel</a>
</footer>
</section>
{% ui.endform %}
{% else %}
No connection found
{% endif %}
<style>
.databases strong.grid {background:#181818;color:#fff}
.databases .db-grid {padding:0.66rem 0.3rem}
.databases .db-grid strong {color:#444}
.databases .db-grid:nth-child(even) {background: #eaeaea }
.databases .tables .table-item {padding:0.33rem 0;background:rgba(255,255,255,0.1);line-height: 1.8em;}
.databases .tables .table-item:nth-child(even) {background:rgba(255,255,255,0.2)}
.databases summary {background: #172841;color:#fff;margin: 0 -8px 0 -8px;padding:7px 10px}
.tables {background: #2d3137;margin: 0 -8px 0 -8px;color: #fff;padding: 2px 10px;}
.tables label {padding:10px 5px;display:block}
section + section { margin-top:15px; }
</style>
{% endsection %}