Project-Name-Here/assetflow
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Project-Name-Here:55ae8d4c8f8cc29e2abca08d7393308c50a2db86
Branches Tags
Project-Name-Here:master
Project-Name-Here:AFLOW-36-project-support
Project-Name-Here:AFLOW-31-login-auth-and-permission-support
..
compare: Project-Name-Here:5ade4891b589c2fcee03f01e33a7d9442516998e
Branches Tags
Project-Name-Here:master
Project-Name-Here:AFLOW-36-project-support
Project-Name-Here:AFLOW-31-login-auth-and-permission-support

No commits in common. "55ae8d4c8f8cc29e2abca08d7393308c50a2db86" and "5ade4891b589c2fcee03f01e33a7d9442516998e" have entirely different histories.
55ae8d4c8f ... 5ade4891b5

5 changed files with 15 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
.prettierrc.json
View File

@ -10,7 +10,7 @@
"htmlWhitespaceSensitivity": "css",
"insertPragma": false,
"jsxSingleQuote": false,
"printWidth": 225,
"printWidth": 200,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,

1
src/frontend/dashboard.eta.html
View File

@ -25,7 +25,6 @@
</div>
<div class="alert alert-light" role="alert">A new version is available. <a href="#" class="alert-link">Click here to update</a></div>
<!-- TODO: Center table content -->
<h2>Recent items</h2>
<div class="container">
<table class="table">

1
src/frontend/items.eta.html
View File

@ -1,6 +1,5 @@
<%~ E.includeFile("partials/head.eta.html", {"title": "Dashboard"}) %> <%~ E.includeFile("partials/controls.eta.html", {"active": "AllItems"}) %>
<!-- TODO: Center table content -->
<h1>All items</h1>
<div class="container">
<table class="table">

2
src/frontend/manage/imports/csvImport.eta.html
View File

@ -1,5 +1,5 @@
<%~ E.includeFile("../../partials/head.eta.html", {"title": "Importer - CSV" }) %>
<%~ E.includeFile("../../partials/controls.eta.html", {"active": "SETT_CSV_IMPORT" }) %>
<%~ E.includeFile("../../partials/controls.eta.html", {"active": "CSV_import" }) %>
<h1>Import A CSV File</h1>
Upload a CSV file to import into the database. The CSV file must have the following columns:

21
src/frontend/partials/controls.eta.html
View File

@ -63,7 +63,7 @@
<li class="nav-item">
<a class="nav-link <%= it.active == 'AllItems' ? 'active' : ''%>" href="/items"> <i class="bi bi-list-ul"></i> Items </a>
</li>
<!-- <li class="nav-item">
<!-- <li class="nav-item">
<a class="nav-link <%= it.active == 'placeholder' ? 'active' : ''%>" href="#"> Products </a>
</li>
<li class="nav-item">
@ -77,6 +77,18 @@
</li> -->
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>Importer</span>
<a class="link-secondary" href="#" aria-label="Add a new report"> </a>
</h6>
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link <%= it.active == 'CSV_import' ? 'active' : ''%>" href="/manage/import/csv"><i class="bi bi-filetype-csv"></i> CSV Import </a>
</li>
<li class="nav-item">
<a class="nav-link <%= it.active == 'json_import' ? 'active' : ''%>" href="/manage/import/json"> <i class="bi bi-filetype-json"></i>JSON Import </a>
</li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>Settings</span>
</h6>
@ -105,13 +117,6 @@
<li class="nav-item">
<a class="nav-link <%= it.active == 'SETT_CAT' ? 'active' : ''%>" href="/manage/categories"><i class="bi bi-tag"></i> Manage categories </a>
</li>
<li class="nav-item">
<a class="nav-link <%= it.active == 'SETT_CSV_IMPORT' ? 'active' : ''%>" href="/manage/import/csv"><i class="bi bi-filetype-csv"></i> CSV Import </a>
</li>
<li class="nav-item">
<a class="nav-link <%= it.active == 'SETT_JSON_IMPORT' ? 'active' : ''%>" href="/manage/import/json"> <i class="bi bi-filetype-json"></i> JSON Import</a>
</li>
</ul>
</div>
</nav>