Skip to content

Commit 609f29e

Browse files
fixed header
1 parent 39e83ee commit 609f29e

File tree

4 files changed

+53
-4
lines changed

4 files changed

+53
-4
lines changed

src/json_parser/parser.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export class ParserService {
1919
return `<tspan style="fill: ${color};">${quotes}${obj}${quotes}</tspan>`;
2020
}
2121

22-
// Форматирование объекта
2322
const entries = Object.entries(obj)
2423
.map(([key, value], index, array) => {
2524
const formattedValue = this.parse(value, indent, depth + 1);

src/widget/views/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
</style>
2626
<rect width="800" height="{{ height_ }}" style="fill: #1e1e1e;" />
27-
<rect width="685" height="40" x="107" style="fill: #252526;" />
27+
<rect width="800" height="40" x="107" style="fill: #252526;" />
2828
<rect width="1" height="{{ height }}" x="40" y="40" style="fill: #404040;" />
2929

3030
<text y="60" font-family="Consolas, monospace" class="indexes">

src/widget/widget.controller.ts

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Get, Controller, Render, Header, Res } from '@nestjs/common';
1+
import { Get, Controller, Render, Header, Res, Query } from '@nestjs/common';
22
import type { Response } from 'express';
33
import { WidgetService } from './widget.service';
44

@@ -27,4 +27,50 @@ export class WidgetController {
2727
height_: 60 + (lines_count * 19)
2828
};
2929
}
30+
31+
/*
32+
@Get('/user')
33+
@Render('index')
34+
@Header('Cache-Control', 'no-cache')
35+
@Header('Age', '0')
36+
async widgetUser(
37+
@Res({ passthrough: true }) res: Response,
38+
@Query() query: { query: string }
39+
) {
40+
let json = {};
41+
let content = "";
42+
let indexes = ""
43+
let lines_count = 0;
44+
45+
try {
46+
if (!query.query || query.query.length > 255) {
47+
throw Error('Invalid request query');
48+
}
49+
50+
json = JSON.parse(query.query);
51+
52+
content = await this.widgetService.generateUser(json);
53+
lines_count = content.split('\n').length;
54+
indexes = this.widgetService.generate_indexes(lines_count);
55+
} catch (e) {
56+
console.error(e)
57+
json = {
58+
status: 'error',
59+
message: (e.message ?? "Unknown error. See server console.").slice(0, 60) + (!!e.message && e.message.length > 60 ? '...' : '')
60+
}
61+
62+
content = await this.widgetService.generateUser(json);
63+
lines_count = content.split('\n').length;
64+
indexes = this.widgetService.generate_indexes(lines_count);
65+
}
66+
67+
res.header('Content-Type', 'image/svg+xml');
68+
return {
69+
json: content,
70+
indexes: indexes,
71+
height: 52 + (lines_count * 19),
72+
height_: 60 + (lines_count * 19)
73+
};
74+
}
75+
*/
3076
}

src/widget/widget.service.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,13 @@ export class WidgetService {
115115
console.error(e)
116116
json = {
117117
status: 'error',
118-
message: (e.message ?? "Unknown error. See server console.").slice(0, 60) + '...'
118+
message: (e.message ?? "Unknown error. See server console.").slice(0, 60) + (!!e.message && e.message.length > 60 ? '...' : '')
119119
}
120120
}
121121
return this.parserService.parse(json, 30);
122122
}
123+
124+
async generateUser(obj: any) {
125+
return this.parserService.parse(obj, 30);
126+
}
123127
}

0 commit comments

Comments
 (0)