Skip to content

Commit b1ff944

Browse files
JeidnxMyIgel
Jeidnx
authored and
MyIgel
committed
chore: switch to ejs
1 parent 9eab1c5 commit b1ff944

35 files changed

+296
-283
lines changed

‎lib/about.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { _ } from "./utils/language";
2-
import { CanRender } from "./container";
1+
import { _ } from "./utils/language.js";
2+
import { CanRender } from "./container.js";
33

44
export const About = function (picturesSource: string, picturesLicense: string): CanRender {
55
function render(d: HTMLElement) {

‎lib/config_default.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { LanguageCode } from "./utils/language";
2-
import { Node, NodeId } from "./utils/node";
1+
import { LanguageCode } from "./utils/language.js";
2+
import { Node, NodeId } from "./utils/node.js";
33
import { GeoJSONOptions, GridLayerOptions, LatLngBoundsExpression } from "leaflet";
44
import { GeoJsonObject } from "geojson";
55

‎lib/datadistributor.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { NodeFilter } from "./filters/nodefilter";
2-
import { Link, Node, NodeId } from "./utils/node";
1+
import { NodeFilter } from "./filters/nodefilter.js";
2+
import { Link, Node, NodeId } from "./utils/node.js";
33
import { Moment } from "moment";
44

55
export interface CanSetData {

‎lib/filters/filtergui.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { _ } from "../utils/language";
2-
import { CanFiltersChanged, DataDistributor, Filter } from "../datadistributor";
3-
import { CanRender } from "../container";
1+
import { _ } from "../utils/language.js";
2+
import { CanFiltersChanged, DataDistributor, Filter } from "../datadistributor.js";
3+
import { CanRender } from "../container.js";
44

55
export const FilterGui = function (distributor: ReturnType<typeof DataDistributor>): CanFiltersChanged & CanRender {
66
let container = document.createElement("ul");

‎lib/filters/genericnode.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import * as helper from "../utils/helper";
2-
import { Filter } from "../datadistributor";
3-
import { CanRender } from "../container";
4-
import { Node } from "../utils/node";
1+
import * as helper from "../utils/helper.js";
2+
import { Filter } from "../datadistributor.js";
3+
import { CanRender } from "../container.js";
4+
import { Node } from "../utils/node.js";
55

66
export const GenericNodeFilter = function (
77
name: string,

‎lib/filters/hostname.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { _ } from "../utils/language";
2-
import { Node } from "../utils/node";
3-
import { CanRender } from "../container";
4-
import { Filter } from "../datadistributor";
1+
import { _ } from "../utils/language.js";
2+
import { Node } from "../utils/node.js";
3+
import { CanRender } from "../container.js";
4+
import { Filter } from "../datadistributor.js";
55

66
export const HostnameFilter = function (): CanRender & Filter {
77
let refreshFunctions: (() => any)[] = [];

‎lib/filters/nodefilter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FilterMethod, ObjectsLinksAndNodes } from "../datadistributor";
1+
import { FilterMethod, ObjectsLinksAndNodes } from "../datadistributor.js";
22

33
export const NodeFilter = function (filter: FilterMethod) {
44
return function (data: ObjectsLinksAndNodes) {

‎lib/forcegraph.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import * as d3Selection from "d3-selection";
66
import * as d3Timer from "d3-timer";
77
import * as d3Zoom from "d3-zoom";
88

9-
import math from "./utils/math";
10-
import draw, { MapLink } from "./forcegraph/draw";
11-
import { Sidebar } from "./sidebar";
9+
import math from "./utils/math.js";
10+
import draw, { MapLink } from "./forcegraph/draw.js";
11+
import { Sidebar } from "./sidebar.js";
1212
import { ClientPointEvent } from "d3-selection";
13-
import { ObjectsLinksAndNodes } from "./datadistributor";
14-
import { Link, Node } from "./utils/node";
13+
import { ObjectsLinksAndNodes } from "./datadistributor.js";
14+
import { Link, Node } from "./utils/node.js";
1515

1616
export const ForceGraph = function (linkScale: (t: any) => any, sidebar: ReturnType<typeof Sidebar>) {
1717
const self = {

‎lib/forcegraph/draw.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as helper from "../utils/helper";
1+
import * as helper from "../utils/helper.js";
22
import { ZoomTransform } from "d3-zoom";
3-
import { Link, Node } from "../utils/node";
3+
import { Link, Node } from "../utils/node.js";
44

55
type Highlight = { type: string; id: string } | null;
66

‎lib/global.d.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { Config } from "./config_default";
2-
import Polyglot from "node-polyglot";
3-
import { Router } from "./utils/router";
1+
import { Config } from "./config_default.js";
2+
import { Router } from "./utils/router.js";
43

54
export {};
65

‎lib/gui.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { interpolate } from "d3-interpolate";
2-
import { _ } from "./utils/language";
3-
import { About } from "./about";
4-
import { Container } from "./container";
5-
import { DataDistributor } from "./datadistributor";
6-
import { ForceGraph } from "./forcegraph";
7-
import { Legend } from "./legend";
8-
import { Linklist } from "./linklist";
9-
import { Nodelist } from "./nodelist";
10-
import { Map } from "./map";
11-
import { Proportions } from "./proportions";
12-
import { SimpleNodelist } from "./simplenodelist";
13-
import { Sidebar } from "./sidebar";
14-
import { Tabs } from "./tabs";
15-
import { Title } from "./title";
16-
import { Main as Infobox } from "./infobox/main";
17-
import { FilterGui } from "./filters/filtergui";
18-
import { HostnameFilter } from "./filters/hostname";
19-
import * as helper from "./utils/helper";
20-
import { Language } from "./utils/language";
2+
import { _ } from "./utils/language.js";
3+
import { About } from "./about.js";
4+
import { Container } from "./container.js";
5+
import { DataDistributor } from "./datadistributor.js";
6+
import { ForceGraph } from "./forcegraph.js";
7+
import { Legend } from "./legend.js";
8+
import { Linklist } from "./linklist.js";
9+
import { Nodelist } from "./nodelist.js";
10+
import { Map } from "./map.js";
11+
import { Proportions } from "./proportions.js";
12+
import { SimpleNodelist } from "./simplenodelist.js";
13+
import { Sidebar } from "./sidebar.js";
14+
import { Tabs } from "./tabs.js";
15+
import { Title } from "./title.js";
16+
import { Main as Infobox } from "./infobox/main.js";
17+
import { FilterGui } from "./filters/filtergui.js";
18+
import { HostnameFilter } from "./filters/hostname.js";
19+
import * as helper from "./utils/helper.js";
20+
import { Language } from "./utils/language.js";
2121

2222
export const Gui = function (language: ReturnType<typeof Language>) {
2323
const self = {

‎lib/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import "../scss/main.scss";
2-
import { load } from "./load";
2+
import { load } from "./load.js";
33

44
load();

‎lib/infobox/link.ts

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
import { snabbdomBundle as V } from "snabbdom/snabbdom.bundle";
2-
import { _ } from "../utils/language";
3-
import * as helper from "../utils/helper";
4-
import { LinkInfo } from "../config_default";
5-
import { Link as LinkData } from "../utils/node";
1+
import { classModule, eventListenersModule, h, init, propsModule, styleModule } from "snabbdom";
2+
import { _ } from "../utils/language.js";
3+
import * as helper from "../utils/helper.js";
4+
import { LinkInfo } from "../config_default.js";
5+
import { Link as LinkData } from "../utils/node.js";
6+
7+
const patch = init([classModule, propsModule, styleModule, eventListenersModule]);
68

79
function showStatImg(images: HTMLElement[], linkInfo: LinkInfo, link: LinkData, time: string) {
810
let subst: ReplaceMapping = {
@@ -19,8 +21,8 @@ function showStatImg(images: HTMLElement[], linkInfo: LinkInfo, link: LinkData,
1921
"{LOCALE}": _.locale(),
2022
};
2123

22-
images.push(V.h("h4", helper.listReplace(linkInfo.name, subst)));
23-
images.push(helper.showStat(V, linkInfo, subst));
24+
images.push(h("h4", helper.listReplace(linkInfo.name, subst)) as unknown as HTMLElement);
25+
images.push(helper.showStat(linkInfo, subst));
2426
}
2527

2628
export const Link = function (el: HTMLElement, linkData: LinkData[], linkScale: (t: any) => any) {
@@ -42,20 +44,20 @@ export const Link = function (el: HTMLElement, linkData: LinkData[], linkScale:
4244
let img = [];
4345
let time = linkData[0].target.lastseen.format("DDMMYYYYHmmss");
4446

45-
header = V.patch(
47+
header = patch(
4648
header,
47-
V.h(
49+
h(
4850
"div",
49-
V.h("h2", [
50-
V.h(
51+
h("h2", [
52+
h(
5153
"a",
5254
{
5355
props: { href: router.generateLink({ node: linkData[0].source.node_id }) },
5456
},
5557
linkData[0].source.hostname,
5658
),
57-
V.h("span", " - "),
58-
V.h(
59+
h("span", " - "),
60+
h(
5961
"a",
6062
{
6163
props: { href: router.generateLink({ node: linkData[0].target.node_id }) },
@@ -64,26 +66,24 @@ export const Link = function (el: HTMLElement, linkData: LinkData[], linkScale:
6466
),
6567
]),
6668
),
67-
);
69+
) as unknown as HTMLDivElement;
6870

6971
helper.attributeEntry(
70-
V,
7172
children,
7273
"node.hardware",
7374
(linkData[0].source.model ? linkData[0].source.model + " – " : "") +
7475
(linkData[0].target.model ? linkData[0].target.model : ""),
7576
);
76-
helper.attributeEntry(V, children, "node.distance", helper.showDistance(linkData[0]));
77+
helper.attributeEntry(children, "node.distance", helper.showDistance(linkData[0]));
7778

7879
linkData.forEach(function (link) {
7980
children.push(
80-
V.h("tr", { props: { className: "header" } }, [V.h("th", _.t("node.connectionType")), V.h("th", link.type)]),
81+
h("tr", { props: { className: "header" } }, [h("th", _.t("node.connectionType")), h("th", link.type)]),
8182
);
8283
helper.attributeEntry(
83-
V,
8484
children,
8585
"node.tq",
86-
V.h(
86+
h(
8787
"span",
8888
{ style: { color: linkScale((link.source_tq + link.target_tq) / 2) } },
8989
helper.showTq(link.source_tq) + " - " + helper.showTq(link.target_tq),
@@ -103,10 +103,10 @@ export const Link = function (el: HTMLElement, linkData: LinkData[], linkScale:
103103
});
104104
}
105105

106-
let elNew = V.h("table", children);
107-
let pTable = (table = V.patch(table, elNew));
108-
pTable.elm.classList.add("attributes");
109-
images = V.patch(images, V.h("div", img));
106+
let elNew = h("table", children);
107+
let pTable = patch(table, elNew);
108+
(pTable.elm as unknown as HTMLElement).classList.add("attributes");
109+
images = patch(images, h("div", img)) as unknown as HTMLDivElement;
110110
};
111111

112112
self.setData = function setData(data: { links: LinkData[] }) {

‎lib/infobox/location.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { _ } from "../utils/language";
2-
import * as helper from "../utils/helper";
3-
import { TargetLocation } from "../utils/router";
1+
import { _ } from "../utils/language.js";
2+
import * as helper from "../utils/helper.js";
3+
import { TargetLocation } from "../utils/router.js";
44

55
export const location = function (el: HTMLElement, position: TargetLocation) {
66
let config = window.config;

‎lib/infobox/main.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { _ } from "../utils/language";
2-
import { Link } from "./link";
3-
import { Node } from "./node";
4-
import { location } from "./location";
5-
import { Link as LinkData, Node as NodeData, NodeId } from "../utils/node";
6-
import { Sidebar } from "../sidebar";
7-
import { TargetLocation } from "../utils/router";
8-
import { ObjectsLinksAndNodes } from "../datadistributor";
1+
import { _ } from "../utils/language.js";
2+
import { Link } from "./link.js";
3+
import { Node } from "./node.js";
4+
import { location } from "./location.js";
5+
import { Link as LinkData, Node as NodeData, NodeId } from "../utils/node.js";
6+
import { Sidebar } from "../sidebar.js";
7+
import { TargetLocation } from "../utils/router.js";
8+
import { ObjectsLinksAndNodes } from "../datadistributor.js";
99

1010
export const Main = function (sidebar: ReturnType<typeof Sidebar>, linkScale: (t: any) => any) {
1111
const self = {

0 commit comments

Comments
 (0)