Main logic
This commit is contained in:
11
.env.example
Normal file
11
.env.example
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
# Скопируйте в `.env` и при необходимости измените.
|
||||||
|
# Клиентский бандл: после правок выполните `npm run env:sync`.
|
||||||
|
|
||||||
|
# База API (путь относительно текущего origin в браузере, для file:// — склеивается с SG_API_FALLBACK_ORIGIN)
|
||||||
|
SG_API_BASE_PATH=/api/v1
|
||||||
|
|
||||||
|
# Origin для разрешения относительных URL (HLS playlist и т.д.) при открытии приложения как file:// или вне основного хоста
|
||||||
|
SG_API_FALLBACK_ORIGIN=https://sparkguardian.ru
|
||||||
|
|
||||||
|
# Только dev-сервер (`ng serve`): куда проксировать `/api/**`
|
||||||
|
SG_DEV_PROXY_TARGET=http://sparkguardian.ru:8080
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -29,6 +29,9 @@ yarn-error.log
|
|||||||
!.vscode/mcp.json
|
!.vscode/mcp.json
|
||||||
.history/*
|
.history/*
|
||||||
|
|
||||||
|
# Local env (see .env.example)
|
||||||
|
.env
|
||||||
|
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
/.angular/cache
|
/.angular/cache
|
||||||
.sass-cache/
|
.sass-cache/
|
||||||
|
|||||||
40
Makefile
Normal file
40
Makefile
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
.DEFAULT_GOAL := help
|
||||||
|
|
||||||
|
.PHONY: help install env-sync start serve build build-dev watch test clean
|
||||||
|
|
||||||
|
help:
|
||||||
|
@echo "SparkGuardian"
|
||||||
|
@echo " make install Установить зависимости (npm install)"
|
||||||
|
@echo " make env-sync Сгенерировать src/environments/environment.ts из .env"
|
||||||
|
@echo " make start Dev-сервер (ng serve + прокси, перед стартом — env:sync)"
|
||||||
|
@echo " make serve то же, что start"
|
||||||
|
@echo " make build Production-сборка (перед сборкой — env:sync)"
|
||||||
|
@echo " make build-dev Сборка в режиме development"
|
||||||
|
@echo " make watch ng build --watch (development)"
|
||||||
|
@echo " make test Unit-тесты (ng test)"
|
||||||
|
@echo " make clean Удалить dist, out-tsc, кэш Angular"
|
||||||
|
|
||||||
|
install:
|
||||||
|
npm install
|
||||||
|
|
||||||
|
env-sync:
|
||||||
|
npm run env:sync
|
||||||
|
|
||||||
|
start serve:
|
||||||
|
npm start
|
||||||
|
|
||||||
|
build:
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
build-dev:
|
||||||
|
npm run env:sync
|
||||||
|
npx ng build --configuration development
|
||||||
|
|
||||||
|
watch:
|
||||||
|
npm run watch
|
||||||
|
|
||||||
|
test:
|
||||||
|
npm test
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf dist out-tsc .angular/cache
|
||||||
19
angular.json
19
angular.json
@@ -22,14 +22,27 @@
|
|||||||
{
|
{
|
||||||
"glob": "**/*",
|
"glob": "**/*",
|
||||||
"input": "public"
|
"input": "public"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"glob": "**/*",
|
||||||
|
"input": "node_modules/@taiga-ui/icons/src",
|
||||||
|
"output": "assets/taiga-ui/icons"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
|
"node_modules/@taiga-ui/styles/taiga-ui-theme.less",
|
||||||
|
"node_modules/@taiga-ui/styles/taiga-ui-fonts.less",
|
||||||
"src/styles.css"
|
"src/styles.css"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/environments/environment.ts",
|
||||||
|
"with": "src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
],
|
||||||
"budgets": [
|
"budgets": [
|
||||||
{
|
{
|
||||||
"type": "initial",
|
"type": "initial",
|
||||||
@@ -54,12 +67,16 @@
|
|||||||
},
|
},
|
||||||
"serve": {
|
"serve": {
|
||||||
"builder": "@angular/build:dev-server",
|
"builder": "@angular/build:dev-server",
|
||||||
|
"options": {
|
||||||
|
"proxyConfig": "proxy.conf.cjs"
|
||||||
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
"buildTarget": "sparkguardian:build:production"
|
"buildTarget": "sparkguardian:build:production"
|
||||||
},
|
},
|
||||||
"development": {
|
"development": {
|
||||||
"buildTarget": "sparkguardian:build:development"
|
"buildTarget": "sparkguardian:build:development",
|
||||||
|
"proxyConfig": "proxy.conf.cjs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"defaultConfiguration": "development"
|
"defaultConfiguration": "development"
|
||||||
|
|||||||
@@ -162,6 +162,64 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/sessions/{id}/events": {
|
||||||
|
"get": {
|
||||||
|
"security": [
|
||||||
|
{
|
||||||
|
"ForwardAuth": []
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Downloads encrypted .bin chunks from S3, decrypts, and returns parsed events with optional time range filtering.",
|
||||||
|
"produces": [
|
||||||
|
"application/json"
|
||||||
|
],
|
||||||
|
"tags": [
|
||||||
|
"telemetry"
|
||||||
|
],
|
||||||
|
"summary": "Get parsed telemetry events",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"type": "integer",
|
||||||
|
"description": "Session ID",
|
||||||
|
"name": "id",
|
||||||
|
"in": "path",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "integer",
|
||||||
|
"description": "Start timestamp (Unix ms)",
|
||||||
|
"name": "from",
|
||||||
|
"in": "query"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "integer",
|
||||||
|
"description": "End timestamp (Unix ms)",
|
||||||
|
"name": "to",
|
||||||
|
"in": "query"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "OK",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/handler.ParsedEventsResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "Bad Request",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/handler.ErrorResponse"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Internal Server Error",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/handler.ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/sessions/{id}/playlist/{stream_type}.m3u8": {
|
"/sessions/{id}/playlist/{stream_type}.m3u8": {
|
||||||
"get": {
|
"get": {
|
||||||
"security": [
|
"security": [
|
||||||
@@ -448,6 +506,44 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"handler.ParsedEvent": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"data": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "integer"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"event_type": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "keyboard"
|
||||||
|
},
|
||||||
|
"timestamp": {
|
||||||
|
"type": "integer",
|
||||||
|
"example": 1711360200000
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"handler.ParsedEventsResponse": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"count": {
|
||||||
|
"type": "integer",
|
||||||
|
"example": 42
|
||||||
|
},
|
||||||
|
"events": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"$ref": "#/definitions/handler.ParsedEvent"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"session_id": {
|
||||||
|
"type": "integer",
|
||||||
|
"example": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"handler.SessionDetailResponse": {
|
"handler.SessionDetailResponse": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|||||||
1136
package-lock.json
generated
1136
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@@ -3,8 +3,12 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"env:sync": "node scripts/sync-env.cjs",
|
||||||
|
"prestart": "npm run env:sync",
|
||||||
|
"prebuild": "npm run env:sync",
|
||||||
|
"start": "ng serve --proxy-config proxy.conf.cjs",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
|
"prewatch": "npm run env:sync",
|
||||||
"watch": "ng build --watch --configuration development",
|
"watch": "ng build --watch --configuration development",
|
||||||
"test": "ng test"
|
"test": "ng test"
|
||||||
},
|
},
|
||||||
@@ -17,14 +21,22 @@
|
|||||||
"@angular/forms": "^21.2.0",
|
"@angular/forms": "^21.2.0",
|
||||||
"@angular/platform-browser": "^21.2.0",
|
"@angular/platform-browser": "^21.2.0",
|
||||||
"@angular/router": "^21.2.0",
|
"@angular/router": "^21.2.0",
|
||||||
|
"@taiga-ui/cdk": "^5.1.0",
|
||||||
|
"@taiga-ui/core": "^5.1.0",
|
||||||
|
"@taiga-ui/icons": "^5.1.0",
|
||||||
|
"@taiga-ui/kit": "^5.1.0",
|
||||||
|
"@taiga-ui/styles": "^5.1.0",
|
||||||
|
"hls.js": "^1.6.15",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"dotenv": "^16.4.7",
|
||||||
"@angular/build": "^21.2.6",
|
"@angular/build": "^21.2.6",
|
||||||
"@angular/cli": "^21.2.6",
|
"@angular/cli": "^21.2.6",
|
||||||
"@angular/compiler-cli": "^21.2.0",
|
"@angular/compiler-cli": "^21.2.0",
|
||||||
"jsdom": "^28.0.0",
|
"jsdom": "^28.0.0",
|
||||||
|
"less": "^4.6.4",
|
||||||
"prettier": "^3.8.1",
|
"prettier": "^3.8.1",
|
||||||
"typescript": "~5.9.2",
|
"typescript": "~5.9.2",
|
||||||
"vitest": "^4.0.8"
|
"vitest": "^4.0.8"
|
||||||
|
|||||||
15
proxy.conf.cjs
Normal file
15
proxy.conf.cjs
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
/**
|
||||||
|
* Прокси для `ng serve`. Целевой backend задаётся в `.env` (SG_DEV_PROXY_TARGET).
|
||||||
|
*/
|
||||||
|
const path = require('path');
|
||||||
|
require('dotenv').config({ path: path.join(__dirname, '.env') });
|
||||||
|
|
||||||
|
const target = process.env.SG_DEV_PROXY_TARGET || 'http://sparkguardian.ru:8080';
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
'/api/**': {
|
||||||
|
target,
|
||||||
|
secure: false,
|
||||||
|
changeOrigin: true,
|
||||||
|
},
|
||||||
|
};
|
||||||
398
public/KB_USA-standard.svg
Normal file
398
public/KB_USA-standard.svg
Normal file
@@ -0,0 +1,398 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<!-- Reorganised with TEXT EDITOR (gedit under Ubuntu).
|
||||||
|
This file is the general file for the USA alphanumerical keyboard :
|
||||||
|
- it uses style sheet (css) [see details at section "style"]
|
||||||
|
- it displays the standard pad
|
||||||
|
- and optionnaly
|
||||||
|
* for some keys : the draw and/or the text (↹ and/or TAB …)
|
||||||
|
- keys and inscriptions are geographically referenced : "kb" + line(number) + range(letter) -->
|
||||||
|
|
||||||
|
<svg id="svg2"
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
version="1.0"
|
||||||
|
xml:space="preserve"
|
||||||
|
sodipodi:version="0.32"
|
||||||
|
inkscape:version="0.48.0 r9654"
|
||||||
|
inkscape:output_extension="org.inkscape.output.svg.inkscape"
|
||||||
|
|
||||||
|
sodipodi:docname="KB_USA 800px.svg" width="800" height="247" viewBox="0 0 801 248" style="display:inline">
|
||||||
|
|
||||||
|
<metadata
|
||||||
|
id="metadata316">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
<dc:description>Meta (⌘) and Menu: Lucide icons (https://lucide.dev), ISC License, © Lucide Contributors.</dc:description>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<sodipodi:namedview id="base"
|
||||||
|
inkscape:window-width="1679"
|
||||||
|
inkscape:window-height="1019"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
borderopacity="1.0"
|
||||||
|
bordercolor="#666666"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:guide-bbox="true"
|
||||||
|
inkscape:zoom="0.6"
|
||||||
|
inkscape:cx="400"
|
||||||
|
inkscape:cy="123.5"
|
||||||
|
inkscape:current-layer="layer3"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
showgrid="true"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
|
inkscape:bbox-nodes="true"
|
||||||
|
inkscape:snap-nodes="true"
|
||||||
|
inkscape:snap-grids="true"
|
||||||
|
inkscape:bbox-paths="false"
|
||||||
|
fit-margin-top="0"
|
||||||
|
fit-margin-left="0"
|
||||||
|
fit-margin-right="0"
|
||||||
|
fit-margin-bottom="0"
|
||||||
|
units="px"
|
||||||
|
inkscape:snap-bbox-edge-midpoints="false"
|
||||||
|
inkscape:snap-bbox-midpoints="false"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:snap-page="true"
|
||||||
|
inkscape:snap-smooth-nodes="true">
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<defs id="defs4">
|
||||||
|
<style id="style6" type="text/css">
|
||||||
|
|
||||||
|
<!-- General : «#» style for «id» ; «.» class style (for particular style in group)
|
||||||
|
DRAW styles : K_ : particular key style
|
||||||
|
TEXT styles : «text» : common style for all text | T_ : text style | _L : large ; _s : very small -->
|
||||||
|
|
||||||
|
<![CDATA[
|
||||||
|
|
||||||
|
text {
|
||||||
|
writing-mode: lr-tb;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
font-family: var(--sg-keyboard-font-family);
|
||||||
|
letter-spacing: var(--sg-keyboard-letter-spacing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#T_others text {
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
text-align: start;
|
||||||
|
text-anchor: start;
|
||||||
|
fill: var(--sg-keyboard-ink);
|
||||||
|
}
|
||||||
|
#T_alterninsc text {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
fill: var(--sg-keyboard-ink-soft);
|
||||||
|
stroke: none;
|
||||||
|
}
|
||||||
|
#T_alterninsc text.T_alt-left {
|
||||||
|
text-align: start;
|
||||||
|
text-anchor: start;
|
||||||
|
}
|
||||||
|
#T_alterninsc text.T_alt-right {
|
||||||
|
text-align: end;
|
||||||
|
text-anchor: end;
|
||||||
|
}
|
||||||
|
#T_stdletters text {
|
||||||
|
font-size: 20px;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
fill: var(--sg-keyboard-ink);
|
||||||
|
stroke: none;
|
||||||
|
text-align: center;
|
||||||
|
text-anchor: middle;
|
||||||
|
}
|
||||||
|
#T_stdspecial text {
|
||||||
|
font-size: 17px;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
letter-spacing: 0.03em;
|
||||||
|
fill: var(--sg-keyboard-ink);
|
||||||
|
stroke: none;
|
||||||
|
text-align: center;
|
||||||
|
text-anchor: middle;
|
||||||
|
}
|
||||||
|
.T_size_s {
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
fill: var(--sg-keyboard-ink);
|
||||||
|
stroke: none;
|
||||||
|
text-align: start;
|
||||||
|
text-anchor: start;
|
||||||
|
}
|
||||||
|
.T_size_L {
|
||||||
|
font-size: 20px;
|
||||||
|
font-weight: var(--sg-keyboard-font-weight);
|
||||||
|
letter-spacing: 0.03em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#GlyphKey rect,
|
||||||
|
#GlyphKey use {
|
||||||
|
fill: var(--sg-keyboard-key-main);
|
||||||
|
stroke: var(--sg-keyboard-key-stroke);
|
||||||
|
stroke-width: 0.85;
|
||||||
|
}
|
||||||
|
#ModifKey rect {
|
||||||
|
fill: var(--sg-keyboard-key-mod);
|
||||||
|
stroke: var(--sg-keyboard-key-stroke);
|
||||||
|
stroke-width: 0.85;
|
||||||
|
}
|
||||||
|
#OtherKey rect {
|
||||||
|
fill: var(--sg-keyboard-key-other);
|
||||||
|
stroke: var(--sg-keyboard-key-stroke);
|
||||||
|
stroke-width: 0.85;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Встроенные значки Lucide (обводка); Meta — иконка command (⌘) */
|
||||||
|
.sg-lucide path,
|
||||||
|
.sg-lucide line,
|
||||||
|
.sg-lucide polyline,
|
||||||
|
.sg-lucide rect {
|
||||||
|
fill: none;
|
||||||
|
stroke: var(--sg-keyboard-ink);
|
||||||
|
stroke-width: 1.55;
|
||||||
|
stroke-linecap: round;
|
||||||
|
stroke-linejoin: round;
|
||||||
|
}
|
||||||
|
#S_kb6b.sg-lucide path {
|
||||||
|
stroke: var(--sg-keyboard-ink-soft) !important;
|
||||||
|
}
|
||||||
|
#S_kb6m.sg-lucide line {
|
||||||
|
stroke: var(--sg-keyboard-ink) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
]]>
|
||||||
|
|
||||||
|
</style>
|
||||||
|
</defs>
|
||||||
|
<!-- ======== Keys ======== -->
|
||||||
|
<g inkscape:groupmode="layer" id="layer2" inkscape:label="Keys" style="display:inline" sodipodi:insensitive="true">
|
||||||
|
<g id="GlyphKey">
|
||||||
|
<!-- Num keys - Standard letters keys - Specials glyphs keys - Ponctuation keys -->
|
||||||
|
<rect id="K_kb2a" x="2" y="2" width="48" height="44" rx="6" ry="6" />
|
||||||
|
<use id="K_kb2b" xlink:href="#K_kb2a" transform="translate(54,0)"/>
|
||||||
|
<use id="K_kb2c" xlink:href="#K_kb2a" transform="translate(108,0)"/>
|
||||||
|
<use id="K_kb2d" xlink:href="#K_kb2a" transform="translate(162,0)"/>
|
||||||
|
<use id="K_kb2e" xlink:href="#K_kb2a" transform="translate(216,0)"/>
|
||||||
|
<use id="K_kb2f" xlink:href="#K_kb2a" transform="translate(270,0)"/>
|
||||||
|
<use id="K_kb2g" xlink:href="#K_kb2a" transform="translate(324,0)"/>
|
||||||
|
<use id="K_kb2h" xlink:href="#K_kb2a" transform="translate(378,0)"/>
|
||||||
|
<use id="K_kb2i" xlink:href="#K_kb2a" transform="translate(432,0)"/>
|
||||||
|
<use id="K_kb2j" xlink:href="#K_kb2a" transform="translate(486,0)"/>
|
||||||
|
<use id="K_kb2k" xlink:href="#K_kb2a" transform="translate(540,0)"/>
|
||||||
|
<use id="K_kb2l" xlink:href="#K_kb2a" transform="translate(594,0)"/>
|
||||||
|
<use id="K_kb2m" xlink:href="#K_kb2a" transform="translate(648,0)"/>
|
||||||
|
|
||||||
|
<use id="K_kb3b" xlink:href="#K_kb2a" transform="translate(80,50)"/>
|
||||||
|
<use id="K_kb3c" xlink:href="#K_kb2a" transform="translate(134,50)"/>
|
||||||
|
<use id="K_kb3d" xlink:href="#K_kb2a" transform="translate(188,50)"/>
|
||||||
|
<use id="K_kb3e" xlink:href="#K_kb2a" transform="translate(242,50)"/>
|
||||||
|
<use id="K_kb3f" xlink:href="#K_kb2a" transform="translate(296,50)"/>
|
||||||
|
<use id="K_kb3g" xlink:href="#K_kb2a" transform="translate(350,50)"/>
|
||||||
|
<use id="K_kb3h" xlink:href="#K_kb2a" transform="translate(404,50)"/>
|
||||||
|
<use id="K_kb3i" xlink:href="#K_kb2a" transform="translate(458,50)"/>
|
||||||
|
<use id="K_kb3j" xlink:href="#K_kb2a" transform="translate(512,50)"/>
|
||||||
|
<use id="K_kb3k" xlink:href="#K_kb2a" transform="translate(566,50)"/>
|
||||||
|
<use id="K_kb3l" xlink:href="#K_kb2a" transform="translate(620,50)"/>
|
||||||
|
<use id="K_kb3m" xlink:href="#K_kb2a" transform="translate(674,50)"/>
|
||||||
|
<rect id="K_kb3n" x="730" y="52" width="70" height="44" rx="6" ry="6" />
|
||||||
|
|
||||||
|
<use id="K_kb4b" xlink:href="#K_kb2a" transform="translate(96,100)"/>
|
||||||
|
<use id="K_kb4c" xlink:href="#K_kb2a" transform="translate(150,100)"/>
|
||||||
|
<use id="K_kb4d" xlink:href="#K_kb2a" transform="translate(204,100)"/>
|
||||||
|
<use id="K_kb4e" xlink:href="#K_kb2a" transform="translate(258,100)"/>
|
||||||
|
<use id="K_kb4f" xlink:href="#K_kb2a" transform="translate(312,100)"/>
|
||||||
|
<use id="K_kb4g" xlink:href="#K_kb2a" transform="translate(366,100)"/>
|
||||||
|
<use id="K_kb4h" xlink:href="#K_kb2a" transform="translate(420,100)"/>
|
||||||
|
<use id="K_kb4i" xlink:href="#K_kb2a" transform="translate(474,100)"/>
|
||||||
|
<use id="K_kb4j" xlink:href="#K_kb2a" transform="translate(528,100)"/>
|
||||||
|
<use id="K_kb4k" xlink:href="#K_kb2a" transform="translate(582,100)"/>
|
||||||
|
<use id="K_kb4l" xlink:href="#K_kb2a" transform="translate(636,100)"/>
|
||||||
|
<use id="K_kb4m" xlink:href="#K_kb2a" transform="translate(690,100)"/>
|
||||||
|
|
||||||
|
<use id="K_kb5c" xlink:href="#K_kb2a" transform="translate(116,150)"/>
|
||||||
|
<use id="K_kb5d" xlink:href="#K_kb2a" transform="translate(170,150)"/>
|
||||||
|
<use id="K_kb5e" xlink:href="#K_kb2a" transform="translate(224,150)"/>
|
||||||
|
<use id="K_kb5f" xlink:href="#K_kb2a" transform="translate(278,150)"/>
|
||||||
|
<use id="K_kb5g" xlink:href="#K_kb2a" transform="translate(332,150)"/>
|
||||||
|
<use id="K_kb5h" xlink:href="#K_kb2a" transform="translate(386,150)"/>
|
||||||
|
<use id="K_kb5i" xlink:href="#K_kb2a" transform="translate(440,150)"/>
|
||||||
|
<use id="K_kb5j" xlink:href="#K_kb2a" transform="translate(494,150)"/>
|
||||||
|
<use id="K_kb5k" xlink:href="#K_kb2a" transform="translate(548,150)"/>
|
||||||
|
<use id="K_kb5l" xlink:href="#K_kb2a" transform="translate(602,150)"/>
|
||||||
|
|
||||||
|
<rect id="K_kb6d" x="188" y="202" width="364" height="44" rx="6" ry="6" />
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<!-- Modification keys -->
|
||||||
|
<g id="ModifKey">
|
||||||
|
<rect id="K_kb4a" x="2" y="102" width="90" height="44" rx="6" ry="6" />
|
||||||
|
<rect id="K_kb5a" x="2" y="152" width="110" height="44" rx="6" ry="6" />
|
||||||
|
<rect id="K_kb5m" x="658" y="152" width="142" height="44" rx="6" ry="6" />
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<!-- Other keys -->
|
||||||
|
<g id="OtherKey">
|
||||||
|
<!-- Backspace --> <rect id="K_kb2n" x="704" y="2" width="96" height="44" rx="6" ry="6" />
|
||||||
|
|
||||||
|
<!-- Tabulation --> <rect id="K_kb3a" x="2" y="52" width="74" height="44" rx="6" ry="6" />
|
||||||
|
|
||||||
|
<!-- Enter key -->
|
||||||
|
<rect id="K_kb4n" x="692" y="102" width="107" height="44" rx="6" ry="6" />
|
||||||
|
|
||||||
|
<!-- Ctrl 1 --> <rect id="K_kb6a" x="2" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
<!-- Win 1 --> <rect id="K_kb6b" x="64" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
<!-- Alt 1 --> <rect id="K_kb6c" x="126" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
<!-- Alt 2 --> <rect id="K_kb6k" x="558" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
<!-- Win 2 --> <rect id="K_kb6l" x="620" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
<!-- Menu --> <rect id="K_kb6m" x="682" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
<!-- Ctrl 2 --> <rect id="K_kb6n" x="744" y="202" width="56" height="44" rx="6" ry="6" />
|
||||||
|
</g>
|
||||||
|
|
||||||
|
</g>
|
||||||
|
<!-- ======== Key signs ======== -->
|
||||||
|
<g inkscape:groupmode="layer" id="DrawedInscr" inkscape:label="DrawedInscr" style="display:inline">
|
||||||
|
|
||||||
|
<!-- Meta / ⌘ — Lucide «command» -->
|
||||||
|
<g id="S_kb6b" class="sg-lucide" transform="translate(82,214) scale(0.8333333333)">
|
||||||
|
<path d="M15 6v12a3 3 0 1 0 3-3H6a3 3 0 1 0 3 3V6a3 3 0 1 0-3 3h12a3 3 0 1 0-3-3" />
|
||||||
|
</g>
|
||||||
|
<use id="S_kb6l" xlink:href="#S_kb6b" transform="translate(556,0)" x="0" y="0" width="1" height="1" />
|
||||||
|
<!-- Menu — Lucide «menu» -->
|
||||||
|
<g id="S_kb6m" class="sg-lucide" transform="translate(700,214) scale(0.8333333333)">
|
||||||
|
<line x1="4" x2="20" y1="12" y2="12" />
|
||||||
|
<line x1="4" x2="20" y1="6" y2="6" />
|
||||||
|
<line x1="4" x2="20" y1="18" y2="18" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<!-- ======== Inscriptions layer ======== -->
|
||||||
|
<g inkscape:groupmode="layer" id="en-us" inkscape:label="incriptions" sodipodi:insensitive="true" style="display:inline">
|
||||||
|
|
||||||
|
<g id="T_stdletters">
|
||||||
|
|
||||||
|
<text id="T_kb3b2" x="96" y="72" >Q</text>
|
||||||
|
<text id="T_kb3c2" x="150" y="72" >W</text>
|
||||||
|
<text id="T_kb3d2" x="204" y="72" >E</text>
|
||||||
|
<text id="T_kb3e2" x="258" y="72" >R</text>
|
||||||
|
<text id="T_kb3f2" x="312" y="72" >T</text>
|
||||||
|
<text id="T_kb3g2" x="366" y="72" >Y</text>
|
||||||
|
<text id="T_kb3h2" x="420" y="72" >U</text>
|
||||||
|
<text id="T_kb3i2" x="474" y="72" >I</text>
|
||||||
|
<text id="T_kb3j2" x="528" y="72" >O</text>
|
||||||
|
<text id="T_kb3k2" x="582" y="72" >P</text>
|
||||||
|
|
||||||
|
<text id="T_kb4c2" x="112" y="122" >A</text>
|
||||||
|
<text id="T_kb4d2" x="166" y="122" >S</text>
|
||||||
|
<text id="T_kb4e2" x="220" y="122" >D</text>
|
||||||
|
<text id="T_kb4f2" x="274" y="122" >F</text>
|
||||||
|
<text id="T_kb4g2" x="328" y="122" >G</text>
|
||||||
|
<text id="T_kb4h2" x="382" y="122" >H</text>
|
||||||
|
<text id="T_kb4i2" x="436" y="122" >J</text>
|
||||||
|
<text id="T_kb4j2" x="490" y="122" >K</text>
|
||||||
|
<text id="T_kb4k2" x="544" y="122" >L</text>
|
||||||
|
|
||||||
|
<text id="T_kb5c2" x="132" y="172" >Z</text>
|
||||||
|
<text id="T_kb5d2" x="186" y="172" >X</text>
|
||||||
|
<text id="T_kb5e2" x="240" y="172" >C</text>
|
||||||
|
<text id="T_kb5f2" x="294" y="172" >V</text>
|
||||||
|
<text id="T_kb5g2" x="348" y="172" >B</text>
|
||||||
|
<text id="T_kb5h2" x="402" y="172" >N</text>
|
||||||
|
<text id="T_kb5i2" x="454" y="172" >M</text>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<g id="T_stdspecial">
|
||||||
|
|
||||||
|
<text id="T_kb2a1" x="14" y="42" class="T_size_L">`</text>
|
||||||
|
<text id="T_kb2b1" x="68" y="42" >1</text>
|
||||||
|
<text id="T_kb2c1" x="122" y="42" >2</text>
|
||||||
|
<text id="T_kb2d1" x="176" y="42" >3</text>
|
||||||
|
<text id="T_kb2e1" x="230" y="42" >4</text>
|
||||||
|
<text id="T_kb2f1" x="284" y="42" >5</text>
|
||||||
|
<text id="T_kb2g1" x="338" y="42" >6</text>
|
||||||
|
<text id="T_kb2h1" x="392" y="42" >7</text>
|
||||||
|
<text id="T_kb2i1" x="446" y="42" >8</text>
|
||||||
|
<text id="T_kb2j1" x="500" y="42" >9</text>
|
||||||
|
<text id="T_kb2k1" x="554" y="42" >0</text>
|
||||||
|
<text id="T_kb2l1" x="610" y="42" >-</text>
|
||||||
|
<text id="T_kb2m1" x="662" y="42" >=</text>
|
||||||
|
|
||||||
|
<text id="T_kb3l1" x="636" y="90" >[</text>
|
||||||
|
<text id="T_kb3m1" x="690" y="90" >]</text>
|
||||||
|
<text id="T_kb3n1" x="744" y="90" >\</text>
|
||||||
|
|
||||||
|
<text id="T_kb4l1" x="598" y="142" >;</text>
|
||||||
|
<text id="T_kb4m1" x="652" y="142" class="T_size_L">'</text>
|
||||||
|
|
||||||
|
<text id="T_kb5j1" x="508" y="190" >,</text>
|
||||||
|
<text id="T_kb5k1" x="562" y="192" >.</text>
|
||||||
|
<text id="T_kb5l1" x="616" y="192" >/</text>
|
||||||
|
|
||||||
|
<!-- Shift level -->
|
||||||
|
|
||||||
|
<text id="T_kb2a2" x="14" y="18" class="T_size_L">~</text>
|
||||||
|
<text id="T_kb2b2" x="68" y="20" >!</text>
|
||||||
|
<text id="T_kb2c2" x="122" y="20" >@</text>
|
||||||
|
<text id="T_kb2d2" x="176" y="20" >#</text>
|
||||||
|
<text id="T_kb2e2" x="230" y="20" >$</text>
|
||||||
|
<text id="T_kb2f2" x="284" y="20" >%</text>
|
||||||
|
<text id="T_kb2g2" x="338" y="22" class="T_size_L">^</text>
|
||||||
|
<text id="T_kb2h2" x="392" y="20" >&</text>
|
||||||
|
<text id="T_kb2i2" x="446" y="20" >∗</text>
|
||||||
|
<text id="T_kb2j2" x="500" y="20" >(</text>
|
||||||
|
<text id="T_kb2k2" x="554" y="20" >)</text>
|
||||||
|
<text id="T_kb2l2" x="608" y="20" >_</text>
|
||||||
|
<text id="T_kb2m2" x="662" y="20" >+</text>
|
||||||
|
|
||||||
|
<text id="T_kb3l2" x="636" y="68" >{</text>
|
||||||
|
<text id="T_kb3m2" x="690" y="68" >}</text>
|
||||||
|
<text id="T_kb3n2" x="744" y="68" >|</text>
|
||||||
|
|
||||||
|
<text id="T_kb4l2" x="598" y="122" >:</text>
|
||||||
|
<text id="T_kb4m2" x="652" y="122" class="T_size_L">"</text>
|
||||||
|
|
||||||
|
<text id="T_kb5j2" x="508" y="170" ><</text>
|
||||||
|
<text id="T_kb5k2" x="562" y="170" >></text>
|
||||||
|
<text id="T_kb5l2" x="616" y="170" >?</text>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<g id="T_others">
|
||||||
|
<text id="T_kb6a" x="10" y="230" >Ctrl</text>
|
||||||
|
<text id="T_kb6c" x="134" y="230" >Alt</text>
|
||||||
|
<text id="T_kb6k" x="564" y="230" >Alt</text>
|
||||||
|
<text id="T_kb6n" x="750" y="230" >Ctrl</text>
|
||||||
|
</g>
|
||||||
|
<!-- ======== alternates inscriptions ======== -->
|
||||||
|
<g inkscape:groupmode="layer" id="sublayer4a" inkscape:label="alternative inscriptions" style="display:inline">
|
||||||
|
<g id="T_alterninsc" >
|
||||||
|
<!-- K_kb2n x=704 w=96 → правый край подписи ~790 -->
|
||||||
|
<text id="T_kb2n" class="T_alt-right" x="790" y="40" >delete</text>
|
||||||
|
<!-- K_kb3a x=2 w=74 -->
|
||||||
|
<text id="T_kb3a" class="T_alt-left" x="10" y="80" >tab</text>
|
||||||
|
<!-- K_kb4n x=692 w=107 -->
|
||||||
|
<text id="T_kb4n" class="T_alt-right" x="789" y="130">return</text>
|
||||||
|
<!-- K_kb4a x=2 w=90 -->
|
||||||
|
<text id="T_kb4a1" class="T_alt-left" x="10" y="128">caps lock</text>
|
||||||
|
<!-- K_kb5a x=2 w=110 -->
|
||||||
|
<text id="T_kb5a" class="T_alt-left" x="10" y="180">shift</text>
|
||||||
|
<!-- K_kb5m x=658 w=142 -->
|
||||||
|
<text id="T_kb5m" class="T_alt-right" x="790" y="180">shift</text>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 16 KiB |
BIN
public/fonts/TinkoffSans-Bold.ttf
Normal file
BIN
public/fonts/TinkoffSans-Bold.ttf
Normal file
Binary file not shown.
BIN
public/fonts/TinkoffSans-Medium.ttf
Normal file
BIN
public/fonts/TinkoffSans-Medium.ttf
Normal file
Binary file not shown.
BIN
public/fonts/TinkoffSans-Regular.ttf
Normal file
BIN
public/fonts/TinkoffSans-Regular.ttf
Normal file
Binary file not shown.
33
scripts/sync-env.cjs
Normal file
33
scripts/sync-env.cjs
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
/**
|
||||||
|
* Генерирует `src/environments/environment.ts` из переменных окружения (.env).
|
||||||
|
* Значения по умолчанию совпадают с .env.example.
|
||||||
|
*/
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
require('dotenv').config({ path: path.join(__dirname, '..', '.env') });
|
||||||
|
|
||||||
|
const defaults = {
|
||||||
|
SG_API_FALLBACK_ORIGIN: 'https://sparkguardian.ru',
|
||||||
|
SG_API_BASE_PATH: '/api/v1',
|
||||||
|
};
|
||||||
|
|
||||||
|
function val(key) {
|
||||||
|
const v = process.env[key];
|
||||||
|
if (v !== undefined && v !== '') {
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
return defaults[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
const content = `// Сгенерировано npm run env:sync — правьте .env и снова запустите sync
|
||||||
|
export const environment = {
|
||||||
|
production: false,
|
||||||
|
apiFallbackOrigin: ${JSON.stringify(val('SG_API_FALLBACK_ORIGIN'))},
|
||||||
|
apiBasePath: ${JSON.stringify(val('SG_API_BASE_PATH'))},
|
||||||
|
} as const;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const outPath = path.join(__dirname, '..', 'src', 'environments', 'environment.ts');
|
||||||
|
fs.writeFileSync(outPath, content, 'utf8');
|
||||||
|
console.log('env:sync →', outPath);
|
||||||
@@ -1,11 +1,22 @@
|
|||||||
|
import { provideHttpClient, withInterceptors } from '@angular/common/http';
|
||||||
import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core';
|
import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core';
|
||||||
import { provideRouter } from '@angular/router';
|
import { provideRouter } from '@angular/router';
|
||||||
|
import { provideTaiga } from '@taiga-ui/core';
|
||||||
|
import { tuiNotificationOptionsProvider } from '@taiga-ui/core/components/notification';
|
||||||
|
|
||||||
|
import { apiBaseUrlInterceptor } from './core/http/api-base-url.interceptor';
|
||||||
|
import { devLogInterceptor } from './core/http/dev-log.interceptor';
|
||||||
import { routes } from './app.routes';
|
import { routes } from './app.routes';
|
||||||
|
|
||||||
export const appConfig: ApplicationConfig = {
|
export const appConfig: ApplicationConfig = {
|
||||||
providers: [
|
providers: [
|
||||||
provideBrowserGlobalErrorListeners(),
|
provideBrowserGlobalErrorListeners(),
|
||||||
provideRouter(routes)
|
provideRouter(routes),
|
||||||
]
|
provideTaiga(),
|
||||||
|
tuiNotificationOptionsProvider(() => ({
|
||||||
|
block: 'start',
|
||||||
|
inline: 'end',
|
||||||
|
})),
|
||||||
|
provideHttpClient(withInterceptors([apiBaseUrlInterceptor, devLogInterceptor])),
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
min-height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell {
|
||||||
|
min-height: 100dvh;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-header {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 0.75rem;
|
||||||
|
padding: 1rem 1.5rem;
|
||||||
|
border-bottom: 1px solid var(--tui-border-normal);
|
||||||
|
background: var(--tui-background-elevation-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.brand {
|
||||||
|
font: var(--tui-font-heading-5);
|
||||||
|
color: var(--tui-text-primary);
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brand:hover {
|
||||||
|
color: var(--tui-text-action);
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-sub {
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
color: var(--sg-color-subtitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-main {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|||||||
356
src/app/app.html
356
src/app/app.html
@@ -1,344 +1,14 @@
|
|||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
<tui-root>
|
||||||
<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
|
<div class="shell">
|
||||||
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
|
<header class="shell-header">
|
||||||
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * -->
|
<a routerLink="/" class="brand">SparkGuardian</a>
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
<span class="shell-sub">Прокторинг</span>
|
||||||
<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
|
</header>
|
||||||
<!-- * * * * * * * to get started with your project! * * * * * * * -->
|
<main class="shell-main">
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
|
|
||||||
<style>
|
|
||||||
:host {
|
|
||||||
--bright-blue: oklch(51.01% 0.274 263.83);
|
|
||||||
--electric-violet: oklch(53.18% 0.28 296.97);
|
|
||||||
--french-violet: oklch(47.66% 0.246 305.88);
|
|
||||||
--vivid-pink: oklch(69.02% 0.277 332.77);
|
|
||||||
--hot-red: oklch(61.42% 0.238 15.34);
|
|
||||||
--orange-red: oklch(63.32% 0.24 31.68);
|
|
||||||
|
|
||||||
--gray-900: oklch(19.37% 0.006 300.98);
|
|
||||||
--gray-700: oklch(36.98% 0.014 302.71);
|
|
||||||
--gray-400: oklch(70.9% 0.015 304.04);
|
|
||||||
|
|
||||||
--red-to-pink-to-purple-vertical-gradient: linear-gradient(
|
|
||||||
180deg,
|
|
||||||
var(--orange-red) 0%,
|
|
||||||
var(--vivid-pink) 50%,
|
|
||||||
var(--electric-violet) 100%
|
|
||||||
);
|
|
||||||
|
|
||||||
--red-to-pink-to-purple-horizontal-gradient: linear-gradient(
|
|
||||||
90deg,
|
|
||||||
var(--orange-red) 0%,
|
|
||||||
var(--vivid-pink) 50%,
|
|
||||||
var(--electric-violet) 100%
|
|
||||||
);
|
|
||||||
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
|
|
||||||
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
|
||||||
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
|
||||||
"Segoe UI Symbol";
|
|
||||||
box-sizing: border-box;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
-moz-osx-font-smoothing: grayscale;
|
|
||||||
display: block;
|
|
||||||
height: 100dvh;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 3.125rem;
|
|
||||||
color: var(--gray-900);
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 100%;
|
|
||||||
letter-spacing: -0.125rem;
|
|
||||||
margin: 0;
|
|
||||||
font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
|
||||||
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
|
||||||
"Segoe UI Symbol";
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--gray-700);
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
width: 100%;
|
|
||||||
min-height: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1rem;
|
|
||||||
box-sizing: inherit;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.angular-logo {
|
|
||||||
max-width: 9.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-around;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 700px;
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content h1 {
|
|
||||||
margin-top: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content p {
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
width: 1px;
|
|
||||||
background: var(--red-to-pink-to-purple-vertical-gradient);
|
|
||||||
margin-inline: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: start;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 1.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
|
|
||||||
color: var(--pill-accent);
|
|
||||||
padding-inline: 0.75rem;
|
|
||||||
padding-block: 0.375rem;
|
|
||||||
border-radius: 2.75rem;
|
|
||||||
border: 0;
|
|
||||||
transition: background 0.3s ease;
|
|
||||||
font-family: var(--inter-font);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 1.4rem;
|
|
||||||
letter-spacing: -0.00875rem;
|
|
||||||
text-decoration: none;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill:hover {
|
|
||||||
background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group .pill:nth-child(6n + 1) {
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
}
|
|
||||||
.pill-group .pill:nth-child(6n + 2) {
|
|
||||||
--pill-accent: var(--electric-violet);
|
|
||||||
}
|
|
||||||
.pill-group .pill:nth-child(6n + 3) {
|
|
||||||
--pill-accent: var(--french-violet);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group .pill:nth-child(6n + 4),
|
|
||||||
.pill-group .pill:nth-child(6n + 5),
|
|
||||||
.pill-group .pill:nth-child(6n + 6) {
|
|
||||||
--pill-accent: var(--hot-red);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group svg {
|
|
||||||
margin-inline-start: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.73rem;
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links path {
|
|
||||||
transition: fill 0.3s ease;
|
|
||||||
fill: var(--gray-400);
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links a:hover svg path {
|
|
||||||
fill: var(--gray-900);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 650px) {
|
|
||||||
.content {
|
|
||||||
flex-direction: column;
|
|
||||||
width: max-content;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
height: 1px;
|
|
||||||
width: 100%;
|
|
||||||
background: var(--red-to-pink-to-purple-horizontal-gradient);
|
|
||||||
margin-block: 1.5rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<main class="main">
|
|
||||||
<div class="content">
|
|
||||||
<div class="left-side">
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
viewBox="0 0 982 239"
|
|
||||||
fill="none"
|
|
||||||
class="angular-logo"
|
|
||||||
>
|
|
||||||
<g clip-path="url(#a)">
|
|
||||||
<path
|
|
||||||
fill="url(#b)"
|
|
||||||
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
fill="url(#c)"
|
|
||||||
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
|
||||||
/>
|
|
||||||
</g>
|
|
||||||
<defs>
|
|
||||||
<radialGradient
|
|
||||||
id="c"
|
|
||||||
cx="0"
|
|
||||||
cy="0"
|
|
||||||
r="1"
|
|
||||||
gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
>
|
|
||||||
<stop stop-color="#FF41F8" />
|
|
||||||
<stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
|
|
||||||
<stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
|
|
||||||
</radialGradient>
|
|
||||||
<linearGradient
|
|
||||||
id="b"
|
|
||||||
x1="0"
|
|
||||||
x2="982"
|
|
||||||
y1="192"
|
|
||||||
y2="192"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
>
|
|
||||||
<stop stop-color="#F0060B" />
|
|
||||||
<stop offset="0" stop-color="#F0070C" />
|
|
||||||
<stop offset=".526" stop-color="#CC26D5" />
|
|
||||||
<stop offset="1" stop-color="#7702FF" />
|
|
||||||
</linearGradient>
|
|
||||||
<clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
|
|
||||||
</defs>
|
|
||||||
</svg>
|
|
||||||
<h1>Hello, {{ title() }}</h1>
|
|
||||||
<p>Congratulations! Your app is running. 🎉</p>
|
|
||||||
</div>
|
|
||||||
<div class="divider" role="separator" aria-label="Divider"></div>
|
|
||||||
<div class="right-side">
|
|
||||||
<div class="pill-group">
|
|
||||||
@for (item of [
|
|
||||||
{ title: 'Explore the Docs', link: 'https://angular.dev' },
|
|
||||||
{ title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
|
|
||||||
{ title: 'Prompt and best practices for AI', link: 'https://angular.dev/ai/develop-with-ai'},
|
|
||||||
{ title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
|
|
||||||
{ title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
|
|
||||||
{ title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
|
|
||||||
]; track item.title) {
|
|
||||||
<a
|
|
||||||
class="pill"
|
|
||||||
[href]="item.link"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<span>{{ item.title }}</span>
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
height="14"
|
|
||||||
viewBox="0 -960 960 960"
|
|
||||||
width="14"
|
|
||||||
fill="currentColor"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
<div class="social-links">
|
|
||||||
<a
|
|
||||||
href="https://github.com/angular/angular"
|
|
||||||
aria-label="Github"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="25"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 25 24"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Github"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
href="https://x.com/angular"
|
|
||||||
aria-label="X"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="X"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
|
|
||||||
aria-label="Youtube"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="29"
|
|
||||||
height="20"
|
|
||||||
viewBox="0 0 29 20"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Youtube"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
fill-rule="evenodd"
|
|
||||||
clip-rule="evenodd"
|
|
||||||
d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
|
|
||||||
|
|
||||||
<router-outlet />
|
<router-outlet />
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
@if (isDev) {
|
||||||
|
<app-dev-console />
|
||||||
|
}
|
||||||
|
</tui-root>
|
||||||
|
|||||||
@@ -1,3 +1,17 @@
|
|||||||
import { Routes } from '@angular/router';
|
import { Routes } from '@angular/router';
|
||||||
|
|
||||||
export const routes: Routes = [];
|
export const routes: Routes = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
loadComponent: () =>
|
||||||
|
import('./features/sessions/sessions-list/sessions-list.component').then((m) => m.SessionsListComponent),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'sessions/:id',
|
||||||
|
loadComponent: () =>
|
||||||
|
import('./features/sessions/session-detail/session-detail.component').then(
|
||||||
|
(m) => m.SessionDetailComponent,
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{ path: '**', redirectTo: '' },
|
||||||
|
];
|
||||||
|
|||||||
@@ -1,10 +1,26 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { App } from './app';
|
import { App } from './app';
|
||||||
|
import { appConfig } from './app.config';
|
||||||
|
|
||||||
describe('App', () => {
|
describe('App', () => {
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
|
Object.defineProperty(window, 'matchMedia', {
|
||||||
|
writable: true,
|
||||||
|
value: (query: string) => ({
|
||||||
|
matches: false,
|
||||||
|
media: query,
|
||||||
|
onchange: null,
|
||||||
|
addListener: () => {},
|
||||||
|
removeListener: () => {},
|
||||||
|
addEventListener: () => {},
|
||||||
|
removeEventListener: () => {},
|
||||||
|
dispatchEvent: () => false,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [App],
|
imports: [App],
|
||||||
|
providers: [...appConfig.providers],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -14,10 +30,10 @@ describe('App', () => {
|
|||||||
expect(app).toBeTruthy();
|
expect(app).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should render title', async () => {
|
it('should show app name in header', async () => {
|
||||||
const fixture = TestBed.createComponent(App);
|
const fixture = TestBed.createComponent(App);
|
||||||
await fixture.whenStable();
|
await fixture.whenStable();
|
||||||
const compiled = fixture.nativeElement as HTMLElement;
|
const compiled = fixture.nativeElement as HTMLElement;
|
||||||
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, sparkguardian');
|
expect(compiled.querySelector('.brand')?.textContent).toContain('SparkGuardian');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
import { Component, signal } from '@angular/core';
|
import { TuiRoot } from '@taiga-ui/core';
|
||||||
import { RouterOutlet } from '@angular/router';
|
import { Component, isDevMode } from '@angular/core';
|
||||||
|
import { RouterLink, RouterOutlet } from '@angular/router';
|
||||||
|
import { DevConsoleComponent } from './features/devtools/dev-console/dev-console.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
imports: [RouterOutlet],
|
imports: [RouterLink, RouterOutlet, TuiRoot, DevConsoleComponent],
|
||||||
templateUrl: './app.html',
|
templateUrl: './app.html',
|
||||||
styleUrl: './app.css'
|
styleUrl: './app.css',
|
||||||
})
|
})
|
||||||
export class App {
|
export class App {
|
||||||
protected readonly title = signal('sparkguardian');
|
protected readonly isDev = isDevMode();
|
||||||
}
|
}
|
||||||
|
|||||||
34
src/app/core/config/api.tokens.ts
Normal file
34
src/app/core/config/api.tokens.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import { DOCUMENT } from '@angular/common';
|
||||||
|
import { inject, InjectionToken } from '@angular/core';
|
||||||
|
|
||||||
|
import { environment } from '../../../environments/environment';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Origin для разрешения относительных `playlist_url` (HLS).
|
||||||
|
* При `ng serve` — origin dev-сервера; API проксируется (см. `proxy.conf.cjs`, `SG_DEV_PROXY_TARGET` в `.env`).
|
||||||
|
*/
|
||||||
|
export const API_ORIGIN = new InjectionToken<string>('API_ORIGIN', {
|
||||||
|
factory: () => {
|
||||||
|
const doc = inject(DOCUMENT);
|
||||||
|
const loc = doc.defaultView?.location;
|
||||||
|
if (!loc || loc.protocol === 'file:') {
|
||||||
|
return environment.apiFallbackOrigin;
|
||||||
|
}
|
||||||
|
return loc.origin;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Базовый путь API. Относительный путь работает в dev (прокси) и при деплое на тот же домен.
|
||||||
|
* Для `file://` — абсолютный URL из `environment`.
|
||||||
|
*/
|
||||||
|
export const API_BASE_URL = new InjectionToken<string>('API_BASE_URL', {
|
||||||
|
factory: () => {
|
||||||
|
const doc = inject(DOCUMENT);
|
||||||
|
const loc = doc.defaultView?.location;
|
||||||
|
if (loc?.protocol === 'file:') {
|
||||||
|
return `${environment.apiFallbackOrigin}${environment.apiBasePath}`;
|
||||||
|
}
|
||||||
|
return environment.apiBasePath;
|
||||||
|
},
|
||||||
|
});
|
||||||
52
src/app/core/devtools/dev-log.service.ts
Normal file
52
src/app/core/devtools/dev-log.service.ts
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
import { Injectable, signal } from '@angular/core';
|
||||||
|
|
||||||
|
export type DevLogLevel = 'info' | 'warn' | 'error';
|
||||||
|
export type DevLogStatus = 'pending' | 'ok' | 'error';
|
||||||
|
|
||||||
|
export interface DevHttpLogDetails {
|
||||||
|
method: string;
|
||||||
|
url: string;
|
||||||
|
requestHeaders?: Record<string, string | null>;
|
||||||
|
requestBody?: unknown;
|
||||||
|
statusCode?: number;
|
||||||
|
durationMs?: number;
|
||||||
|
responseHeaders?: Record<string, string | null>;
|
||||||
|
responseBody?: unknown;
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DevLogEntry {
|
||||||
|
id: number;
|
||||||
|
time: string;
|
||||||
|
level: DevLogLevel;
|
||||||
|
source: 'http' | 'system';
|
||||||
|
message: string;
|
||||||
|
status?: DevLogStatus;
|
||||||
|
details?: DevHttpLogDetails;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class DevLogService {
|
||||||
|
private seq = 0;
|
||||||
|
private readonly max = 300;
|
||||||
|
readonly entries = signal<DevLogEntry[]>([]);
|
||||||
|
|
||||||
|
add(entry: Omit<DevLogEntry, 'id' | 'time'>): void {
|
||||||
|
const withMeta: DevLogEntry = {
|
||||||
|
id: ++this.seq,
|
||||||
|
time: new Date().toISOString(),
|
||||||
|
...entry,
|
||||||
|
};
|
||||||
|
this.entries.update((curr) => [...curr.slice(-(this.max - 1)), withMeta]);
|
||||||
|
}
|
||||||
|
|
||||||
|
update(id: number, patch: Partial<Omit<DevLogEntry, 'id' | 'time'>>): void {
|
||||||
|
this.entries.update((curr) =>
|
||||||
|
curr.map((item) => (item.id === id ? { ...item, ...patch } : item)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
clear(): void {
|
||||||
|
this.entries.set([]);
|
||||||
|
}
|
||||||
|
}
|
||||||
17
src/app/core/http/api-base-url.interceptor.ts
Normal file
17
src/app/core/http/api-base-url.interceptor.ts
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import { HttpInterceptorFn } from '@angular/common/http';
|
||||||
|
import { inject } from '@angular/core';
|
||||||
|
|
||||||
|
import { API_BASE_URL } from '../config/api.tokens';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Подставляет базовый URL ко всем относительным запросам.
|
||||||
|
* Абсолютные URL (`http…`) не трогаем — как в Axios с `baseURL`, только через перехватчик.
|
||||||
|
*/
|
||||||
|
export const apiBaseUrlInterceptor: HttpInterceptorFn = (req, next) => {
|
||||||
|
const base = inject(API_BASE_URL);
|
||||||
|
if (/^https?:\/\//i.test(req.url)) {
|
||||||
|
return next(req);
|
||||||
|
}
|
||||||
|
const path = req.url.startsWith('/') ? req.url : `/${req.url}`;
|
||||||
|
return next(req.clone({ url: `${base}${path}` }));
|
||||||
|
};
|
||||||
117
src/app/core/http/dev-log.interceptor.ts
Normal file
117
src/app/core/http/dev-log.interceptor.ts
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
import {
|
||||||
|
HttpErrorResponse,
|
||||||
|
HttpEvent,
|
||||||
|
HttpHeaders,
|
||||||
|
HttpInterceptorFn,
|
||||||
|
HttpResponse,
|
||||||
|
} from '@angular/common/http';
|
||||||
|
import { inject, isDevMode } from '@angular/core';
|
||||||
|
import { tap } from 'rxjs';
|
||||||
|
|
||||||
|
import { httpErrorMessage } from './http-error.util';
|
||||||
|
import { DevLogService } from '../devtools/dev-log.service';
|
||||||
|
|
||||||
|
function headersToObject(headers: HttpHeaders): Record<string, string | null> {
|
||||||
|
const out: Record<string, string | null> = {};
|
||||||
|
for (const key of headers.keys()) {
|
||||||
|
out[key] = headers.get(key);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeBody(value: unknown): unknown {
|
||||||
|
if (value === undefined) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (value === null || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
if (value instanceof Blob) {
|
||||||
|
return `[Blob ${value.type || 'unknown'} ${value.size} bytes]`;
|
||||||
|
}
|
||||||
|
if (value instanceof FormData) {
|
||||||
|
const fields: Record<string, unknown> = {};
|
||||||
|
value.forEach((v, k) => {
|
||||||
|
fields[k] = typeof v === 'string' ? v : `[File ${(v as File).name}]`;
|
||||||
|
});
|
||||||
|
return fields;
|
||||||
|
}
|
||||||
|
if (value instanceof ArrayBuffer) {
|
||||||
|
return `[ArrayBuffer ${value.byteLength} bytes]`;
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const devLogInterceptor: HttpInterceptorFn = (req, next) => {
|
||||||
|
if (!isDevMode()) {
|
||||||
|
return next(req);
|
||||||
|
}
|
||||||
|
|
||||||
|
const logs = inject(DevLogService);
|
||||||
|
const started = performance.now();
|
||||||
|
logs.add({
|
||||||
|
level: 'info',
|
||||||
|
source: 'http',
|
||||||
|
status: 'pending',
|
||||||
|
message: `→ ${req.method} ${req.urlWithParams} (pending)`,
|
||||||
|
details: {
|
||||||
|
method: req.method,
|
||||||
|
url: req.urlWithParams,
|
||||||
|
requestHeaders: headersToObject(req.headers),
|
||||||
|
requestBody: normalizeBody(req.body),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const entryId = logs.entries().at(-1)?.id;
|
||||||
|
|
||||||
|
return next(req).pipe(
|
||||||
|
tap({
|
||||||
|
next: (event: HttpEvent<unknown>) => {
|
||||||
|
if (!(event instanceof HttpResponse)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const ms = Math.round(performance.now() - started);
|
||||||
|
if (entryId) {
|
||||||
|
logs.update(entryId, {
|
||||||
|
level: 'info',
|
||||||
|
status: 'ok',
|
||||||
|
message: `✓ ${req.method} ${req.urlWithParams} [${event.status}] ${ms}ms`,
|
||||||
|
details: {
|
||||||
|
method: req.method,
|
||||||
|
url: req.urlWithParams,
|
||||||
|
requestHeaders: headersToObject(req.headers),
|
||||||
|
requestBody: normalizeBody(req.body),
|
||||||
|
statusCode: event.status,
|
||||||
|
durationMs: ms,
|
||||||
|
responseHeaders: headersToObject(event.headers),
|
||||||
|
responseBody: normalizeBody(event.body),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: (error: unknown) => {
|
||||||
|
const ms = Math.round(performance.now() - started);
|
||||||
|
const status = error instanceof HttpErrorResponse ? error.status : undefined;
|
||||||
|
if (entryId) {
|
||||||
|
logs.update(entryId, {
|
||||||
|
level: 'error',
|
||||||
|
status: 'error',
|
||||||
|
message: `✕ ${req.method} ${req.urlWithParams}${status ? ` [${status}]` : ''} ${ms}ms: ${httpErrorMessage(error)}`,
|
||||||
|
details: {
|
||||||
|
method: req.method,
|
||||||
|
url: req.urlWithParams,
|
||||||
|
requestHeaders: headersToObject(req.headers),
|
||||||
|
requestBody: normalizeBody(req.body),
|
||||||
|
statusCode: status,
|
||||||
|
durationMs: ms,
|
||||||
|
responseHeaders:
|
||||||
|
error instanceof HttpErrorResponse ? headersToObject(error.headers) : undefined,
|
||||||
|
responseBody:
|
||||||
|
error instanceof HttpErrorResponse ? normalizeBody(error.error) : undefined,
|
||||||
|
error: httpErrorMessage(error),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
};
|
||||||
67
src/app/core/http/error-classification.util.ts
Normal file
67
src/app/core/http/error-classification.util.ts
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import { TimeoutError } from 'rxjs';
|
||||||
|
|
||||||
|
import type { UserErrorKind } from '../notifications/user-error-messages.config';
|
||||||
|
|
||||||
|
function isParseFailureMessage(message: string | undefined): boolean {
|
||||||
|
return !!message?.includes('Http failure during parsing');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Определяет категорию ошибки для пользовательского сообщения (без утечки технических деталей).
|
||||||
|
*/
|
||||||
|
export function classifyUserError(err: unknown): UserErrorKind {
|
||||||
|
if (err instanceof TimeoutError) {
|
||||||
|
return 'timeout';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (err instanceof HttpErrorResponse) {
|
||||||
|
if (isParseFailureMessage(err.message)) {
|
||||||
|
return 'parse_error';
|
||||||
|
}
|
||||||
|
const s = err.status;
|
||||||
|
if (s === 0) {
|
||||||
|
return 'network';
|
||||||
|
}
|
||||||
|
if (s === 408) {
|
||||||
|
return 'timeout';
|
||||||
|
}
|
||||||
|
if (s === 401) {
|
||||||
|
return 'unauthorized';
|
||||||
|
}
|
||||||
|
if (s === 403) {
|
||||||
|
return 'forbidden';
|
||||||
|
}
|
||||||
|
if (s === 404) {
|
||||||
|
return 'not_found';
|
||||||
|
}
|
||||||
|
if (s === 400) {
|
||||||
|
return 'bad_request';
|
||||||
|
}
|
||||||
|
if (s >= 500) {
|
||||||
|
return 'server_error';
|
||||||
|
}
|
||||||
|
if (s >= 400 && s < 500) {
|
||||||
|
return 'client_error';
|
||||||
|
}
|
||||||
|
return 'unknown';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (err instanceof Error) {
|
||||||
|
const m = err.message;
|
||||||
|
if (isParseFailureMessage(m)) {
|
||||||
|
return 'parse_error';
|
||||||
|
}
|
||||||
|
if (/идентификатор|некорректн/i.test(m)) {
|
||||||
|
return 'invalid_input';
|
||||||
|
}
|
||||||
|
if (/timeout|timed out/i.test(m)) {
|
||||||
|
return 'timeout';
|
||||||
|
}
|
||||||
|
if (/network|failed to fetch|load failed|net::/i.test(m)) {
|
||||||
|
return 'network';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'unknown';
|
||||||
|
}
|
||||||
56
src/app/core/http/http-error.util.ts
Normal file
56
src/app/core/http/http-error.util.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
|
|
||||||
|
import type { ApiErrorBody } from '../models/api.types';
|
||||||
|
|
||||||
|
/** Безопасная подстановка текста в разметку с innerHTML (например, Taiga notification). */
|
||||||
|
export function escapeHtml(text: string): string {
|
||||||
|
return text
|
||||||
|
.replace(/&/g, '&')
|
||||||
|
.replace(/</g, '<')
|
||||||
|
.replace(/>/g, '>')
|
||||||
|
.replace(/"/g, '"')
|
||||||
|
.replace(/'/g, ''');
|
||||||
|
}
|
||||||
|
|
||||||
|
function summarizeHtmlError(text: string): string | null {
|
||||||
|
const t = text.trim();
|
||||||
|
if (!t.startsWith('<!') && !t.startsWith('<html')) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const pre = t.match(/<pre[^>]*>([\s\S]*?)<\/pre>/i);
|
||||||
|
if (pre?.[1]) {
|
||||||
|
return pre[1].trim();
|
||||||
|
}
|
||||||
|
const title = t.match(/<title[^>]*>([\s\S]*?)<\/title>/i);
|
||||||
|
if (title?.[1]) {
|
||||||
|
return title[1].trim();
|
||||||
|
}
|
||||||
|
return 'Сервер вернул HTML вместо JSON (часто редирект на вход или ошибка прокси).';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function httpErrorMessage(err: unknown): string {
|
||||||
|
if (err instanceof HttpErrorResponse) {
|
||||||
|
const body = err.error as ApiErrorBody | string | null | undefined;
|
||||||
|
if (body && typeof body === 'object' && typeof body.error === 'string') {
|
||||||
|
return body.error;
|
||||||
|
}
|
||||||
|
if (typeof body === 'string' && body.length > 0) {
|
||||||
|
const fromHtml = summarizeHtmlError(body);
|
||||||
|
if (fromHtml) {
|
||||||
|
return fromHtml;
|
||||||
|
}
|
||||||
|
return body.length > 200 ? `${body.slice(0, 200)}…` : body;
|
||||||
|
}
|
||||||
|
if (err.message?.includes('Http failure during parsing')) {
|
||||||
|
return 'Ответ не JSON (часто HTML страницы входа или ошибка прокси /api). Перезапустите `npm start` и проверьте proxy.conf.cjs и `SG_DEV_PROXY_TARGET` в `.env`.';
|
||||||
|
}
|
||||||
|
return err.message || `HTTP ${err.status}`;
|
||||||
|
}
|
||||||
|
if (err instanceof Error) {
|
||||||
|
if (err.message.includes('Http failure during parsing')) {
|
||||||
|
return 'Ответ не JSON — проверьте авторизацию и прокси для API.';
|
||||||
|
}
|
||||||
|
return err.message;
|
||||||
|
}
|
||||||
|
return 'Неизвестная ошибка';
|
||||||
|
}
|
||||||
71
src/app/core/keyboard/keyboard-key-name-map.ts
Normal file
71
src/app/core/keyboard/keyboard-key-name-map.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import { charKeyNameToSvgKeyId } from './vk-to-keyboard-svg-id';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Токены из `key_name` и из `modifiers` (через "+"), в нижнем регистре.
|
||||||
|
* Соответствие имён бэкенда → id прямоугольников в KB_USA-standard.svg.
|
||||||
|
*/
|
||||||
|
function tokenToSvgIds(token: string): string[] {
|
||||||
|
const t = token.trim().toLowerCase();
|
||||||
|
if (!t) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
const named: Record<string, string[]> = {
|
||||||
|
shift: ['K_kb5a'],
|
||||||
|
meta: ['K_kb6b'],
|
||||||
|
super: ['K_kb6b'],
|
||||||
|
win: ['K_kb6b'],
|
||||||
|
windows: ['K_kb6b'],
|
||||||
|
control: ['K_kb6a'],
|
||||||
|
ctrl: ['K_kb6a'],
|
||||||
|
alt: ['K_kb6c'],
|
||||||
|
tab: ['K_kb3a'],
|
||||||
|
enter: ['K_kb4n'],
|
||||||
|
return: ['K_kb4n'],
|
||||||
|
backspace: ['K_kb2n'],
|
||||||
|
space: ['K_kb6d'],
|
||||||
|
caps: ['K_kb4a'],
|
||||||
|
menu: ['K_kb6m'],
|
||||||
|
};
|
||||||
|
|
||||||
|
if (named[t]) {
|
||||||
|
return named[t]!;
|
||||||
|
}
|
||||||
|
|
||||||
|
const single = charKeyNameToSvgKeyId(t);
|
||||||
|
if (single) {
|
||||||
|
return [single];
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Формат бэкенда: `{ key_name, modifiers: "Shift+Meta", action }` и т.п.
|
||||||
|
* Собирает уникальные id клавиш для подсветки (модификаторы + основная клавиша).
|
||||||
|
*/
|
||||||
|
export function keyNameModifiersPayloadToSvgIds(o: Record<string, unknown>): string[] {
|
||||||
|
const out: string[] = [];
|
||||||
|
const seen = new Set<string>();
|
||||||
|
|
||||||
|
const add = (ids: string[]) => {
|
||||||
|
for (const id of ids) {
|
||||||
|
if (id && !seen.has(id)) {
|
||||||
|
seen.add(id);
|
||||||
|
out.push(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const modifiers = typeof o['modifiers'] === 'string' ? o['modifiers'] : '';
|
||||||
|
const keyName = typeof o['key_name'] === 'string' ? o['key_name'] : '';
|
||||||
|
|
||||||
|
for (const part of modifiers.split('+').map((s) => s.trim()).filter(Boolean)) {
|
||||||
|
add(tokenToSvgIds(part));
|
||||||
|
}
|
||||||
|
if (keyName.trim()) {
|
||||||
|
add(tokenToSvgIds(keyName));
|
||||||
|
}
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
88
src/app/core/keyboard/keyboard-payload.util.ts
Normal file
88
src/app/core/keyboard/keyboard-payload.util.ts
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
import type { ParsedEvent } from '../models/api.types';
|
||||||
|
|
||||||
|
import { keyNameModifiersPayloadToSvgIds } from './keyboard-key-name-map';
|
||||||
|
import { normalizeVirtualKey, vkToKeyboardSvgKeyId } from './vk-to-keyboard-svg-id';
|
||||||
|
|
||||||
|
export function isKeyboardTelemetryEvent(event: ParsedEvent): boolean {
|
||||||
|
const t = (event.event_type ?? '').toLowerCase();
|
||||||
|
return t.includes('keyboard') || t.includes('key');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Извлекает виртуальный код клавиши из payload (массив чисел, объект с полями vk/keyCode и т.д.).
|
||||||
|
*/
|
||||||
|
export function parseKeyboardVirtualKey(data: unknown): number | null {
|
||||||
|
if (data == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (Array.isArray(data)) {
|
||||||
|
if (data.length >= 1) {
|
||||||
|
const v = data[0];
|
||||||
|
if (typeof v === 'number' && Number.isFinite(v)) {
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
if (typeof v === 'string') {
|
||||||
|
const n = parseInt(v, 10);
|
||||||
|
return Number.isFinite(n) ? n : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (typeof data === 'object') {
|
||||||
|
const o = data as Record<string, unknown>;
|
||||||
|
for (const key of ['vk', 'virtualKey', 'VirtualKey', 'keyCode', 'KeyCode', 'wParam']) {
|
||||||
|
const v = o[key];
|
||||||
|
if (typeof v === 'number' && Number.isFinite(v)) {
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
if (typeof v === 'string') {
|
||||||
|
const n = parseInt(v, 10);
|
||||||
|
if (Number.isFinite(n)) {
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function eventPayloadJson(data: unknown): string {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(data, null, 2);
|
||||||
|
} catch {
|
||||||
|
return String(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function unwrapJsonPayload(data: unknown): unknown {
|
||||||
|
if (typeof data === 'string') {
|
||||||
|
try {
|
||||||
|
return JSON.parse(data) as unknown;
|
||||||
|
} catch {
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Id элементов `K_kb*` для подсветки: сначала объект `key_name` / `modifiers`, иначе VK из массива/полей.
|
||||||
|
*/
|
||||||
|
export function parseKeyboardHighlightKeyIds(data: unknown): string[] {
|
||||||
|
const raw = unwrapJsonPayload(data);
|
||||||
|
if (raw != null && typeof raw === 'object' && !Array.isArray(raw)) {
|
||||||
|
const o = raw as Record<string, unknown>;
|
||||||
|
if (typeof o['key_name'] === 'string' || typeof o['modifiers'] === 'string') {
|
||||||
|
const fromNames = keyNameModifiersPayloadToSvgIds(o);
|
||||||
|
if (fromNames.length > 0) {
|
||||||
|
return fromNames;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const vk = parseKeyboardVirtualKey(raw);
|
||||||
|
if (vk != null) {
|
||||||
|
const id = vkToKeyboardSvgKeyId(normalizeVirtualKey(vk));
|
||||||
|
return id ? [id] : [];
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
}
|
||||||
54
src/app/core/keyboard/keyboard-svg-highlight.service.ts
Normal file
54
src/app/core/keyboard/keyboard-svg-highlight.service.ts
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
import { Injectable, inject } from '@angular/core';
|
||||||
|
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
|
||||||
|
import { Observable, defer, from, shareReplay } from 'rxjs';
|
||||||
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Файл из `public/KB_USA-standard.svg` — отдаётся с корня приложения (`/KB_USA-standard.svg`),
|
||||||
|
* не через API. HttpClient нельзя: `apiBaseUrlInterceptor` превратил бы путь в `/api/v1/...`.
|
||||||
|
*/
|
||||||
|
const KEYBOARD_SVG_PATH = '/KB_USA-standard.svg';
|
||||||
|
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class KeyboardSvgHighlightService {
|
||||||
|
private readonly sanitizer = inject(DomSanitizer);
|
||||||
|
|
||||||
|
private readonly baseSvg$ = defer(() =>
|
||||||
|
from(
|
||||||
|
fetch(KEYBOARD_SVG_PATH).then((r) => {
|
||||||
|
if (!r.ok) {
|
||||||
|
throw new Error(`Не удалось загрузить клавиатуру: ${r.status} ${r.statusText}`);
|
||||||
|
}
|
||||||
|
return r.text();
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
).pipe(shareReplay({ bufferSize: 1, refCount: false }));
|
||||||
|
|
||||||
|
svgWithHighlight(keyIds: string[] | null): Observable<SafeHtml> {
|
||||||
|
return this.baseSvg$.pipe(
|
||||||
|
map((svg) => this.injectHighlight(svg, keyIds ?? [])),
|
||||||
|
map((html) => this.sanitizer.bypassSecurityTrustHtml(html)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Подсветка: заливка `--sg-keyboard-key-pressed-fill` (акцент), подписи/иконки `--sg-keyboard-key-pressed-ink`. */
|
||||||
|
private injectHighlight(svgText: string, keyIds: string[]): string {
|
||||||
|
const valid = keyIds.filter((id) => /^K_kb[0-9a-z]+$/i.test(id));
|
||||||
|
if (valid.length === 0) {
|
||||||
|
return svgText;
|
||||||
|
}
|
||||||
|
const rules: string[] = [];
|
||||||
|
for (const id of valid) {
|
||||||
|
const suffix = id.slice(2);
|
||||||
|
rules.push(
|
||||||
|
`#${id}{fill:var(--sg-keyboard-key-pressed-fill)!important;stroke:none!important;}`,
|
||||||
|
);
|
||||||
|
rules.push(`[id^="T_${suffix}"]{fill:var(--sg-keyboard-key-pressed-ink)!important;}`);
|
||||||
|
rules.push(
|
||||||
|
`#S_${suffix} path,#S_${suffix} line,#S_${suffix} polyline,#S_${suffix} rect{stroke:var(--sg-keyboard-key-pressed-ink)!important;fill:none!important;}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const styleBlock = `<style type="text/css"><![CDATA[${rules.join('')}]]></style>`;
|
||||||
|
return svgText.replace(/<svg\b[^>]*>/i, (open) => `${open}${styleBlock}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
115
src/app/core/keyboard/vk-to-keyboard-svg-id.ts
Normal file
115
src/app/core/keyboard/vk-to-keyboard-svg-id.ts
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
/**
|
||||||
|
* Соответствие Windows Virtual Key → id элемента в `public/KB_USA-standard.svg` (K_kb*).
|
||||||
|
* Раскладка US QWERTY, без блока F1–F12 (на схеме их нет).
|
||||||
|
*/
|
||||||
|
export function normalizeVirtualKey(vk: number): number {
|
||||||
|
if (vk >= 0x61 && vk <= 0x7a) {
|
||||||
|
return vk - 0x20;
|
||||||
|
}
|
||||||
|
return vk;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildDigitMap(): Map<number, string> {
|
||||||
|
const ids = ['K_kb2k', 'K_kb2b', 'K_kb2c', 'K_kb2d', 'K_kb2e', 'K_kb2f', 'K_kb2g', 'K_kb2h', 'K_kb2i', 'K_kb2j'];
|
||||||
|
const m = new Map<number, string>();
|
||||||
|
for (let d = 0; d <= 9; d++) {
|
||||||
|
m.set(0x30 + d, ids[d]!);
|
||||||
|
}
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
const DIGIT_TO_ID = buildDigitMap();
|
||||||
|
|
||||||
|
const LETTER_TO_ID: Record<string, string> = {
|
||||||
|
A: 'K_kb4c',
|
||||||
|
B: 'K_kb5g',
|
||||||
|
C: 'K_kb5e',
|
||||||
|
D: 'K_kb4e',
|
||||||
|
E: 'K_kb3d',
|
||||||
|
F: 'K_kb4f',
|
||||||
|
G: 'K_kb4g',
|
||||||
|
H: 'K_kb4h',
|
||||||
|
I: 'K_kb3i',
|
||||||
|
J: 'K_kb4i',
|
||||||
|
K: 'K_kb4j',
|
||||||
|
L: 'K_kb4l',
|
||||||
|
M: 'K_kb5i',
|
||||||
|
N: 'K_kb5h',
|
||||||
|
O: 'K_kb3j',
|
||||||
|
P: 'K_kb3k',
|
||||||
|
Q: 'K_kb3b',
|
||||||
|
R: 'K_kb3e',
|
||||||
|
S: 'K_kb4d',
|
||||||
|
T: 'K_kb3f',
|
||||||
|
U: 'K_kb3h',
|
||||||
|
V: 'K_kb5f',
|
||||||
|
W: 'K_kb3c',
|
||||||
|
X: 'K_kb5d',
|
||||||
|
Y: 'K_kb3g',
|
||||||
|
Z: 'K_kb5c',
|
||||||
|
};
|
||||||
|
|
||||||
|
/** OEM и прочие VK (Windows). */
|
||||||
|
const EXTRA_VK: Record<number, string> = {
|
||||||
|
0x08: 'K_kb2n',
|
||||||
|
0x09: 'K_kb3a',
|
||||||
|
0x0d: 'K_kb4n',
|
||||||
|
0x10: 'K_kb5a',
|
||||||
|
0x11: 'K_kb6a',
|
||||||
|
0x12: 'K_kb6c',
|
||||||
|
0x14: 'K_kb4a',
|
||||||
|
0x20: 'K_kb6d',
|
||||||
|
0x5b: 'K_kb6b',
|
||||||
|
0x5c: 'K_kb6l',
|
||||||
|
0x5d: 'K_kb6m',
|
||||||
|
0xa0: 'K_kb5a',
|
||||||
|
0xa1: 'K_kb5m',
|
||||||
|
0xa2: 'K_kb6a',
|
||||||
|
0xa3: 'K_kb6n',
|
||||||
|
0xa4: 'K_kb6c',
|
||||||
|
0xa5: 'K_kb6k',
|
||||||
|
0xba: 'K_kb4l',
|
||||||
|
0xbb: 'K_kb2m',
|
||||||
|
0xbc: 'K_kb5j',
|
||||||
|
0xbd: 'K_kb2l',
|
||||||
|
0xbe: 'K_kb5k',
|
||||||
|
0xbf: 'K_kb5l',
|
||||||
|
0xc0: 'K_kb2a',
|
||||||
|
0xdb: 'K_kb3l',
|
||||||
|
0xdc: 'K_kb3n',
|
||||||
|
0xdd: 'K_kb3m',
|
||||||
|
0xde: 'K_kb4m',
|
||||||
|
};
|
||||||
|
|
||||||
|
export function vkToKeyboardSvgKeyId(vk: number): string | null {
|
||||||
|
const k = normalizeVirtualKey(vk);
|
||||||
|
const fromExtra = EXTRA_VK[k];
|
||||||
|
if (fromExtra) {
|
||||||
|
return fromExtra;
|
||||||
|
}
|
||||||
|
const digit = DIGIT_TO_ID.get(k);
|
||||||
|
if (digit) {
|
||||||
|
return digit;
|
||||||
|
}
|
||||||
|
if (k >= 0x41 && k <= 0x5a) {
|
||||||
|
const ch = String.fromCharCode(k);
|
||||||
|
return LETTER_TO_ID[ch] ?? null;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Одна буква A–Z или цифра 0–9 как в подписи клавиши (`key_name`). */
|
||||||
|
export function charKeyNameToSvgKeyId(name: string): string | null {
|
||||||
|
const c = name.trim();
|
||||||
|
if (c.length !== 1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (c >= '0' && c <= '9') {
|
||||||
|
return DIGIT_TO_ID.get(c.charCodeAt(0)) ?? null;
|
||||||
|
}
|
||||||
|
const ch = c.toUpperCase();
|
||||||
|
if (ch >= 'A' && ch <= 'Z') {
|
||||||
|
return LETTER_TO_ID[ch] ?? null;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
71
src/app/core/models/api.types.ts
Normal file
71
src/app/core/models/api.types.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
/** Соответствует `handler.ErrorResponse` из OpenAPI. */
|
||||||
|
export interface ApiErrorBody {
|
||||||
|
code?: string;
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CreateSessionRequest {
|
||||||
|
title: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CreateSessionResponse {
|
||||||
|
id: number;
|
||||||
|
session_key: string;
|
||||||
|
status: string;
|
||||||
|
title: string;
|
||||||
|
created_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionSummary {
|
||||||
|
id: string;
|
||||||
|
user_id?: string;
|
||||||
|
status: string;
|
||||||
|
started_at?: string;
|
||||||
|
ended_at?: string;
|
||||||
|
chunks_total?: number;
|
||||||
|
events_total?: number;
|
||||||
|
/** Не в swagger, но бэкенд может отдавать для списка. */
|
||||||
|
title?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionListResponse {
|
||||||
|
sessions: SessionSummary[];
|
||||||
|
total: number;
|
||||||
|
limit: number;
|
||||||
|
offset: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StreamInfo {
|
||||||
|
stream_type: string;
|
||||||
|
chunk_count?: number;
|
||||||
|
duration_ms?: number;
|
||||||
|
playlist_url: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SessionDetailResponse {
|
||||||
|
session: SessionSummary;
|
||||||
|
streams: StreamInfo[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TelemetryEvent {
|
||||||
|
id: number;
|
||||||
|
session_id: number;
|
||||||
|
user_id?: number;
|
||||||
|
event_type: string;
|
||||||
|
created_at: string;
|
||||||
|
payload?: number[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ParsedEvent {
|
||||||
|
event_type: string;
|
||||||
|
timestamp: number;
|
||||||
|
data?: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ParsedEventsResponse {
|
||||||
|
session_id: number;
|
||||||
|
count: number;
|
||||||
|
events: ParsedEvent[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export type StreamType = 'screen' | 'webcam';
|
||||||
34
src/app/core/notifications/user-error-messages.config.ts
Normal file
34
src/app/core/notifications/user-error-messages.config.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
/**
|
||||||
|
* Типы ошибок для подбора дружелюбного текста во всплывающих уведомлениях.
|
||||||
|
* Соответствие «тип → фраза» задаётся здесь; технические детали — только в Dev Console.
|
||||||
|
*/
|
||||||
|
export const USER_ERROR_FRIENDLY_MESSAGES = {
|
||||||
|
/** Нет сети / соединение сброшено (часто HTTP 0). */
|
||||||
|
network: 'Проверьте интернет-соединение.',
|
||||||
|
/** Таймаут запроса (в т.ч. RxJS timeout, HTTP 408). */
|
||||||
|
timeout: 'Запрос занял слишком много времени. Попробуйте позже.',
|
||||||
|
/** Ответ сервера 5xx. */
|
||||||
|
server_error: 'Уже работаем над этим.',
|
||||||
|
/** 404. */
|
||||||
|
not_found: 'Не удалось найти запрашиваемые данные.',
|
||||||
|
/** 401. */
|
||||||
|
unauthorized: 'Требуется вход в систему.',
|
||||||
|
/** 403. */
|
||||||
|
forbidden: 'Недостаточно прав для этого действия.',
|
||||||
|
/** 400. */
|
||||||
|
bad_request: 'Некорректный запрос. Попробуйте позже.',
|
||||||
|
/** Прочие 4xx (кроме перечисленных выше). */
|
||||||
|
client_error: 'Не удалось выполнить запрос. Попробуйте позже.',
|
||||||
|
/** Не JSON / ошибка разбора ответа. */
|
||||||
|
parse_error: 'Получен неожиданный ответ сервера. Попробуйте позже.',
|
||||||
|
/** Локальная валидация (неверный id и т.п.). */
|
||||||
|
invalid_input: 'Проверьте введённые данные.',
|
||||||
|
/** Не удалось отнести к категории. */
|
||||||
|
unknown: 'Попробуйте позже.',
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export type UserErrorKind = keyof typeof USER_ERROR_FRIENDLY_MESSAGES;
|
||||||
|
|
||||||
|
export function friendlyMessageForUserError(kind: UserErrorKind): string {
|
||||||
|
return USER_ERROR_FRIENDLY_MESSAGES[kind];
|
||||||
|
}
|
||||||
40
src/app/core/notifications/user-error-notify.service.ts
Normal file
40
src/app/core/notifications/user-error-notify.service.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { isDevMode, inject, Injectable } from '@angular/core';
|
||||||
|
import { TuiNotificationService } from '@taiga-ui/core/components/notification';
|
||||||
|
|
||||||
|
import { DevLogService } from '../devtools/dev-log.service';
|
||||||
|
import { classifyUserError } from '../http/error-classification.util';
|
||||||
|
import { escapeHtml, httpErrorMessage } from '../http/http-error.util';
|
||||||
|
import { friendlyMessageForUserError } from './user-error-messages.config';
|
||||||
|
|
||||||
|
const ERROR_TOAST_TITLE = 'Что-то пошло не так...';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Показывает пользователю обобщённое уведомление; точный текст ошибки — только в DevLog (в dev).
|
||||||
|
*/
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class UserErrorNotifyService {
|
||||||
|
private readonly notifications = inject(TuiNotificationService);
|
||||||
|
private readonly devLog = inject(DevLogService);
|
||||||
|
|
||||||
|
notifyError(err: unknown, source: string): void {
|
||||||
|
const kind = classifyUserError(err);
|
||||||
|
const userSubtitle = friendlyMessageForUserError(kind);
|
||||||
|
const technical = httpErrorMessage(err);
|
||||||
|
|
||||||
|
if (isDevMode()) {
|
||||||
|
this.devLog.add({
|
||||||
|
level: 'error',
|
||||||
|
source: 'system',
|
||||||
|
message: `${source}: ${technical}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
this.notifications
|
||||||
|
.open(escapeHtml(userSubtitle), {
|
||||||
|
label: ERROR_TOAST_TITLE,
|
||||||
|
appearance: 'negative',
|
||||||
|
autoClose: 0,
|
||||||
|
})
|
||||||
|
.subscribe();
|
||||||
|
}
|
||||||
|
}
|
||||||
80
src/app/core/services/sessions-api.service.ts
Normal file
80
src/app/core/services/sessions-api.service.ts
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||||
|
import { Injectable, inject } from '@angular/core';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
import { API_ORIGIN } from '../config/api.tokens';
|
||||||
|
import type {
|
||||||
|
CreateSessionRequest,
|
||||||
|
CreateSessionResponse,
|
||||||
|
ParsedEventsResponse,
|
||||||
|
SessionDetailResponse,
|
||||||
|
SessionListResponse,
|
||||||
|
StreamType,
|
||||||
|
TelemetryEvent,
|
||||||
|
} from '../models/api.types';
|
||||||
|
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class SessionsApiService {
|
||||||
|
private readonly http = inject(HttpClient);
|
||||||
|
private readonly apiOrigin = inject(API_ORIGIN);
|
||||||
|
|
||||||
|
listSessions(limit = 50, offset = 0): Observable<SessionListResponse> {
|
||||||
|
const params = new HttpParams()
|
||||||
|
.set('limit', String(limit))
|
||||||
|
.set('offset', String(offset));
|
||||||
|
return this.http.get<SessionListResponse>('/sessions', { params });
|
||||||
|
}
|
||||||
|
|
||||||
|
createSession(body: CreateSessionRequest): Observable<CreateSessionResponse> {
|
||||||
|
return this.http.post<CreateSessionResponse>('/sessions', body);
|
||||||
|
}
|
||||||
|
|
||||||
|
getSession(id: number): Observable<SessionDetailResponse> {
|
||||||
|
return this.http.get<SessionDetailResponse>(`/sessions/${id}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getTelemetry(sessionId: number): Observable<TelemetryEvent[]> {
|
||||||
|
return this.http.get<TelemetryEvent[]>(`/sessions/${sessionId}/telemetry`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getParsedEvents(sessionId: number, from?: number, to?: number): Observable<ParsedEventsResponse> {
|
||||||
|
let params = new HttpParams();
|
||||||
|
if (typeof from === 'number') {
|
||||||
|
params = params.set('from', String(from));
|
||||||
|
}
|
||||||
|
if (typeof to === 'number') {
|
||||||
|
params = params.set('to', String(to));
|
||||||
|
}
|
||||||
|
return this.http.get<ParsedEventsResponse>(`/sessions/${sessionId}/events`, { params });
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Относительный `playlist_url` из API нужно разрешить относительно хоста (`API_ORIGIN`).
|
||||||
|
*/
|
||||||
|
resolvePlaylistUrl(playlistUrl: string): string {
|
||||||
|
if (/^https?:\/\//i.test(playlistUrl)) {
|
||||||
|
return playlistUrl;
|
||||||
|
}
|
||||||
|
return new URL(playlistUrl, `${this.apiOrigin}/`).href;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ручка для агента (Bearer). В веб-интерфейсе обычно не нужна — оставлена для отладки/скриптов.
|
||||||
|
*/
|
||||||
|
uploadChunk(
|
||||||
|
sessionId: number,
|
||||||
|
chunkIdx: number,
|
||||||
|
file: File,
|
||||||
|
streamType: StreamType = 'screen',
|
||||||
|
bearerToken: string,
|
||||||
|
): Observable<void> {
|
||||||
|
const form = new FormData();
|
||||||
|
form.set('session_id', String(sessionId));
|
||||||
|
form.set('chunk_idx', String(chunkIdx));
|
||||||
|
form.set('stream_type', streamType);
|
||||||
|
form.set('file', file, file.name);
|
||||||
|
return this.http.post<void>('/upload', form, {
|
||||||
|
headers: { Authorization: `Bearer ${bearerToken}` },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
24
src/app/core/sessions/session-status-chip-classes.pipe.ts
Normal file
24
src/app/core/sessions/session-status-chip-classes.pipe.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { Pipe, PipeTransform } from '@angular/core';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Классы-модификаторы для чипа статуса. `finished` — без модификатора (дефолтный вид Taiga).
|
||||||
|
*/
|
||||||
|
@Pipe({
|
||||||
|
name: 'sessionStatusChipClasses',
|
||||||
|
standalone: true,
|
||||||
|
})
|
||||||
|
export class SessionStatusChipClassesPipe implements PipeTransform {
|
||||||
|
transform(value: string | null | undefined): Record<string, boolean> {
|
||||||
|
const k = value?.trim().toLowerCase() ?? '';
|
||||||
|
if (k === '' || k === 'finished') {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
if (k === 'active') {
|
||||||
|
return { 'status-chip--active': true };
|
||||||
|
}
|
||||||
|
if (k === 'pending') {
|
||||||
|
return { 'status-chip--pending': true };
|
||||||
|
}
|
||||||
|
return { 'status-chip--unknown': true };
|
||||||
|
}
|
||||||
|
}
|
||||||
11
src/app/core/sessions/session-status-labels.config.ts
Normal file
11
src/app/core/sessions/session-status-labels.config.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
/**
|
||||||
|
* Отображаемые подписи для статусов сессий (значения с API — обычно в нижнем регистре).
|
||||||
|
* Неизвестный ключ в UI показывается как есть; в dev — предупреждение в консоли разработчика.
|
||||||
|
*/
|
||||||
|
export const SESSION_STATUS_LABELS: Readonly<Record<string, string>> = {
|
||||||
|
active: 'Активная',
|
||||||
|
pending: 'Ожидается',
|
||||||
|
finished: 'Завершена',
|
||||||
|
paused: 'Приостановлена',
|
||||||
|
failed: 'Ошибка',
|
||||||
|
};
|
||||||
33
src/app/core/sessions/session-status.pipe.ts
Normal file
33
src/app/core/sessions/session-status.pipe.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { isDevMode, Pipe, PipeTransform, inject } from '@angular/core';
|
||||||
|
|
||||||
|
import { DevLogService } from '../devtools/dev-log.service';
|
||||||
|
import { SESSION_STATUS_LABELS } from './session-status-labels.config';
|
||||||
|
|
||||||
|
@Pipe({
|
||||||
|
name: 'sessionStatus',
|
||||||
|
standalone: true,
|
||||||
|
})
|
||||||
|
export class SessionStatusPipe implements PipeTransform {
|
||||||
|
private readonly devLog = inject(DevLogService);
|
||||||
|
private readonly warnedUnknown = new Set<string>();
|
||||||
|
|
||||||
|
transform(value: string | null | undefined): string {
|
||||||
|
if (value == null || value === '') {
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
const key = value.trim();
|
||||||
|
const mapped = SESSION_STATUS_LABELS[key.toLowerCase()];
|
||||||
|
if (mapped !== undefined) {
|
||||||
|
return mapped;
|
||||||
|
}
|
||||||
|
if (isDevMode() && !this.warnedUnknown.has(key)) {
|
||||||
|
this.warnedUnknown.add(key);
|
||||||
|
this.devLog.add({
|
||||||
|
level: 'warn',
|
||||||
|
source: 'system',
|
||||||
|
message: `Неизвестный статус сессии (нет подписи в session-status-labels.config): ${key}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
import { DatePipe } from '@angular/common';
|
||||||
|
import { ChangeDetectionStrategy, Component, computed, inject, isDevMode, signal } from '@angular/core';
|
||||||
|
|
||||||
|
import { DevLogService } from '../../../core/devtools/dev-log.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-dev-console',
|
||||||
|
imports: [DatePipe],
|
||||||
|
templateUrl: './dev-console.html',
|
||||||
|
styleUrl: './dev-console.css',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class DevConsoleComponent {
|
||||||
|
private readonly logs = inject(DevLogService);
|
||||||
|
protected readonly isDev = isDevMode();
|
||||||
|
protected readonly collapsed = signal(false);
|
||||||
|
protected readonly minimized = signal(false);
|
||||||
|
protected readonly entries = this.logs.entries;
|
||||||
|
protected readonly count = computed(() => this.entries().length);
|
||||||
|
protected readonly expandedIds = signal<Record<number, boolean>>({});
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
if (!this.isDev || typeof window === 'undefined') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('error', (e) => {
|
||||||
|
this.logs.add({
|
||||||
|
level: 'error',
|
||||||
|
source: 'system',
|
||||||
|
message: `${e.message} (${e.filename}:${e.lineno})`,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener('unhandledrejection', (e: PromiseRejectionEvent) => {
|
||||||
|
const reason =
|
||||||
|
typeof e.reason === 'string'
|
||||||
|
? e.reason
|
||||||
|
: e.reason instanceof Error
|
||||||
|
? e.reason.message
|
||||||
|
: 'Unhandled promise rejection';
|
||||||
|
this.logs.add({
|
||||||
|
level: 'warn',
|
||||||
|
source: 'system',
|
||||||
|
message: reason,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleCollapsed(): void {
|
||||||
|
this.collapsed.update((v) => !v);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected minimize(): void {
|
||||||
|
this.minimized.set(true);
|
||||||
|
this.collapsed.set(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected restore(): void {
|
||||||
|
this.minimized.set(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected clear(): void {
|
||||||
|
this.logs.clear();
|
||||||
|
this.expandedIds.set({});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleExpanded(id: number): void {
|
||||||
|
this.expandedIds.update((curr) => ({ ...curr, [id]: !curr[id] }));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected isExpanded(id: number): boolean {
|
||||||
|
return !!this.expandedIds()[id];
|
||||||
|
}
|
||||||
|
|
||||||
|
protected pretty(value: unknown): string {
|
||||||
|
if (value === undefined) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
if (typeof value === 'string') {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return JSON.stringify(value, null, 2);
|
||||||
|
} catch {
|
||||||
|
return String(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
144
src/app/features/devtools/dev-console/dev-console.css
Normal file
144
src/app/features/devtools/dev-console/dev-console.css
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
:host {
|
||||||
|
position: fixed;
|
||||||
|
right: 1rem;
|
||||||
|
bottom: 1rem;
|
||||||
|
z-index: 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console-mini {
|
||||||
|
border: 1px solid var(--tui-border-normal);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: #1b1d22;
|
||||||
|
color: #e8edf1;
|
||||||
|
padding: 0.45rem 0.7rem;
|
||||||
|
font-size: 0.78rem;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
box-shadow: 0 8px 24px rgb(0 0 0 / 28%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console {
|
||||||
|
width: min(760px, calc(100vw - 2rem));
|
||||||
|
max-height: min(46vh, 380px);
|
||||||
|
border: 1px solid var(--tui-border-normal);
|
||||||
|
border-radius: 0.75rem;
|
||||||
|
background: #121317;
|
||||||
|
color: #e8edf1;
|
||||||
|
box-shadow: 0 8px 24px rgb(0 0 0 / 28%);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console_collapsed {
|
||||||
|
max-height: 2.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__header {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.5rem;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.4rem 0.55rem;
|
||||||
|
background: #1b1d22;
|
||||||
|
border-bottom: 1px solid rgb(255 255 255 / 8%);
|
||||||
|
font-size: 0.8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__count {
|
||||||
|
margin-right: auto;
|
||||||
|
color: #9aa4b2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__header button {
|
||||||
|
border: 1px solid rgb(255 255 255 / 18%);
|
||||||
|
background: transparent;
|
||||||
|
color: inherit;
|
||||||
|
border-radius: 0.35rem;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1;
|
||||||
|
padding: 0.35rem 0.45rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__list {
|
||||||
|
overflow: auto;
|
||||||
|
max-height: calc(min(46vh, 380px) - 2.5rem);
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||||
|
font-size: 0.76rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__entry {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 6rem 3.2rem 1fr;
|
||||||
|
gap: 0.5rem;
|
||||||
|
padding: 0.35rem 0.55rem;
|
||||||
|
border-bottom: 1px solid rgb(255 255 255 / 6%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__main {
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__entry[data-level='warn'] {
|
||||||
|
background: rgb(255 199 0 / 8%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__entry[data-level='error'] {
|
||||||
|
background: rgb(217 45 32 / 12%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__time {
|
||||||
|
color: #9aa4b2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__source {
|
||||||
|
color: #c7cbd1;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__message {
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__expand {
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
border: 1px solid rgb(255 255 255 / 18%);
|
||||||
|
background: transparent;
|
||||||
|
color: #d6dde7;
|
||||||
|
border-radius: 0.3rem;
|
||||||
|
font-size: 0.72rem;
|
||||||
|
line-height: 1.2;
|
||||||
|
padding: 0.2rem 0.35rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__details {
|
||||||
|
margin-top: 0.35rem;
|
||||||
|
padding: 0.4rem;
|
||||||
|
border: 1px solid rgb(255 255 255 / 12%);
|
||||||
|
border-radius: 0.4rem;
|
||||||
|
background: rgb(0 0 0 / 18%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__meta {
|
||||||
|
margin-bottom: 0.35rem;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__details details {
|
||||||
|
margin: 0.35rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__details summary {
|
||||||
|
cursor: pointer;
|
||||||
|
color: #d4d9e0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dev-console__details pre {
|
||||||
|
margin: 0.35rem 0 0;
|
||||||
|
padding: 0.35rem;
|
||||||
|
border-radius: 0.35rem;
|
||||||
|
background: rgb(255 255 255 / 4%);
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
79
src/app/features/devtools/dev-console/dev-console.html
Normal file
79
src/app/features/devtools/dev-console/dev-console.html
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
@if (isDev) {
|
||||||
|
@if (minimized()) {
|
||||||
|
<button type="button" class="dev-console-mini" (click)="restore()">
|
||||||
|
Dev ({{ count() }})
|
||||||
|
</button>
|
||||||
|
} @else {
|
||||||
|
<aside class="dev-console" [class.dev-console_collapsed]="collapsed()">
|
||||||
|
<header class="dev-console__header">
|
||||||
|
<strong>Dev Console</strong>
|
||||||
|
<span class="dev-console__count">{{ count() }}</span>
|
||||||
|
<button type="button" (click)="toggleCollapsed()">
|
||||||
|
{{ collapsed() ? 'Expand' : 'Collapse' }}
|
||||||
|
</button>
|
||||||
|
<button type="button" (click)="clear()">Clear</button>
|
||||||
|
<button type="button" (click)="minimize()">Minimize</button>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
@if (!collapsed()) {
|
||||||
|
<div class="dev-console__list">
|
||||||
|
@for (entry of entries(); track entry.id) {
|
||||||
|
<div class="dev-console__entry" [attr.data-level]="entry.level">
|
||||||
|
<span class="dev-console__time">
|
||||||
|
{{ entry.time | date: 'HH:mm:ss.SSS' }}
|
||||||
|
</span>
|
||||||
|
<span class="dev-console__source">{{ entry.source }}</span>
|
||||||
|
<div class="dev-console__main">
|
||||||
|
<span class="dev-console__message">{{ entry.message }}</span>
|
||||||
|
|
||||||
|
@if (entry.source === 'http' && entry.details) {
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="dev-console__expand"
|
||||||
|
(click)="toggleExpanded(entry.id)"
|
||||||
|
>
|
||||||
|
{{ isExpanded(entry.id) ? 'Hide details' : 'Show details' }}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
@if (isExpanded(entry.id)) {
|
||||||
|
<div class="dev-console__details">
|
||||||
|
<div class="dev-console__meta">
|
||||||
|
<span><b>Method:</b> {{ entry.details.method }}</span>
|
||||||
|
<span><b>Status:</b> {{ entry.details.statusCode ?? 'pending' }}</span>
|
||||||
|
<span><b>Duration:</b> {{ entry.details.durationMs ?? '—' }} ms</span>
|
||||||
|
</div>
|
||||||
|
<div class="dev-console__meta"><b>URL:</b> {{ entry.details.url }}</div>
|
||||||
|
|
||||||
|
<details open>
|
||||||
|
<summary>Request headers</summary>
|
||||||
|
<pre>{{ pretty(entry.details.requestHeaders) }}</pre>
|
||||||
|
</details>
|
||||||
|
<details open>
|
||||||
|
<summary>Request body</summary>
|
||||||
|
<pre>{{ pretty(entry.details.requestBody) }}</pre>
|
||||||
|
</details>
|
||||||
|
<details open>
|
||||||
|
<summary>Response headers</summary>
|
||||||
|
<pre>{{ pretty(entry.details.responseHeaders) }}</pre>
|
||||||
|
</details>
|
||||||
|
<details open>
|
||||||
|
<summary>Response body</summary>
|
||||||
|
<pre>{{ pretty(entry.details.responseBody) }}</pre>
|
||||||
|
</details>
|
||||||
|
@if (entry.details.error) {
|
||||||
|
<details open>
|
||||||
|
<summary>Error</summary>
|
||||||
|
<pre>{{ entry.details.error }}</pre>
|
||||||
|
</details>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</aside>
|
||||||
|
}
|
||||||
|
}
|
||||||
48
src/app/features/sessions/hls-player/hls-player.component.ts
Normal file
48
src/app/features/sessions/hls-player/hls-player.component.ts
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
import {
|
||||||
|
ChangeDetectionStrategy,
|
||||||
|
Component,
|
||||||
|
effect,
|
||||||
|
ElementRef,
|
||||||
|
input,
|
||||||
|
viewChild,
|
||||||
|
} from '@angular/core';
|
||||||
|
import Hls from 'hls.js';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-hls-player',
|
||||||
|
templateUrl: './hls-player.html',
|
||||||
|
styleUrl: './hls-player.css',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class HlsPlayerComponent {
|
||||||
|
/** Полный URL плейлиста `.m3u8`. */
|
||||||
|
readonly src = input.required<string>();
|
||||||
|
|
||||||
|
private readonly videoRef = viewChild<ElementRef<HTMLVideoElement>>('videoEl');
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
effect((onCleanup) => {
|
||||||
|
const url = this.src();
|
||||||
|
const ref = this.videoRef();
|
||||||
|
if (!ref) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const video = ref.nativeElement;
|
||||||
|
let hls: Hls | null = null;
|
||||||
|
|
||||||
|
if (Hls.isSupported()) {
|
||||||
|
hls = new Hls({ enableWorker: true, lowLatencyMode: true });
|
||||||
|
hls.loadSource(url);
|
||||||
|
hls.attachMedia(video);
|
||||||
|
} else if (video.canPlayType('application/vnd.apple.mpegurl')) {
|
||||||
|
video.src = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
onCleanup(() => {
|
||||||
|
hls?.destroy();
|
||||||
|
video.removeAttribute('src');
|
||||||
|
video.load();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
11
src/app/features/sessions/hls-player/hls-player.css
Normal file
11
src/app/features/sessions/hls-player/hls-player.css
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 960px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.player {
|
||||||
|
width: 100%;
|
||||||
|
border-radius: var(--tui-radius-l, 0.75rem);
|
||||||
|
background: var(--tui-background-neutral-1, #000);
|
||||||
|
}
|
||||||
1
src/app/features/sessions/hls-player/hls-player.html
Normal file
1
src/app/features/sessions/hls-player/hls-player.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<video #videoEl class="player" controls playsinline></video>
|
||||||
@@ -0,0 +1,325 @@
|
|||||||
|
import { AsyncPipe, NgClass } from '@angular/common';
|
||||||
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import { ChangeDetectionStrategy, Component, inject, model, signal } from '@angular/core';
|
||||||
|
import { toObservable } from '@angular/core/rxjs-interop';
|
||||||
|
import { ActivatedRoute, RouterLink } from '@angular/router';
|
||||||
|
import { TuiButton } from '@taiga-ui/core/components/button';
|
||||||
|
import { TuiLink } from '@taiga-ui/core/components/link';
|
||||||
|
import { TuiLoader } from '@taiga-ui/core/components/loader';
|
||||||
|
import { TuiTitle } from '@taiga-ui/core/components/title';
|
||||||
|
import { TuiChip } from '@taiga-ui/kit/components/chip';
|
||||||
|
import { TuiTabs } from '@taiga-ui/kit/components/tabs';
|
||||||
|
import { catchError, combineLatest, distinctUntilChanged, map, of, startWith, switchMap, tap, timeout } from 'rxjs';
|
||||||
|
|
||||||
|
import { UserErrorNotifyService } from '../../../core/notifications/user-error-notify.service';
|
||||||
|
import { SessionStatusChipClassesPipe } from '../../../core/sessions/session-status-chip-classes.pipe';
|
||||||
|
import { SessionStatusPipe } from '../../../core/sessions/session-status.pipe';
|
||||||
|
import type { ParsedEvent, SessionDetailResponse, StreamInfo } from '../../../core/models/api.types';
|
||||||
|
import { SessionsApiService } from '../../../core/services/sessions-api.service';
|
||||||
|
import { formatTimestamp } from '../../../shared/utils/date-time.util';
|
||||||
|
import { HlsPlayerComponent } from '../hls-player/hls-player.component';
|
||||||
|
import { TelemetryEventDetailComponent } from '../telemetry-event-detail/telemetry-event-detail.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-session-detail',
|
||||||
|
imports: [
|
||||||
|
AsyncPipe,
|
||||||
|
NgClass,
|
||||||
|
RouterLink,
|
||||||
|
HlsPlayerComponent,
|
||||||
|
TuiButton,
|
||||||
|
TuiChip,
|
||||||
|
...TuiTabs,
|
||||||
|
TuiLink,
|
||||||
|
TuiLoader,
|
||||||
|
TuiTitle,
|
||||||
|
SessionStatusChipClassesPipe,
|
||||||
|
SessionStatusPipe,
|
||||||
|
TelemetryEventDetailComponent,
|
||||||
|
],
|
||||||
|
templateUrl: './session-detail.html',
|
||||||
|
styleUrl: './session-detail.css',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class SessionDetailComponent {
|
||||||
|
private readonly route = inject(ActivatedRoute);
|
||||||
|
private readonly api = inject(SessionsApiService);
|
||||||
|
private readonly userErrors = inject(UserErrorNotifyService);
|
||||||
|
|
||||||
|
private readonly telemetryToMs = signal<number | null>(null);
|
||||||
|
private readonly recordingStartMs = signal<number | null>(null);
|
||||||
|
private readonly recordingEndMs = signal<number | null>(null);
|
||||||
|
protected readonly customToLocal = signal('');
|
||||||
|
|
||||||
|
/** Выбранный тип потока (или первая вкладка по умолчанию в шаблоне). */
|
||||||
|
protected readonly selectedStreamType = signal<string | null>(null);
|
||||||
|
|
||||||
|
/** 0 — просмотр, 1 — служебная информация. */
|
||||||
|
protected readonly activeTabIndex = model(0);
|
||||||
|
|
||||||
|
/** null — все типы событий в таблице телеметрии. */
|
||||||
|
protected readonly telemetryEventTypeFilter = signal<string | null>(null);
|
||||||
|
|
||||||
|
/** Раскрытая строка телеметрии: ключ или null. */
|
||||||
|
protected readonly expandedTelemetryRowKey = signal<string | null>(null);
|
||||||
|
|
||||||
|
private readonly sessionId$ = this.route.paramMap.pipe(
|
||||||
|
map((p) => Number(p.get('id'))),
|
||||||
|
distinctUntilChanged(),
|
||||||
|
);
|
||||||
|
|
||||||
|
protected readonly vm$ = this.sessionId$.pipe(
|
||||||
|
switchMap((id) => {
|
||||||
|
if (!Number.isFinite(id)) {
|
||||||
|
this.userErrors.notifyError(new Error('Некорректный идентификатор сессии'), 'Сессия');
|
||||||
|
return of({ status: 'error' as const });
|
||||||
|
}
|
||||||
|
this.selectedStreamType.set(null);
|
||||||
|
this.activeTabIndex.set(0);
|
||||||
|
this.telemetryEventTypeFilter.set(null);
|
||||||
|
this.expandedTelemetryRowKey.set(null);
|
||||||
|
return this.api.getSession(id).pipe(
|
||||||
|
map((detail) => ({ status: 'ok' as const, id, detail })),
|
||||||
|
tap((state) => {
|
||||||
|
if (state.status !== 'ok') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const start = this.toUnixMs(state.detail.session.started_at);
|
||||||
|
const end = this.toUnixMs(state.detail.session.ended_at);
|
||||||
|
this.recordingStartMs.set(start);
|
||||||
|
this.recordingEndMs.set(end);
|
||||||
|
// Дефолт для телеметрии: до текущего момента (или конца записи, если завершена).
|
||||||
|
if (this.telemetryToMs() === null) {
|
||||||
|
this.telemetryToMs.set(end ?? Date.now());
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
catchError((e: HttpErrorResponse) => {
|
||||||
|
this.userErrors.notifyError(e, 'Сессия');
|
||||||
|
return of({ status: 'error' as const });
|
||||||
|
}),
|
||||||
|
startWith({ status: 'loading' as const }),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
protected readonly telemetry$ = combineLatest([
|
||||||
|
this.sessionId$,
|
||||||
|
toObservable(this.telemetryToMs),
|
||||||
|
toObservable(this.recordingStartMs),
|
||||||
|
toObservable(this.recordingEndMs),
|
||||||
|
]).pipe(
|
||||||
|
switchMap(([id, toMs, recordingStartMs, recordingEndMs]) => {
|
||||||
|
if (!Number.isFinite(id)) {
|
||||||
|
return of({
|
||||||
|
status: 'error' as const,
|
||||||
|
toMs,
|
||||||
|
fromMs: recordingStartMs ?? 0,
|
||||||
|
telemetry: [] as ParsedEvent[],
|
||||||
|
parsedMeta: undefined,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const now = Date.now();
|
||||||
|
const lowerBound = recordingStartMs ?? 0;
|
||||||
|
const upperBound = recordingEndMs ?? now;
|
||||||
|
const normalizedTo = this.clamp(toMs ?? upperBound, lowerBound, upperBound);
|
||||||
|
return this.api
|
||||||
|
.getParsedEvents(
|
||||||
|
id,
|
||||||
|
lowerBound,
|
||||||
|
normalizedTo,
|
||||||
|
)
|
||||||
|
.pipe(
|
||||||
|
timeout(12000),
|
||||||
|
map((resp) => ({
|
||||||
|
status: 'ok' as const,
|
||||||
|
toMs: normalizedTo,
|
||||||
|
fromMs: lowerBound,
|
||||||
|
telemetry: Array.isArray(resp.events) ? resp.events : [],
|
||||||
|
parsedMeta: {
|
||||||
|
session_id: resp.session_id,
|
||||||
|
count: resp.count,
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
catchError((e: unknown) => {
|
||||||
|
this.userErrors.notifyError(e, 'Телеметрия');
|
||||||
|
return of({
|
||||||
|
status: 'error' as const,
|
||||||
|
toMs: normalizedTo,
|
||||||
|
fromMs: lowerBound,
|
||||||
|
telemetry: [] as ParsedEvent[],
|
||||||
|
parsedMeta: undefined,
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
startWith({
|
||||||
|
status: 'loading' as const,
|
||||||
|
toMs: normalizedTo,
|
||||||
|
fromMs: lowerBound,
|
||||||
|
telemetry: [] as ParsedEvent[],
|
||||||
|
parsedMeta: undefined,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
protected pickStream(type: string): void {
|
||||||
|
this.selectedStreamType.set(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected activeStreamType(detail: SessionDetailResponse): string | null {
|
||||||
|
const streams = detail.streams;
|
||||||
|
if (!streams?.length) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const picked = this.selectedStreamType();
|
||||||
|
if (picked && streams.some((s) => s.stream_type === picked)) {
|
||||||
|
return picked;
|
||||||
|
}
|
||||||
|
return streams[0].stream_type;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected playlistUrl(detail: SessionDetailResponse): string | null {
|
||||||
|
const t = this.activeStreamType(detail);
|
||||||
|
if (!t) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const stream = detail.streams.find((s) => s.stream_type === t);
|
||||||
|
return stream ? this.api.resolvePlaylistUrl(stream.playlist_url) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected formatDate(value: string | null | undefined): string {
|
||||||
|
return formatTimestamp(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected formatUnixMs(value: number | null | undefined): string {
|
||||||
|
if (!value) {
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
return formatTimestamp(new Date(value).toISOString());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected pickTelemetryEventTypeFilter(type: string | null): void {
|
||||||
|
this.telemetryEventTypeFilter.set(type);
|
||||||
|
this.expandedTelemetryRowKey.set(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected telemetryRowKey(row: ParsedEvent, index: number): string {
|
||||||
|
return `${row.timestamp}\u0000${row.event_type}\u0000${index}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected toggleTelemetryRow(row: ParsedEvent, index: number): void {
|
||||||
|
const key = this.telemetryRowKey(row, index);
|
||||||
|
this.expandedTelemetryRowKey.update((cur) => (cur === key ? null : key));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected isTelemetryRowExpanded(row: ParsedEvent, index: number): boolean {
|
||||||
|
return this.expandedTelemetryRowKey() === this.telemetryRowKey(row, index);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Уникальные значения `event_type` (пустая строка — отдельная вкладка). */
|
||||||
|
protected uniqueTelemetryEventTypes(events: ParsedEvent[]): string[] {
|
||||||
|
const set = new Set<string>();
|
||||||
|
for (const e of events) {
|
||||||
|
set.add(e.event_type ?? '');
|
||||||
|
}
|
||||||
|
return [...set].sort((a, b) => a.localeCompare(b, 'ru'));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected telemetryEventsOfType(events: ParsedEvent[], typeKey: string): number {
|
||||||
|
return events.filter((e) => (e.event_type ?? '') === typeKey).length;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected filteredTelemetryEvents(events: ParsedEvent[]): ParsedEvent[] {
|
||||||
|
const filter = this.telemetryEventTypeFilter();
|
||||||
|
if (filter === null) {
|
||||||
|
return events;
|
||||||
|
}
|
||||||
|
return events.filter((e) => (e.event_type ?? '') === filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected telemetryTypeTabLabel(typeKey: string): string {
|
||||||
|
return typeKey === '' ? 'Без типа' : typeKey;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected eventDataPreview(event: ParsedEvent): string {
|
||||||
|
const data = event.data;
|
||||||
|
if (data === null || data === undefined) {
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
if (Array.isArray(data)) {
|
||||||
|
return data.map((v) => String(v)).join(', ');
|
||||||
|
}
|
||||||
|
if (typeof data === 'object') {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(data);
|
||||||
|
} catch {
|
||||||
|
return '[object]';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return String(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected selectRecentWindow(seconds: number): void {
|
||||||
|
this.customToLocal.set('');
|
||||||
|
const start = this.recordingStartMs() ?? Date.now();
|
||||||
|
const end = this.recordingEndMs() ?? Date.now();
|
||||||
|
this.telemetryToMs.set(this.clamp(start + seconds * 1000, start, end));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected loadUntilEndTelemetry(): void {
|
||||||
|
this.customToLocal.set('');
|
||||||
|
const end = this.recordingEndMs() ?? Date.now();
|
||||||
|
this.telemetryToMs.set(end);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected applyCustomTo(value: string): void {
|
||||||
|
this.customToLocal.set(value);
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const ms = new Date(value).getTime();
|
||||||
|
if (Number.isFinite(ms)) {
|
||||||
|
const start = this.recordingStartMs() ?? Date.now();
|
||||||
|
const end = this.recordingEndMs() ?? Date.now();
|
||||||
|
this.telemetryToMs.set(this.clamp(ms, start, end));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected telemetryRangeLabel(toMs: number | null): string {
|
||||||
|
return `С ${this.formatUnixMs(this.recordingStartMs())} до ${this.formatUnixMs(toMs)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected detailPayloadJson(detail: SessionDetailResponse): string {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(detail, null, 2);
|
||||||
|
} catch {
|
||||||
|
return '{}';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected formatDurationMs(ms: number | null | undefined): string {
|
||||||
|
if (ms === null || ms === undefined || !Number.isFinite(ms)) {
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
return `${ms} ms`;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected streamResolvedPlaylistUrl(stream: StreamInfo): string {
|
||||||
|
return this.api.resolvePlaylistUrl(stream.playlist_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
private toUnixMs(value: string | null | undefined): number | null {
|
||||||
|
if (!value) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const ms = new Date(value).getTime();
|
||||||
|
return Number.isFinite(ms) ? ms : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private clamp(value: number, min: number, max: number): number {
|
||||||
|
if (max < min) {
|
||||||
|
return min;
|
||||||
|
}
|
||||||
|
return Math.min(max, Math.max(min, value));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
258
src/app/features/sessions/session-detail/session-detail.css
Normal file
258
src/app/features/sessions/session-detail/session-detail.css
Normal file
@@ -0,0 +1,258 @@
|
|||||||
|
.page {
|
||||||
|
max-width: 960px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 1.5rem 1rem 3rem;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.back {
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.heading {
|
||||||
|
margin-bottom: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Не задавать display: block — ломает горизонтальный flex у tui-tabs и переносит вкладки. */
|
||||||
|
.session-tabs {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
align-items: flex-end;
|
||||||
|
margin-bottom: 1.25rem;
|
||||||
|
min-width: 0;
|
||||||
|
overflow-x: auto;
|
||||||
|
-webkit-overflow-scrolling: touch;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Воздух между подписью и нижней линией (у Taiga у [tuiTab] padding: 0). */
|
||||||
|
.session-tabs [tuiTab] {
|
||||||
|
padding-block-end: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* У Taiga для неактивной вкладки: box-shadow inset 0 -.125rem — линия hover оказывается
|
||||||
|
* выше общей нижней границы полосы (inset 0 -1px на tui-tabs). Убираем дублирующую линию.
|
||||||
|
*/
|
||||||
|
.session-tabs [tuiTab]:hover:not(._active) {
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-title {
|
||||||
|
margin: 0 0 0.75rem;
|
||||||
|
font: var(--tui-font-heading-6);
|
||||||
|
color: var(--tui-text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.kv {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(10rem, 14rem) 1fr;
|
||||||
|
gap: 0.35rem 1rem;
|
||||||
|
margin: 0;
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.kv dt {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--tui-text-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.kv dd {
|
||||||
|
margin: 0;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mono {
|
||||||
|
font-family: ui-monospace, monospace;
|
||||||
|
font-size: 0.92em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.json-block {
|
||||||
|
margin: 0.75rem 0 0;
|
||||||
|
padding: 1rem;
|
||||||
|
max-height: min(360px, 50vh);
|
||||||
|
overflow: auto;
|
||||||
|
border-radius: var(--tui-radius-m);
|
||||||
|
background: color-mix(in srgb, var(--tui-background-base) 88%, var(--tui-text-primary));
|
||||||
|
font-size: 0.8rem;
|
||||||
|
line-height: 1.45;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta-table th,
|
||||||
|
.meta-table td {
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
text-align: left;
|
||||||
|
vertical-align: top;
|
||||||
|
border-bottom: 1px solid var(--tui-border-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta-table th {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--tui-text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.table-wrap_flat {
|
||||||
|
max-height: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-wrap {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-wrap_small {
|
||||||
|
padding: 1rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
color: var(--tui-status-negative);
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
padding: 1.25rem 1.5rem;
|
||||||
|
border-radius: var(--tui-radius-l);
|
||||||
|
background: var(--tui-background-elevation-1);
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-title {
|
||||||
|
margin: 0 0 1rem;
|
||||||
|
font: var(--tui-font-heading-6);
|
||||||
|
color: var(--sg-color-subtitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-head {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-head .section-title {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-presets {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.from-picker {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.summary-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.small {
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
margin-top: 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.muted {
|
||||||
|
color: var(--tui-text-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stream-tabs {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.5rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stream-tabs button {
|
||||||
|
transition:
|
||||||
|
background-color 0.15s ease,
|
||||||
|
color 0.15s ease,
|
||||||
|
border-color 0.15s ease,
|
||||||
|
outline-color 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Контраст к карточке — жёлтый акцент при наведении (специфичнее secondary appearance Taiga) */
|
||||||
|
.stream-tabs
|
||||||
|
button[tuiButton][tuiAppearance][data-appearance='secondary']:hover:not(:disabled):not([data-state='disabled']) {
|
||||||
|
background: var(--sg-color-accent);
|
||||||
|
color: var(--sg-color-text);
|
||||||
|
border-color: color-mix(in srgb, var(--sg-color-accent) 78%, black);
|
||||||
|
outline: 2px solid transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stream-tabs button.stream-active[tuiButton][tuiAppearance][data-appearance='secondary'] {
|
||||||
|
outline: 2px solid var(--sg-color-accent);
|
||||||
|
background: color-mix(in srgb, var(--sg-color-accent) 22%, white);
|
||||||
|
border-color: var(--sg-color-accent);
|
||||||
|
color: var(--sg-color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.table-wrap {
|
||||||
|
overflow: auto;
|
||||||
|
max-height: min(480px, 70vh);
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry th,
|
||||||
|
.telemetry td {
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
text-align: left;
|
||||||
|
border-bottom: 1px solid var(--tui-border-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry th {
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
background: var(--tui-background-elevation-1);
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-row {
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.12s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-row:hover {
|
||||||
|
background: color-mix(in srgb, var(--tui-background-accent-1) 12%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-row.telemetry-row_expanded {
|
||||||
|
background: color-mix(in srgb, var(--tui-background-accent-1) 18%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.telemetry-row-detail td {
|
||||||
|
padding: 0 0.75rem 1rem;
|
||||||
|
border-bottom: 1px solid var(--tui-border-normal);
|
||||||
|
vertical-align: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payload {
|
||||||
|
font-family: ui-monospace, monospace;
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
271
src/app/features/sessions/session-detail/session-detail.html
Normal file
271
src/app/features/sessions/session-detail/session-detail.html
Normal file
@@ -0,0 +1,271 @@
|
|||||||
|
<div class="page">
|
||||||
|
<nav class="back">
|
||||||
|
<a tuiLink routerLink="/">← К списку сессий</a>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
@if (vm$ | async; as state) {
|
||||||
|
@switch (state.status) {
|
||||||
|
@case ('loading') {
|
||||||
|
<div class="loading-wrap">
|
||||||
|
<tui-loader [loading]="true" size="xl" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@case ('error') {
|
||||||
|
<p class="muted">Не удалось загрузить сессию.</p>
|
||||||
|
}
|
||||||
|
@case ('ok') {
|
||||||
|
<h2 tuiTitle class="heading">Сессия {{ state.id }}</h2>
|
||||||
|
|
||||||
|
<tui-tabs class="session-tabs" [(activeItemIndex)]="activeTabIndex" size="m">
|
||||||
|
<button tuiTab type="button">Просмотр</button>
|
||||||
|
<button tuiTab type="button">Служебная информация</button>
|
||||||
|
</tui-tabs>
|
||||||
|
|
||||||
|
@if (telemetry$ | async; as telemetryState) {
|
||||||
|
@if (activeTabIndex() === 0) {
|
||||||
|
<section class="card summary" aria-label="Сводка">
|
||||||
|
@if (state.detail.session.title) {
|
||||||
|
<p class="session-title">{{ state.detail.session.title }}</p>
|
||||||
|
}
|
||||||
|
<div class="summary-row">
|
||||||
|
<span
|
||||||
|
tuiChip
|
||||||
|
size="s"
|
||||||
|
class="status-chip"
|
||||||
|
[ngClass]="state.detail.session.status | sessionStatusChipClasses"
|
||||||
|
>{{ state.detail.session.status | sessionStatus }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="muted small">
|
||||||
|
Начало: {{ formatDate(state.detail.session.started_at) }} · Окончание:
|
||||||
|
{{ formatDate(state.detail.session.ended_at) }}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card" aria-label="Видео">
|
||||||
|
<h3 class="section-title">Трансляция</h3>
|
||||||
|
@if (state.detail.streams.length === 0) {
|
||||||
|
<p class="muted">Потоки ещё не готовы.</p>
|
||||||
|
} @else {
|
||||||
|
<div class="stream-tabs">
|
||||||
|
@for (s of state.detail.streams; track s.stream_type) {
|
||||||
|
<button
|
||||||
|
tuiButton
|
||||||
|
type="button"
|
||||||
|
size="s"
|
||||||
|
appearance="secondary"
|
||||||
|
[class.stream-active]="activeStreamType(state.detail) === s.stream_type"
|
||||||
|
(click)="pickStream(s.stream_type)"
|
||||||
|
>
|
||||||
|
{{ s.stream_type }}
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
@if (playlistUrl(state.detail); as src) {
|
||||||
|
<app-hls-player [src]="src" />
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card" aria-label="Телеметрия">
|
||||||
|
<div class="telemetry-head">
|
||||||
|
<h3 class="section-title">
|
||||||
|
События телеметрии ({{ filteredTelemetryEvents(telemetryState.telemetry).length }})
|
||||||
|
</h3>
|
||||||
|
<div class="telemetry-actions">
|
||||||
|
<span class="muted small">{{ telemetryRangeLabel(telemetryState.toMs) }}</span>
|
||||||
|
<div class="telemetry-presets">
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="selectRecentWindow(2)">+2с</button>
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="selectRecentWindow(10)">+10с</button>
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="selectRecentWindow(60)">+1м</button>
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="selectRecentWindow(300)">+5м</button>
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="selectRecentWindow(900)">+15м</button>
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="loadUntilEndTelemetry()">До конца</button>
|
||||||
|
</div>
|
||||||
|
<label class="from-picker">
|
||||||
|
<span class="muted small">До:</span>
|
||||||
|
<input
|
||||||
|
#toInput
|
||||||
|
type="datetime-local"
|
||||||
|
class="sg-native-input"
|
||||||
|
[value]="customToLocal()"
|
||||||
|
/>
|
||||||
|
<button tuiButton type="button" size="s" appearance="secondary" (click)="applyCustomTo(toInput.value)">
|
||||||
|
Применить
|
||||||
|
</button>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (telemetryState.status === 'loading') {
|
||||||
|
<div class="loading-wrap loading-wrap_small">
|
||||||
|
<tui-loader [loading]="true" size="l" />
|
||||||
|
</div>
|
||||||
|
} @else if (telemetryState.status === 'error') {
|
||||||
|
<p class="muted">События телеметрии временно недоступны.</p>
|
||||||
|
} @else {
|
||||||
|
@if (telemetryState.telemetry.length === 0) {
|
||||||
|
<p class="muted">Событий пока нет.</p>
|
||||||
|
} @else {
|
||||||
|
<div class="telemetry-type-tabs stream-tabs" aria-label="Фильтр по типу события">
|
||||||
|
<button
|
||||||
|
tuiButton
|
||||||
|
type="button"
|
||||||
|
size="s"
|
||||||
|
appearance="secondary"
|
||||||
|
[class.stream-active]="telemetryEventTypeFilter() === null"
|
||||||
|
(click)="pickTelemetryEventTypeFilter(null)"
|
||||||
|
>
|
||||||
|
Все ({{ telemetryState.telemetry.length }})
|
||||||
|
</button>
|
||||||
|
@for (t of uniqueTelemetryEventTypes(telemetryState.telemetry); track t) {
|
||||||
|
<button
|
||||||
|
tuiButton
|
||||||
|
type="button"
|
||||||
|
size="s"
|
||||||
|
appearance="secondary"
|
||||||
|
[class.stream-active]="telemetryEventTypeFilter() === t"
|
||||||
|
(click)="pickTelemetryEventTypeFilter(t)"
|
||||||
|
>
|
||||||
|
{{ telemetryTypeTabLabel(t) }} ({{ telemetryEventsOfType(telemetryState.telemetry, t) }})
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
@if (filteredTelemetryEvents(telemetryState.telemetry).length === 0) {
|
||||||
|
<p class="muted">Нет событий выбранного типа.</p>
|
||||||
|
} @else {
|
||||||
|
<div class="table-wrap">
|
||||||
|
<table class="telemetry">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Время</th>
|
||||||
|
<th>Тип</th>
|
||||||
|
<th>Payload</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@for (
|
||||||
|
row of filteredTelemetryEvents(telemetryState.telemetry);
|
||||||
|
track row.timestamp + '-' + row.event_type + '-' + $index;
|
||||||
|
let i = $index
|
||||||
|
) {
|
||||||
|
<tr
|
||||||
|
class="telemetry-row"
|
||||||
|
[class.telemetry-row_expanded]="isTelemetryRowExpanded(row, i)"
|
||||||
|
(click)="toggleTelemetryRow(row, i)"
|
||||||
|
>
|
||||||
|
<td>{{ formatUnixMs(row.timestamp) }}</td>
|
||||||
|
<td><span tuiChip size="xs">{{ row.event_type || '—' }}</span></td>
|
||||||
|
<td class="payload">{{ eventDataPreview(row) }}</td>
|
||||||
|
</tr>
|
||||||
|
@if (isTelemetryRowExpanded(row, i)) {
|
||||||
|
<tr class="telemetry-row-detail">
|
||||||
|
<td colspan="3" (click)="$event.stopPropagation()">
|
||||||
|
<app-telemetry-event-detail [event]="row" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (activeTabIndex() === 1) {
|
||||||
|
<section class="card" aria-label="Сессия">
|
||||||
|
<h3 class="section-title">Сессия</h3>
|
||||||
|
<dl class="kv">
|
||||||
|
<dt>Идентификатор</dt>
|
||||||
|
<dd>{{ state.detail.session.id }}</dd>
|
||||||
|
<dt>ID пользователя</dt>
|
||||||
|
<dd>{{ state.detail.session.user_id ?? '—' }}</dd>
|
||||||
|
<dt>Статус</dt>
|
||||||
|
<dd><code class="mono">{{ state.detail.session.status }}</code></dd>
|
||||||
|
<dt>Начало</dt>
|
||||||
|
<dd><code class="mono">{{ state.detail.session.started_at ?? '—' }}</code></dd>
|
||||||
|
<dt>Окончание</dt>
|
||||||
|
<dd><code class="mono">{{ state.detail.session.ended_at ?? '—' }}</code></dd>
|
||||||
|
<dt>Всего чанков</dt>
|
||||||
|
<dd>{{ state.detail.session.chunks_total ?? '—' }}</dd>
|
||||||
|
<dt>Всего событий</dt>
|
||||||
|
<dd>{{ state.detail.session.events_total ?? '—' }}</dd>
|
||||||
|
<dt>Название</dt>
|
||||||
|
<dd>{{ state.detail.session.title ?? '—' }}</dd>
|
||||||
|
</dl>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card" aria-label="Потоки">
|
||||||
|
<h3 class="section-title">Потоки</h3>
|
||||||
|
@if (state.detail.streams.length === 0) {
|
||||||
|
<p class="muted">Нет записей о потоках.</p>
|
||||||
|
} @else {
|
||||||
|
<div class="table-wrap table-wrap_flat">
|
||||||
|
<table class="meta-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Тип потока</th>
|
||||||
|
<th>Чанков</th>
|
||||||
|
<th>Длительность (мс)</th>
|
||||||
|
<th>URL плейлиста (как в API)</th>
|
||||||
|
<th>URL плейлиста (абсолютный)</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@for (stream of state.detail.streams; track stream.stream_type) {
|
||||||
|
<tr>
|
||||||
|
<td><code class="mono">{{ stream.stream_type }}</code></td>
|
||||||
|
<td>{{ stream.chunk_count ?? '—' }}</td>
|
||||||
|
<td>{{ formatDurationMs(stream.duration_ms) }}</td>
|
||||||
|
<td class="payload">{{ stream.playlist_url }}</td>
|
||||||
|
<td class="payload">{{ streamResolvedPlaylistUrl(stream) }}</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card" aria-label="Телеметрия, ответ API">
|
||||||
|
<h3 class="section-title">Запрос событий</h3>
|
||||||
|
<dl class="kv">
|
||||||
|
<dt>От (мс)</dt>
|
||||||
|
<dd><code class="mono">{{ telemetryState.fromMs }}</code></dd>
|
||||||
|
<dt>До (мс)</dt>
|
||||||
|
<dd><code class="mono">{{ telemetryState.toMs }}</code></dd>
|
||||||
|
<dt>ID сессии</dt>
|
||||||
|
<dd>
|
||||||
|
@if (telemetryState.parsedMeta) {
|
||||||
|
{{ telemetryState.parsedMeta.session_id }}
|
||||||
|
} @else {
|
||||||
|
—
|
||||||
|
}
|
||||||
|
</dd>
|
||||||
|
<dt>Количество</dt>
|
||||||
|
<dd>
|
||||||
|
@if (telemetryState.parsedMeta) {
|
||||||
|
{{ telemetryState.parsedMeta.count }}
|
||||||
|
} @else {
|
||||||
|
—
|
||||||
|
}
|
||||||
|
</dd>
|
||||||
|
<dt>Строк в выборке</dt>
|
||||||
|
<dd>{{ telemetryState.telemetry.length }}</dd>
|
||||||
|
<dt>Статус загрузки</dt>
|
||||||
|
<dd><code class="mono">{{ telemetryState.status }}</code></dd>
|
||||||
|
</dl>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card" aria-label="Исходный JSON">
|
||||||
|
<h3 class="section-title">Исходный JSON</h3>
|
||||||
|
<pre class="json-block">{{ detailPayloadJson(state.detail) }}</pre>
|
||||||
|
</section>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
import { AsyncPipe, NgClass } from '@angular/common';
|
||||||
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import {
|
||||||
|
ChangeDetectionStrategy,
|
||||||
|
Component,
|
||||||
|
inject,
|
||||||
|
signal,
|
||||||
|
} from '@angular/core';
|
||||||
|
import { toObservable } from '@angular/core/rxjs-interop';
|
||||||
|
import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||||
|
import { Router, RouterLink } from '@angular/router';
|
||||||
|
import { TuiButton } from '@taiga-ui/core/components/button';
|
||||||
|
import { TuiLink } from '@taiga-ui/core/components/link';
|
||||||
|
import { TuiLoader } from '@taiga-ui/core/components/loader';
|
||||||
|
import { TuiTitle } from '@taiga-ui/core/components/title';
|
||||||
|
import { TuiInput } from '@taiga-ui/core/components/input';
|
||||||
|
import { TuiChip } from '@taiga-ui/kit/components/chip';
|
||||||
|
import { TuiPagination } from '@taiga-ui/kit/components/pagination';
|
||||||
|
import { catchError, map, of, startWith, switchMap } from 'rxjs';
|
||||||
|
|
||||||
|
import { UserErrorNotifyService } from '../../../core/notifications/user-error-notify.service';
|
||||||
|
import { SessionStatusChipClassesPipe } from '../../../core/sessions/session-status-chip-classes.pipe';
|
||||||
|
import { SessionStatusPipe } from '../../../core/sessions/session-status.pipe';
|
||||||
|
import { SessionsApiService } from '../../../core/services/sessions-api.service';
|
||||||
|
import { formatTimestamp } from '../../../shared/utils/date-time.util';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-sessions-list',
|
||||||
|
imports: [
|
||||||
|
AsyncPipe,
|
||||||
|
NgClass,
|
||||||
|
ReactiveFormsModule,
|
||||||
|
RouterLink,
|
||||||
|
TuiButton,
|
||||||
|
TuiChip,
|
||||||
|
...TuiInput,
|
||||||
|
TuiLink,
|
||||||
|
TuiLoader,
|
||||||
|
TuiPagination,
|
||||||
|
TuiTitle,
|
||||||
|
SessionStatusChipClassesPipe,
|
||||||
|
SessionStatusPipe,
|
||||||
|
],
|
||||||
|
templateUrl: './sessions-list.html',
|
||||||
|
styleUrl: './sessions-list.css',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class SessionsListComponent {
|
||||||
|
private readonly api = inject(SessionsApiService);
|
||||||
|
private readonly router = inject(Router);
|
||||||
|
private readonly userErrors = inject(UserErrorNotifyService);
|
||||||
|
|
||||||
|
protected readonly limit = 10;
|
||||||
|
protected readonly pageIndex = signal(0);
|
||||||
|
|
||||||
|
protected readonly titleControl = new FormControl('', {
|
||||||
|
nonNullable: true,
|
||||||
|
validators: [Validators.required, Validators.minLength(1)],
|
||||||
|
});
|
||||||
|
|
||||||
|
protected readonly creating = signal(false);
|
||||||
|
|
||||||
|
protected readonly listState$ = toObservable(this.pageIndex).pipe(
|
||||||
|
switchMap((page) =>
|
||||||
|
this.api.listSessions(this.limit, page * this.limit).pipe(
|
||||||
|
map((data) => ({ status: 'ok' as const, data })),
|
||||||
|
catchError((e: HttpErrorResponse) => {
|
||||||
|
this.userErrors.notifyError(e, 'Список сессий');
|
||||||
|
return of({ status: 'error' as const });
|
||||||
|
}),
|
||||||
|
startWith({ status: 'loading' as const }),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
protected onPageIndexChange(index: number): void {
|
||||||
|
this.pageIndex.set(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected pageCount(total: number): number {
|
||||||
|
return Math.max(1, Math.ceil(total / this.limit));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected formatDate(value: string | null | undefined): string {
|
||||||
|
return formatTimestamp(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected createSession(): void {
|
||||||
|
if (this.titleControl.invalid || this.creating()) {
|
||||||
|
this.titleControl.markAsTouched();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const title = this.titleControl.value.trim();
|
||||||
|
this.creating.set(true);
|
||||||
|
this.api.createSession({ title }).subscribe({
|
||||||
|
next: (res) => {
|
||||||
|
this.creating.set(false);
|
||||||
|
void this.router.navigate(['/sessions', res.id]);
|
||||||
|
},
|
||||||
|
error: (e: HttpErrorResponse) => {
|
||||||
|
this.creating.set(false);
|
||||||
|
this.userErrors.notifyError(e, 'Создание сессии');
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
119
src/app/features/sessions/sessions-list/sessions-list.css
Normal file
119
src/app/features/sessions/sessions-list/sessions-list.css
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
.page {
|
||||||
|
max-width: 960px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 1.5rem 1rem 3rem;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.heading {
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
padding: 1.25rem 1.5rem;
|
||||||
|
border-radius: var(--tui-radius-l);
|
||||||
|
background: var(--tui-background-elevation-1);
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-title {
|
||||||
|
margin: 0 0 1rem;
|
||||||
|
font: var(--tui-font-heading-6);
|
||||||
|
color: var(--sg-color-subtitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 1rem;
|
||||||
|
align-items: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-field {
|
||||||
|
flex: 1 1 240px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.accent-cta[tuiAppearance][data-appearance='primary'] {
|
||||||
|
min-inline-size: var(--sg-primary-action-min-inline-size);
|
||||||
|
--t-bg: var(--sg-color-accent);
|
||||||
|
background: var(--t-bg);
|
||||||
|
border-color: var(--sg-color-accent);
|
||||||
|
color: var(--sg-color-text);
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.accent-cta[tuiAppearance][data-appearance='primary']:hover:not([data-state='disabled']):not(:disabled) {
|
||||||
|
--t-bg: var(--tui-background-accent-1-hover);
|
||||||
|
filter: brightness(0.96);
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-wrap {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
color: var(--tui-status-negative);
|
||||||
|
margin: 0.75rem 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.muted {
|
||||||
|
color: var(--tui-text-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-list {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-row {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
padding: 0.75rem 0;
|
||||||
|
border-bottom: 1px solid var(--tui-border-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-row:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-link {
|
||||||
|
font: var(--tui-font-text-m);
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-chip {
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta {
|
||||||
|
margin-left: auto;
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.pager {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 1rem;
|
||||||
|
margin-top: 1rem;
|
||||||
|
padding-top: 1rem;
|
||||||
|
border-top: 1px solid var(--tui-border-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.total {
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Активная страница пагинации (Taiga 5: активная кнопка — appearance primary) */
|
||||||
|
tui-pagination button.t-button[tuiButton][tuiAppearance][data-appearance='primary'] {
|
||||||
|
--t-bg: var(--sg-color-accent);
|
||||||
|
background: var(--t-bg);
|
||||||
|
border-color: var(--sg-color-accent);
|
||||||
|
color: var(--sg-color-text);
|
||||||
|
}
|
||||||
82
src/app/features/sessions/sessions-list/sessions-list.html
Normal file
82
src/app/features/sessions/sessions-list/sessions-list.html
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
<div class="page">
|
||||||
|
<h2 tuiTitle class="heading">Сессии прокторинга</h2>
|
||||||
|
|
||||||
|
<section class="create card" aria-label="Создать сессию">
|
||||||
|
<h3 class="section-title">Новая сессия</h3>
|
||||||
|
<div class="create-row">
|
||||||
|
<tui-textfield class="create-field sg-tui-textfield">
|
||||||
|
<label tuiLabel>Название</label>
|
||||||
|
<input
|
||||||
|
tuiInput
|
||||||
|
type="text"
|
||||||
|
placeholder="Например, экзамен по ОС"
|
||||||
|
[formControl]="titleControl"
|
||||||
|
/>
|
||||||
|
</tui-textfield>
|
||||||
|
<button
|
||||||
|
tuiButton
|
||||||
|
class="accent-cta"
|
||||||
|
type="button"
|
||||||
|
appearance="primary"
|
||||||
|
[disabled]="creating() || titleControl.invalid"
|
||||||
|
(click)="createSession()"
|
||||||
|
>
|
||||||
|
Создать
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
@if (listState$ | async; as state) {
|
||||||
|
@switch (state.status) {
|
||||||
|
@case ('loading') {
|
||||||
|
<div class="loading-wrap">
|
||||||
|
<tui-loader [loading]="true" size="xl" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@case ('error') {
|
||||||
|
<section class="card" aria-label="Список сессий">
|
||||||
|
<p class="muted">Список временно недоступен.</p>
|
||||||
|
</section>
|
||||||
|
}
|
||||||
|
@case ('ok') {
|
||||||
|
<section class="card" aria-label="Список сессий">
|
||||||
|
@if (state.data.sessions.length === 0) {
|
||||||
|
<p class="muted">Сессий пока нет.</p>
|
||||||
|
} @else {
|
||||||
|
<ul class="session-list">
|
||||||
|
@for (s of state.data.sessions; track s.id) {
|
||||||
|
<li class="session-row">
|
||||||
|
<a tuiLink [routerLink]="['/sessions', s.id]" class="session-link">
|
||||||
|
Сессия {{ s.id }}
|
||||||
|
@if (s.title) {
|
||||||
|
— {{ s.title }}
|
||||||
|
}
|
||||||
|
</a>
|
||||||
|
<span
|
||||||
|
tuiChip
|
||||||
|
size="xs"
|
||||||
|
class="status-chip"
|
||||||
|
[ngClass]="s.status | sessionStatusChipClasses"
|
||||||
|
>{{ s.status | sessionStatus }}</span>
|
||||||
|
<span class="muted meta">
|
||||||
|
@if (s.started_at) {
|
||||||
|
{{ formatDate(s.started_at) }}
|
||||||
|
}
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
}
|
||||||
|
<footer class="pager">
|
||||||
|
<span class="muted total">Всего: {{ state.data.total }}</span>
|
||||||
|
<tui-pagination
|
||||||
|
[length]="pageCount(state.data.total)"
|
||||||
|
[index]="pageIndex()"
|
||||||
|
(indexChange)="onPageIndexChange($event)"
|
||||||
|
/>
|
||||||
|
</footer>
|
||||||
|
</section>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
import { AsyncPipe } from '@angular/common';
|
||||||
|
import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core';
|
||||||
|
import { toObservable } from '@angular/core/rxjs-interop';
|
||||||
|
import { SafeHtml } from '@angular/platform-browser';
|
||||||
|
import { TuiLoader } from '@taiga-ui/core/components/loader';
|
||||||
|
import { Observable, of } from 'rxjs';
|
||||||
|
import { switchMap } from 'rxjs/operators';
|
||||||
|
|
||||||
|
import {
|
||||||
|
eventPayloadJson,
|
||||||
|
isKeyboardTelemetryEvent,
|
||||||
|
parseKeyboardHighlightKeyIds,
|
||||||
|
parseKeyboardVirtualKey,
|
||||||
|
} from '../../../core/keyboard/keyboard-payload.util';
|
||||||
|
import { KeyboardSvgHighlightService } from '../../../core/keyboard/keyboard-svg-highlight.service';
|
||||||
|
import type { ParsedEvent } from '../../../core/models/api.types';
|
||||||
|
import { formatTimestamp } from '../../../shared/utils/date-time.util';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-telemetry-event-detail',
|
||||||
|
imports: [AsyncPipe, TuiLoader],
|
||||||
|
templateUrl: './telemetry-event-detail.html',
|
||||||
|
styleUrl: './telemetry-event-detail.css',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
})
|
||||||
|
export class TelemetryEventDetailComponent {
|
||||||
|
private readonly keyboardSvg = inject(KeyboardSvgHighlightService);
|
||||||
|
|
||||||
|
readonly event = input.required<ParsedEvent>();
|
||||||
|
|
||||||
|
protected readonly keyboardModel = computed(() => {
|
||||||
|
const e = this.event();
|
||||||
|
if (!isKeyboardTelemetryEvent(e)) {
|
||||||
|
return { kind: 'none' as const };
|
||||||
|
}
|
||||||
|
const keyIds = parseKeyboardHighlightKeyIds(e.data);
|
||||||
|
const vk = parseKeyboardVirtualKey(e.data);
|
||||||
|
return { kind: 'keyboard' as const, vk, keyIds };
|
||||||
|
});
|
||||||
|
|
||||||
|
protected readonly keyboardSvg$: Observable<SafeHtml | null> = toObservable(this.keyboardModel).pipe(
|
||||||
|
switchMap((m) => (m.kind === 'keyboard' ? this.keyboardSvg.svgWithHighlight(m.keyIds) : of(null))),
|
||||||
|
);
|
||||||
|
|
||||||
|
protected formatTime(ms: number): string {
|
||||||
|
return formatTimestamp(new Date(ms).toISOString());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected payloadText(e: ParsedEvent): string {
|
||||||
|
return eventPayloadJson(e.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Удобно в шаблоне, где нет сужения типа для `keyboardModel()`. */
|
||||||
|
protected keyboardKeyIds(): string[] {
|
||||||
|
const m = this.keyboardModel();
|
||||||
|
return m.kind === 'keyboard' ? m.keyIds : [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
.detail {
|
||||||
|
padding: 0.5rem 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-title {
|
||||||
|
margin: 0 0 0.75rem;
|
||||||
|
font: var(--tui-font-text-m);
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--tui-text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-kv {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(8rem, 12rem) 1fr;
|
||||||
|
gap: 0.35rem 1rem;
|
||||||
|
margin: 0 0 1rem;
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-kv dt {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--tui-text-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-kv dd {
|
||||||
|
margin: 0;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payload-json {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0.75rem 1rem;
|
||||||
|
max-height: 200px;
|
||||||
|
overflow: auto;
|
||||||
|
border-radius: var(--tui-radius-m);
|
||||||
|
background: color-mix(in srgb, var(--tui-background-base) 88%, var(--tui-text-primary));
|
||||||
|
font-size: 0.8rem;
|
||||||
|
line-height: 1.45;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mono {
|
||||||
|
font-family: ui-monospace, monospace;
|
||||||
|
font-size: 0.92em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.keyboard-block {
|
||||||
|
margin-top: 0.75rem;
|
||||||
|
padding-top: 0.75rem;
|
||||||
|
border-top: 1px solid var(--tui-border-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.keyboard-title {
|
||||||
|
margin: 0 0 0.5rem;
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--tui-text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.keyboard-svg-host {
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: auto;
|
||||||
|
border-radius: var(--tui-radius-m);
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.keyboard-svg-host ::ng-deep svg {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
max-width: 800px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.keyboard-loading {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.muted {
|
||||||
|
color: var(--tui-text-tertiary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.small {
|
||||||
|
font: var(--tui-font-text-s);
|
||||||
|
margin: 0.5rem 0 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<div class="detail">
|
||||||
|
<h4 class="detail-title">Подробности</h4>
|
||||||
|
<dl class="kv detail-kv">
|
||||||
|
<dt>Тип</dt>
|
||||||
|
<dd>{{ event().event_type || '—' }}</dd>
|
||||||
|
<dt>Время</dt>
|
||||||
|
<dd>{{ formatTime(event().timestamp) }}</dd>
|
||||||
|
@if (keyboardModel().kind === 'keyboard') {
|
||||||
|
<dt>Виртуальный код (VK)</dt>
|
||||||
|
<dd>
|
||||||
|
@if (keyboardModel().vk != null) {
|
||||||
|
{{ keyboardModel().vk }} (0x{{ keyboardModel().vk!.toString(16).toUpperCase() }})
|
||||||
|
} @else {
|
||||||
|
—
|
||||||
|
}
|
||||||
|
</dd>
|
||||||
|
@if (keyboardKeyIds().length > 0) {
|
||||||
|
<dt>Клавиши на схеме</dt>
|
||||||
|
<dd><code class="mono">{{ keyboardKeyIds().join(', ') }}</code></dd>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
<dt>Данные</dt>
|
||||||
|
<dd><pre class="payload-json">{{ payloadText(event()) }}</pre></dd>
|
||||||
|
</dl>
|
||||||
|
|
||||||
|
@if (keyboardModel().kind === 'keyboard') {
|
||||||
|
<div class="keyboard-block">
|
||||||
|
<h4 class="keyboard-title">Клавиатура (US)</h4>
|
||||||
|
@if (keyboardSvg$ | async; as svg) {
|
||||||
|
<div class="keyboard-svg-host" [innerHTML]="svg"></div>
|
||||||
|
} @else {
|
||||||
|
<div class="keyboard-loading">
|
||||||
|
<tui-loader [loading]="true" size="m" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if (keyboardKeyIds().length === 0) {
|
||||||
|
<p class="muted small">
|
||||||
|
Не удалось сопоставить событие с клавишами на схеме (проверьте поля <code class="mono">key_name</code> /
|
||||||
|
<code class="mono">modifiers</code> или VK).
|
||||||
|
</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
23
src/app/shared/utils/date-time.util.ts
Normal file
23
src/app/shared/utils/date-time.util.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
/**
|
||||||
|
* Преобразует ISO-время (timestamptz), например `2026-04-06T23:58:27Z`,
|
||||||
|
* в человекочитаемый локальный формат.
|
||||||
|
*/
|
||||||
|
export function formatTimestamp(value: string | null | undefined): string {
|
||||||
|
if (!value) {
|
||||||
|
return '—';
|
||||||
|
}
|
||||||
|
|
||||||
|
const date = new Date(value);
|
||||||
|
if (Number.isNaN(date.getTime())) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Intl.DateTimeFormat('ru-RU', {
|
||||||
|
day: '2-digit',
|
||||||
|
month: '2-digit',
|
||||||
|
year: 'numeric',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
second: '2-digit',
|
||||||
|
}).format(date);
|
||||||
|
}
|
||||||
6
src/environments/environment.prod.ts
Normal file
6
src/environments/environment.prod.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
/** Production-сборка (см. fileReplacements в angular.json). При деплое при необходимости меняйте здесь или генерируйте шагом CI. */
|
||||||
|
export const environment = {
|
||||||
|
production: true,
|
||||||
|
apiFallbackOrigin: 'https://sparkguardian.ru',
|
||||||
|
apiBasePath: '/api/v1',
|
||||||
|
} as const;
|
||||||
6
src/environments/environment.ts
Normal file
6
src/environments/environment.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// Сгенерировано npm run env:sync — правьте .env и снова запустите sync
|
||||||
|
export const environment = {
|
||||||
|
production: false,
|
||||||
|
apiFallbackOrigin: "https://sparkguardian.ru",
|
||||||
|
apiBasePath: "/api/v1",
|
||||||
|
} as const;
|
||||||
@@ -1 +1,68 @@
|
|||||||
/* You can add global styles to this file, and also import other style files */
|
@import './styles/color-tokens.css';
|
||||||
|
@import './styles/session-status-chips.css';
|
||||||
|
@import './styles/sg-input-fields.css';
|
||||||
|
|
||||||
|
/* Базовая вёрстка под Taiga UI: тема и шрифты подключаются в angular.json */
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Tinkoff Sans';
|
||||||
|
src: url('/fonts/TinkoffSans-Regular.ttf') format('truetype');
|
||||||
|
font-weight: 400;
|
||||||
|
font-style: normal;
|
||||||
|
font-display: swap;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Tinkoff Sans';
|
||||||
|
src: url('/fonts/TinkoffSans-Medium.ttf') format('truetype');
|
||||||
|
font-weight: 500;
|
||||||
|
font-style: normal;
|
||||||
|
font-display: swap;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Tinkoff Sans';
|
||||||
|
src: url('/fonts/TinkoffSans-Bold.ttf') format('truetype');
|
||||||
|
font-weight: 700;
|
||||||
|
font-style: normal;
|
||||||
|
font-display: swap;
|
||||||
|
}
|
||||||
|
|
||||||
|
html,
|
||||||
|
body {
|
||||||
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
box-sizing: border-box;
|
||||||
|
background: var(--sg-color-bg);
|
||||||
|
color: var(--sg-color-text);
|
||||||
|
font: var(--tui-font-text-m, 15px/1.5 'Tinkoff Sans', sans-serif);
|
||||||
|
font-family: 'Tinkoff Sans', sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
*,
|
||||||
|
*::before,
|
||||||
|
*::after {
|
||||||
|
box-sizing: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Taiga задаёт font через shorthand на кнопках/инпутах; без !important родной шрифт
|
||||||
|
* перебивает body. Трогать только при смене темы через переменные Taiga.
|
||||||
|
*/
|
||||||
|
* {
|
||||||
|
font-family: 'Tinkoff Sans', sans-serif !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Form defaults */
|
||||||
|
input::placeholder,
|
||||||
|
textarea::placeholder {
|
||||||
|
color: var(--sg-color-placeholder);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Уведомления об ошибках: заголовок — Medium (500) */
|
||||||
|
tui-notification-alert [tuiTitle] {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|||||||
80
src/styles/color-tokens.css
Normal file
80
src/styles/color-tokens.css
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
:root {
|
||||||
|
/* SparkGuardian color tokens */
|
||||||
|
--sg-color-accent: #ffdb00;
|
||||||
|
--sg-color-bg: #f6f7f8;
|
||||||
|
--sg-color-text: #383839;
|
||||||
|
--sg-color-subtitle: #313132;
|
||||||
|
--sg-color-form-bg: #e8edf1;
|
||||||
|
--sg-color-placeholder: #6b6d6f;
|
||||||
|
|
||||||
|
/* Поля ввода: .sg-tui-textfield на tui-textfield, .sg-native-input на нативных input */
|
||||||
|
--sg-color-textfield-bg: #f3f4f7;
|
||||||
|
--sg-color-textfield-hover-bg: #eaeff3;
|
||||||
|
--sg-color-textfield-focus-bg: #ffffff;
|
||||||
|
--sg-color-textfield-focus-border: #333333;
|
||||||
|
--sg-color-textfield-focus-label: #333333;
|
||||||
|
--sg-textfield-radius: var(--tui-radius-l);
|
||||||
|
--sg-native-input-min-height: 2rem;
|
||||||
|
--sg-native-input-padding: 0.35rem 0.5rem;
|
||||||
|
/* Основные кнопки (например «Создать»): минимальная ширина без !important */
|
||||||
|
--sg-primary-action-min-inline-size: 11rem;
|
||||||
|
|
||||||
|
/* Semantic aliases */
|
||||||
|
--sg-color-card-bg: #ffffff;
|
||||||
|
--sg-color-border: color-mix(in srgb, var(--sg-color-text) 12%, transparent);
|
||||||
|
--sg-color-danger: #d92d20;
|
||||||
|
|
||||||
|
/* Taiga accent palette override (used by primary/secondary appearances, including pagination active item) */
|
||||||
|
--tui-background-accent-1: var(--sg-color-accent);
|
||||||
|
--tui-background-accent-1-hover: color-mix(in srgb, var(--sg-color-accent) 92%, black);
|
||||||
|
--tui-background-accent-1-pressed: color-mix(in srgb, var(--sg-color-accent) 84%, black);
|
||||||
|
--tui-text-primary-on-accent-1: var(--sg-color-text);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Bridge to Taiga tokens used in the app.
|
||||||
|
* This keeps styling centralized and avoids hardcoding colors in components.
|
||||||
|
*/
|
||||||
|
--tui-background-base: var(--sg-color-bg);
|
||||||
|
--tui-background-elevation-1: var(--sg-color-card-bg);
|
||||||
|
--tui-text-primary: var(--sg-color-text);
|
||||||
|
--tui-text-tertiary: color-mix(in srgb, var(--sg-color-text) 70%, white);
|
||||||
|
--tui-text-action: color-mix(in srgb, var(--sg-color-text) 80%, black);
|
||||||
|
--tui-border-normal: var(--sg-color-border);
|
||||||
|
--tui-focus: var(--sg-color-accent);
|
||||||
|
--tui-status-negative: var(--sg-color-danger);
|
||||||
|
|
||||||
|
/* Чипы статусов сессии (кроме «Завершена» — без отдельной раскраски) */
|
||||||
|
--sg-session-status-active-bg: color-mix(in srgb, #16a34a 18%, var(--sg-color-card-bg));
|
||||||
|
--sg-session-status-active-fg: #166534;
|
||||||
|
--sg-session-status-active-border: color-mix(in srgb, #16a34a 38%, transparent);
|
||||||
|
|
||||||
|
--sg-session-status-pending-bg: color-mix(in srgb, #d97706 18%, var(--sg-color-card-bg));
|
||||||
|
--sg-session-status-pending-fg: #92400e;
|
||||||
|
--sg-session-status-pending-border: color-mix(in srgb, #d97706 34%, transparent);
|
||||||
|
|
||||||
|
--sg-session-status-unknown-bg: color-mix(in srgb, var(--sg-color-text) 10%, var(--sg-color-card-bg));
|
||||||
|
--sg-session-status-unknown-fg: var(--sg-color-text);
|
||||||
|
--sg-session-status-unknown-border: var(--sg-color-border);
|
||||||
|
|
||||||
|
/* Встроенная SVG-клавиатура (public/KB_USA-standard.svg) */
|
||||||
|
--sg-keyboard-font-family: 'Tinkoff Sans', system-ui, sans-serif;
|
||||||
|
--sg-keyboard-font-weight: 400;
|
||||||
|
--sg-keyboard-letter-spacing: 0.03em;
|
||||||
|
/* Не нажатые клавиши — светлый «фоновый» тон (как подложка интерфейса) */
|
||||||
|
--sg-keyboard-key-surface-idle: color-mix(
|
||||||
|
in srgb,
|
||||||
|
var(--sg-color-form-bg) 78%,
|
||||||
|
var(--sg-color-border)
|
||||||
|
);
|
||||||
|
--sg-keyboard-key-main: var(--sg-keyboard-key-surface-idle);
|
||||||
|
--sg-keyboard-key-mod: var(--sg-keyboard-key-surface-idle);
|
||||||
|
--sg-keyboard-key-other: var(--sg-keyboard-key-surface-idle);
|
||||||
|
--sg-keyboard-key-stroke: color-mix(in srgb, var(--sg-color-border) 65%, transparent);
|
||||||
|
/* Символы на клавишах — основной тёмный текст (тот же оттенок, что раньше был заливкой нажатой) */
|
||||||
|
--sg-keyboard-ink: var(--sg-color-text);
|
||||||
|
--sg-keyboard-ink-soft: var(--tui-text-tertiary);
|
||||||
|
/* Нажатие: контрастный жёлтый акцент, символы на жёлтом — тёмные */
|
||||||
|
--sg-keyboard-key-pressed-fill: var(--sg-color-accent);
|
||||||
|
--sg-keyboard-key-pressed-ink: var(--sg-color-text);
|
||||||
|
--sg-keyboard-highlight: var(--sg-keyboard-key-pressed-fill);
|
||||||
|
}
|
||||||
18
src/styles/session-status-chips.css
Normal file
18
src/styles/session-status-chips.css
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
/* Раскраска чипов статуса сессии (см. SessionStatusChipClassesPipe). «Завершена» — без этих классов. */
|
||||||
|
[tuiChip].status-chip.status-chip--active {
|
||||||
|
background: var(--sg-session-status-active-bg);
|
||||||
|
color: var(--sg-session-status-active-fg);
|
||||||
|
border-color: var(--sg-session-status-active-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
[tuiChip].status-chip.status-chip--pending {
|
||||||
|
background: var(--sg-session-status-pending-bg);
|
||||||
|
color: var(--sg-session-status-pending-fg);
|
||||||
|
border-color: var(--sg-session-status-pending-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
[tuiChip].status-chip.status-chip--unknown {
|
||||||
|
background: var(--sg-session-status-unknown-bg);
|
||||||
|
color: var(--sg-session-status-unknown-fg);
|
||||||
|
border-color: var(--sg-session-status-unknown-border);
|
||||||
|
}
|
||||||
110
src/styles/sg-input-fields.css
Normal file
110
src/styles/sg-input-fields.css
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
/*
|
||||||
|
* Единый вид полей ввода SparkGuardian.
|
||||||
|
* Taiga: добавьте class="sg-tui-textfield" на <tui-textfield>.
|
||||||
|
* Нативные input/textarea/select: class="sg-native-input".
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* --- tui-textfield (Taiga Input) --- */
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'] {
|
||||||
|
--tui-focus: var(--sg-color-textfield-focus-border);
|
||||||
|
--t-shadow: none;
|
||||||
|
box-shadow: none;
|
||||||
|
background-color: var(--sg-color-textfield-bg);
|
||||||
|
outline: 1px solid transparent;
|
||||||
|
outline-offset: -1px;
|
||||||
|
border-width: 0;
|
||||||
|
border-radius: var(--sg-textfield-radius, var(--tui-radius-l));
|
||||||
|
filter: none;
|
||||||
|
transition:
|
||||||
|
background-color 0.15s ease,
|
||||||
|
outline-color 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']::before,
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']::after {
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']:hover:not(:focus-within):not(
|
||||||
|
[data-state='disabled']
|
||||||
|
):not(._disabled),
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'][data-state='hover']:not(:focus-within) {
|
||||||
|
--t-shadow: none;
|
||||||
|
box-shadow: none;
|
||||||
|
background-color: var(--sg-color-textfield-hover-bg);
|
||||||
|
outline: 1px solid transparent;
|
||||||
|
outline-offset: -1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']:focus-within,
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'][data-focus='true'],
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']:focus-visible:not([data-focus='false']) {
|
||||||
|
--t-shadow: none;
|
||||||
|
box-shadow: none;
|
||||||
|
background-color: var(--sg-color-textfield-focus-bg);
|
||||||
|
outline: 1px solid var(--sg-color-textfield-focus-border);
|
||||||
|
outline-offset: -1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'] input:not(.t-filler) {
|
||||||
|
background: transparent;
|
||||||
|
outline: none;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']:focus-within input:not(.t-filler),
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'][data-focus='true'] input:not(.t-filler) {
|
||||||
|
outline: none;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']:focus-within [tuiLabel],
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'][data-focus='true'] [tuiLabel] {
|
||||||
|
color: var(--sg-color-textfield-focus-label) !important; /* Taiga: color … !important на [tuiLabel] */
|
||||||
|
}
|
||||||
|
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield']:focus-within input:not(.t-filler)::placeholder,
|
||||||
|
tui-textfield.sg-tui-textfield[tuiAppearance][data-appearance='textfield'][data-focus='true']
|
||||||
|
input:not(.t-filler)::placeholder {
|
||||||
|
color: var(--sg-color-textfield-focus-label);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- нативные поля (datetime-local, text, …) --- */
|
||||||
|
.sg-native-input {
|
||||||
|
box-sizing: border-box;
|
||||||
|
min-block-size: var(--sg-native-input-min-height, 2rem);
|
||||||
|
padding: var(--sg-native-input-padding, 0.35rem 0.5rem);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
outline: 1px solid transparent;
|
||||||
|
outline-offset: -1px;
|
||||||
|
border-radius: var(--sg-textfield-radius, var(--tui-radius-l));
|
||||||
|
background: var(--sg-color-textfield-bg);
|
||||||
|
color: var(--sg-color-text);
|
||||||
|
font: inherit;
|
||||||
|
box-shadow: none;
|
||||||
|
transition:
|
||||||
|
background-color 0.15s ease,
|
||||||
|
outline-color 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sg-native-input:hover:not(:disabled) {
|
||||||
|
background: var(--sg-color-textfield-hover-bg);
|
||||||
|
outline: 1px solid transparent;
|
||||||
|
outline-offset: -1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sg-native-input:focus {
|
||||||
|
outline: 1px solid var(--sg-color-textfield-focus-border);
|
||||||
|
outline-offset: -1px;
|
||||||
|
background: var(--sg-color-textfield-focus-bg);
|
||||||
|
border-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sg-native-input:focus-visible {
|
||||||
|
outline: 1px solid var(--sg-color-textfield-focus-border);
|
||||||
|
outline-offset: -1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sg-native-input:disabled {
|
||||||
|
opacity: var(--tui-disabled-opacity);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user