Compare commits

..

No commits in common. "edc10e50256983a16cbd4720d094639a3a0d12d3" and "506b29887da27cee1f0276a5b246d71ab6959774" have entirely different histories.

3 changed files with 17 additions and 48 deletions

View File

@ -200,10 +200,9 @@ export default function () {
renderSingle: false,
unlisted: [
".DS_Store",
".git*",
".git",
"Thumbs.db",
"README.*",
"README",
"README*",
],
});
});
@ -218,10 +217,9 @@ export default function () {
renderSingle: false,
unlisted: [
".DS_Store",
".git*",
".git",
"Thumbs.db",
"README.*",
"README",
"README*",
],
});
});
@ -236,10 +234,9 @@ export default function () {
renderSingle: false,
unlisted: [
".DS_Store",
".git*",
".git",
"Thumbs.db",
"README.*",
"README",
"README*",
],
});
});
@ -255,11 +252,7 @@ export default function () {
renderSingle: false,
unlisted: [
".*", //dot files/folders
".DS_Store",
".git*",
"Thumbs.db",
"README.*",
"README",
"Thumbs.db"
],
redirects: [
{

View File

@ -168,28 +168,6 @@ export interface ServeErrorTemplateParameters {
err?: any;
}
export const removeFilesForWhichAFolderDescribesThem = (files: PathDetails[]) => {
let outFiles = [];
for (const file of files) {
if (file.type == "directory") {
outFiles.push(file);
} else {
const searchFolder = path.basename(file.relative!, path.extname(file.relative!));
let found = false;
for (const searching of files) {
if (searching.name == searchFolder && searching.type == "directory") {
found = true;
break;
}
}
if (!found) {
outFiles.push(file);
}
}
}
return outFiles;
}
export const directoryTemplate = (vals: ServeDirectoryTemplateParameters) => {
let breadcrumbs: Breadcrumb[] = [];
if (vals.paths.length == 1 && helpers.getDirectoryName(vals.paths[0].name)) {
@ -206,7 +184,7 @@ export const directoryTemplate = (vals: ServeDirectoryTemplateParameters) => {
});
}
return new Promise((resolve, reject) => {
ejs.renderFile(path.join(config.viewsPath, 'directory.ejs'), { h: helpers, path, config, breadcrumbs, directory: vals.directory, paths: vals.paths, files: removeFilesForWhichAFolderDescribesThem(vals.files) }, (err, str) => {
ejs.renderFile(path.join(config.viewsPath, 'directory.ejs'), { h: helpers, path, config, breadcrumbs, ...vals }, (err, str) => {
if (err) {
console.error(err);
reject(err);

View File

@ -131,17 +131,15 @@
</div>
</div>
<% } %>
<% if (files && files.length && !(files.length == 1 && files[0].title == '..')) { %>
<ul id="files" class="list-group shadow-lg">
<% files.forEach(function(value, index) { %>
<li class="list-group-item list-group-item-action flex-column align-items-start">
<div class="d-flex w-100 justify-content-between">
<a href="<%= value.relative.replaceAll('\\', '/') %>" title="<%= value.title %>" class="<%= value.type.replaceAll('directory', 'folder') %> <%= value.ext %>"><%= value.title %></a>
</div>
</li>
<% }); %>
</ul>
<% } %>
<ul id="files" class="list-group shadow-lg">
<% files.forEach(function(value, index) { %>
<li class="list-group-item list-group-item-action flex-column align-items-start">
<div class="d-flex w-100 justify-content-between">
<a href="<%= value.relative %>" title="<%= value.title %>" class="<%= value.type.replaceAll('directory', 'folder') %> <%= value.ext %>"><%= value.base %></a>
</div>
</li>
<% }); %>
</ul>
</main>
<%- include('./includes/bottom-navbar.ejs') %>
<%- include('./includes/bottom-scripts.ejs') %>