Merge commit 'ef5634fb18cbf61704d661fbbbe003312e0a25bf'

Author: sea5kg

.code-check.json

@@ -5,6 +5,7 @@
     ],
     "exclude": [
         "src/core/3rdParty",
+        "src-libhv",
         "src/3rdParty/quazip-0.7.3",
         "json.hpp",
         ".DS_Store"

CHANGELOG.md

@@ -5,6 +5,29 @@ All notable changes to fhq-server project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.2.45] - 2021-09-29 (2021 Sept 29)
+
+### Security
+
+- web-user: [sync] Upgrade @angular/cdk from 12.2.1 to 12.2.2.
+- web-user: [sync] Upgrade @angular/material from 12.2.1 to 12.2.2.
+- web-user: [sync] Upgrade tslib from 2.3.0 to 2.3.1
+- web-user: [sync] Upgrade core-js from 3.16.2 to 3.16.3
+- web-user: [sync] Upgrade jquery from 3.5.1 to 3.6.0
+- web-user: [sync] Upgrade prismjs from 1.24.1 to 1.25.0
+
+## Added 
+
+- Added libhv todo replace wsjcpp-light-http-server and qt web sockets
+- Added base config for elasticsearch-logstash-kibana
+- Added links to googledocument + trello
+- wed-user: Added 'mailn.ru' -> 'mail.ru'
+
+## Fixed
+
+- web-admin: Implemented upload files to quest
+- web-admin: redesign ui for edit quest
+
 ## [v0.2.44] - 2021-09-14 (2021 Sept 14)
 
 ### Added 

CMakeLists.txt

@@ -263,6 +263,11 @@ list (APPEND WSJCPP_LIBRARIES ${LIBMYSQLCLIENT_LIBRARIES})
 #####
 ############################
 
+# libhv
+add_subdirectory(src-libhv)
+list (APPEND WSJCPP_LIBRARIES hv_static)
+list (APPEND WSJCPP_INCLUDE_DIRS "${PROJECT_BINARY_DIR}/src-libhv/include/hv")
+
 include_directories(${WSJCPP_INCLUDE_DIRS})
 
 find_package (Qt5Core)

README.md

@@ -18,18 +18,18 @@ Backend && Frontend for FreeHackQuest on Qt and WebSockets
 
 ## Distribution
 
-| What                    | Where         |
-| ----------------------- | ------------- |
-| fhq-server (docker)     | [![Docker Pulls](https://img.shields.io/docker/pulls/sea5kg/fhq-server.svg)](https://hub.docker.com/r/sea5kg/fhq-server/)  |
-| fhq-server (vm)         | [https://freehackquest.com/dist/](https://freehackquest.com/dist/)  |
-| client library (js) | [![npm](https://img.shields.io/npm/v/freehackquest-libclient-web-js)](https://www.npmjs.com/package/freehackquest-libclient-web-js) |
-| client library (python)     | [![PyPI](https://img.shields.io/pypi/v/freehackquest-libclient-py)](https://pypi.org/project/freehackquest-libclient-py/) |
-
-
+| What                    | Where         |  Source code |
+| ----------------------- | ------------- | ------------ |
+| fhq-server (docker)     | [![Docker Pulls](https://img.shields.io/docker/pulls/sea5kg/fhq-server.svg)](https://hub.docker.com/r/sea5kg/fhq-server/)  |  |
+| fhq-server (vm)         | [https://freehackquest.com/dist/](https://freehackquest.com/dist/)  | |
+| client library (js)     | [![npm](https://img.shields.io/npm/v/freehackquest-libclient-web-js)](https://www.npmjs.com/package/freehackquest-libclient-web-js) | [GitHub](https://github.com/freehackquest/freehackquest-libclient-web-js) |
+| client library (python) | [![PyPI](https://img.shields.io/pypi/v/freehackquest-libclient-py)](https://pypi.org/project/freehackquest-libclient-py/) | [GitHub](https://github.com/freehackquest/freehackquest-libclient-py) |
 
 ## For developers
 
 * [Doxygen Documentation](https://freehackquest.com/doxygen/)
+* [trello](https://trello.com/b/Z7blDGj3/fhq-server)
+* [Документация к системе](https://docs.google.com/document/d/16toRLzVUy8tkilW-jFVjG-1g-8ILDICfucO3EwK8oTg/edit?usp=sharing)
 
 ### Build all components (c++ && angular)
 

contrib/kibana_elasticsearch_logstash/.gitignore

@@ -0,0 +1 @@
+/elasticsearch_data

contrib/kibana_elasticsearch_logstash/README.md

@@ -0,0 +1,6 @@
+
+Example got from https://github.com/deviantony/docker-elk
+
+```
+$ docker-compose up
+```

contrib/kibana_elasticsearch_logstash/configs/elasticsearch.yml

@@ -0,0 +1,16 @@
+---
+## Default Elasticsearch configuration from Elasticsearch base image.
+## https://github.com/elastic/elasticsearch/blob/master/distribution/docker/src/docker/config/elasticsearch.yml
+#
+cluster.name: "es-docker-cluster"
+network.host: 0.0.0.0
+
+## X-Pack settings
+## see https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-xpack.html
+#
+# xpack.license.self_generated.type: trial
+# xpack.security.enabled: true
+# xpack.monitoring.collection.enabled: true
+# node.name: es01
+# bootstrap.memory_lock: true
+discovery.type: single-node

contrib/kibana_elasticsearch_logstash/configs/kibana.yml

@@ -0,0 +1,13 @@
+---
+    ## Default Kibana configuration from Kibana base image.
+    ## https://github.com/elastic/kibana/blob/master/src/dev/build/tasks/os_packages/docker_generator/templates/kibana_yml.template.ts
+    #
+    server.name: kb-container
+    server.host: 0.0.0.0
+    elasticsearch.hosts: [ "http://es-container:9200" ]
+    monitoring.ui.container.elasticsearch.enabled: true
+    
+    ## X-Pack security credentials
+    #
+    elasticsearch.username: elastic
+    elasticsearch.password: changeme

contrib/kibana_elasticsearch_logstash/configs/logstash.yml

@@ -0,0 +1,12 @@
+---
+## Default Logstash configuration from Logstash base image.
+## https://github.com/elastic/logstash/blob/master/docker/data/logstash/config/logstash-full.yml
+#
+http.host: "0.0.0.0"
+xpack.monitoring.elasticsearch.hosts: [ "http://es-container:9200" ]
+
+## X-Pack security credentials
+#
+xpack.monitoring.enabled: true
+xpack.monitoring.elasticsearch.username: elastic
+xpack.monitoring.elasticsearch.password: changeme

contrib/kibana_elasticsearch_logstash/configs/logstash_pipeline/logstash.conf

@@ -0,0 +1,20 @@
+input {
+	beats {
+		port => 5044
+	}
+
+	tcp {
+		port => 5000
+	}
+}
+
+## Add your filters / logstash plugins configuration here
+
+output {
+	elasticsearch {
+		hosts => "es-container:9200"
+		user => "elastic"
+		password => "changeme"
+		ecs_compatibility => disabled
+	}
+}