diff --git a/public/assets/components/loader.js b/public/assets/components/loader.js index 9d0651b9..ef595e0e 100644 --- a/public/assets/components/loader.js +++ b/public/assets/components/loader.js @@ -44,7 +44,6 @@ class Loader extends window.HTMLElement { } customElements.define("component-loader", Loader); - export function createLoader($parent, opts = {}) { const { wait = 500 } = opts; const cancel = effect(new rxjs.Observable((observer) => { @@ -61,7 +60,7 @@ export function createLoader($parent, opts = {}) { `); const id = window.setTimeout(() => { - $parent.appendChild($icon); + $parent.replaceChildren($icon); animate($icon, { time: 1000, keyframes: opacityIn() }); }, wait); return () => { diff --git a/public/assets/pages/filespage/ctrl_filesystem.js b/public/assets/pages/filespage/ctrl_filesystem.js index 2d063dc7..4a929ea0 100644 --- a/public/assets/pages/filespage/ctrl_filesystem.js +++ b/public/assets/pages/filespage/ctrl_filesystem.js @@ -1,4 +1,4 @@ -import { createElement } from "../../lib/skeleton/index.js"; +import { createElement, createRender } from "../../lib/skeleton/index.js"; import { animate, slideYIn } from "../../lib/animate.js"; import rxjs, { effect } from "../../lib/rx.js"; import { loadCSS } from "../../helpers/loader.js"; @@ -7,9 +7,10 @@ import { ApplicationError } from "../../lib/error.js"; import { createLoader } from "../../components/loader.js"; import ctrlError from "../ctrl_error.js"; +import { sort } from "./helper.js"; import { createThing } from "./thing.js"; -import { getState$ } from "./ctrl_filesystem_state.js"; -import { ls } from "./model_files.js"; +import { getState$ } from "./state_filesystem.js"; +import { ls, search } from "./model_files.js"; const ICONS = { EMPTY_FILES: "<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" width="300" height="170" viewBox="0 0 300 170" fill="none">
  <path
     d="m 52.629905,160.16785 c 1.546,0 2.8,-1.2536 2.8,-2.8 0,-1.5464 -1.254,-2.8 -2.8,-2.8 -1.547,0 -2.8,1.2536 -2.8,2.8 0,1.5464 1.253,2.8 2.8,2.8 z"
     fill="#909090"
     id="path5067"
     style="fill:#909090;fill-opacity:0.133333" />
  <path
     d="m 113.03018,22.393649 c 1.5464,0 2.8,-1.2536 2.8,-2.8 0,-1.5464 -1.2536,-2.8 -2.8,-2.8 -1.5464,0 -2.8,1.2536 -2.8,2.8 0,1.5464 1.2536,2.8 2.8,2.8 z"
     fill="#909090"
     id="path5069"
     style="fill:#909090;fill-opacity:0.133333" />
  <path
     d="m 73.293565,112.46216 c 2.87189,0 5.20003,-2.3281 5.20003,-5.2 0,-2.8719 -2.32814,-5.2 -5.20003,-5.2 -2.87188,0 -5.199995,2.3281 -5.199995,5.2 0,2.8719 2.328115,5.2 5.199995,5.2 z"
     fill="#909090"
     id="path5071"
     style="fill:#909090;fill-opacity:0.13333334" />
  <defs
     id="defs5117">
    <filter
       id="filter0_d"
       x="16.0762"
       y="12.9575"
       width="114.8"
       height="134.60001"
       filterUnits="userSpaceOnUse"
       color-interpolation-filters="sRGB">
      <feFlood
         flood-opacity="0"
         result="BackgroundImageFix"
         id="feFlood5097" />
      <feColorMatrix
         in="SourceAlpha"
         type="matrix"
         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
         id="feColorMatrix5099" />
      <feOffset
         dy="11"
         id="feOffset5101" />
      <feGaussianBlur
         stdDeviation="11"
         id="feGaussianBlur5103" />
      <feColorMatrix
         type="matrix"
         values="0 0 0 0 0.397708 0 0 0 0 0.47749 0 0 0 0 0.575 0 0 0 0.27 0"
         id="feColorMatrix5105" />
      <feBlend
         mode="normal"
         in2="BackgroundImageFix"
         result="effect1_dropShadow"
         id="feBlend5107" />
      <feBlend
         mode="normal"
         in="SourceGraphic"
         in2="effect1_dropShadow"
         result="shape"
         id="feBlend5109" />
    </filter>
    <linearGradient
       id="paint0_linear"
       x1="73.453102"
       y1="21.8619"
       x2="73.453102"
       y2="115.534"
       gradientUnits="userSpaceOnUse">
      <stop
         stop-color="#FDFEFF"
         id="stop5112" />
      <stop
         offset="0.9964"
         stop-color="#ECF0F5"
         id="stop5114" />
    </linearGradient>
    <filter
       id="filter0_d-7"
       x="0.39111301"
       y="35.394798"
       width="145.595"
       height="102.8"
       filterUnits="userSpaceOnUse"
       color-interpolation-filters="sRGB">
      <feFlood
         flood-opacity="0"
         result="BackgroundImageFix"
         id="feFlood1227" />
      <feColorMatrix
         in="SourceAlpha"
         type="matrix"
         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
         id="feColorMatrix1229" />
      <feOffset
         dy="11"
         id="feOffset1231" />
      <feGaussianBlur
         stdDeviation="11"
         id="feGaussianBlur1233" />
      <feColorMatrix
         type="matrix"
         values="0 0 0 0 0.397708 0 0 0 0 0.47749 0 0 0 0 0.575 0 0 0 0.27 0"
         id="feColorMatrix1235" />
      <feBlend
         mode="normal"
         in2="BackgroundImageFix"
         result="effect1_dropShadow"
         id="feBlend1237" />
      <feBlend
         mode="normal"
         in="SourceGraphic"
         in2="effect1_dropShadow"
         result="shape"
         id="feBlend1239" />
    </filter>
  </defs>
  <path
     d="m 21.220832,92.264016 h -4.9 c -0.3,0 -0.6,0.1 -0.7,0.4 l -2.4,4.3 c -0.1,0.3 -0.1,0.6 0,0.9 l 2.4,4.300004 c 0.1,0.3 0.4,0.4 0.7,0.4 h 4.9 c 0.3,0 0.6,-0.1 0.7,-0.4 l 2.4,-4.300004 c 0.1,-0.3 0.1,-0.6 0,-0.9 l -2.4,-4.3 c -0.1,-0.3 -0.4,-0.4 -0.7,-0.4 z"
     id="path4"
     style="fill:#909090;fill-opacity:0.133333" />
  <path
     class="file"
     d="m 271.09259,11.652312 -7.37019,3.583918 c -0.76194,0.431116 -1.70491,0.583501 -2.57246,0.605222 -0.86754,0.02172 -1.78791,-0.161244 -2.63285,-0.474867 -1.61444,-0.757898 -3.0554,-2.112442 -3.93815,-3.841509 0,0 -1.50896,-3.3100372 -3.07075,-6.8247745 l -0.23388,-0.4834368 -15.96253,7.5074693 c -2.54223,1.145271 -3.61329,4.185144 -2.51928,6.732998 l 11.52855,25.644074 c 1.09402,2.547855 4.089,3.580205 6.63125,2.434931 l 25.59584,-12.049402 c 2.54224,-1.145275 3.61331,-4.185143 2.5193,-6.732998 L 271.70365,11.48249 Z"
     style="clip-rule:evenodd;fill:#909090;fill-opacity:0.13333334;fill-rule:evenodd;stroke-width:1.49471"
     id="path6" />
  <path
     class="file"
     d="m 259.41468,12.923368 c -1.10144,-0.461713 -1.97659,-1.31538 -2.62543,-2.561005 l -0.0528,-0.2047 -0.28668,-0.6881472 -1.04119,-2.343158 -0.57341,-1.376276 13.00599,4.7217702 -5.15993,2.421202 c -0.48277,0.243866 -1.01841,0.283028 -1.55401,0.322196 -0.53564,0.03916 -1.12406,-0.126364 -1.71249,-0.291899 z"
     style="clip-rule:evenodd;fill:#909090;fill-opacity:0.13333334;fill-rule:evenodd;stroke-width:1.49471"
     id="path8" />
  <path
     d="m 23.944403,17.635563 c -2.077419,1.199415 -2.474669,3.832798 -1.303579,5.861202 l 11.157969,19.326133 c 1.26869,2.197435 3.53196,2.919135 5.66264,1.688975 l 24.34312,-14.054491 c 1.38496,-0.79961 1.92411,-3.064169 0.62288,-5.317939 L 54.928543,8.6868627 c -1.04099,-1.803011 -3.07654,-2.130313 -4.46146,-1.330734 l -12.51782,7.2271693 -4.94944,-2.175869 z"
     id="path16"
     style="fill:#909090;fill-opacity:0.13333334;stroke-width:0.632594" />
  <g
     id="g20"
     transform="translate(243.28104,131.07346)"
     style="fill:#909090;fill-opacity:0.13333334">
    <path
       d="m 42.4,23.2 8.6,9.9 c 0.3,0.3 0.1,0.8 -0.3,0.9 L 38,36.2 c -0.4,0.1 -0.7,-0.3 -0.6,-0.7 l 4.1,-12.1 c 0.1,-0.4 0.7,-0.5 0.9,-0.2 z"
       id="path18"
       style="fill:#909090;fill-opacity:0.13333334" />
  </g>
  <path
     d="m 286.08832,85.7161 -2,1 c -0.3,0.1 -0.6,0 -0.8,-0.3 l -1,-2 c -0.1,-0.3 0,-0.6 0.3,-0.8 l 2,-1 c 0.3,-0.1 0.6,0 0.8,0.3 l 1,2 c 0.1,0.3 0,0.7 -0.3,0.8 z"
     id="path10"
     style="fill:#909090;fill-opacity:0.133333" />
  <path
     d="m 111.3581,67.893483 h 72.0997 c 2.9,0 5.1,2.2 5.1,5.1 v 45.699997 c 0,2.9 -2.2,5.1 -5.1,5.1 h -72.0997 c -2.9,0 -5.1,-2.2 -5.1,-5.1 V 72.993483 c 0,-2.9 2.4,-5.1 5.1,-5.1 z"
     fill="#909090"
     id="path1199" />
  <g
     filter="url(#filter0_d)"
     id="g1203"
     style="filter:url(#filter0_d-7)"
     transform="translate(76.4668,31.198683)">
    <path
       d="M 117.691,46.4948 H 87.2911 c -3,0 -5.8,1 -8.1,2.9 l -8,6.5 c -2.2,1.8 -5.1,2.9 -8.1,2.9 h -34.4 c -3.5,0 -6.3,2.9 -6.3,6.3 0,0.3 0,0.6 0.1,0.9 l 6.3,33.7 c 0.5,3.2002 3.2,5.5002 6.3,5.5002 h 73.5999 c 3.2,0 5.8,-2.2 6.3,-5.4002 l 8.9,-46.1 c 0.6,-3.5 -1.7,-6.6 -5.2,-7.3 -0.3,0.1 -0.7,0.1 -1,0.1 z"
       fill="#ffffff"
       id="path1201" />
  </g>
  <path
     d="m 135.3581,112.59358 c 1.8,0 3.3,-1.5 3.3,-3.3 0,-1.8 -1.5,-3.3 -3.3,-3.3 -1.8,0 -3.3,1.5 -3.3,3.3 0,1.8 1.5,3.3 3.3,3.3 z"
     fill="#909090"
     id="path1205" />
  <path
     d="m 161.0581,112.49348 c 1.8,0 3.3,-1.5 3.3,-3.3 0,-1.8 -1.5,-3.3 -3.3,-3.3 -1.8,0 -3.3,1.5 -3.3,3.3 0,1.9 1.5,3.3 3.3,3.3 z"
     fill="#909090"
     id="path1207" />
  <path
     d="m 144.158,88.893481 c -3.6,-7 -4.4,-15.399998 -2,-22.999998 2.3,-7.6 7.8,-14.1 14.6,-17.8 2.1,-1.1 4.5,-2 6.9,-2.1 2.4,-0.1 5,0.7 6.6,2.7 1.6,1.8 1.9,4.8 0.6,6.8 -1.4,1.9 -4.2,2.7 -6.5,2.1 -3.7,-0.7 -6.7,-3.6 -7.6,-7.1 -0.9,-3.5 0.3,-7.6 3.1,-9.9 1.8,-1.6 4.3,-2.5 6.6,-3.2 11.1998,-3.3 23.3998,-3.7 34.7998,-1.2"
     stroke="#57595a"
     stroke-width="2"
     stroke-miterlimit="10"
     stroke-dasharray="4, 4"
     id="path1209" />
  <path
     d="m 151.358,116.09348 h -6.2 v 1.5 h 6.2 z"
     fill="#909090"
     id="path1211" />
  <path
     d="m 207.2578,33.593433 c -0.1,1.5 -0.2,2.9 -1.3,3.2 -1.1,0.3 -1.6,-0.7 -2.3,-2.1 -0.7,-1.3 -0.3,-2.699996 0.9,-2.999996 1.1,-0.3 2.9,0.1 2.7,1.899996 z"
     fill="#909090"
     id="path1213" />
  <path
     d="m 206.0578,40.793453 c 0.3,-1.8 0.6,-2.8 -0.4,-3.3 -1.1,-0.5 -1.8,0.4 -3,1.6 -1,1.1 -0.4,2.70003 0.6,3.20003 1.2,0.6 2.5,0 2.8,-1.50003 z"
     fill="#909090"
     id="path1215" />
  <path
     d="m 207.4578,37.493533 c -0.1,0.7 -0.6,1.2 -1.3,1.3 -0.3,0 -0.6,0 -1,0 -1.4,-0.2 -2.5,-1.1 -2.4,-2 0.1,-0.9 1.4,-1.4 3,-1.2 0.3,0 0.6,0.1 0.8,0.2 0.6,0.2 1,0.9 0.9,1.7 0,0 0,-0.1 0,0 z"
     fill="#57595a"
     id="path1217" />
  <path
     d="m 95.8579,65.593483 c 0,-1.7 0,-3.4 1.2,-3.9 1.3,-0.5 2,0.7 3,2.4 0.9,1.5 0.5,3.1 -0.8,3.6 -1.1,0.5 -3.4,0.2 -3.4,-2.1 z"
     fill="#909090"
     id="path1219" />
  <path
     d="m 96.5579,57.193583 c -0.2,2.1 -0.5,3.3 0.8,3.8 1.3,0.5 2,-0.6 3.3,-2.2 1,-1.4 0.3,-3.2 -1,-3.7 -1.3,-0.5 -2.9,0.4 -3.1,2.1 z"
     fill="#909090"
     id="path1221" />
  <path
     d="m 95.458,61.193583 c 0,-0.8 0.6,-1.4 1.3,-1.5 0.3,-0.1 0.7,-0.1 1.1,0 1.6,0.1 3,1 2.9,2 -0.1,1 -1.4,1.7 -3.1,1.5 -0.3,0 -0.6,-0.1 -0.9,-0.2 -0.8,-0.1 -1.3,-0.9 -1.3,-1.8 z"
     fill="#57595a"
     id="path1223" />
  <path
     d="m 102.2581,61.493583 c 10.5,0 29.9,6.1 30.2,28.499998"
     stroke="#57595a"
     stroke-width="2"
     stroke-miterlimit="10"
     stroke-dasharray="4, 4"
     id="path1225" />
  <path
     d="m 175.07841,4.158838 h -2.98808 c -0.18294,0 -0.36588,0.065003 -0.42687,0.2600102 l -1.46354,2.7951101 c -0.061,0.195007 -0.061,0.390015 0,0.585023 l 1.46354,2.7951107 c 0.061,0.195008 0.24393,0.260011 0.42687,0.260011 h 2.98808 c 0.18294,0 0.36589,-0.065 0.42687,-0.260011 l 1.46355,-2.7951107 c 0.061,-0.195008 0.061,-0.390016 0,-0.585023 l -1.46355,-2.7951101 c -0.061,-0.1950076 -0.24393,-0.2600102 -0.42687,-0.2600102 z"
     id="path4-5"
     style="fill:#909090;fill-opacity:0.133333;stroke-width:0.629598" />
</svg>
", @@ -19,6 +20,7 @@ const ICONS = { export default async function(render) { const $page = createElement(`
+
@@ -37,24 +39,37 @@ export default async function(render) { return prev[0] === curr[0] && prev[1] && curr[1] }), ); - effect(rxjs.of(path).pipe( - ls(), - removeLoader, + const $list = qs($page, `[data-target="list"]`); + + effect(ls(path).pipe( rxjs.mergeMap(({ files, ...rest }) => getState$().pipe(rxjs.mergeMap((state) => { - if (state.show_hidden === false) files = files.filter(({ name }) => name[0] !== "."); - // files = files.sort() + const $header = qs($page, `[data-target="header"]`); + $header.innerHTML = ""; + $list.innerHTML = ""; + if (!!state.search) { + const removeLoader = createLoader($header); + return search(state.search_q).pipe(rxjs.map((files) => ({ + ...rest, files, ...state, + })), removeLoader); + } return rxjs.of({ ...rest, files, ...state }); }))), - rxjs.mergeMap(({ files, search_mode, ...rest }) => { + rxjs.mergeMap(({ show_hidden, files, ...rest }) => { + if (show_hidden === false) files = files.filter(({ name }) => name[0] !== "."); + console.log(rest); + files = sort(files, rest.sort); + return rxjs.of({ ...rest, files }) + }), + removeLoader, + rxjs.mergeMap(({ files, search, ...rest }) => { if (files.length === 0) { - renderEmpty(render, search_mode ? ICONS.EMPTY_SEARCH : ICONS.EMPTY_FILES); + renderEmpty(createRender(qs($page, `[data-target="header"]`)), !!search ? ICONS.EMPTY_SEARCH : ICONS.EMPTY_FILES); return rxjs.EMPTY; } return rxjs.of({...rest, files }); }), rxjs.mergeMap((obj) => refreshOnResize$.pipe(rxjs.mapTo(obj))), rxjs.mergeMap(({ files, path, view }) => { // STEP1: setup the list of files - const $list = qs($page, `[data-target="list"]`); $list.closest(".scroll-y").scrollTop = 0; let FILE_HEIGHT, COLUMN_PER_ROW; switch(view) { @@ -82,8 +97,7 @@ export default async function(render) { for (let i = 0; i < size; i++) { const file = files[i]; $fs.appendChild(createThing({ - name: file.name, - type: file.type, + ...file, ...createLink(file, path), view, n: i, @@ -193,8 +207,7 @@ export default async function(render) { type: "hidden", })); else $fs.appendChild(createThing({ - name: file.name, - type: file.type, + ...file, ...createLink(file, path), view, n: i, diff --git a/public/assets/pages/filespage/ctrl_newitem.js b/public/assets/pages/filespage/ctrl_newitem.js index ac3fb50f..6ca1a7ec 100644 --- a/public/assets/pages/filespage/ctrl_newitem.js +++ b/public/assets/pages/filespage/ctrl_newitem.js @@ -4,7 +4,7 @@ import { qs } from "../../lib/dom.js"; import { animate } from "../../lib/animate.js"; import { loadCSS } from "../../helpers/loader.js"; -import { getAction$, setAction } from "./model_action.js"; +import { getAction$, setAction } from "./state_event.js"; export default async function(render) { const $node = createElement(` diff --git a/public/assets/pages/filespage/ctrl_submenu.js b/public/assets/pages/filespage/ctrl_submenu.js index 4bba408a..c5d916b5 100644 --- a/public/assets/pages/filespage/ctrl_submenu.js +++ b/public/assets/pages/filespage/ctrl_submenu.js @@ -3,8 +3,10 @@ import rxjs, { effect, applyMutation, onClick, preventDefault } from "../../lib/ import { animate, slideYIn } from "../../lib/animate.js"; import { loadCSS } from "../../helpers/loader.js"; import { qs, qsa } from "../../lib/dom.js"; -import { getSelection$, clearSelection } from "./model_files.js"; -import { getAction$, setAction } from "./model_action.js"; + +import "../../components/dropdown.js"; +import "../../components/icon.js"; +import { createModal } from "../../components/modal.js"; import componentShare from "./modal_share.js"; import componentEmbed from "./modal_embed.js"; @@ -12,11 +14,9 @@ import componentTag from "./modal_tag.js"; import componentRename from "./modal_rename.js"; import componentDelete from "./modal_delete.js"; -import "../../components/dropdown.js"; -import "../../components/icon.js"; -import { createModal } from "../../components/modal.js"; - -import { setState } from "./ctrl_filesystem_state.js"; +import { getSelection$, clearSelection } from "./state_selection.js"; +import { getAction$, setAction } from "./state_event.js"; +import { setState } from "./state_filesystem.js"; const modalOpt = { withButtonsRight: "OK", @@ -139,13 +139,14 @@ function componentRight(render) { effect(getSelection$().pipe( rxjs.filter((selections) => selections.length === 0), rxjs.map(() => render(createFragment(` - +
+ +
@@ -257,8 +258,15 @@ function componentRight(render) { time: 100, }); $input.classList.add("hidden"); + // setState("search", ""); TODO } + return $input; }), + rxjs.mergeMap(($input) => rxjs.merge( + rxjs.fromEvent($input, "input").pipe(rxjs.debounceTime(500)), + rxjs.fromEvent($input, "change"), + ).pipe(rxjs.map(() => $input.value), rxjs.distinctUntilChanged())), + rxjs.tap((val) => setState("search", val)), ), )), )); diff --git a/public/assets/pages/filespage/helper.js b/public/assets/pages/filespage/helper.js new file mode 100644 index 00000000..cc2af8b5 --- /dev/null +++ b/public/assets/pages/filespage/helper.js @@ -0,0 +1,85 @@ +import { extname } from "../../lib/path.js"; + +export function sort(files, type) { + if (type === "name") { + return sortByName(files); + } else if (type === "date") { + return sortByDate(files); + } else { + return sortByType(files); + } +}; + +function _moveLoadingDownward(fileA, fileB) { + if (fileA.icon === "loading" && fileB.icon !== "loading") { + return +1; + } else if (fileA.icon !== "loading" && fileB.icon === "loading") { + return -1; + } + return 0; +} +function _moveFolderUpward(fileA, fileB) { + if (["directory", "link"].indexOf(fileA.type) === -1 && + ["directory", "link"].indexOf(fileB.type) !== -1) { + return +1; + } else if (["directory", "link"].indexOf(fileA.type) !== -1 && + ["directory", "link"].indexOf(fileB.type) === -1) { + return -1; + } + return 0; +} +function _moveHiddenFilesDownward(fileA, fileB) { + if (fileA.name[0] === "." && fileB.name[0] !== ".") return +1; + else if (fileA.name[0] !== "." && fileB.name[0] === ".") return -1; + return 0; +} +function sortByType(files) { + return files.sort((fileA, fileB) => { + let tmp = _moveLoadingDownward(fileA, fileB); + if (tmp !== 0) return tmp; + + tmp = _moveFolderUpward(fileA, fileB); + if (tmp !== 0) return tmp; + + tmp = _moveHiddenFilesDownward(fileA, fileB); + if (tmp !== 0) return tmp; + + const aExt = extname(fileA.name.toLowerCase()); + const bExt = extname(fileB.name.toLowerCase()); + + if (fileA.name.toLowerCase() === fileB.name.toLowerCase()) { + return fileA.name > fileB.name ? +1 : -1; + } else { + if (aExt !== bExt) return aExt > bExt ? +1 : -1; + else return fileA.name.toLowerCase() > fileB.name.toLowerCase() ? +1 : -1; + } + }); +} +function sortByName(files) { + return files.sort((fileA, fileB) => { + let tmp = _moveLoadingDownward(fileA, fileB); + if (tmp !== 0) return tmp; + + tmp = _moveFolderUpward(fileA, fileB); + if (tmp !== 0) return tmp; + + tmp = _moveHiddenFilesDownward(fileA, fileB); + if (tmp !== 0) return tmp; + + if (fileA.name.toLowerCase() === fileB.name.toLowerCase()) { + return fileA.name > fileB.name ? +1 : -1; + } + return fileA.name.toLowerCase() > fileB.name.toLowerCase() ? +1 : -1; + }); +} +function sortByDate(files) { + return files.sort((fileA, fileB) => { + const tmp = _moveLoadingDownward(fileA, fileB); + if (tmp !== 0) return tmp; + + if (fileB.time === fileA.time) { + return fileA.name > fileB.name ? +1 : -1; + } + return fileB.time - fileA.time; + }); +} diff --git a/public/assets/pages/filespage/model_files.js b/public/assets/pages/filespage/model_files.js index 75483839..a671aa66 100644 --- a/public/assets/pages/filespage/model_files.js +++ b/public/assets/pages/filespage/model_files.js @@ -1,42 +1,6 @@ -import { onDestroy } from "../../lib/skeleton/index.js"; import rxjs from "../../lib/rx.js"; import ajax from "../../lib/ajax.js"; -const selection$ = new rxjs.BehaviorSubject([]); - -onDestroy(() => selection$.next([])); - -export function addSelection({ name, type, shift, n }) { - selection$.next( - selection$.value - .concat({ name, type, shift, n }) - .sort((prev, curr) => prev.n - curr.n) - ); -} - -export function clearSelection() { - selection$.next([]); -} - -export function getSelection$() { - return selection$.asObservable(); -} - -export function isSelected(n) { - let isChecked = false; - for (let i=0;i= lowerBound; -} - // export function ls() { // return rxjs.from(new Error("missing cache")).pipe( // rxjs.catchError(() => rxjs.of({ files: null })), @@ -57,18 +21,22 @@ function isBetween(n, lowerBound, higherBound) { // ) // } -export function ls() { - return rxjs.pipe( - rxjs.mergeMap((path) => ajax({ - url: `/api/files/ls?path=${path}`, - responseType: "json" - }).pipe(rxjs.map(({ responseJSON }) => ({ - files: responseJSON.results.sort(sortByDefault), - path, - })))), +export function search(term) { + return rxjs.of([]).pipe( + rxjs.delay(1500), ); } +export function ls(path) { + return ajax({ + url: `/api/files/ls?path=${path}`, + responseType: "json" + }).pipe(rxjs.map(({ responseJSON }) => ({ + files: responseJSON.results.sort(sortByDefault), + path, + }))); +} + const sortByDefault = (fileA, fileB) => { if (fileA.type !== fileB.type) { if (fileA.type === "file") return +1; diff --git a/public/assets/pages/filespage/model_action.js b/public/assets/pages/filespage/state_event.js similarity index 100% rename from public/assets/pages/filespage/model_action.js rename to public/assets/pages/filespage/state_event.js diff --git a/public/assets/pages/filespage/ctrl_filesystem_state.js b/public/assets/pages/filespage/state_filesystem.js similarity index 93% rename from public/assets/pages/filespage/ctrl_filesystem_state.js rename to public/assets/pages/filespage/state_filesystem.js index 5561185a..d40c93e3 100644 --- a/public/assets/pages/filespage/ctrl_filesystem_state.js +++ b/public/assets/pages/filespage/state_filesystem.js @@ -2,10 +2,10 @@ import rxjs, { effect, preventDefault } from "../../lib/rx.js"; const state$ = new rxjs.BehaviorSubject({ view: "grid", - sort: null, + sort: "type", show_hidden: false, order: null, - search_mode: false, + search: "", }); export const getState$ = () => state$.asObservable(); diff --git a/public/assets/pages/filespage/state_selection.js b/public/assets/pages/filespage/state_selection.js new file mode 100644 index 00000000..5a0c2830 --- /dev/null +++ b/public/assets/pages/filespage/state_selection.js @@ -0,0 +1,38 @@ +import rxjs from "../../lib/rx.js"; +import ajax from "../../lib/ajax.js"; +import { onDestroy } from "../../lib/skeleton/index.js"; + +const selection$ = new rxjs.BehaviorSubject([]); + +onDestroy(() => selection$.next([])); + +export function addSelection({ name, type, shift, n }) { + selection$.next( + selection$.value + .concat({ name, type, shift, n }) + .sort((prev, curr) => prev.n - curr.n) + ); +} + +export function clearSelection() { + selection$.next([]); +} + +export function getSelection$() { + return selection$.asObservable(); +} + +export function isSelected(n) { + let isChecked = false; + for (let i=0;i= lowerBound; +} diff --git a/public/assets/pages/filespage/thing.js b/public/assets/pages/filespage/thing.js index dbb03e14..2d6b6e8d 100644 --- a/public/assets/pages/filespage/thing.js +++ b/public/assets/pages/filespage/thing.js @@ -1,5 +1,8 @@ import { createElement } from "../../lib/skeleton/index.js"; -import { addSelection, isSelected } from "./model_files.js"; +import { qs } from "../../lib/dom.js"; +import assert from "../../lib/assert.js"; + +import { addSelection, isSelected } from "./state_selection.js"; const IMAGE = { FILE: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiPgogIDxwYXRoIHN0eWxlPSJjb2xvcjojMDAwMDAwO3RleHQtaW5kZW50OjA7dGV4dC10cmFuc2Zvcm06bm9uZTtmaWxsOiM4YzhjOGM7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlLXdpZHRoOjAuOTg0ODEwNDEiIGQ9Im0gMiwxMy4wODI0MTIgMC4wMTk0NjIsMS40OTIzNDcgYyA1ZS02LDAuMjIyMTQ1IDAuMjA1NTkwMiwwLjQyNDI2MiAwLjQzMTE1MDIsMC40MjQyNzIgTCAxMy41ODk2MTIsMTUgQyAxMy44MTUxNzMsMTQuOTk5OTk1IDEzLjk5OTk5LDE0Ljc5Nzg3NCAxNCwxNC41NzU3MjkgdiAtMS40OTMzMTcgYyAtNC4xNzE4NjkyLDAuNjYyMDIzIC03LjY1MTY5MjgsMC4zOTg2OTYgLTEyLDAgeiIgLz4KICA8cGF0aCBzdHlsZT0iY29sb3I6IzAwMDAwMDt0ZXh0LWluZGVudDowO3RleHQtdHJhbnNmb3JtOm5vbmU7ZGlzcGxheTppbmxpbmU7ZmlsbDojYWFhYWFhO3N0cm9rZS13aWR0aDowLjk4NDA4MTI3IiBkPSJNIDIuMzUwMSwxLjAwMTMzMTIgQyAyLjE1MjU5LDEuMDM4MzI0NyAxLjk5NjU5LDEuMjI3MjcyMyAyLjAwMDA5LDEuNDI0OTM1NiBWIDE0LjEzMzQ1NyBjIDVlLTYsMC4yMjE4MTYgMC4yMDUyMywwLjQyMzYzNCAwLjQzMDc5LDAuNDIzNjQ0IGwgMTEuMTM5LC0xLjAxZS00IGMgMC4yMjU1NiwtNmUtNiAwLjQzMDExLC0wLjIwMDc1OCAwLjQzMDEyLC0wLjQyMjU3NCBsIDYuN2UtNCwtOS44MjI2NDI2IGMgLTIuNDg0MDQ2LC0xLjM1NTAwNiAtMi40MzUyMzQsLTIuMDMxMjI1NCAtMy41MDAxLC0zLjMwOTcwNyAtMC4wNDMsLTAuMDE1ODgyIDAuMDQ2LDAuMDAxNzQgMCwwIEwgMi40MzA2NywxLjAwMTEwOCBDIDIuNDAzODMsMC45OTg1OSAyLjM3Njc0LDAuOTk4NTkgMi4zNDk5LDEuMDAxMTA4IFoiIC8+CiAgPHBhdGggc3R5bGU9ImRpc3BsYXk6aW5saW5lO2ZpbGw6IzhjOGM4YztmaWxsLW9wYWNpdHk6MTtzdHJva2U6IzllNzU3NTtzdHJva2Utd2lkdGg6MDtzdHJva2UtbGluZWNhcDpidXR0O3N0cm9rZS1saW5lam9pbjptaXRlcjtzdHJva2UtbWl0ZXJsaW1pdDo0O3N0cm9rZS1kYXNoYXJyYXk6bm9uZTtzdHJva2Utb3BhY2l0eToxIiBkPSJtIDEwLjUwMDU3LDEuMDAyMDc2NCBjIDAsMy4yNzY4MDI4IC0wLjAwNTIsMy4xNzM5MTYxIDAuMzYyOTIxLDMuMjY5ODIwMiAwLjI4MDEwOSwwLjA3Mjk4NCAzLjEzNzE4LDAuMDM5ODg3IDMuMTM3MTgsMC4wMzk4ODcgLTEuMTIwMDY3LC0xLjA1NTY2OTIgLTIuMzMzNCwtMi4yMDY0NzEzIC0zLjUwMDEsLTMuMzA5NzA3NCB6IiAvPgo8L3N2Zz4K", @@ -19,7 +22,7 @@ const $tmpl = createElement(` __TEMPLATE__ - 06/06/2020 +
@@ -35,6 +38,7 @@ const $tmpl = createElement(` export function createThing({ name = null, type = "N/A", + time = 0, path = null, // size = 0, // time = null, @@ -44,9 +48,9 @@ export function createThing({ n = 0, }) { const $thing = $tmpl.cloneNode(true); - if (!($thing instanceof window.HTMLElement)) throw new Error("assertion failed: $thing must be an HTMLELement"); - const $label = $thing.querySelector(".component_filename .file-details > span"); - if (!($label instanceof window.HTMLElement)) throw new Error("assertion failed: $label must be an HTMLELement"); + assert.type($thing, window.HTMLElement); + const $label = qs($thing, ".component_filename .file-details > span"); + const $time = qs($thing, ".component_datetime"); $label.textContent = name; $thing.querySelector("a").setAttribute("href", link); @@ -54,10 +58,7 @@ export function createThing({ $thing.setAttribute("data-droptarget", type === "directory"); $thing.setAttribute("data-n", n); $thing.classList.add("view-" + view); - const sideEffectSelection = ($el, checked) => { - $el.classList.add(checked ? "selected" : "not-selected"); - $el.querySelector(`input[type="checkbox"]`).checked = checked; - }; + $time.textContent = formatTime(new Date(time)); sideEffectSelection($thing, isSelected(n)); if (type === "hidden") $thing.classList.add("hidden"); @@ -79,7 +80,7 @@ export function createThing({ const crt = $thing.cloneNode(true); $thing.style.opacity = "0.7"; const $box = crt.querySelector(".box"); - crt.style.opacity = "0.2 " + crt.style.opacity = "0.2"; crt.style.backgroundColor = "var(--border)"; $box.style.backgroundColor = "inherit"; $box.style.border = "none"; @@ -102,3 +103,17 @@ export function createThing({ }; return $thing; } + +function sideEffectSelection($el, checked) { + $el.classList.add(checked ? "selected" : "not-selected"); + $el.querySelector(`input[type="checkbox"]`).checked = checked; +} + +function formatTime(date) { + if (!date) return ""; + return new Intl.DateTimeFormat(navigator.language || "en-US") + .format(date) + .split("/") + .map((chunk) => chunk.padStart(2, "0")) + .join("/"); +}