diff --git a/.code-check.json b/.code-check.json index c41799ac..8ef798b7 100644 --- a/.code-check.json +++ b/.code-check.json @@ -1,11 +1,11 @@ { "paths": [ - "fhq-server/src/", - "fhq-server/unit-tests.wsjcpp/src/" + "src/", + "unit-tests.wsjcpp/src/" ], "exclude": [ - "fhq-server/src/core/3rdParty", - "fhq-server/src/3rdParty/quazip-0.7.3", + "src/core/3rdParty", + "src/3rdParty/quazip-0.7.3", "json.hpp", ".DS_Store" ], diff --git a/.dockerignore b/.dockerignore index 96df1401..b1b6a609 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,7 +2,6 @@ ci code-check contrib -dckr_fhqserver docker_dev fhqjad-store install diff --git a/.gitignore b/.gitignore index 27681f21..ce69c5de 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,10 @@ fhq-server-build/ tests/get-pip.py fhq-server/fhq-server.debian95 .idea + +.wsjcpp +fhq-server + +contrib/docker_compose_example/logs/*.log +contrib/docker_compose_example/mysql_data +contrib/docker_compose_example/nginx/logs/*.log \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 5581b611..46b0d028 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -70,8 +70,11 @@ }, "files.autoSave": "off", "search.exclude": { - "**/.git": true, - "**/node_modules/**": true, - "**/tmp/**": true + ".git": true, + "node_modules": true, + "tmp": true, + "**/packs": true, + "**/log": true, + "log": true } } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index df84b584..36e259a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,19 @@ 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.37] - ? +## [v0.2.37] - 2021-03-27 (2021 Mar 27) + +### Changes + +- Redesign docker-compose (moved to contrib/docker_compose_example) +- Moved fhq-server to root of repository +- Moved web-site-admin to web-admin +- Moved user-web-site to web-user + +### Security + +- Fixed few alerts by lgtm +- Fixed few alerts by deepcode ## [v0.2.36] - 2021-03-15 (2021 Mar 15) diff --git a/fhq-server/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from fhq-server/CMakeLists.txt rename to CMakeLists.txt diff --git a/Dockerfile b/Dockerfile index 90e6528b..6685a19e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,12 @@ WORKDIR /root/ # Fix for building on debian 9.5 system (mysqlclient library) # RUN ln -s /usr/lib/x86_64-linux-gnu/pkgconfig/mariadb.pc /usr/lib/x86_64-linux-gnu/pkgconfig/mysqlclient.pc -COPY ./fhq-server /root/fhq-server +COPY . /root/fhq-server WORKDIR /root/fhq-server RUN ./clean.sh && ./build_simple.sh -COPY ./user-web-site /root/user-web-site -WORKDIR /root/user-web-site +COPY ./web-user /root/web-user +WORKDIR /root/web-user RUN npm install && npm run build-prod FROM freehackquest/fhq-docker-common:latest @@ -23,8 +23,8 @@ RUN mkdir -p /usr/share/fhq-server \ && mkdir -p /usr/share/fhq-server/public/games \ && mkdir -p /usr/share/fhq-server/web/public/games \ && mkdir -p /var/log/fhq-server -COPY ./admin-web-site /usr/share/fhq-server/admin-web-site -COPY --from=0 /root/user-web-site/dist /usr/share/fhq-server/user-web-site +COPY ./web-admin /usr/share/fhq-server/web-admin +COPY --from=0 /root/web-user/dist /usr/share/fhq-server/web-user # 1234 - ws # 4613 - wss diff --git a/README.md b/README.md index 4bb2493d..60ed5c8b 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,17 @@ Backend && Frontend for FreeHackQuest on Qt and WebSockets -**!!! FAST START YOUR GAME** [here (based on docker-compose)](https://github.com/freehackquest/freehackquest-start-game)!!! +## docker-compose example -* [HOW-TO-BUILD-AND-DEVELOP](https://github.com/freehackquest/fhq-server/tree/master/install/HOW-TO-BUILD-AND-DEVELOP.md) -* [INSTALL_FROM_PPA](https://github.com/freehackquest/fhq-server/tree/master/install/INSTALL_FROM_PPA.md) +[docker-compose example](https://github.com/freehackquest/fhq-server/tree/master/contrib/docker_compose_example) + + + ## Distribution @@ -46,7 +49,7 @@ $ sudo apt install git-core g++ make cmake qtchooser qt5-default \ build-essential curl ``` -Install latest nodejs (for user-web-site) +Install latest nodejs (for web-user) ``` $ curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash - @@ -75,7 +78,7 @@ $ git clone https://github.com/freehackquest/fhq-server ~/fhq-server.git Build angular: ``` -$ cd ~/fhq-server.git/user-web-site +$ cd ~/fhq-server.git/web-user $ npm install $ npm run build --prod ``` @@ -83,13 +86,13 @@ $ npm run build --prod Build c++ server: ``` -$ cd ~/fhq-server.git/fhq-server +$ cd ~/fhq-server.git/ $ ./build_simple.sh -$ ./fhq-server -wd ../ci/travis/data start +$ ./fhq-server -wd ./ci/travis/data start ``` -* user-web-site you can see here: `http://localhost:7080/` -* admin-web-site: `http://localhost:7080/admin/` +* web-user you can see here: `http://localhost:7080/` +* web-admin: `http://localhost:7080/admin/` *Note: default login/password: admin/admin* @@ -97,7 +100,7 @@ $ ./fhq-server -wd ../ci/travis/data start Also you can start web angular for develop: *Will need backend runned (!)* ``` -$ cd ~/fhq-server.git/user-web-site +$ cd ~/fhq-server.git/web-user $ npm run start ``` So you can see web user here: `http://localhost:4200/` @@ -107,7 +110,7 @@ So you can see web user here: `http://localhost:4200/` Build and run unit-tests: ``` -$ cd ~/fhq-server.git/fhq-server/unit-tests.wsjcpp +$ cd ~/fhq-server.git/unit-tests.wsjcpp $ ./build_simple.sh $ ./unit-tests ``` @@ -180,13 +183,13 @@ $ sudo apt install valgrind # ubuntu and debian Terminal1: ``` -$ cd ~/fhq-server.git/fhq-server +$ cd ~/fhq-server.git/ $ valgrind --leak-check=full \ --show-leak-kinds=all \ --track-origins=yes \ --verbose \ --log-file=valgrind-out.txt \ - ./fhq-server -wd ../ci/travis/data + ./fhq-server -wd ./ci/travis/data ``` Terminal2: @@ -206,12 +209,12 @@ Fast to fix and develop for current server version ``` $ git clone git@github.com:freehackquest/fhq-server.git ~/fhq-server.git -$ cd ~/fhq-server.git/user-web-site +$ cd ~/fhq-server.git/web-user $ npm install $ npm run start ``` -In a file `~/fhq-server.git/user-web-site/src/app/services/fhq.service.ts` +In a file `~/fhq-server.git/web-user/src/app/services/fhq.service.ts` And then you can just uncomment line: ``` // baseUrl = 'ws://freehackquest.com/api-ws/'; @@ -225,6 +228,11 @@ And now your local web site will be connected to offical server. *Notice: but please never do commit for this line* +## Build docker image + +``` +$ docker build -t freehackquest/fhq-server:latest . +``` ## Ubuntu - install from ppa (outdated) @@ -274,8 +282,8 @@ Create directories $ sudo mkdir /etc/fhq-server/ $ sudo mkdir /var/log/fhq-server/ $ sudo mkdir /usr/share/fhq-server/ -$ sudo mkdir /usr/share/fhq-server/admin-web-site -$ sudo mkdir /usr/share/fhq-server/user-web-site +$ sudo mkdir /usr/share/fhq-server/web-admin +$ sudo mkdir /usr/share/fhq-server/web-user $ sudo mkdir /usr/share/fhq-server/fhqjad-store ``` @@ -300,8 +308,8 @@ ssl_cert_file = /etc/ssl/certs/test-selfsigned.crt # Web Configuration web_port = 7080 web_max_threads = 1 -web_admin_folder = /usr/share/fhq-server/admin-web-site -web_user_folder = /usr/share/fhq-server/user-web-site +web_admin_folder = /usr/share/fhq-server/web-admin +web_user_folder = /usr/share/fhq-server/web-user web_public_folder = /usr/share/fhq-server/public/ web_public_folrer_url = http://localhost:7080/public/ @@ -469,7 +477,7 @@ jsonResponse["data"] = jsonResult; pRequest->sendMessageSuccess(cmd(), jsonResponse); ``` -admin-web-site paginator: +web-admin paginator: ``` var page_name = 'quests_proposal'; var pg = new SwaPaginator(0, r.data.total, r.data.page_size, r.data.page_index); diff --git a/fhq-server/build_simple.sh b/build_simple.sh similarity index 100% rename from fhq-server/build_simple.sh rename to build_simple.sh diff --git a/ci/travis/data/conf.d/fhq-server.conf b/ci/travis/data/conf.d/fhq-server.conf index f16d198b..93378c66 100644 --- a/ci/travis/data/conf.d/fhq-server.conf +++ b/ci/travis/data/conf.d/fhq-server.conf @@ -19,8 +19,8 @@ ssl_cert_file = ./test-selfsigned.crt # Web Configuration web_port = 7080 web_max_threads = 1 -web_admin_folder = ../../../../admin-web-site -web_user_folder = ../../../../user-web-site/dist +web_admin_folder = ../../../../web-admin +web_user_folder = ../../../../web-user/dist web_public_folder = ../public/ web_public_folrer_url = http://localhost:7080/public/ diff --git a/ci/travis/run.sh b/ci/travis/run.sh index 90111d9d..2503cbad 100755 --- a/ci/travis/run.sh +++ b/ci/travis/run.sh @@ -23,35 +23,33 @@ check_ret $? "build code-check" check_ret $? "code-check" cd ../.. -cd fhq-server/unit-tests.wsjcpp +cd unit-tests.wsjcpp check_ret $? "change directory to unit-tests.wsjcpp" ./build_simple.sh check_ret $? "build unit-tests" ./unit-tests check_ret $? "unit-tests" -cd ../.. +cd .. # hardcode for build travis -cd user-web-site -check_ret $? "change directory to user-web-site" +cd web-user +check_ret $? "change directory to web-user" npm install -check_ret $? "npm install requirements for user-web-site" +check_ret $? "npm install requirements for web-user" npm run build-prod -check_ret $? "angular build-prod user-web-site" +check_ret $? "angular build-prod web-user" cd .. -cd fhq-server check_ret $? "change directory to fhq-server" python3 -m sea5kg_cpplint check_ret $? "sea5kg_cpplint" qmake --version # TODO when will be removed all then qt need remove this line ./build_simple.sh check_ret $? "build fhq-server" -./fhq-server -wd ../ci/travis/data version +./fhq-server -wd ./ci/travis/data version check_ret $? "print version of fhq-server" -./fhq-server -wd ../ci/travis/data -cdc +./fhq-server -wd ./ci/travis/data -cdc check_ret $? "test connection to database" -cd .. cd fhq-server-tests check_ret $? "Change directory to tests" diff --git a/fhq-server/clean.sh b/clean.sh similarity index 100% rename from fhq-server/clean.sh rename to clean.sh diff --git a/fhq-server/cmake/FindMYSQL.cmake b/cmake/FindMYSQL.cmake similarity index 100% rename from fhq-server/cmake/FindMYSQL.cmake rename to cmake/FindMYSQL.cmake diff --git a/fhq-server/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake similarity index 100% rename from fhq-server/cmake/FindPostgreSQL.cmake rename to cmake/FindPostgreSQL.cmake diff --git a/contrib/code_stats/stats.sh b/contrib/code_stats/stats.sh index c1ffb0d4..1884f980 100755 --- a/contrib/code_stats/stats.sh +++ b/contrib/code_stats/stats.sh @@ -1,24 +1,23 @@ #!/bin/bash function calculateLinesInFiles() { - LINES=0 - LINES_CPP=$((find $1 -name "*.cpp" -print0 | xargs -0 cat ) | wc -l) - LINES=$(( $LINES + $LINES_CPP)) - LINES_H=$((find $1 -name "*.h" -print0 | xargs -0 cat ) | wc -l) - LINES=$(( $LINES + $LINES_H)) - LINES_HPP=$((find $1 -name "*.hpp" -print0 | xargs -0 cat ) | wc -l) - LINES=$(( $LINES + $LINES_HPP)) - LINES_C=$((find $1 -name "*.c" -print0 | xargs -0 cat ) | wc -l) - LINES=$(( $LINES + $LINES_C)) - LINES_CC=$((find $1 -name "*.cc" -print0 | xargs -0 cat ) | wc -l) - LINES=$(( $LINES + $LINES_CC)) - echo $LINES - + LINES=0 + LINES_CPP=$((find $1 -name "*.cpp" -print0 | xargs -0 cat ) | wc -l) + LINES=$(( $LINES + $LINES_CPP)) + LINES_H=$((find $1 -name "*.h" -print0 | xargs -0 cat ) | wc -l) + LINES=$(( $LINES + $LINES_H)) + LINES_HPP=$((find $1 -name "*.hpp" -print0 | xargs -0 cat ) | wc -l) + LINES=$(( $LINES + $LINES_HPP)) + LINES_C=$((find $1 -name "*.c" -print0 | xargs -0 cat ) | wc -l) + LINES=$(( $LINES + $LINES_C)) + LINES_CC=$((find $1 -name "*.cc" -print0 | xargs -0 cat ) | wc -l) + LINES=$(( $LINES + $LINES_CC)) + echo $LINES } -LINES_SRC=$(calculateLinesInFiles "../../fhq-server/src") -LINES_SRC_3RDPARTY=$(calculateLinesInFiles "../../fhq-server/src/3rdParty") -LINES_WSJCPP=$(calculateLinesInFiles "../../fhq-server/src.wsjcpp") +LINES_SRC=$(calculateLinesInFiles "../../src") +LINES_SRC_3RDPARTY=$(calculateLinesInFiles "../../src/3rdParty") +LINES_WSJCPP=$(calculateLinesInFiles "../../src.wsjcpp") echo "Lines in src: $LINES_SRC" echo "Lines in src/3rdParty: $LINES_SRC_3RDPARTY" diff --git a/contrib/docker_compose_example/README.md b/contrib/docker_compose_example/README.md index 24862423..44065843 100644 --- a/contrib/docker_compose_example/README.md +++ b/contrib/docker_compose_example/README.md @@ -1,17 +1,25 @@ -# Install from DockerHub +# docker-compose example for fhq-server -You can install fhq-server from +## Reguiremts -``` -$ docker pull freehackquest/fhq-server -``` +* docker +* docker-compose + +## Start -## Using docker-compose +For start just run this: -For example: +``` +$ cd ~ +$ git clone https://github.com/freehackquest/fhq-server +$ cd ./contrib/docker_compose_example +$ docker-compose up +``` -* fhq_conf/[fhq-server.conf](DOCKER_COMPOSE/fhq_conf/fhq-server.conf) -* [docker-compose.yml](DOCKER_COMPOSE/docker-compose.yml) -* fhq_data/games - empty directory for a public -* fhq_logs - empty directory +## Configurations +1. Default port used 801 / 4431 (look in docker-compose) +2. Admin Panel (Login: `admin`; Password: `admin`): http://localhost/admin/?settings= +3. Change settings in + * "Server folders" + * "Mail Settings" diff --git a/dckr_fhqserver/conf.d/fhq-server.conf b/contrib/docker_compose_example/conf.d/fhq-server.conf similarity index 61% rename from dckr_fhqserver/conf.d/fhq-server.conf rename to contrib/docker_compose_example/conf.d/fhq-server.conf index 269d3552..be401918 100644 --- a/dckr_fhqserver/conf.d/fhq-server.conf +++ b/contrib/docker_compose_example/conf.d/fhq-server.conf @@ -7,21 +7,21 @@ dbhost=fhqserver_db dbport=3306 dbname=fhqserver dbuser=fhqserver -dbpass=fhqserver +dbpass=VveGJemxFb ## Server configurations port = 1234 ssl_on = no ssl_port = 4613 -ssl_key_file = /etc/ssl/private/localhost.key -ssl_cert_file = /etc/ssl/certs/localhost.pem +ssl_key_file = /usr/share/fhq-server/ssl/test_fhqserver.key +ssl_cert_file = /usr/share/fhq-server/ssl/test_fhqserver.crt # Web Configuration web_port = 7080 web_max_threads = 4 -web_admin_folder = /usr/share/fhq-server/admin-web-site +web_admin_folder = /usr/share/fhq-server/web-admin web_public_folder = /usr/share/fhq-server/public/ -web_user_folder = /usr/share/fhq-server/user-web-site +web_user_folder = /usr/share/fhq-server/web-user # Jobs Pool Config jobs_fast_threads = 2 diff --git a/dckr_fhqserver/data/.gitkeeper b/contrib/docker_compose_example/data/.gitkeeper similarity index 100% rename from dckr_fhqserver/data/.gitkeeper rename to contrib/docker_compose_example/data/.gitkeeper diff --git a/dckr_fhqserver/data/public/games/.gitkeeper b/contrib/docker_compose_example/data/public/games/.gitkeeper similarity index 100% rename from dckr_fhqserver/data/public/games/.gitkeeper rename to contrib/docker_compose_example/data/public/games/.gitkeeper diff --git a/contrib/docker_compose_example/docker-compose.yml b/contrib/docker_compose_example/docker-compose.yml index 7070f54c..6caba04d 100644 --- a/contrib/docker_compose_example/docker-compose.yml +++ b/contrib/docker_compose_example/docker-compose.yml @@ -1,41 +1,55 @@ version: '2' services: - fhq_db: + fhqserver_db: image: mysql:5.7 + command: --default-authentication-plugin=mysql_native_password volumes: - - "fhq_mysql_db:/var/lib/mysql" + - "./mysql_data:/var/lib/mysql" restart: always environment: - MYSQL_ROOT_PASSWORD: HBgvNyuACY # look in fhq-config/fhq.server.conf - MYSQL_DATABASE: fhqserver # look in fhq-config/fhq.server.conf - MYSQL_USER: fhqserver # look in fhq-config/fhq.server.conf - MYSQL_PASSWORD: VveGJemxFb # look in fhq-config/fhq.server.conf + MYSQL_ROOT_PASSWORD: KzhyntJxwt + MYSQL_DATABASE: fhqserver + MYSQL_USER: fhqserver + MYSQL_PASSWORD: VveGJemxFb networks: - - fhq_net + - fhqserver_net - fhq_server: + fhqserver: + build: . depends_on: - - fhq_db + - fhqserver_db image: freehackquest/fhq-server:latest volumes: - - "./fhq_data:/usr/share/fhq-server/public" - - "./fhq_conf:/etc/fhq-server" - - "./fhq_logs:/var/log/fhq-server" - + - "./data/public:/usr/share/fhq-server/public" + - "./conf.d:/etc/fhq-server" + - "./logs:/var/log/fhq-server" + - "./ssl:/usr/share/fhq-server/ssl" + # - "./fhq-server_data/web_admin_conf/fhq.ws.config.js:/usr/share/fhq-server/web-admin/fhq.ws.config.js" + # - "./fhq-server_data/public:/usr/share/fhq-server/fhq-web-public" + # - "./fhq-server_data/fhqjad-store:/usr/share/fhq-server/fhqjad-store" ports: - "1234:1234" - "4613:4613" - "7080:7080" restart: always - links: - - "fhq_db" networks: - - fhq_net + - fhqserver_net -volumes: - fhq_mysql_db: + ext_nginx_node: + image: nginx:1.16 + volumes: + - "./nginx/html/:/usr/share/nginx/html" + - "./nginx/conf.d:/etc/nginx/conf.d" + - "./nginx/logs:/var/log/nginx/" + - "./ssl:/etc/nginx/ssl" + restart: always + ports: + - "801:80" + - "4431:443" + networks: + - fhqserver_net networks: - fhq_net: - driver: bridge \ No newline at end of file + fhqserver_net: + driver: bridge diff --git a/contrib/docker_compose_example/fhq_conf/fhq-server.conf b/contrib/docker_compose_example/fhq_conf/fhq-server.conf deleted file mode 100644 index fd803cbf..00000000 --- a/contrib/docker_compose_example/fhq_conf/fhq-server.conf +++ /dev/null @@ -1,22 +0,0 @@ -# fhq-server config - -## Database Configuration -## For docker sample -usemysql=yes -storage_type=mysql -dbhost=fhq_db -dbport=3306 -dbname=fhqserver -dbuser=fhqserver -dbpass=VveGJemxFb - -## Server configurations -port = 1234 -ssl_on = no -ssl_port = 4613 -ssl_key_file = /usr/share/fhq-server/fhq.key -ssl_cert_file = /usr/share/fhq-server/fhq.pem - -# Web Configuration -web_port = 7080 -web_admin_folder = /usr/share/fhq-server/admin-web-site \ No newline at end of file diff --git a/contrib/docker_compose_example/fhq_logs/.placeholder b/contrib/docker_compose_example/fhq_logs/.placeholder deleted file mode 100644 index e69de29b..00000000 diff --git a/contrib/docker_compose_example/games/.placeholder b/contrib/docker_compose_example/games/.placeholder deleted file mode 100644 index e69de29b..00000000 diff --git a/contrib/docker_compose_example/nginx/conf.d/default.conf b/contrib/docker_compose_example/nginx/conf.d/default.conf new file mode 100644 index 00000000..fbb1b14c --- /dev/null +++ b/contrib/docker_compose_example/nginx/conf.d/default.conf @@ -0,0 +1,74 @@ +server { + listen 80; + server_name localhost; + + location = /files/ { + root /usr/share/nginx/html/files/; + } + + location / { + proxy_pass http://fhqserver:7080; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + } + + location /api-ws/ { + proxy_pass http://fhqserver:1234; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + #error_page 404 /404.html; + # redirect server error pages to the static page /50x.html + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + +server { + listen 443 ssl; + server_name localhost; + ssl_certificate /etc/nginx/ssl/test_fhqserver.crt; + ssl_certificate_key /etc/nginx/ssl/test_fhqserver.key; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers HIGH:!aNULL:!MD5; + + # location ^~ /files { + # alias /var/www/mysite/manage/public; + # index index.php; +# + # if (!-e $request_filename) { rewrite ^ /manage/index.php last; } +# + # location ~ \.php$ { + # if (!-f $request_filename) { return 404; } + # fastcgi_pass 127.0.0.1:9000; +# + # include fastcgi_params; + # fastcgi_param SCRIPT_FILENAME $request_filename; + # fastcgi_param SCRIPT_NAME $fastcgi_script_name; + # } + # } + + location ^~ /files { + alias /usr/share/nginx/html/files/; + } + + location /api-wss/ { + proxy_pass https://fhqserver:4613; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location / { + proxy_pass http://fhqserver:7080; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + } +} \ No newline at end of file diff --git a/contrib/docker_compose_example/nginx/html/files/users/0.png b/contrib/docker_compose_example/nginx/html/files/users/0.png new file mode 100644 index 00000000..99a7d29e Binary files /dev/null and b/contrib/docker_compose_example/nginx/html/files/users/0.png differ diff --git a/dckr_fhqserver/logs/.gitkeeper b/contrib/docker_compose_example/nginx/logs/.gitkeeper similarity index 100% rename from dckr_fhqserver/logs/.gitkeeper rename to contrib/docker_compose_example/nginx/logs/.gitkeeper diff --git a/contrib/docker_compose_example/ssl/test_fhqserver.crt b/contrib/docker_compose_example/ssl/test_fhqserver.crt new file mode 100644 index 00000000..5f15397a --- /dev/null +++ b/contrib/docker_compose_example/ssl/test_fhqserver.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDazCCAlOgAwIBAgIUW2mVSJp6DAQa6X0j3TQXeCs8hOcwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTAzMjcwODA4MjFaFw0zMTAz +MjUwODA4MjFaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQC8fAitk+xvn4MSRqwXO+dqdYnVwi/aCAf6TlE+jT4w +pcKle+JWKWxJ/cgbzInXSF53TDg4Nn5mvRB8px8TiTQxoJItuuWrqUgckw0s+tca +YPYctgwzwdrZAvEkCG7LVgZoFQr/3WJtJA+hqIYydu7TzGOBD326R8PblCnLScA2 +mvO4RjRU7TJMg+Z662PyYh33Kt4NToTjbDsVKparGTFE5q5FwDOC8VPraQzCRYB2 +mdj5wVhyXUDisO2qOG4UoNTB1ypcyqZBEWaxc7GBI3/Wv787ZvXlpr+owdif/bjw +3TLf/NySHztJmn3xJrr05givxQC4qS6AqDAmIYh2gH9BAgMBAAGjUzBRMB0GA1Ud +DgQWBBSZN819rm68JcSrcjZWDUl3w2AzaDAfBgNVHSMEGDAWgBSZN819rm68JcSr +cjZWDUl3w2AzaDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBv +ZCUIjGXzkQCK91Sbsucs+iWg7uBr9ITxG/uxhn7pPw5rCu6B3B2C0m0bXG3e0hvb +vl4Lo0a1YLdWQWW8FCHziNSxqAyfs+QbK2rFA3VzrdYi9C12jff5+C6FTX0oc7Gb +tMnqCLDLwUVJ6tjVMBkpjBm8TDESFh93Mw605A31VTyxKBezaSbpheqR4MI3myfI +fwkKenYpgLh9/Pn6rx5LeMlzb+oBdgq87UF0aExzg+7eat62lZndBVMcAttIpFh+ +CtkSPjxqQ9fGmEtxnqaIJCCw8vHFA4TwkxQcEE7JnSSriSwZi254jJYEAXvxUqWj +PdgOc2wwEnazLguwZm02 +-----END CERTIFICATE----- diff --git a/contrib/docker_compose_example/ssl/test_fhqserver.key b/contrib/docker_compose_example/ssl/test_fhqserver.key new file mode 100644 index 00000000..db3a4e92 --- /dev/null +++ b/contrib/docker_compose_example/ssl/test_fhqserver.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8fAitk+xvn4MS +RqwXO+dqdYnVwi/aCAf6TlE+jT4wpcKle+JWKWxJ/cgbzInXSF53TDg4Nn5mvRB8 +px8TiTQxoJItuuWrqUgckw0s+tcaYPYctgwzwdrZAvEkCG7LVgZoFQr/3WJtJA+h +qIYydu7TzGOBD326R8PblCnLScA2mvO4RjRU7TJMg+Z662PyYh33Kt4NToTjbDsV +KparGTFE5q5FwDOC8VPraQzCRYB2mdj5wVhyXUDisO2qOG4UoNTB1ypcyqZBEWax +c7GBI3/Wv787ZvXlpr+owdif/bjw3TLf/NySHztJmn3xJrr05givxQC4qS6AqDAm +IYh2gH9BAgMBAAECggEAcTPJfn7GVTAnZ5WcjAPFdFINq52KYdfK+tGIyBnKjSsx +IXSrNnaAfFv4kIGjE/J6EgpsBY7tEcVhnow9BN21xEydHuwOPrBYCBllo2swP76W +ch4AbCF00DuNGsgZyvPqux5QUeXj1IsA/GWb27lErV4nMP9d0sCBaGKvS1ILKH+V +TkPlIHxpGmDoiCZEfhypIHkIpcCZKj204OIs6jAkdSEkb7aGWVHPEOAIwc+qG9hx +1NdPIPOzq6iO3dwTk5TKJZHT3oCeEurWOB+GT4xGWXW4qDpvezAmWESq2LGVml0I +d/chDgQbCjm25+rDcw8JeFNqQxU3J6adODL8OPIjAQKBgQDtoJG1hzhjmt/SuheE +GPbA8r4NyttxFPmCBmRWng98kchblIKBBwAtfFNT3sn+spedkR2u+S/tOsCA/0Tm +3CtI9SFAdkNlG4UWGXpW/ak5p0shSx2DD9ha79k5qhzce8VddBf4Is42ouC8rD/9 +kEMIxCdAwieeSYSSK8NeKnpTMQKBgQDLDsR0Dn6gRuYa9zbstH0/XXm0Fghk+eUg +LgF7htezHhI42nGGwMCR61+siD41ShvpXDWdwGpV+BQnS2IjHwofeZCeEcNab9YT +HM+0zodhU+95kAj72vQFg/eDnZ/H/W4ikHEwFKurTheQ/JEtusjCBTkKJlAr0nJ/ +SzdrMyhJEQKBgQCYhXSg8G74N8MsDbfkWOWgyO3GCou5VH4lwBaNJhzIlwXkCjmN +ucGacG9HqPs8GMOKJkfINDdX7Fr9MVu3VmAODxDNwFrXvcc5fRbyWRRSZheqAf2q +TvROwh5Kje7CcksnBcoQwb5cgUUAtQrJpNvx930+aqBlT8jgzWgzu84SMQKBgDNZ +Z6qlo7XqV/RHwfb36ZhljgpRbAwE+cE6gRt4zQE5wIfqDb1y7v+3kvkxdvHI7OgF +bnWXHAzjcE1Djeytw8ST3FNs0IcFMxCgP5JMjAW70RpfpzXxd7YRWj1JVgef+gL5 +nfX3tDXcyK7cf+YdjvkpkvQTHkEGtfek0L3mMPDRAoGARCdlVA/HlbVntq52RA3Z +XENe4QDQgzl7rlTos+33Hcsb+AuJUfRLMadJk7b91h1/hJP0buIaSTzv5EgijgHh +3OqwvxFoRcNrIuQgIA1vIVNBQUrF9BvriwVATGHPF5D/7pNzVY7b7cLFtKKtZ86d +rLmX5kleBLTrsj4QkTqI0gU= +-----END PRIVATE KEY----- diff --git a/contrib/docker_compose_example/ssl/test_fhqserver.pub b/contrib/docker_compose_example/ssl/test_fhqserver.pub new file mode 100644 index 00000000..e9b380d9 --- /dev/null +++ b/contrib/docker_compose_example/ssl/test_fhqserver.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIi6P4tNXqOG2yxTvchWk/cOmE98p6FknQVQkYYyTONWRhQpeotb/yhxxx6pluSGKS/PMJOtXczLXpBEBZQNi3kNjIxr27yJQmniHgyE8UPLy0oCnL3Jte1JCnuBbxzUSgVLW1fIyEwbzJTUSCHox1zsSjQ1BZRhgSfdydatuZ+CcBaE7lVgIf7gFNm1upe/gh61AKgPRdVSp04O4Yv5ymTeLLOxPZvJ0hwwf//5+cLpEcWsER8D8mkaFzf8L0KS6I/pcrjBeY3Zp06v9RbFziTM8a+IE18S83mu8Vw3t8hfK3C/d69dJn3y0FhZUuOuYoY4gR/E9KfdW+e68p9G/IoYnF/M129WITBHHb/dQhK63fGabYe625TE0AxxqQzTZKQMDspuU4VLYYcL4C4Jjj5ukAfOa1uyca6ZN1QZB46NEedwxot2ufhFu/z7ZcdHeStXTJo04Vkm0BhKHLY+q76iVO/JCFweL8YAyN3FZNS1VA8bBQGHr4SraAv0oiiP8= seakg@seakg-H55M-S2 diff --git a/contrib/ppa/build_source_pkg_for_ppa.py b/contrib/ppa/build_source_pkg_for_ppa.py index 178af7af..b1ea52c5 100755 --- a/contrib/ppa/build_source_pkg_for_ppa.py +++ b/contrib/ppa/build_source_pkg_for_ppa.py @@ -85,12 +85,12 @@ def copytree(src, dst, symlinks=False, ignore=None): else: shutil.copy2(s, d) -shutil.copytree('../../fhq-server/src', './fhq-server/src', symlinks=False, ignore=None) -shutil.copytree('../../fhq-server/cmake', './fhq-server/cmake', symlinks=False, ignore=None) +shutil.copytree('../../src', './fhq-server/src', symlinks=False, ignore=None) +shutil.copytree('../../cmake', './fhq-server/cmake', symlinks=False, ignore=None) shutil.copytree('./install_files', './fhq-server/install_files', symlinks=False, ignore=None) -shutil.copytree('../../admin-web-site', './fhq-server/install_files/admin-web-site', symlinks=False, ignore=None) +shutil.copytree('../../web-admin', './fhq-server/install_files/web-admin', symlinks=False, ignore=None) shutil.copytree('./debian', './fhq-server/debian', symlinks=False, ignore=None) -shutil.copy2('../../fhq-server/CMakeLists.txt', './fhq-server/CMakeLists.txt') +shutil.copy2('../../CMakeLists.txt', './fhq-server/CMakeLists.txt') dist_debian_folder = './debian_' + dist_name_ diff --git a/contrib/ppa/debian/rules b/contrib/ppa/debian/rules index adb76cf4..8c33196a 100755 --- a/contrib/ppa/debian/rules +++ b/contrib/ppa/debian/rules @@ -27,7 +27,7 @@ binary-arch: cp install_files/fhq-server.service debian/tmp/etc/systemd/system cp install_files/fhq-server.postinst debian/tmp/DEBIAN/postinst cp install_files/fhq-server.config debian/tmp/DEBIAN/config - cp -rf install_files/admin-web-site debian/tmp/usr/share/fhq-server + cp -rf install_files/web-admin debian/tmp/usr/share/fhq-server dpkg-gencontrol -pfhq-server dpkg --build debian/tmp .. diff --git a/contrib/ppa/install_files/fhq-server.conf.sample b/contrib/ppa/install_files/fhq-server.conf.sample index 8864e5db..fa5a4db0 100644 --- a/contrib/ppa/install_files/fhq-server.conf.sample +++ b/contrib/ppa/install_files/fhq-server.conf.sample @@ -19,4 +19,4 @@ ssl_cert_file = /etc/ssl/certs/localhost.pem # Web Configuration web_port = 7080 web_max_threads = 4 -web_admin_folder = /usr/share/fhq-server/admin-web-site +web_admin_folder = /usr/share/fhq-server/web-admin diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 9ddf9ea1..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: '2' - -services: - fhqserver_db: - image: mysql:5.7 - volumes: - - "./dckr_mysql:/var/lib/mysql" - restart: always - environment: - MYSQL_ROOT_PASSWORD: KzhyntJxwt - MYSQL_DATABASE: fhqserver - MYSQL_USER: fhqserver - MYSQL_PASSWORD: fhqserver - networks: - - fhqserver_net - - fhqserver: - build: . - depends_on: - - fhqserver_db - image: freehackquest/fhq-server:latest - volumes: - - "./dckr_fhqserver/data/public:/usr/share/fhq-server/public" - - "./dckr_fhqserver/conf.d:/etc/fhq-server" - - "./dckr_fhqserver/logs:/var/log/fhq-server" - ports: - - "1234:1234" - - "4613:4613" - - "7080:7080" - restart: always - networks: - - fhqserver_net - -networks: - fhqserver_net: - driver: bridge diff --git a/docker_dev/data/conf.d/fhq-server.conf b/docker_dev/data/conf.d/fhq-server.conf index 7ae99d02..34d83953 100644 --- a/docker_dev/data/conf.d/fhq-server.conf +++ b/docker_dev/data/conf.d/fhq-server.conf @@ -19,7 +19,7 @@ ssl_cert_file = # Web Configuration web_port = 7080 web_max_threads = 1 -web_admin_folder = ../../../admin-web-site +web_admin_folder = ../../../web-admin web_public_folder = ./public web_user_folder = ../../web-user diff --git a/fhq-server-tests/libtestfhq/__init__.py b/fhq-server-tests/libtestfhq/__init__.py index 6256c523..820e49c6 100644 --- a/fhq-server-tests/libtestfhq/__init__.py +++ b/fhq-server-tests/libtestfhq/__init__.py @@ -16,8 +16,8 @@ def start_server(): global p_fhq_server wd = os.getcwd() print(wd) - os.chdir(wd + "/../fhq-server") - p_fhq_server = subprocess.Popen([wd + '/../fhq-server/fhq-server', '-wd', '../ci/travis/data', 'start']) + os.chdir(wd + "/..") + p_fhq_server = subprocess.Popen([wd + '/../fhq-server', '-wd', './ci/travis/data', 'start']) os.chdir(wd) wait_max = 20 diff --git a/fhq-server-tests/libtestquests/__init__.py b/fhq-server-tests/libtestquests/__init__.py index faeec8fe..ae59ef49 100644 --- a/fhq-server-tests/libtestquests/__init__.py +++ b/fhq-server-tests/libtestquests/__init__.py @@ -51,9 +51,9 @@ def run_tests(): questid1 = quest1['questid'] quest1_new = fhqtest.admin_session.quest({"questid": questid1}) - quest1_new_hints = quest1_new['hints'] - quest1_new_files = quest1_new['files'] - quest1_new_game = quest1_new['game'] + # quest1_new_hints = quest1_new['hints'] + # quest1_new_files = quest1_new['files'] + # quest1_new_game = quest1_new['game'] quest1_new = quest1_new['quest'] pprint(quest1_new) @@ -61,7 +61,11 @@ def run_tests(): fhqtest.check_values("author of quest", quest1_new['author'], quest_author) fhqtest.check_values("answer of quest", quest1_new['answer'], quest_answer) fhqtest.check_values("answer format of quest", quest1_new['answer_format'], quest_answer_format) - fhqtest.check_values("description_state of quest", quest1_new['description_state'], quest_description_state) + fhqtest.check_values( + "description_state of quest", + quest1_new['description_state'], + quest_description_state + ) fhqtest.check_values("score of quest", quest1_new['score'], quest_score) fhqtest.check_values("state of quest", quest1_new['state'], quest_state) fhqtest.check_values("subject of quest", quest1_new['subject'], quest_subject) @@ -73,10 +77,10 @@ def run_tests(): quest1_hint3 = fhqtest.generate_random(255).strip() fhqtest.print_bold("Add hint to quest...") - h1 = fhqtest.admin_session.addhint({"questid": questid1, "hint": quest1_hint1}) - fhqtest.alert(h1 is None, 'Could not get response (hint1)') - fhqtest.check_response(h1, "Quest hint succesfull created") - pprint(h1) + resp_h1 = fhqtest.admin_session.addhint({"questid": questid1, "hint": quest1_hint1}) + fhqtest.alert(resp_h1 is None, 'Could not get response (hint1)') + fhqtest.check_response(resp_h1, "Quest hint succesfull created") + pprint(resp_h1) h2 = fhqtest.admin_session.addhint({"questid": questid1, "hint": quest1_hint2}) fhqtest.alert(h2 is None, 'Could not get response (hint2)') @@ -116,19 +120,23 @@ def run_tests(): }) fhqtest.alert(quest1_update is None, 'Could not get response (4)') fhqtest.check_response(quest1_update, "Quest succesfull update") - + quest1_updated = fhqtest.admin_session.quest({"questid": questid1}) quest1_updated_hints = quest1_updated['hints'] - quest1_updated_files = quest1_updated['files'] - quest1_updated_game = quest1_updated['game'] + # quest1_updated_files = quest1_updated['files'] + # quest1_updated_game = quest1_updated['game'] quest1_updated = quest1_updated['quest'] print("quest1_updated = " + str(quest1_updated)) fhqtest.check_values("name of quest", quest1_updated['name'], quest_name2) fhqtest.check_values("author of quest", quest1_updated['author'], quest_author2) fhqtest.check_values("answer of quest", quest1_updated['answer'], quest_answer2) - fhqtest.check_values("answer format of quest", quest1_updated['answer_format'], quest_answer_format2) - fhqtest.check_values("description_state of quest", quest1_updated['description_state'], quest_description_state2) + fhqtest.check_values( + "answer format of quest", quest1_updated['answer_format'], quest_answer_format2 + ) + fhqtest.check_values( + "description_state of quest", quest1_updated['description_state'], quest_description_state2 + ) fhqtest.check_values("score of quest", quest1_updated['score'], quest_score2) fhqtest.check_values("state of quest", quest1_updated['state'], quest_state2) fhqtest.check_values("subject of quest", quest1_updated['subject'], quest_subject2) @@ -160,7 +168,9 @@ def run_tests(): fhqtest.alert(resp is None, 'Could not get response (quests)') fhqtest.check_response(resp, "quest get filtered") fhqtest.alert(resp['result'] == 'FAIL', 'Wrong response') - fhqtest.alert(resp['data'][0]['questid'] != questid, 'Wrong work filter by gameid in request quests') + fhqtest.alert( + resp['data'][0]['questid'] != questid, 'Wrong work filter by gameid in request quests' + ) fhqtest.user_session.quest_pass({ "questid": quest1_updated['id'], diff --git a/fhq-server-tests/update_libfreehackquestclient.sh b/fhq-server-tests/update_libfreehackquestclient.sh index ffe9705f..b7fc4f4f 100755 --- a/fhq-server-tests/update_libfreehackquestclient.sh +++ b/fhq-server-tests/update_libfreehackquestclient.sh @@ -1,9 +1,28 @@ #!/bin/bash -cd ../fhq-server +check_ret() { + if [ $1 -ne 0 ]; then + echo "" + echo "!!! FAIL: $3" + echo "********************************************************************************" + echo "" + exit $1 + else + echo "" + echo "*** SUCCESS: $2" + echo "********************************************************************************" + echo "" + fi +} + +cd ../ +check_ret $? "Change to .." rm -rf ./libfreehackquest-client-py ./fhq-server export-libfreehackquest-client-py -cd ../fhq-server-tests +check_ret $? "./fhq-server export-libfreehackquest-client-py" +cd ./fhq-server-tests +check_ret $? "cd ./fhq-server-tests" rm -rf libfreehackquestclient -cp -r ../fhq-server/libfreehackquest-client-py/libfreehackquestclient libfreehackquestclient -rm -rf ../fhq-server/libfreehackquest-client-py \ No newline at end of file +cp -r ../libfreehackquest-client-py/libfreehackquestclient libfreehackquestclient +check_ret $? "Copy" +rm -rf ../libfreehackquest-client-py \ No newline at end of file diff --git a/fhq-server/.gitignore b/fhq-server/.gitignore deleted file mode 100644 index b600fade..00000000 --- a/fhq-server/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.wsjcpp/* diff --git a/install/LXD.md b/install/LXD.md index 34313386..153c06bf 100644 --- a/install/LXD.md +++ b/install/LXD.md @@ -18,7 +18,7 @@ On ask: "Would you like LXD to be available over the network (yes/no)?": *yes* After this: - - Please open admin-web-site and change `lxd_mode` to `enabled` + - Please open web-admin and change `lxd_mode` to `enabled` ## Generate certificates: diff --git a/fhq-server/sea5kg_cpplint.config b/sea5kg_cpplint.config similarity index 73% rename from fhq-server/sea5kg_cpplint.config rename to sea5kg_cpplint.config index 5c145bfe..c1980b0d 100644 --- a/fhq-server/sea5kg_cpplint.config +++ b/sea5kg_cpplint.config @@ -5,6 +5,8 @@ skip_files = unit-tests\.wsjcpp/.* skip_files = cmake/.* skip_files = src/3rdParty/.* skip_files = tmp_docker/.* +skip_files = tests/searver-api-tests/tmp_docker/.* +skip_files = tests/code-check/.* line_length_limit = 300 check_copyright_in_files = no \ No newline at end of file diff --git a/fhq-server/src.wsjcpp/.gitkeep b/src.wsjcpp/.gitkeep similarity index 100% rename from fhq-server/src.wsjcpp/.gitkeep rename to src.wsjcpp/.gitkeep diff --git a/fhq-server/src.wsjcpp/CMakeLists.txt b/src.wsjcpp/CMakeLists.txt similarity index 99% rename from fhq-server/src.wsjcpp/CMakeLists.txt rename to src.wsjcpp/CMakeLists.txt index 81baca16..272d238a 100644 --- a/fhq-server/src.wsjcpp/CMakeLists.txt +++ b/src.wsjcpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Automaticly generated by wsjcpp@v0.2.1 cmake_minimum_required(VERSION 3.0) -add_definitions(-DWSJCPP_APP_VERSION="v0.2.36") +add_definitions(-DWSJCPP_APP_VERSION="v0.2.37") add_definitions(-DWSJCPP_APP_NAME="fhq-server") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/fhq-server/src.wsjcpp/nlohmann_json/json.hpp b/src.wsjcpp/nlohmann_json/json.hpp similarity index 100% rename from fhq-server/src.wsjcpp/nlohmann_json/json.hpp rename to src.wsjcpp/nlohmann_json/json.hpp diff --git a/fhq-server/src.wsjcpp/nlohmann_json/wsjcpp.hold.yml b/src.wsjcpp/nlohmann_json/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/nlohmann_json/wsjcpp.hold.yml rename to src.wsjcpp/nlohmann_json/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/generate.Class.wsjcpp-script b/src.wsjcpp/wsjcpp_core/generate.Class.wsjcpp-script similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/generate.Class.wsjcpp-script rename to src.wsjcpp/wsjcpp_core/generate.Class.wsjcpp-script diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/generate.WsjcppUnitTest.wsjcpp-script b/src.wsjcpp/wsjcpp_core/generate.WsjcppUnitTest.wsjcpp-script similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/generate.WsjcppUnitTest.wsjcpp-script rename to src.wsjcpp/wsjcpp_core/generate.WsjcppUnitTest.wsjcpp-script diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp b/src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp rename to src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_core.h b/src.wsjcpp/wsjcpp_core/wsjcpp_core.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_core.h rename to src.wsjcpp/wsjcpp_core/wsjcpp_core.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.cpp b/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.cpp rename to src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.h b/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.h rename to src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests_main.cpp b/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests_main.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests_main.cpp rename to src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests_main.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_diff_text/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_diff_text/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_diff_text/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_diff_text/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.cpp b/src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.cpp rename to src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.h b/src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.h rename to src.wsjcpp/wsjcpp_diff_text/wsjcpp_diff_text.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_employees/generate.WsjcppEmploy b/src.wsjcpp/wsjcpp_employees/generate.WsjcppEmploy similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_employees/generate.WsjcppEmploy rename to src.wsjcpp/wsjcpp_employees/generate.WsjcppEmploy diff --git a/fhq-server/src.wsjcpp/wsjcpp_employees/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_employees/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_employees/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_employees/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_employees/wsjcpp_employees.cpp b/src.wsjcpp/wsjcpp_employees/wsjcpp_employees.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_employees/wsjcpp_employees.cpp rename to src.wsjcpp/wsjcpp_employees/wsjcpp_employees.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_employees/wsjcpp_employees.h b/src.wsjcpp/wsjcpp_employees/wsjcpp_employees.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_employees/wsjcpp_employees.h rename to src.wsjcpp/wsjcpp_employees/wsjcpp_employees.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_geoip/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_geoip/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_geoip/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_geoip/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.cpp b/src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.cpp rename to src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.h b/src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.h rename to src.wsjcpp/wsjcpp_geoip/wsjcpp_geoip.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/md5.cpp b/src.wsjcpp/wsjcpp_hashes/md5.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/md5.cpp rename to src.wsjcpp/wsjcpp_hashes/md5.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/md5.h b/src.wsjcpp/wsjcpp_hashes/md5.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/md5.h rename to src.wsjcpp/wsjcpp_hashes/md5.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/smallsha1.cpp b/src.wsjcpp/wsjcpp_hashes/smallsha1.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/smallsha1.cpp rename to src.wsjcpp/wsjcpp_hashes/smallsha1.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/smallsha1.h b/src.wsjcpp/wsjcpp_hashes/smallsha1.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/smallsha1.h rename to src.wsjcpp/wsjcpp_hashes/smallsha1.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_hashes/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_hashes/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.cpp b/src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.cpp rename to src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.h b/src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.h rename to src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_levenshtein/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_levenshtein/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_levenshtein/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_levenshtein/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.cpp b/src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.cpp rename to src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.h b/src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.h rename to src.wsjcpp/wsjcpp_levenshtein/wsjcpp_levenshtein.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/generate.WsjcppLightWebHttpHandler b/src.wsjcpp/wsjcpp_light_web_server/generate.WsjcppLightWebHttpHandler similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/generate.WsjcppLightWebHttpHandler rename to src.wsjcpp/wsjcpp_light_web_server/generate.WsjcppLightWebHttpHandler diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.cpp b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.cpp rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.h b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.h rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_deque_http_requests.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.cpp b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.cpp rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.h b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.h rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_rewrite_folder.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.cpp b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.cpp rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.h b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.h rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_handler_web_folder.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.cpp b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.cpp rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.h b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.h rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_request.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.cpp b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.cpp rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.h b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.h rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_http_response.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.cpp b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.cpp rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.h b/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.h rename to src.wsjcpp/wsjcpp_light_web_server/wsjcpp_light_web_server.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_parse_conf/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_parse_conf/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_parse_conf/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_parse_conf/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.cpp b/src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.cpp rename to src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.h b/src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.h rename to src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_print_tree/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_print_tree/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_print_tree/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_print_tree/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.cpp b/src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.cpp rename to src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.h b/src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.h rename to src.wsjcpp/wsjcpp_print_tree/wsjcpp_print_tree.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_storages/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_storages/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_storages/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_storages/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_storages/wsjcpp_storages.cpp b/src.wsjcpp/wsjcpp_storages/wsjcpp_storages.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_storages/wsjcpp_storages.cpp rename to src.wsjcpp/wsjcpp_storages/wsjcpp_storages.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_storages/wsjcpp_storages.h b/src.wsjcpp/wsjcpp_storages/wsjcpp_storages.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_storages/wsjcpp_storages.h rename to src.wsjcpp/wsjcpp_storages/wsjcpp_storages.h diff --git a/fhq-server/src.wsjcpp/wsjcpp_validators/wsjcpp.hold.yml b/src.wsjcpp/wsjcpp_validators/wsjcpp.hold.yml similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_validators/wsjcpp.hold.yml rename to src.wsjcpp/wsjcpp_validators/wsjcpp.hold.yml diff --git a/fhq-server/src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp b/src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp rename to src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp diff --git a/fhq-server/src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h b/src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h similarity index 100% rename from fhq-server/src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h rename to src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/CMakeLists.txt b/src/3rdParty/quazip-0.7.3/CMakeLists.txt similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/CMakeLists.txt rename to src/3rdParty/quazip-0.7.3/CMakeLists.txt diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/COPYING b/src/3rdParty/quazip-0.7.3/COPYING similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/COPYING rename to src/3rdParty/quazip-0.7.3/COPYING diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/Doxyfile b/src/3rdParty/quazip-0.7.3/Doxyfile similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/Doxyfile rename to src/3rdParty/quazip-0.7.3/Doxyfile diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/FindQuaZip.cmake b/src/3rdParty/quazip-0.7.3/FindQuaZip.cmake similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/FindQuaZip.cmake rename to src/3rdParty/quazip-0.7.3/FindQuaZip.cmake diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/NEWS.txt b/src/3rdParty/quazip-0.7.3/NEWS.txt similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/NEWS.txt rename to src/3rdParty/quazip-0.7.3/NEWS.txt diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/README.txt b/src/3rdParty/quazip-0.7.3/README.txt similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/README.txt rename to src/3rdParty/quazip-0.7.3/README.txt diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/includes.pri b/src/3rdParty/quazip-0.7.3/includes.pri similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/includes.pri rename to src/3rdParty/quazip-0.7.3/includes.pri diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip.pri b/src/3rdParty/quazip-0.7.3/quazip.pri similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip.pri rename to src/3rdParty/quazip-0.7.3/quazip.pri diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip.pro b/src/3rdParty/quazip-0.7.3/quazip.pro similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip.pro rename to src/3rdParty/quazip-0.7.3/quazip.pro diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip.sln b/src/3rdParty/quazip-0.7.3/quazip.sln similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip.sln rename to src/3rdParty/quazip-0.7.3/quazip.sln diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/CMakeLists.txt b/src/3rdParty/quazip-0.7.3/quazip/CMakeLists.txt similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/CMakeLists.txt rename to src/3rdParty/quazip-0.7.3/quazip/CMakeLists.txt diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/JlCompress.cpp b/src/3rdParty/quazip-0.7.3/quazip/JlCompress.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/JlCompress.cpp rename to src/3rdParty/quazip-0.7.3/quazip/JlCompress.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/JlCompress.h b/src/3rdParty/quazip-0.7.3/quazip/JlCompress.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/JlCompress.h rename to src/3rdParty/quazip-0.7.3/quazip/JlCompress.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/crypt.h b/src/3rdParty/quazip-0.7.3/quazip/crypt.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/crypt.h rename to src/3rdParty/quazip-0.7.3/quazip/crypt.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/debian/libquazip0.symbols b/src/3rdParty/quazip-0.7.3/quazip/debian/libquazip0.symbols similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/debian/libquazip0.symbols rename to src/3rdParty/quazip-0.7.3/quazip/debian/libquazip0.symbols diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/doc/faq.dox b/src/3rdParty/quazip-0.7.3/quazip/doc/faq.dox similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/doc/faq.dox rename to src/3rdParty/quazip-0.7.3/quazip/doc/faq.dox diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/doc/index.dox b/src/3rdParty/quazip-0.7.3/quazip/doc/index.dox similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/doc/index.dox rename to src/3rdParty/quazip-0.7.3/quazip/doc/index.dox diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/doc/usage.dox b/src/3rdParty/quazip-0.7.3/quazip/doc/usage.dox similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/doc/usage.dox rename to src/3rdParty/quazip-0.7.3/quazip/doc/usage.dox diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/ioapi.h b/src/3rdParty/quazip-0.7.3/quazip/ioapi.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/ioapi.h rename to src/3rdParty/quazip-0.7.3/quazip/ioapi.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/qioapi.cpp b/src/3rdParty/quazip-0.7.3/quazip/qioapi.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/qioapi.cpp rename to src/3rdParty/quazip-0.7.3/quazip/qioapi.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaadler32.cpp b/src/3rdParty/quazip-0.7.3/quazip/quaadler32.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaadler32.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quaadler32.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaadler32.h b/src/3rdParty/quazip-0.7.3/quazip/quaadler32.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaadler32.h rename to src/3rdParty/quazip-0.7.3/quazip/quaadler32.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quachecksum32.h b/src/3rdParty/quazip-0.7.3/quazip/quachecksum32.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quachecksum32.h rename to src/3rdParty/quazip-0.7.3/quazip/quachecksum32.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quacrc32.cpp b/src/3rdParty/quazip-0.7.3/quazip/quacrc32.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quacrc32.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quacrc32.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quacrc32.h b/src/3rdParty/quazip-0.7.3/quazip/quacrc32.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quacrc32.h rename to src/3rdParty/quazip-0.7.3/quazip/quacrc32.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quagzipfile.cpp b/src/3rdParty/quazip-0.7.3/quazip/quagzipfile.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quagzipfile.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quagzipfile.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quagzipfile.h b/src/3rdParty/quazip-0.7.3/quazip/quagzipfile.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quagzipfile.h rename to src/3rdParty/quazip-0.7.3/quazip/quagzipfile.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaziodevice.cpp b/src/3rdParty/quazip-0.7.3/quazip/quaziodevice.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaziodevice.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quaziodevice.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaziodevice.h b/src/3rdParty/quazip-0.7.3/quazip/quaziodevice.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quaziodevice.h rename to src/3rdParty/quazip-0.7.3/quazip/quaziodevice.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.cpp b/src/3rdParty/quazip-0.7.3/quazip/quazip.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quazip.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.h b/src/3rdParty/quazip-0.7.3/quazip/quazip.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.h rename to src/3rdParty/quazip-0.7.3/quazip/quazip.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.pri b/src/3rdParty/quazip-0.7.3/quazip/quazip.pri similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.pri rename to src/3rdParty/quazip-0.7.3/quazip/quazip.pri diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.pro b/src/3rdParty/quazip-0.7.3/quazip/quazip.pro similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.pro rename to src/3rdParty/quazip-0.7.3/quazip/quazip.pro diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.sln b/src/3rdParty/quazip-0.7.3/quazip/quazip.sln similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.sln rename to src/3rdParty/quazip-0.7.3/quazip/quazip.sln diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.vcproj b/src/3rdParty/quazip-0.7.3/quazip/quazip.vcproj similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.vcproj rename to src/3rdParty/quazip-0.7.3/quazip/quazip.vcproj diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj b/src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj rename to src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj.filters b/src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj.filters similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj.filters rename to src/3rdParty/quazip-0.7.3/quazip/quazip.vcxproj.filters diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip_global.h b/src/3rdParty/quazip-0.7.3/quazip/quazip_global.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazip_global.h rename to src/3rdParty/quazip-0.7.3/quazip/quazip_global.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipdir.cpp b/src/3rdParty/quazip-0.7.3/quazip/quazipdir.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipdir.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quazipdir.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipdir.h b/src/3rdParty/quazip-0.7.3/quazip/quazipdir.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipdir.h rename to src/3rdParty/quazip-0.7.3/quazip/quazipdir.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfile.cpp b/src/3rdParty/quazip-0.7.3/quazip/quazipfile.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfile.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quazipfile.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfile.h b/src/3rdParty/quazip-0.7.3/quazip/quazipfile.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfile.h rename to src/3rdParty/quazip-0.7.3/quazip/quazipfile.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.cpp b/src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.h b/src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.h rename to src/3rdParty/quazip-0.7.3/quazip/quazipfileinfo.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.cpp b/src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.cpp similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.cpp rename to src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.cpp diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.h b/src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.h rename to src/3rdParty/quazip-0.7.3/quazip/quazipnewinfo.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/run_moc.bat b/src/3rdParty/quazip-0.7.3/quazip/run_moc.bat similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/run_moc.bat rename to src/3rdParty/quazip-0.7.3/quazip/run_moc.bat diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/unzip.c b/src/3rdParty/quazip-0.7.3/quazip/unzip.c similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/unzip.c rename to src/3rdParty/quazip-0.7.3/quazip/unzip.c diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/unzip.h b/src/3rdParty/quazip-0.7.3/quazip/unzip.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/unzip.h rename to src/3rdParty/quazip-0.7.3/quazip/unzip.h diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/zip.c b/src/3rdParty/quazip-0.7.3/quazip/zip.c similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/zip.c rename to src/3rdParty/quazip-0.7.3/quazip/zip.c diff --git a/fhq-server/src/3rdParty/quazip-0.7.3/quazip/zip.h b/src/3rdParty/quazip-0.7.3/quazip/zip.h similarity index 100% rename from fhq-server/src/3rdParty/quazip-0.7.3/quazip/zip.h rename to src/3rdParty/quazip-0.7.3/quazip/zip.h diff --git a/fhq-server/src/cmd/cmd_handlers_classbook.cpp b/src/cmd/cmd_handlers_classbook.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_classbook.cpp rename to src/cmd/cmd_handlers_classbook.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_classbook.h b/src/cmd/cmd_handlers_classbook.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_classbook.h rename to src/cmd/cmd_handlers_classbook.h diff --git a/fhq-server/src/cmd/cmd_handlers_communication.cpp b/src/cmd/cmd_handlers_communication.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_communication.cpp rename to src/cmd/cmd_handlers_communication.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_communication.h b/src/cmd/cmd_handlers_communication.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_communication.h rename to src/cmd/cmd_handlers_communication.h diff --git a/fhq-server/src/cmd/cmd_handlers_events.cpp b/src/cmd/cmd_handlers_events.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_events.cpp rename to src/cmd/cmd_handlers_events.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_events.h b/src/cmd/cmd_handlers_events.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_events.h rename to src/cmd/cmd_handlers_events.h diff --git a/fhq-server/src/cmd/cmd_handlers_games.cpp b/src/cmd/cmd_handlers_games.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_games.cpp rename to src/cmd/cmd_handlers_games.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_games.h b/src/cmd/cmd_handlers_games.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_games.h rename to src/cmd/cmd_handlers_games.h diff --git a/fhq-server/src/cmd/cmd_handlers_leaks.cpp b/src/cmd/cmd_handlers_leaks.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_leaks.cpp rename to src/cmd/cmd_handlers_leaks.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_leaks.h b/src/cmd/cmd_handlers_leaks.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_leaks.h rename to src/cmd/cmd_handlers_leaks.h diff --git a/fhq-server/src/cmd/cmd_handlers_lxd.cpp b/src/cmd/cmd_handlers_lxd.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_lxd.cpp rename to src/cmd/cmd_handlers_lxd.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_lxd.h b/src/cmd/cmd_handlers_lxd.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_lxd.h rename to src/cmd/cmd_handlers_lxd.h diff --git a/fhq-server/src/cmd/cmd_handlers_mails.cpp b/src/cmd/cmd_handlers_mails.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_mails.cpp rename to src/cmd/cmd_handlers_mails.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_mails.h b/src/cmd/cmd_handlers_mails.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_mails.h rename to src/cmd/cmd_handlers_mails.h diff --git a/fhq-server/src/cmd/cmd_handlers_quests.cpp b/src/cmd/cmd_handlers_quests.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_quests.cpp rename to src/cmd/cmd_handlers_quests.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_quests.h b/src/cmd/cmd_handlers_quests.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_quests.h rename to src/cmd/cmd_handlers_quests.h diff --git a/fhq-server/src/cmd/cmd_handlers_quests_writeups.cpp b/src/cmd/cmd_handlers_quests_writeups.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_quests_writeups.cpp rename to src/cmd/cmd_handlers_quests_writeups.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_quests_writeups.h b/src/cmd/cmd_handlers_quests_writeups.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_quests_writeups.h rename to src/cmd/cmd_handlers_quests_writeups.h diff --git a/fhq-server/src/cmd/cmd_handlers_server.cpp b/src/cmd/cmd_handlers_server.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_server.cpp rename to src/cmd/cmd_handlers_server.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_server.h b/src/cmd/cmd_handlers_server.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_server.h rename to src/cmd/cmd_handlers_server.h diff --git a/fhq-server/src/cmd/cmd_handlers_support.cpp b/src/cmd/cmd_handlers_support.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_support.cpp rename to src/cmd/cmd_handlers_support.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_support.h b/src/cmd/cmd_handlers_support.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_support.h rename to src/cmd/cmd_handlers_support.h diff --git a/fhq-server/src/cmd/cmd_handlers_useful_links.cpp b/src/cmd/cmd_handlers_useful_links.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_useful_links.cpp rename to src/cmd/cmd_handlers_useful_links.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_useful_links.h b/src/cmd/cmd_handlers_useful_links.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_useful_links.h rename to src/cmd/cmd_handlers_useful_links.h diff --git a/fhq-server/src/cmd/cmd_handlers_users.cpp b/src/cmd/cmd_handlers_users.cpp similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_users.cpp rename to src/cmd/cmd_handlers_users.cpp diff --git a/fhq-server/src/cmd/cmd_handlers_users.h b/src/cmd/cmd_handlers_users.h similarity index 100% rename from fhq-server/src/cmd/cmd_handlers_users.h rename to src/cmd/cmd_handlers_users.h diff --git a/fhq-server/src/core/cmd_handlers.cpp b/src/core/cmd_handlers.cpp similarity index 100% rename from fhq-server/src/core/cmd_handlers.cpp rename to src/core/cmd_handlers.cpp diff --git a/fhq-server/src/core/cmd_handlers.h b/src/core/cmd_handlers.h similarity index 98% rename from fhq-server/src/core/cmd_handlers.h rename to src/core/cmd_handlers.h index 0b036134..0613e888 100644 --- a/fhq-server/src/core/cmd_handlers.h +++ b/src/core/cmd_handlers.h @@ -272,6 +272,11 @@ class CmdHandlers { #define REGISTRY_CMD( classname ) \ static classname * pRegistry ## classname = new classname(); \ + +// Registry Wsjcpp JsonRpc20 Handler +#define REGISTRY_WSJCPP_JSONRPC20_HANDLER( classname ) \ + static classname * pRegistryWsjcppJsonRpc20 ## classname = new classname(); \ + // --------------------------------------------------------------------- /*! diff --git a/fhq-server/src/core/employees.cpp b/src/core/employees.cpp similarity index 100% rename from fhq-server/src/core/employees.cpp rename to src/core/employees.cpp diff --git a/fhq-server/src/core/employees.h b/src/core/employees.h similarity index 100% rename from fhq-server/src/core/employees.h rename to src/core/employees.h diff --git a/fhq-server/src/core/export_libwsjcppcli_java_android.cpp b/src/core/export_libwsjcppcli_java_android.cpp similarity index 94% rename from fhq-server/src/core/export_libwsjcppcli_java_android.cpp rename to src/core/export_libwsjcppcli_java_android.cpp index f54364fa..c4de4e65 100644 --- a/fhq-server/src/core/export_libwsjcppcli_java_android.cpp +++ b/src/core/export_libwsjcppcli_java_android.cpp @@ -119,11 +119,12 @@ void ExportLibWsjCppCliJavaAndroid::exportPrepareDirs() { // --------------------------------------------------------------------- -void ExportLibWsjCppCliJavaAndroid::exportManifest() { - std::ofstream fManifest; +bool ExportLibWsjCppCliJavaAndroid::exportManifest() { WsjcppLog::info(TAG, "write code to libfhqcli-java-android/libfhqcli/src/main/AndroidManifest.xml"); - fManifest.open ("libfhqcli-java-android/libfhqcli/src/main/AndroidManifest.xml"); - + std::ofstream fManifest("libfhqcli-java-android/libfhqcli/src/main/AndroidManifest.xml"); + if (!fManifest.is_open()) { + return false; + } fManifest << "" " \n" @@ -131,15 +132,17 @@ void ExportLibWsjCppCliJavaAndroid::exportManifest() { " \n" " \n" " \n"; + return true; } // --------------------------------------------------------------------- -void ExportLibWsjCppCliJavaAndroid::exportBuildGradle() { - std::ofstream fBuildGradle; +bool ExportLibWsjCppCliJavaAndroid::exportBuildGradle() { WsjcppLog::info(TAG, "write code to libfhqcli-java-android/libfhqcli/build.gradle "); - fBuildGradle.open ("libfhqcli-java-android/libfhqcli/build.gradle"); - + std::ofstream fBuildGradle("libfhqcli-java-android/libfhqcli/build.gradle"); + if (!fBuildGradle.is_open()) { + return false; + } // TODO version code must be date + time fBuildGradle << "" "apply plugin: 'com.android.library' \n" @@ -168,6 +171,7 @@ void ExportLibWsjCppCliJavaAndroid::exportBuildGradle() { " implementation 'com.neovisionaries:nv-websocket-client:2.8'\n" "}\n" ; + return true; } // --------------------------------------------------------------------- diff --git a/fhq-server/src/core/export_libwsjcppcli_java_android.h b/src/core/export_libwsjcppcli_java_android.h similarity index 87% rename from fhq-server/src/core/export_libwsjcppcli_java_android.h rename to src/core/export_libwsjcppcli_java_android.h index 75411f5f..41216d02 100644 --- a/fhq-server/src/core/export_libwsjcppcli_java_android.h +++ b/src/core/export_libwsjcppcli_java_android.h @@ -13,8 +13,8 @@ class ExportLibWsjCppCliJavaAndroid { std::string TAG; std::string m_sVersion; void exportPrepareDirs(); - void exportManifest(); - void exportBuildGradle(); + bool exportManifest(); + bool exportBuildGradle(); void exportAPImd(); }; diff --git a/fhq-server/src/core/export_libwsjcppcli_py.cpp b/src/core/export_libwsjcppcli_py.cpp similarity index 100% rename from fhq-server/src/core/export_libwsjcppcli_py.cpp rename to src/core/export_libwsjcppcli_py.cpp diff --git a/fhq-server/src/core/export_libwsjcppcli_py.h b/src/core/export_libwsjcppcli_py.h similarity index 100% rename from fhq-server/src/core/export_libwsjcppcli_py.h rename to src/core/export_libwsjcppcli_py.h diff --git a/fhq-server/src/core/export_list_of_handlers.cpp b/src/core/export_list_of_handlers.cpp similarity index 100% rename from fhq-server/src/core/export_list_of_handlers.cpp rename to src/core/export_list_of_handlers.cpp diff --git a/fhq-server/src/core/export_list_of_handlers.h b/src/core/export_list_of_handlers.h similarity index 100% rename from fhq-server/src/core/export_list_of_handlers.h rename to src/core/export_list_of_handlers.h diff --git a/fhq-server/src/core/export_struct_of_storage.cpp b/src/core/export_struct_of_storage.cpp similarity index 100% rename from fhq-server/src/core/export_struct_of_storage.cpp rename to src/core/export_struct_of_storage.cpp diff --git a/fhq-server/src/core/export_struct_of_storage.h b/src/core/export_struct_of_storage.h similarity index 100% rename from fhq-server/src/core/export_struct_of_storage.h rename to src/core/export_struct_of_storage.h diff --git a/fhq-server/src/core/fallen.cpp b/src/core/fallen.cpp similarity index 100% rename from fhq-server/src/core/fallen.cpp rename to src/core/fallen.cpp diff --git a/fhq-server/src/core/fallen.h b/src/core/fallen.h similarity index 100% rename from fhq-server/src/core/fallen.h rename to src/core/fallen.h diff --git a/fhq-server/src/core/jobs_pool.cpp b/src/core/jobs_pool.cpp similarity index 100% rename from fhq-server/src/core/jobs_pool.cpp rename to src/core/jobs_pool.cpp diff --git a/fhq-server/src/core/jobs_pool.h b/src/core/jobs_pool.h similarity index 100% rename from fhq-server/src/core/jobs_pool.h rename to src/core/jobs_pool.h diff --git a/fhq-server/src/core/websocketserver.cpp b/src/core/websocketserver.cpp similarity index 99% rename from fhq-server/src/core/websocketserver.cpp rename to src/core/websocketserver.cpp index b1705760..bebd5864 100644 --- a/fhq-server/src/core/websocketserver.cpp +++ b/src/core/websocketserver.cpp @@ -189,7 +189,8 @@ void WebSocketServer::processTextMessage(const QString &message) { nlohmann::json jsonRequest_ = nlohmann::json::parse(message.toStdString()); ModelRequest *pModelRequest = new ModelRequest(pClient, this, jsonRequest_); - + // TODO condition WsjcppJsonRpc20Request or ModelRequest + if (!pModelRequest->hasCommand()) { this->sendMessageError(pClient, sCmd, sM, WsjcppJsonRpc20Error(404, "Not found requare parameter 'cmd'")); // pModelRequestData->sendError(Error(404, "Not found command '" + QString(cmd.c_str()) + "'")); diff --git a/fhq-server/src/core/websocketserver.h b/src/core/websocketserver.h similarity index 100% rename from fhq-server/src/core/websocketserver.h rename to src/core/websocketserver.h diff --git a/fhq-server/src/core/wsjcpp_export_libcli_web_js.cpp b/src/core/wsjcpp_export_libcli_web_js.cpp similarity index 100% rename from fhq-server/src/core/wsjcpp_export_libcli_web_js.cpp rename to src/core/wsjcpp_export_libcli_web_js.cpp diff --git a/fhq-server/src/core/wsjcpp_export_libcli_web_js.h b/src/core/wsjcpp_export_libcli_web_js.h similarity index 100% rename from fhq-server/src/core/wsjcpp_export_libcli_web_js.h rename to src/core/wsjcpp_export_libcli_web_js.h diff --git a/fhq-server/src/employees/employ_chats.cpp b/src/employees/employ_chats.cpp similarity index 100% rename from fhq-server/src/employees/employ_chats.cpp rename to src/employees/employ_chats.cpp diff --git a/fhq-server/src/employees/employ_chats.h b/src/employees/employ_chats.h similarity index 100% rename from fhq-server/src/employees/employ_chats.h rename to src/employees/employ_chats.h diff --git a/fhq-server/src/employees/employ_database.cpp b/src/employees/employ_database.cpp similarity index 99% rename from fhq-server/src/employees/employ_database.cpp rename to src/employees/employ_database.cpp index 37c61a36..36930287 100644 --- a/fhq-server/src/employees/employ_database.cpp +++ b/src/employees/employ_database.cpp @@ -141,8 +141,8 @@ bool EmployDatabase::manualCreateDatabase(const std::string& sRootPassword, std: } while (query.next()) { QSqlRecord record = query.record(); - std::string sDatabaseName = record.value("Database").toString().toStdString(); - if (sDatabaseName == sDatabaseName) { + std::string sDatabaseName1 = record.value("Database").toString().toStdString(); + if (sDatabaseName == sDatabaseName1) { bDatabaseAlreadyExists = true; } } diff --git a/fhq-server/src/employees/employ_database.h b/src/employees/employ_database.h similarity index 100% rename from fhq-server/src/employees/employ_database.h rename to src/employees/employ_database.h diff --git a/fhq-server/src/employees/employ_games.cpp b/src/employees/employ_games.cpp similarity index 100% rename from fhq-server/src/employees/employ_games.cpp rename to src/employees/employ_games.cpp diff --git a/fhq-server/src/employees/employ_games.h b/src/employees/employ_games.h similarity index 100% rename from fhq-server/src/employees/employ_games.h rename to src/employees/employ_games.h diff --git a/fhq-server/src/employees/employ_images.cpp b/src/employees/employ_images.cpp similarity index 100% rename from fhq-server/src/employees/employ_images.cpp rename to src/employees/employ_images.cpp diff --git a/fhq-server/src/employees/employ_images.h b/src/employees/employ_images.h similarity index 100% rename from fhq-server/src/employees/employ_images.h rename to src/employees/employ_images.h diff --git a/fhq-server/src/employees/employ_leaks.cpp b/src/employees/employ_leaks.cpp similarity index 100% rename from fhq-server/src/employees/employ_leaks.cpp rename to src/employees/employ_leaks.cpp diff --git a/fhq-server/src/employees/employ_leaks.h b/src/employees/employ_leaks.h similarity index 100% rename from fhq-server/src/employees/employ_leaks.h rename to src/employees/employ_leaks.h diff --git a/fhq-server/src/employees/employ_mails.cpp b/src/employees/employ_mails.cpp similarity index 100% rename from fhq-server/src/employees/employ_mails.cpp rename to src/employees/employ_mails.cpp diff --git a/fhq-server/src/employees/employ_mails.h b/src/employees/employ_mails.h similarity index 100% rename from fhq-server/src/employees/employ_mails.h rename to src/employees/employ_mails.h diff --git a/fhq-server/src/employees/employ_notify.cpp b/src/employees/employ_notify.cpp similarity index 100% rename from fhq-server/src/employees/employ_notify.cpp rename to src/employees/employ_notify.cpp diff --git a/fhq-server/src/employees/employ_notify.h b/src/employees/employ_notify.h similarity index 100% rename from fhq-server/src/employees/employ_notify.h rename to src/employees/employ_notify.h diff --git a/fhq-server/src/employees/employ_orchestra.cpp b/src/employees/employ_orchestra.cpp similarity index 100% rename from fhq-server/src/employees/employ_orchestra.cpp rename to src/employees/employ_orchestra.cpp diff --git a/fhq-server/src/employees/employ_orchestra.h b/src/employees/employ_orchestra.h similarity index 100% rename from fhq-server/src/employees/employ_orchestra.h rename to src/employees/employ_orchestra.h diff --git a/fhq-server/src/employees/employ_quests.cpp b/src/employees/employ_quests.cpp similarity index 100% rename from fhq-server/src/employees/employ_quests.cpp rename to src/employees/employ_quests.cpp diff --git a/fhq-server/src/employees/employ_quests.h b/src/employees/employ_quests.h similarity index 100% rename from fhq-server/src/employees/employ_quests.h rename to src/employees/employ_quests.h diff --git a/fhq-server/src/employees/employ_scoreboard.cpp b/src/employees/employ_scoreboard.cpp similarity index 100% rename from fhq-server/src/employees/employ_scoreboard.cpp rename to src/employees/employ_scoreboard.cpp diff --git a/fhq-server/src/employees/employ_scoreboard.h b/src/employees/employ_scoreboard.h similarity index 100% rename from fhq-server/src/employees/employ_scoreboard.h rename to src/employees/employ_scoreboard.h diff --git a/fhq-server/src/employees/employ_server_info.cpp b/src/employees/employ_server_info.cpp similarity index 100% rename from fhq-server/src/employees/employ_server_info.cpp rename to src/employees/employ_server_info.cpp diff --git a/fhq-server/src/employees/employ_server_info.h b/src/employees/employ_server_info.h similarity index 100% rename from fhq-server/src/employees/employ_server_info.h rename to src/employees/employ_server_info.h diff --git a/fhq-server/src/employees/employ_users.cpp b/src/employees/employ_users.cpp similarity index 100% rename from fhq-server/src/employees/employ_users.cpp rename to src/employees/employ_users.cpp diff --git a/fhq-server/src/employees/employ_users.h b/src/employees/employ_users.h similarity index 100% rename from fhq-server/src/employees/employ_users.h rename to src/employees/employ_users.h diff --git a/fhq-server/src/main.cpp b/src/main.cpp similarity index 98% rename from fhq-server/src/main.cpp rename to src/main.cpp index 59d9186c..bc5b0d40 100644 --- a/fhq-server/src/main.cpp +++ b/src/main.cpp @@ -140,6 +140,7 @@ int main(int argc, char** argv) { } else if (helpArgs.has("export-libfreehackquest-client-py")) { ExportLibWsjCppCliPy *pExportPython = new ExportLibWsjCppCliPy(); pExportPython->exportLib(); + delete pExportPython; return 0; } else if (helpArgs.has("export-libfhqcli-web-javascript")) { WsjCpp::ExportLibCliWebJS *pExportWebJS = new WsjCpp::ExportLibCliWebJS(); @@ -150,6 +151,7 @@ int main(int argc, char** argv) { pExportWebJS->setAppVersion(appVersion); pExportWebJS->setPrefixRepositoryURL("https://github.com/freehackquest/"); pExportWebJS->exportLib(); + delete pExportWebJS; return 0; } else if (helpArgs.has("export-libfhqcli-java-android")) { ExportLibWsjCppCliJavaAndroid *pExportJavaAndroid = new ExportLibWsjCppCliJavaAndroid(); @@ -158,6 +160,7 @@ int main(int argc, char** argv) { pExportJavaAndroid->setVersion(std::string(WSJCPP_APP_VERSION)); // pExportJavaAndroid->setPrefixRepositoryURL("https://github.com/freehackquest/"); pExportJavaAndroid->exportLib(); + delete pExportJavaAndroid; return 0; } else if (helpArgs.has("show-employees")) { WsjcppPrintTree tree("WsjcppEmployees (" + std::to_string(g_pWsjcppEmployees->size()) + ")"); @@ -313,8 +316,8 @@ int main(int argc, char** argv) { std::cout << "\nCurrent LXD mode: " << pGlobalSettings->get("lxd_mode").convertValueToString(false) << "\n"; return 0; } else if (helpArgs.has("start") || helpArgs.has("-s")) { - pGlobalSettings->registrySetting("web_server", "web_admin_folder").dirPath("/usr/share/fhq-server/admin-web-site").inFile(); - pGlobalSettings->registrySetting("web_server", "web_user_folder").dirPath("/usr/share/fhq-server/user-web-site").inFile(); + pGlobalSettings->registrySetting("web_server", "web_admin_folder").dirPath("/usr/share/fhq-server/web-admin").inFile(); + pGlobalSettings->registrySetting("web_server", "web_user_folder").dirPath("/usr/share/fhq-server/web-user").inFile(); pGlobalSettings->registrySetting("web_server", "web_public_folder").dirPath("/usr/share/fhq-server/fhq-web-public").inFile(); pGlobalSettings->registrySetting("web_server", "web_public_folder_url").string("http://localhost:7080/public/").inFile(); pGlobalSettings->registrySetting("web_server", "web_fhqjad_store").dirPath("/usr/share/fhq-server/web/fhqjad-store").inFile(); diff --git a/fhq-server/src/models/include/model_database_connection.h b/src/models/include/model_database_connection.h similarity index 100% rename from fhq-server/src/models/include/model_database_connection.h rename to src/models/include/model_database_connection.h diff --git a/fhq-server/src/models/include/model_game.h b/src/models/include/model_game.h similarity index 100% rename from fhq-server/src/models/include/model_game.h rename to src/models/include/model_game.h diff --git a/fhq-server/src/models/include/model_leak.h b/src/models/include/model_leak.h similarity index 100% rename from fhq-server/src/models/include/model_leak.h rename to src/models/include/model_leak.h diff --git a/fhq-server/src/models/include/model_lxd_orchestra.h b/src/models/include/model_lxd_orchestra.h similarity index 100% rename from fhq-server/src/models/include/model_lxd_orchestra.h rename to src/models/include/model_lxd_orchestra.h diff --git a/fhq-server/src/models/model_notification.cpp b/src/models/model_notification.cpp similarity index 100% rename from fhq-server/src/models/model_notification.cpp rename to src/models/model_notification.cpp diff --git a/fhq-server/src/models/model_notification.h b/src/models/model_notification.h similarity index 100% rename from fhq-server/src/models/model_notification.h rename to src/models/model_notification.h diff --git a/fhq-server/src/models/sources/model_database_connection.cpp b/src/models/sources/model_database_connection.cpp similarity index 100% rename from fhq-server/src/models/sources/model_database_connection.cpp rename to src/models/sources/model_database_connection.cpp diff --git a/fhq-server/src/models/sources/model_game.cpp b/src/models/sources/model_game.cpp similarity index 100% rename from fhq-server/src/models/sources/model_game.cpp rename to src/models/sources/model_game.cpp diff --git a/fhq-server/src/models/sources/model_leak.cpp b/src/models/sources/model_leak.cpp similarity index 100% rename from fhq-server/src/models/sources/model_leak.cpp rename to src/models/sources/model_leak.cpp diff --git a/fhq-server/src/models/sources/model_lxd_orchestra.cpp b/src/models/sources/model_lxd_orchestra.cpp similarity index 100% rename from fhq-server/src/models/sources/model_lxd_orchestra.cpp rename to src/models/sources/model_lxd_orchestra.cpp diff --git a/fhq-server/src/storages/mysql/mysql_storage.cpp b/src/storages/mysql/mysql_storage.cpp similarity index 100% rename from fhq-server/src/storages/mysql/mysql_storage.cpp rename to src/storages/mysql/mysql_storage.cpp diff --git a/fhq-server/src/storages/mysql/mysql_storage.h b/src/storages/mysql/mysql_storage.h similarity index 100% rename from fhq-server/src/storages/mysql/mysql_storage.h rename to src/storages/mysql/mysql_storage.h diff --git a/fhq-server/src/storages/postgresql/postgresql_storage.cpp b/src/storages/postgresql/postgresql_storage.cpp similarity index 100% rename from fhq-server/src/storages/postgresql/postgresql_storage.cpp rename to src/storages/postgresql/postgresql_storage.cpp diff --git a/fhq-server/src/storages/postgresql/postgresql_storage.h b/src/storages/postgresql/postgresql_storage.h similarity index 100% rename from fhq-server/src/storages/postgresql/postgresql_storage.h rename to src/storages/postgresql/postgresql_storage.h diff --git a/fhq-server/src/storages/updates/update0100.cpp b/src/storages/updates/update0100.cpp similarity index 100% rename from fhq-server/src/storages/updates/update0100.cpp rename to src/storages/updates/update0100.cpp diff --git a/fhq-server/src/storages/updates/update0100.h b/src/storages/updates/update0100.h similarity index 100% rename from fhq-server/src/storages/updates/update0100.h rename to src/storages/updates/update0100.h diff --git a/fhq-server/src/storages/updates/update0101.cpp b/src/storages/updates/update0101.cpp similarity index 100% rename from fhq-server/src/storages/updates/update0101.cpp rename to src/storages/updates/update0101.cpp diff --git a/fhq-server/src/storages/updates/update0101.h b/src/storages/updates/update0101.h similarity index 100% rename from fhq-server/src/storages/updates/update0101.h rename to src/storages/updates/update0101.h diff --git a/fhq-server/src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.cpp b/src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.cpp rename to src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.cpp diff --git a/fhq-server/src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.h b/src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.h similarity index 100% rename from fhq-server/src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.h rename to src/storages/updates/update_6c8d4zm6u2_pmlyt8k7nm.h diff --git a/fhq-server/src/storages/updates/update_722kt134lq_6c8d4zm6u2.cpp b/src/storages/updates/update_722kt134lq_6c8d4zm6u2.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_722kt134lq_6c8d4zm6u2.cpp rename to src/storages/updates/update_722kt134lq_6c8d4zm6u2.cpp diff --git a/fhq-server/src/storages/updates/update_722kt134lq_6c8d4zm6u2.h b/src/storages/updates/update_722kt134lq_6c8d4zm6u2.h similarity index 100% rename from fhq-server/src/storages/updates/update_722kt134lq_6c8d4zm6u2.h rename to src/storages/updates/update_722kt134lq_6c8d4zm6u2.h diff --git a/fhq-server/src/storages/updates/update_csww6lwcrp_722kt134lq.cpp b/src/storages/updates/update_csww6lwcrp_722kt134lq.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_csww6lwcrp_722kt134lq.cpp rename to src/storages/updates/update_csww6lwcrp_722kt134lq.cpp diff --git a/fhq-server/src/storages/updates/update_csww6lwcrp_722kt134lq.h b/src/storages/updates/update_csww6lwcrp_722kt134lq.h similarity index 100% rename from fhq-server/src/storages/updates/update_csww6lwcrp_722kt134lq.h rename to src/storages/updates/update_csww6lwcrp_722kt134lq.h diff --git a/fhq-server/src/storages/updates/update_mhd92m15nb_snwxenqco0.cpp b/src/storages/updates/update_mhd92m15nb_snwxenqco0.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_mhd92m15nb_snwxenqco0.cpp rename to src/storages/updates/update_mhd92m15nb_snwxenqco0.cpp diff --git a/fhq-server/src/storages/updates/update_mhd92m15nb_snwxenqco0.h b/src/storages/updates/update_mhd92m15nb_snwxenqco0.h similarity index 100% rename from fhq-server/src/storages/updates/update_mhd92m15nb_snwxenqco0.h rename to src/storages/updates/update_mhd92m15nb_snwxenqco0.h diff --git a/fhq-server/src/storages/updates/update_pmlyt8k7nm_215438peu8.cpp b/src/storages/updates/update_pmlyt8k7nm_215438peu8.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_pmlyt8k7nm_215438peu8.cpp rename to src/storages/updates/update_pmlyt8k7nm_215438peu8.cpp diff --git a/fhq-server/src/storages/updates/update_pmlyt8k7nm_215438peu8.h b/src/storages/updates/update_pmlyt8k7nm_215438peu8.h similarity index 100% rename from fhq-server/src/storages/updates/update_pmlyt8k7nm_215438peu8.h rename to src/storages/updates/update_pmlyt8k7nm_215438peu8.h diff --git a/fhq-server/src/storages/updates/update_snwxenqco0_csww6lwcrp.cpp b/src/storages/updates/update_snwxenqco0_csww6lwcrp.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_snwxenqco0_csww6lwcrp.cpp rename to src/storages/updates/update_snwxenqco0_csww6lwcrp.cpp diff --git a/fhq-server/src/storages/updates/update_snwxenqco0_csww6lwcrp.h b/src/storages/updates/update_snwxenqco0_csww6lwcrp.h similarity index 100% rename from fhq-server/src/storages/updates/update_snwxenqco0_csww6lwcrp.h rename to src/storages/updates/update_snwxenqco0_csww6lwcrp.h diff --git a/fhq-server/src/storages/updates/update_u0100_mhd92m15nb.cpp b/src/storages/updates/update_u0100_mhd92m15nb.cpp similarity index 100% rename from fhq-server/src/storages/updates/update_u0100_mhd92m15nb.cpp rename to src/storages/updates/update_u0100_mhd92m15nb.cpp diff --git a/fhq-server/src/storages/updates/update_u0100_mhd92m15nb.h b/src/storages/updates/update_u0100_mhd92m15nb.h similarity index 100% rename from fhq-server/src/storages/updates/update_u0100_mhd92m15nb.h rename to src/storages/updates/update_u0100_mhd92m15nb.h diff --git a/fhq-server/src/storages/updates/updates_init_database.cpp b/src/storages/updates/updates_init_database.cpp similarity index 100% rename from fhq-server/src/storages/updates/updates_init_database.cpp rename to src/storages/updates/updates_init_database.cpp diff --git a/fhq-server/src/storages/updates/updates_init_database.h b/src/storages/updates/updates_init_database.h similarity index 100% rename from fhq-server/src/storages/updates/updates_init_database.h rename to src/storages/updates/updates_init_database.h diff --git a/fhq-server/src/tasks/add_public_events_task.cpp b/src/tasks/add_public_events_task.cpp similarity index 100% rename from fhq-server/src/tasks/add_public_events_task.cpp rename to src/tasks/add_public_events_task.cpp diff --git a/fhq-server/src/tasks/add_public_events_task.h b/src/tasks/add_public_events_task.h similarity index 100% rename from fhq-server/src/tasks/add_public_events_task.h rename to src/tasks/add_public_events_task.h diff --git a/fhq-server/src/tasks/lxd_async_operation_task.cpp b/src/tasks/lxd_async_operation_task.cpp similarity index 100% rename from fhq-server/src/tasks/lxd_async_operation_task.cpp rename to src/tasks/lxd_async_operation_task.cpp diff --git a/fhq-server/src/tasks/lxd_async_operation_task.h b/src/tasks/lxd_async_operation_task.h similarity index 100% rename from fhq-server/src/tasks/lxd_async_operation_task.h rename to src/tasks/lxd_async_operation_task.h diff --git a/fhq-server/src/tasks/mail_send_task.cpp b/src/tasks/mail_send_task.cpp similarity index 100% rename from fhq-server/src/tasks/mail_send_task.cpp rename to src/tasks/mail_send_task.cpp diff --git a/fhq-server/src/tasks/mail_send_task.h b/src/tasks/mail_send_task.h similarity index 100% rename from fhq-server/src/tasks/mail_send_task.h rename to src/tasks/mail_send_task.h diff --git a/fhq-server/src/tasks/notify_to_all_task.cpp b/src/tasks/notify_to_all_task.cpp similarity index 100% rename from fhq-server/src/tasks/notify_to_all_task.cpp rename to src/tasks/notify_to_all_task.cpp diff --git a/fhq-server/src/tasks/notify_to_all_task.h b/src/tasks/notify_to_all_task.h similarity index 100% rename from fhq-server/src/tasks/notify_to_all_task.h rename to src/tasks/notify_to_all_task.h diff --git a/fhq-server/src/tasks/runtasks.cpp b/src/tasks/runtasks.cpp similarity index 100% rename from fhq-server/src/tasks/runtasks.cpp rename to src/tasks/runtasks.cpp diff --git a/fhq-server/src/tasks/runtasks.h b/src/tasks/runtasks.h similarity index 100% rename from fhq-server/src/tasks/runtasks.h rename to src/tasks/runtasks.h diff --git a/fhq-server/src/tasks/update_max_score_game_task.cpp b/src/tasks/update_max_score_game_task.cpp similarity index 100% rename from fhq-server/src/tasks/update_max_score_game_task.cpp rename to src/tasks/update_max_score_game_task.cpp diff --git a/fhq-server/src/tasks/update_max_score_game_task.h b/src/tasks/update_max_score_game_task.h similarity index 100% rename from fhq-server/src/tasks/update_max_score_game_task.h rename to src/tasks/update_max_score_game_task.h diff --git a/fhq-server/src/tasks/update_quest_solved_task.cpp b/src/tasks/update_quest_solved_task.cpp similarity index 100% rename from fhq-server/src/tasks/update_quest_solved_task.cpp rename to src/tasks/update_quest_solved_task.cpp diff --git a/fhq-server/src/tasks/update_quest_solved_task.h b/src/tasks/update_quest_solved_task.h similarity index 100% rename from fhq-server/src/tasks/update_quest_solved_task.h rename to src/tasks/update_quest_solved_task.h diff --git a/fhq-server/src/tasks/update_user_location_task.cpp b/src/tasks/update_user_location_task.cpp similarity index 100% rename from fhq-server/src/tasks/update_user_location_task.cpp rename to src/tasks/update_user_location_task.cpp diff --git a/fhq-server/src/tasks/update_user_location_task.h b/src/tasks/update_user_location_task.h similarity index 100% rename from fhq-server/src/tasks/update_user_location_task.h rename to src/tasks/update_user_location_task.h diff --git a/fhq-server/src/tasks/update_user_rating_task.cpp b/src/tasks/update_user_rating_task.cpp similarity index 100% rename from fhq-server/src/tasks/update_user_rating_task.cpp rename to src/tasks/update_user_rating_task.cpp diff --git a/fhq-server/src/tasks/update_user_rating_task.h b/src/tasks/update_user_rating_task.h similarity index 100% rename from fhq-server/src/tasks/update_user_rating_task.h rename to src/tasks/update_user_rating_task.h diff --git a/fhq-server/src/utils/utils_lxd.cpp b/src/utils/utils_lxd.cpp similarity index 100% rename from fhq-server/src/utils/utils_lxd.cpp rename to src/utils/utils_lxd.cpp diff --git a/fhq-server/src/utils/utils_lxd.h b/src/utils/utils_lxd.h similarity index 100% rename from fhq-server/src/utils/utils_lxd.h rename to src/utils/utils_lxd.h diff --git a/fhq-server/src/utils/utils_prepare_deb_package.cpp b/src/utils/utils_prepare_deb_package.cpp similarity index 100% rename from fhq-server/src/utils/utils_prepare_deb_package.cpp rename to src/utils/utils_prepare_deb_package.cpp diff --git a/fhq-server/src/utils/utils_prepare_deb_package.h b/src/utils/utils_prepare_deb_package.h similarity index 100% rename from fhq-server/src/utils/utils_prepare_deb_package.h rename to src/utils/utils_prepare_deb_package.h diff --git a/fhq-server/src/validators/validators.cpp b/src/validators/validators.cpp similarity index 100% rename from fhq-server/src/validators/validators.cpp rename to src/validators/validators.cpp diff --git a/fhq-server/src/validators/validators.h b/src/validators/validators.h similarity index 100% rename from fhq-server/src/validators/validators.h rename to src/validators/validators.h diff --git a/fhq-server/src/web-server/http_handler_web_admin_folder.cpp b/src/web-server/http_handler_web_admin_folder.cpp similarity index 100% rename from fhq-server/src/web-server/http_handler_web_admin_folder.cpp rename to src/web-server/http_handler_web_admin_folder.cpp diff --git a/fhq-server/src/web-server/http_handler_web_admin_folder.h b/src/web-server/http_handler_web_admin_folder.h similarity index 100% rename from fhq-server/src/web-server/http_handler_web_admin_folder.h rename to src/web-server/http_handler_web_admin_folder.h diff --git a/fhq-server/src/web-server/http_handler_web_public_folder.cpp b/src/web-server/http_handler_web_public_folder.cpp similarity index 100% rename from fhq-server/src/web-server/http_handler_web_public_folder.cpp rename to src/web-server/http_handler_web_public_folder.cpp diff --git a/fhq-server/src/web-server/http_handler_web_public_folder.h b/src/web-server/http_handler_web_public_folder.h similarity index 100% rename from fhq-server/src/web-server/http_handler_web_public_folder.h rename to src/web-server/http_handler_web_public_folder.h diff --git a/fhq-server/src/web-server/http_handler_web_user_folder.cpp b/src/web-server/http_handler_web_user_folder.cpp similarity index 100% rename from fhq-server/src/web-server/http_handler_web_user_folder.cpp rename to src/web-server/http_handler_web_user_folder.cpp diff --git a/fhq-server/src/web-server/http_handler_web_user_folder.h b/src/web-server/http_handler_web_user_folder.h similarity index 100% rename from fhq-server/src/web-server/http_handler_web_user_folder.h rename to src/web-server/http_handler_web_user_folder.h diff --git a/fhq-server/templates/tmpl_create_new_storage_update.py b/templates/tmpl_create_new_storage_update.py similarity index 96% rename from fhq-server/templates/tmpl_create_new_storage_update.py rename to templates/tmpl_create_new_storage_update.py index 8a677ad6..80efaadf 100755 --- a/fhq-server/templates/tmpl_create_new_storage_update.py +++ b/templates/tmpl_create_new_storage_update.py @@ -3,6 +3,7 @@ import re import os +import sys import random import string @@ -60,7 +61,7 @@ def recoursive_search_endpoints(spoint, weight): recoursive_search_endpoints(v["to"], weight + 1) if not found: if weight > max_weight: - max_weight = weight; + max_weight = weight end_points.append({ "point": spoint, "weight": weight @@ -72,7 +73,7 @@ def recoursive_search_endpoints(spoint, weight): if len(end_points) == 0: print("Not found updates") - exit(-1) + sys.exit(-1) endpoint = "" @@ -85,8 +86,8 @@ def recoursive_search_endpoints(spoint, weight): print("Found point: " + endpoint + " weight: " + str(max_weight)) newpoint = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(10)) -newpoint_upper = newpoint.upper(); -endpoint_upper = endpoint.upper(); +newpoint_upper = newpoint.upper() +endpoint_upper = endpoint.upper() filename_h = "update_" + endpoint + "_" + newpoint + ".h" filename_cpp = "update_" + endpoint + "_" + newpoint + ".cpp" diff --git a/tests/server-api-tests/conftest.py b/tests/server-api-tests/conftest.py index 29c294bd..00c59b5b 100644 --- a/tests/server-api-tests/conftest.py +++ b/tests/server-api-tests/conftest.py @@ -165,7 +165,7 @@ def start_local_server(): current_wor_dir = os.getcwd() # print(current_wor_dir) # os.chdir(current_wor_dir + "/../../fhq-server") - cmd = [current_wor_dir + '/../../fhq-server/fhq-server', '-wd', '../../ci/travis/data', 'start'] + cmd = [current_wor_dir + '/../../fhq-server', '-wd', '../../ci/travis/data', 'start'] pytest.popen_fhq_server = subprocess.Popen(cmd) # os.chdir(current_wor_dir) @@ -228,7 +228,7 @@ def prepare_files_for_start_in_docker(): web_admin_folder = /usr/share/fhq-server/web-admin/ web_public_folder = /usr/share/fhq-server/fhq-web-public/ web_public_folder_url = http://localhost:7080/public/ -web_user_folder = /usr/share/fhq-server/user-web-site/ +web_user_folder = /usr/share/fhq-server/web-user/ web_fhqjad_store = /usr/share/fhq-server/fhqjad-store/ diff --git a/tests/server-api-tests/update_libfreehackquestclient.sh b/tests/server-api-tests/update_libfreehackquestclient.sh index 57f1f11f..b33dbe30 100755 --- a/tests/server-api-tests/update_libfreehackquestclient.sh +++ b/tests/server-api-tests/update_libfreehackquestclient.sh @@ -1,9 +1,28 @@ #!/bin/bash -cd ../../fhq-server +check_ret() { + if [ $1 -ne 0 ]; then + echo "" + echo "!!! FAIL: $3" + echo "********************************************************************************" + echo "" + exit $1 + else + echo "" + echo "*** SUCCESS: $2" + echo "********************************************************************************" + echo "" + fi +} + +cd ../.. +check_ret $? "Change to ../.." rm -rf ./libfreehackquest-client-py ./fhq-server export-libfreehackquest-client-py -cd ../tests/server-api-tests +check_ret $? "./fhq-server export-libfreehackquest-client-py" +cd ./tests/server-api-tests +check_ret $? "cd ./tests/server-api-tests" rm -rf libfreehackquestclient -cp -r ../../fhq-server/libfreehackquest-client-py/libfreehackquestclient libfreehackquestclient -rm -rf ../../fhq-server/libfreehackquest-client-py \ No newline at end of file +cp -r ../../libfreehackquest-client-py/libfreehackquestclient libfreehackquestclient +check_ret $? "Copy" +rm -rf ../../libfreehackquest-client-py \ No newline at end of file diff --git a/fhq-server/unit-tests.wsjcpp/.gitignore b/unit-tests.wsjcpp/.gitignore similarity index 100% rename from fhq-server/unit-tests.wsjcpp/.gitignore rename to unit-tests.wsjcpp/.gitignore diff --git a/fhq-server/unit-tests.wsjcpp/CMakeLists.txt b/unit-tests.wsjcpp/CMakeLists.txt similarity index 99% rename from fhq-server/unit-tests.wsjcpp/CMakeLists.txt rename to unit-tests.wsjcpp/CMakeLists.txt index f23b3e7b..df4d5901 100644 --- a/fhq-server/unit-tests.wsjcpp/CMakeLists.txt +++ b/unit-tests.wsjcpp/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) project(unit-tests C CXX) -add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.36") +add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.37") add_definitions(-DWSJCPP_APP_NAME="unit-tests-fhq-server") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -95,7 +95,7 @@ list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/wsjcpp_parse_conf/") list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.cpp") list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_parse_conf/wsjcpp_parse_conf.h") -# fhq-server:v0.2.36 +# fhq-server:v0.2.37 list (APPEND WSJCPP_INCLUDE_DIRS "../src") list (APPEND WSJCPP_SOURCES "../src/core/fallen.cpp") list (APPEND WSJCPP_SOURCES "../src/core/fallen.h") diff --git a/fhq-server/unit-tests.wsjcpp/CMakeLists.user-custom.txt b/unit-tests.wsjcpp/CMakeLists.user-custom.txt similarity index 100% rename from fhq-server/unit-tests.wsjcpp/CMakeLists.user-custom.txt rename to unit-tests.wsjcpp/CMakeLists.user-custom.txt diff --git a/fhq-server/unit-tests.wsjcpp/build_simple.sh b/unit-tests.wsjcpp/build_simple.sh similarity index 100% rename from fhq-server/unit-tests.wsjcpp/build_simple.sh rename to unit-tests.wsjcpp/build_simple.sh diff --git a/fhq-server/unit-tests.wsjcpp/src/unit_test_jobs_pool.cpp b/unit-tests.wsjcpp/src/unit_test_jobs_pool.cpp similarity index 100% rename from fhq-server/unit-tests.wsjcpp/src/unit_test_jobs_pool.cpp rename to unit-tests.wsjcpp/src/unit_test_jobs_pool.cpp diff --git a/fhq-server/unit-tests.wsjcpp/src/unit_test_storage_escapes.cpp b/unit-tests.wsjcpp/src/unit_test_storage_escapes.cpp similarity index 100% rename from fhq-server/unit-tests.wsjcpp/src/unit_test_storage_escapes.cpp rename to unit-tests.wsjcpp/src/unit_test_storage_escapes.cpp diff --git a/fhq-server/unit-tests.wsjcpp/src/unit_test_storage_struct.cpp b/unit-tests.wsjcpp/src/unit_test_storage_struct.cpp similarity index 100% rename from fhq-server/unit-tests.wsjcpp/src/unit_test_storage_struct.cpp rename to unit-tests.wsjcpp/src/unit_test_storage_struct.cpp diff --git a/fhq-server/unit-tests.wsjcpp/src/unit_test_validators.cpp b/unit-tests.wsjcpp/src/unit_test_validators.cpp similarity index 100% rename from fhq-server/unit-tests.wsjcpp/src/unit_test_validators.cpp rename to unit-tests.wsjcpp/src/unit_test_validators.cpp diff --git a/admin-web-site/assets/libs/css/bootstrap.min.css b/web-admin/assets/libs/css/bootstrap.min.css similarity index 100% rename from admin-web-site/assets/libs/css/bootstrap.min.css rename to web-admin/assets/libs/css/bootstrap.min.css diff --git a/admin-web-site/assets/libs/css/style.css b/web-admin/assets/libs/css/style.css similarity index 100% rename from admin-web-site/assets/libs/css/style.css rename to web-admin/assets/libs/css/style.css diff --git a/admin-web-site/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.css b/web-admin/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.css similarity index 100% rename from admin-web-site/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.css rename to web-admin/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.css diff --git a/admin-web-site/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.min.js b/web-admin/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.min.js similarity index 100% rename from admin-web-site/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.min.js rename to web-admin/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.min.js diff --git a/admin-web-site/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.png b/web-admin/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.png similarity index 100% rename from admin-web-site/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.png rename to web-admin/assets/vendor/bootstrap-colorpicker/@claviska/jquery-minicolors/jquery.minicolors.png diff --git a/admin-web-site/assets/vendor/bootstrap-colorpicker/jquery-asColor/dist/jquery-asColor.min.js b/web-admin/assets/vendor/bootstrap-colorpicker/jquery-asColor/dist/jquery-asColor.min.js similarity index 100% rename from admin-web-site/assets/vendor/bootstrap-colorpicker/jquery-asColor/dist/jquery-asColor.min.js rename to web-admin/assets/vendor/bootstrap-colorpicker/jquery-asColor/dist/jquery-asColor.min.js diff --git a/admin-web-site/assets/vendor/bootstrap-colorpicker/jquery-asColorPicker/dist/jquery-asColorPicker.min.js b/web-admin/assets/vendor/bootstrap-colorpicker/jquery-asColorPicker/dist/jquery-asColorPicker.min.js similarity index 100% rename from admin-web-site/assets/vendor/bootstrap-colorpicker/jquery-asColorPicker/dist/jquery-asColorPicker.min.js rename to web-admin/assets/vendor/bootstrap-colorpicker/jquery-asColorPicker/dist/jquery-asColorPicker.min.js diff --git a/admin-web-site/assets/vendor/bootstrap-colorpicker/jquery-asGradient/dist/jquery-asGradient.js b/web-admin/assets/vendor/bootstrap-colorpicker/jquery-asGradient/dist/jquery-asGradient.js similarity index 100% rename from admin-web-site/assets/vendor/bootstrap-colorpicker/jquery-asGradient/dist/jquery-asGradient.js rename to web-admin/assets/vendor/bootstrap-colorpicker/jquery-asGradient/dist/jquery-asGradient.js diff --git a/admin-web-site/assets/vendor/cropper/dist/cropper-int.js b/web-admin/assets/vendor/cropper/dist/cropper-int.js similarity index 100% rename from admin-web-site/assets/vendor/cropper/dist/cropper-int.js rename to web-admin/assets/vendor/cropper/dist/cropper-int.js diff --git a/admin-web-site/assets/vendor/cropper/dist/cropper.min.css b/web-admin/assets/vendor/cropper/dist/cropper.min.css similarity index 100% rename from admin-web-site/assets/vendor/cropper/dist/cropper.min.css rename to web-admin/assets/vendor/cropper/dist/cropper.min.css diff --git a/admin-web-site/assets/vendor/cropper/dist/cropper.min.js b/web-admin/assets/vendor/cropper/dist/cropper.min.js similarity index 100% rename from admin-web-site/assets/vendor/cropper/dist/cropper.min.js rename to web-admin/assets/vendor/cropper/dist/cropper.min.js diff --git a/admin-web-site/assets/vendor/custom-js/jquery.multi-select.html b/web-admin/assets/vendor/custom-js/jquery.multi-select.html similarity index 100% rename from admin-web-site/assets/vendor/custom-js/jquery.multi-select.html rename to web-admin/assets/vendor/custom-js/jquery.multi-select.html diff --git a/admin-web-site/assets/vendor/datatables/css/buttons.bootstrap4.css b/web-admin/assets/vendor/datatables/css/buttons.bootstrap4.css similarity index 100% rename from admin-web-site/assets/vendor/datatables/css/buttons.bootstrap4.css rename to web-admin/assets/vendor/datatables/css/buttons.bootstrap4.css diff --git a/admin-web-site/assets/vendor/datatables/css/dataTables.bootstrap4.css b/web-admin/assets/vendor/datatables/css/dataTables.bootstrap4.css similarity index 100% rename from admin-web-site/assets/vendor/datatables/css/dataTables.bootstrap4.css rename to web-admin/assets/vendor/datatables/css/dataTables.bootstrap4.css diff --git a/admin-web-site/assets/vendor/datatables/css/fixedHeader.bootstrap4.css b/web-admin/assets/vendor/datatables/css/fixedHeader.bootstrap4.css similarity index 100% rename from admin-web-site/assets/vendor/datatables/css/fixedHeader.bootstrap4.css rename to web-admin/assets/vendor/datatables/css/fixedHeader.bootstrap4.css diff --git a/admin-web-site/assets/vendor/datatables/css/select.bootstrap4.css b/web-admin/assets/vendor/datatables/css/select.bootstrap4.css similarity index 100% rename from admin-web-site/assets/vendor/datatables/css/select.bootstrap4.css rename to web-admin/assets/vendor/datatables/css/select.bootstrap4.css diff --git a/admin-web-site/assets/vendor/datatables/js/buttons.bootstrap4.min.js b/web-admin/assets/vendor/datatables/js/buttons.bootstrap4.min.js similarity index 100% rename from admin-web-site/assets/vendor/datatables/js/buttons.bootstrap4.min.js rename to web-admin/assets/vendor/datatables/js/buttons.bootstrap4.min.js diff --git a/admin-web-site/assets/vendor/datatables/js/data-table.js b/web-admin/assets/vendor/datatables/js/data-table.js similarity index 100% rename from admin-web-site/assets/vendor/datatables/js/data-table.js rename to web-admin/assets/vendor/datatables/js/data-table.js diff --git a/admin-web-site/assets/vendor/datatables/js/dataTables.bootstrap4.min.js b/web-admin/assets/vendor/datatables/js/dataTables.bootstrap4.min.js similarity index 100% rename from admin-web-site/assets/vendor/datatables/js/dataTables.bootstrap4.min.js rename to web-admin/assets/vendor/datatables/js/dataTables.bootstrap4.min.js diff --git a/admin-web-site/assets/vendor/datepicker/datepicker.js b/web-admin/assets/vendor/datepicker/datepicker.js similarity index 100% rename from admin-web-site/assets/vendor/datepicker/datepicker.js rename to web-admin/assets/vendor/datepicker/datepicker.js diff --git a/admin-web-site/assets/vendor/datepicker/moment.js b/web-admin/assets/vendor/datepicker/moment.js similarity index 100% rename from admin-web-site/assets/vendor/datepicker/moment.js rename to web-admin/assets/vendor/datepicker/moment.js diff --git a/admin-web-site/assets/vendor/datepicker/tempusdominus-bootstrap-4.css b/web-admin/assets/vendor/datepicker/tempusdominus-bootstrap-4.css similarity index 100% rename from admin-web-site/assets/vendor/datepicker/tempusdominus-bootstrap-4.css rename to web-admin/assets/vendor/datepicker/tempusdominus-bootstrap-4.css diff --git a/admin-web-site/assets/vendor/datepicker/tempusdominus-bootstrap-4.js b/web-admin/assets/vendor/datepicker/tempusdominus-bootstrap-4.js similarity index 100% rename from admin-web-site/assets/vendor/datepicker/tempusdominus-bootstrap-4.js rename to web-admin/assets/vendor/datepicker/tempusdominus-bootstrap-4.js diff --git a/admin-web-site/assets/vendor/daterangepicker/daterangepicker.css b/web-admin/assets/vendor/daterangepicker/daterangepicker.css similarity index 100% rename from admin-web-site/assets/vendor/daterangepicker/daterangepicker.css rename to web-admin/assets/vendor/daterangepicker/daterangepicker.css diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/css/fontawesome-all.css b/web-admin/assets/vendor/fonts/fontawesome/css/fontawesome-all.css similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/css/fontawesome-all.css rename to web-admin/assets/vendor/fonts/fontawesome/css/fontawesome-all.css diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.eot b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.eot similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.eot rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.eot diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.html b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.html similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.html rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.html diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.svg b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.svg similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.svg rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.svg diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.ttf b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.ttf similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.ttf rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.ttf diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.woff b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.woff similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.woff rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400.woff diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400d41d.eot b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400d41d.eot similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400d41d.eot rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-brands-400d41d.eot diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.eot b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.eot similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.eot rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.eot diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.html b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.html similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.html rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.html diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.svg b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.svg similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.svg rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.svg diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.ttf b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.ttf similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.ttf rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.ttf diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.woff b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.woff similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.woff rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400.woff diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400d41d.eot b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400d41d.eot similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400d41d.eot rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-regular-400d41d.eot diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.eot b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.eot similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.eot rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.eot diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.html b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.html similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.html rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.html diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.svg b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.svg similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.svg rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.svg diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.ttf b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.ttf similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.ttf rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.ttf diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.woff b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.woff similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.woff rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900.woff diff --git a/admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900d41d.eot b/web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900d41d.eot similarity index 100% rename from admin-web-site/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900d41d.eot rename to web-admin/assets/vendor/fonts/fontawesome/webfonts/fa-solid-900d41d.eot diff --git a/admin-web-site/assets/vendor/full-calendar/css/fullcalendar.css b/web-admin/assets/vendor/full-calendar/css/fullcalendar.css similarity index 100% rename from admin-web-site/assets/vendor/full-calendar/css/fullcalendar.css rename to web-admin/assets/vendor/full-calendar/css/fullcalendar.css diff --git a/admin-web-site/assets/vendor/full-calendar/css/fullcalendar.print.css b/web-admin/assets/vendor/full-calendar/css/fullcalendar.print.css similarity index 100% rename from admin-web-site/assets/vendor/full-calendar/css/fullcalendar.print.css rename to web-admin/assets/vendor/full-calendar/css/fullcalendar.print.css diff --git a/admin-web-site/assets/vendor/full-calendar/js/calendar.js b/web-admin/assets/vendor/full-calendar/js/calendar.js similarity index 100% rename from admin-web-site/assets/vendor/full-calendar/js/calendar.js rename to web-admin/assets/vendor/full-calendar/js/calendar.js diff --git a/admin-web-site/assets/vendor/full-calendar/js/fullcalendar.js b/web-admin/assets/vendor/full-calendar/js/fullcalendar.js similarity index 100% rename from admin-web-site/assets/vendor/full-calendar/js/fullcalendar.js rename to web-admin/assets/vendor/full-calendar/js/fullcalendar.js diff --git a/admin-web-site/assets/vendor/full-calendar/js/jquery-ui.min.js b/web-admin/assets/vendor/full-calendar/js/jquery-ui.min.js similarity index 100% rename from admin-web-site/assets/vendor/full-calendar/js/jquery-ui.min.js rename to web-admin/assets/vendor/full-calendar/js/jquery-ui.min.js diff --git a/admin-web-site/assets/vendor/full-calendar/js/moment.min.js b/web-admin/assets/vendor/full-calendar/js/moment.min.js similarity index 100% rename from admin-web-site/assets/vendor/full-calendar/js/moment.min.js rename to web-admin/assets/vendor/full-calendar/js/moment.min.js diff --git a/admin-web-site/assets/vendor/gauge/gauge.js b/web-admin/assets/vendor/gauge/gauge.js similarity index 100% rename from admin-web-site/assets/vendor/gauge/gauge.js rename to web-admin/assets/vendor/gauge/gauge.js diff --git a/admin-web-site/assets/vendor/gauge/gauge.min.js b/web-admin/assets/vendor/gauge/gauge.min.js similarity index 100% rename from admin-web-site/assets/vendor/gauge/gauge.min.js rename to web-admin/assets/vendor/gauge/gauge.min.js diff --git a/admin-web-site/assets/vendor/inputmask/css/inputmask.css b/web-admin/assets/vendor/inputmask/css/inputmask.css similarity index 100% rename from admin-web-site/assets/vendor/inputmask/css/inputmask.css rename to web-admin/assets/vendor/inputmask/css/inputmask.css diff --git a/admin-web-site/assets/vendor/inputmask/js/jquery.inputmask.bundle.js b/web-admin/assets/vendor/inputmask/js/jquery.inputmask.bundle.js similarity index 100% rename from admin-web-site/assets/vendor/inputmask/js/jquery.inputmask.bundle.js rename to web-admin/assets/vendor/inputmask/js/jquery.inputmask.bundle.js diff --git a/admin-web-site/assets/vendor/jquery/jquery-3.3.1.min.js b/web-admin/assets/vendor/jquery/jquery-3.3.1.min.js similarity index 100% rename from admin-web-site/assets/vendor/jquery/jquery-3.3.1.min.js rename to web-admin/assets/vendor/jquery/jquery-3.3.1.min.js diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.css b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.css similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.css rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.css diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.min.js b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.min.js similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.min.js rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-2.0.2.min.js diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-au-mill.js b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-au-mill.js similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-au-mill.js rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-au-mill.js diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-in-mill.js b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-in-mill.js similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-in-mill.js rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-in-mill.js diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-uk-mill-en.js b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-uk-mill-en.js similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-uk-mill-en.js rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-uk-mill-en.js diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-us-aea-en.js b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-us-aea-en.js similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-us-aea-en.js rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-us-aea-en.js diff --git a/admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-world-mill-en.js b/web-admin/assets/vendor/jvectormap/jquery-jvectormap-world-mill-en.js similarity index 100% rename from admin-web-site/assets/vendor/jvectormap/jquery-jvectormap-world-mill-en.js rename to web-admin/assets/vendor/jvectormap/jquery-jvectormap-world-mill-en.js diff --git a/admin-web-site/assets/vendor/multi-select/css/multi-select.css b/web-admin/assets/vendor/multi-select/css/multi-select.css similarity index 100% rename from admin-web-site/assets/vendor/multi-select/css/multi-select.css rename to web-admin/assets/vendor/multi-select/css/multi-select.css diff --git a/admin-web-site/assets/vendor/multi-select/js/jquery.multi-select.js b/web-admin/assets/vendor/multi-select/js/jquery.multi-select.js similarity index 100% rename from admin-web-site/assets/vendor/multi-select/js/jquery.multi-select.js rename to web-admin/assets/vendor/multi-select/js/jquery.multi-select.js diff --git a/admin-web-site/assets/vendor/parsley/parsley.js b/web-admin/assets/vendor/parsley/parsley.js similarity index 100% rename from admin-web-site/assets/vendor/parsley/parsley.js rename to web-admin/assets/vendor/parsley/parsley.js diff --git a/admin-web-site/assets/vendor/select2/css/select2.css b/web-admin/assets/vendor/select2/css/select2.css similarity index 100% rename from admin-web-site/assets/vendor/select2/css/select2.css rename to web-admin/assets/vendor/select2/css/select2.css diff --git a/admin-web-site/assets/vendor/select2/js/select2.min.js b/web-admin/assets/vendor/select2/js/select2.min.js similarity index 100% rename from admin-web-site/assets/vendor/select2/js/select2.min.js rename to web-admin/assets/vendor/select2/js/select2.min.js diff --git a/admin-web-site/assets/vendor/shortable-nestable/Sortable.min.js b/web-admin/assets/vendor/shortable-nestable/Sortable.min.js similarity index 100% rename from admin-web-site/assets/vendor/shortable-nestable/Sortable.min.js rename to web-admin/assets/vendor/shortable-nestable/Sortable.min.js diff --git a/admin-web-site/assets/vendor/shortable-nestable/jquery.nestable.js b/web-admin/assets/vendor/shortable-nestable/jquery.nestable.js similarity index 100% rename from admin-web-site/assets/vendor/shortable-nestable/jquery.nestable.js rename to web-admin/assets/vendor/shortable-nestable/jquery.nestable.js diff --git a/admin-web-site/assets/vendor/shortable-nestable/sort-nest.js b/web-admin/assets/vendor/shortable-nestable/sort-nest.js similarity index 97% rename from admin-web-site/assets/vendor/shortable-nestable/sort-nest.js rename to web-admin/assets/vendor/shortable-nestable/sort-nest.js index 811fab00..ea6b22fa 100644 --- a/admin-web-site/assets/vendor/shortable-nestable/sort-nest.js +++ b/web-admin/assets/vendor/shortable-nestable/sort-nest.js @@ -12,10 +12,4 @@ $(function() { // nestable // ============================================================== $('.dd').nestable('serialize'); - - - - - - }); \ No newline at end of file diff --git a/admin-web-site/assets/vendor/slimscroll/jquery.slimscroll.js b/web-admin/assets/vendor/slimscroll/jquery.slimscroll.js similarity index 100% rename from admin-web-site/assets/vendor/slimscroll/jquery.slimscroll.js rename to web-admin/assets/vendor/slimscroll/jquery.slimscroll.js diff --git a/admin-web-site/assets/vendor/summernote/css/summernote-bs4.css b/web-admin/assets/vendor/summernote/css/summernote-bs4.css similarity index 100% rename from admin-web-site/assets/vendor/summernote/css/summernote-bs4.css rename to web-admin/assets/vendor/summernote/css/summernote-bs4.css diff --git a/admin-web-site/assets/vendor/summernote/editor-fonts/summernote4c4d.eot b/web-admin/assets/vendor/summernote/editor-fonts/summernote4c4d.eot similarity index 100% rename from admin-web-site/assets/vendor/summernote/editor-fonts/summernote4c4d.eot rename to web-admin/assets/vendor/summernote/editor-fonts/summernote4c4d.eot diff --git a/admin-web-site/assets/vendor/summernote/editor-fonts/summernote4c4d.ttf b/web-admin/assets/vendor/summernote/editor-fonts/summernote4c4d.ttf similarity index 100% rename from admin-web-site/assets/vendor/summernote/editor-fonts/summernote4c4d.ttf rename to web-admin/assets/vendor/summernote/editor-fonts/summernote4c4d.ttf diff --git a/admin-web-site/assets/vendor/summernote/editor-fonts/summernote4c4d.woff b/web-admin/assets/vendor/summernote/editor-fonts/summernote4c4d.woff similarity index 100% rename from admin-web-site/assets/vendor/summernote/editor-fonts/summernote4c4d.woff rename to web-admin/assets/vendor/summernote/editor-fonts/summernote4c4d.woff diff --git a/admin-web-site/assets/vendor/summernote/editor-fonts/summernoted41d.eot b/web-admin/assets/vendor/summernote/editor-fonts/summernoted41d.eot similarity index 100% rename from admin-web-site/assets/vendor/summernote/editor-fonts/summernoted41d.eot rename to web-admin/assets/vendor/summernote/editor-fonts/summernoted41d.eot diff --git a/admin-web-site/assets/vendor/summernote/js/summernote-bs4.js b/web-admin/assets/vendor/summernote/js/summernote-bs4.js similarity index 100% rename from admin-web-site/assets/vendor/summernote/js/summernote-bs4.js rename to web-admin/assets/vendor/summernote/js/summernote-bs4.js diff --git a/admin-web-site/assets/vendor/timeline/img/cd-icon-location.svg b/web-admin/assets/vendor/timeline/img/cd-icon-location.svg similarity index 100% rename from admin-web-site/assets/vendor/timeline/img/cd-icon-location.svg rename to web-admin/assets/vendor/timeline/img/cd-icon-location.svg diff --git a/admin-web-site/assets/vendor/timeline/img/cd-icon-movie.svg b/web-admin/assets/vendor/timeline/img/cd-icon-movie.svg similarity index 100% rename from admin-web-site/assets/vendor/timeline/img/cd-icon-movie.svg rename to web-admin/assets/vendor/timeline/img/cd-icon-movie.svg diff --git a/admin-web-site/assets/vendor/timeline/img/cd-icon-picture.svg b/web-admin/assets/vendor/timeline/img/cd-icon-picture.svg similarity index 100% rename from admin-web-site/assets/vendor/timeline/img/cd-icon-picture.svg rename to web-admin/assets/vendor/timeline/img/cd-icon-picture.svg diff --git a/admin-web-site/assets/vendor/timeline/js/main.js b/web-admin/assets/vendor/timeline/js/main.js similarity index 100% rename from admin-web-site/assets/vendor/timeline/js/main.js rename to web-admin/assets/vendor/timeline/js/main.js diff --git a/admin-web-site/assets/vendor/vector-map/jqvmap.css b/web-admin/assets/vendor/vector-map/jqvmap.css similarity index 100% rename from admin-web-site/assets/vendor/vector-map/jqvmap.css rename to web-admin/assets/vendor/vector-map/jqvmap.css diff --git a/admin-web-site/css/bootstrap-grid.css.map b/web-admin/css/bootstrap-grid.css.map similarity index 100% rename from admin-web-site/css/bootstrap-grid.css.map rename to web-admin/css/bootstrap-grid.css.map diff --git a/admin-web-site/css/bootstrap-grid.min.css b/web-admin/css/bootstrap-grid.min.css similarity index 100% rename from admin-web-site/css/bootstrap-grid.min.css rename to web-admin/css/bootstrap-grid.min.css diff --git a/admin-web-site/css/bootstrap-reboot.min.css b/web-admin/css/bootstrap-reboot.min.css similarity index 100% rename from admin-web-site/css/bootstrap-reboot.min.css rename to web-admin/css/bootstrap-reboot.min.css diff --git a/admin-web-site/css/bootstrap-reboot.min.css.map b/web-admin/css/bootstrap-reboot.min.css.map similarity index 100% rename from admin-web-site/css/bootstrap-reboot.min.css.map rename to web-admin/css/bootstrap-reboot.min.css.map diff --git a/admin-web-site/css/bootstrap.cyborg.min.css b/web-admin/css/bootstrap.cyborg.min.css similarity index 100% rename from admin-web-site/css/bootstrap.cyborg.min.css rename to web-admin/css/bootstrap.cyborg.min.css diff --git a/admin-web-site/css/bootstrap.min.css b/web-admin/css/bootstrap.min.css similarity index 100% rename from admin-web-site/css/bootstrap.min.css rename to web-admin/css/bootstrap.min.css diff --git a/admin-web-site/css/bootstrap.min.css.map b/web-admin/css/bootstrap.min.css.map similarity index 100% rename from admin-web-site/css/bootstrap.min.css.map rename to web-admin/css/bootstrap.min.css.map diff --git a/admin-web-site/css/bootstrap.solar.min.css b/web-admin/css/bootstrap.solar.min.css similarity index 100% rename from admin-web-site/css/bootstrap.solar.min.css rename to web-admin/css/bootstrap.solar.min.css diff --git a/admin-web-site/css/font-awesome.min.css b/web-admin/css/font-awesome.min.css similarity index 100% rename from admin-web-site/css/font-awesome.min.css rename to web-admin/css/font-awesome.min.css diff --git a/admin-web-site/css/jquery.datetimepicker.css b/web-admin/css/jquery.datetimepicker.css similarity index 100% rename from admin-web-site/css/jquery.datetimepicker.css rename to web-admin/css/jquery.datetimepicker.css diff --git a/admin-web-site/css/simplemde.min.css b/web-admin/css/simplemde.min.css similarity index 100% rename from admin-web-site/css/simplemde.min.css rename to web-admin/css/simplemde.min.css diff --git a/admin-web-site/css/swa-pages.css b/web-admin/css/swa-pages.css similarity index 100% rename from admin-web-site/css/swa-pages.css rename to web-admin/css/swa-pages.css diff --git a/admin-web-site/favicon.ico b/web-admin/favicon.ico similarity index 100% rename from admin-web-site/favicon.ico rename to web-admin/favicon.ico diff --git a/admin-web-site/favicon.png b/web-admin/favicon.png similarity index 100% rename from admin-web-site/favicon.png rename to web-admin/favicon.png diff --git a/admin-web-site/fhq.ws.config.js b/web-admin/fhq.ws.config.js similarity index 100% rename from admin-web-site/fhq.ws.config.js rename to web-admin/fhq.ws.config.js diff --git a/admin-web-site/fonts/FontAwesome.otf b/web-admin/fonts/FontAwesome.otf similarity index 100% rename from admin-web-site/fonts/FontAwesome.otf rename to web-admin/fonts/FontAwesome.otf diff --git a/admin-web-site/fonts/fontawesome-webfont.eot b/web-admin/fonts/fontawesome-webfont.eot similarity index 100% rename from admin-web-site/fonts/fontawesome-webfont.eot rename to web-admin/fonts/fontawesome-webfont.eot diff --git a/admin-web-site/fonts/fontawesome-webfont.svg b/web-admin/fonts/fontawesome-webfont.svg similarity index 100% rename from admin-web-site/fonts/fontawesome-webfont.svg rename to web-admin/fonts/fontawesome-webfont.svg diff --git a/admin-web-site/fonts/fontawesome-webfont.ttf b/web-admin/fonts/fontawesome-webfont.ttf similarity index 100% rename from admin-web-site/fonts/fontawesome-webfont.ttf rename to web-admin/fonts/fontawesome-webfont.ttf diff --git a/admin-web-site/fonts/fontawesome-webfont.woff b/web-admin/fonts/fontawesome-webfont.woff similarity index 100% rename from admin-web-site/fonts/fontawesome-webfont.woff rename to web-admin/fonts/fontawesome-webfont.woff diff --git a/admin-web-site/fonts/fontawesome-webfont.woff2 b/web-admin/fonts/fontawesome-webfont.woff2 similarity index 100% rename from admin-web-site/fonts/fontawesome-webfont.woff2 rename to web-admin/fonts/fontawesome-webfont.woff2 diff --git a/admin-web-site/img/sett_edit.svg b/web-admin/img/sett_edit.svg similarity index 100% rename from admin-web-site/img/sett_edit.svg rename to web-admin/img/sett_edit.svg diff --git a/admin-web-site/img/switcher_off.svg b/web-admin/img/switcher_off.svg similarity index 100% rename from admin-web-site/img/switcher_off.svg rename to web-admin/img/switcher_off.svg diff --git a/admin-web-site/img/switcher_off_readonly.png b/web-admin/img/switcher_off_readonly.png similarity index 100% rename from admin-web-site/img/switcher_off_readonly.png rename to web-admin/img/switcher_off_readonly.png diff --git a/admin-web-site/img/switcher_off_readonly.svg b/web-admin/img/switcher_off_readonly.svg similarity index 100% rename from admin-web-site/img/switcher_off_readonly.svg rename to web-admin/img/switcher_off_readonly.svg diff --git a/admin-web-site/img/switcher_on.svg b/web-admin/img/switcher_on.svg similarity index 100% rename from admin-web-site/img/switcher_on.svg rename to web-admin/img/switcher_on.svg diff --git a/admin-web-site/img/switcher_on_readonly.svg b/web-admin/img/switcher_on_readonly.svg similarity index 100% rename from admin-web-site/img/switcher_on_readonly.svg rename to web-admin/img/switcher_on_readonly.svg diff --git a/admin-web-site/index.css b/web-admin/index.css similarity index 100% rename from admin-web-site/index.css rename to web-admin/index.css diff --git a/admin-web-site/index.html b/web-admin/index.html similarity index 100% rename from admin-web-site/index.html rename to web-admin/index.html diff --git a/admin-web-site/js/fhq.admin.games.js b/web-admin/js/fhq.admin.games.js similarity index 99% rename from admin-web-site/js/fhq.admin.games.js rename to web-admin/js/fhq.admin.games.js index eb666df1..0b09fff7 100644 --- a/admin-web-site/js/fhq.admin.games.js +++ b/web-admin/js/fhq.admin.games.js @@ -25,7 +25,7 @@ fhq.createGame = function() { $('#game_create_error').show(); $('#game_create_error').html(err.error); - }) + }); }; fhq.pages['game_create'] = function() { @@ -148,7 +148,7 @@ fhq.pages['game_create'] = function() { $('.game-create-cancel').unbind().bind('click', function(){ fhq.pages['games'](); - }) + }); } fhq.updateGame = function() { diff --git a/admin-web-site/js/fhq.admin.js b/web-admin/js/fhq.admin.js similarity index 100% rename from admin-web-site/js/fhq.admin.js rename to web-admin/js/fhq.admin.js diff --git a/admin-web-site/js/fhq.admin.knowledge_base.js b/web-admin/js/fhq.admin.knowledge_base.js similarity index 100% rename from admin-web-site/js/fhq.admin.knowledge_base.js rename to web-admin/js/fhq.admin.knowledge_base.js diff --git a/admin-web-site/js/fhq.admin.localization.js b/web-admin/js/fhq.admin.localization.js similarity index 100% rename from admin-web-site/js/fhq.admin.localization.js rename to web-admin/js/fhq.admin.localization.js diff --git a/admin-web-site/js/fhq.admin.mails.js b/web-admin/js/fhq.admin.mails.js similarity index 100% rename from admin-web-site/js/fhq.admin.mails.js rename to web-admin/js/fhq.admin.mails.js diff --git a/admin-web-site/js/fhq.admin.orchestra.js b/web-admin/js/fhq.admin.orchestra.js similarity index 100% rename from admin-web-site/js/fhq.admin.orchestra.js rename to web-admin/js/fhq.admin.orchestra.js diff --git a/admin-web-site/js/fhq.admin.quests.js b/web-admin/js/fhq.admin.quests.js similarity index 100% rename from admin-web-site/js/fhq.admin.quests.js rename to web-admin/js/fhq.admin.quests.js diff --git a/admin-web-site/js/fhq.admin.quests_proposal.js b/web-admin/js/fhq.admin.quests_proposal.js similarity index 100% rename from admin-web-site/js/fhq.admin.quests_proposal.js rename to web-admin/js/fhq.admin.quests_proposal.js diff --git a/admin-web-site/js/fhq.admin.server.js b/web-admin/js/fhq.admin.server.js similarity index 100% rename from admin-web-site/js/fhq.admin.server.js rename to web-admin/js/fhq.admin.server.js diff --git a/admin-web-site/js/fhq.admin.settings.js b/web-admin/js/fhq.admin.settings.js similarity index 100% rename from admin-web-site/js/fhq.admin.settings.js rename to web-admin/js/fhq.admin.settings.js diff --git a/admin-web-site/js/fhq.admin.useful_links.js b/web-admin/js/fhq.admin.useful_links.js similarity index 100% rename from admin-web-site/js/fhq.admin.useful_links.js rename to web-admin/js/fhq.admin.useful_links.js diff --git a/admin-web-site/js/fhq.admin.users.js b/web-admin/js/fhq.admin.users.js similarity index 100% rename from admin-web-site/js/fhq.admin.users.js rename to web-admin/js/fhq.admin.users.js diff --git a/admin-web-site/js/fhq.admin.users_answers.js b/web-admin/js/fhq.admin.users_answers.js similarity index 100% rename from admin-web-site/js/fhq.admin.users_answers.js rename to web-admin/js/fhq.admin.users_answers.js diff --git a/admin-web-site/js/fhq.admin.version.js b/web-admin/js/fhq.admin.version.js similarity index 100% rename from admin-web-site/js/fhq.admin.version.js rename to web-admin/js/fhq.admin.version.js diff --git a/admin-web-site/js/fhq.ws.admin.js b/web-admin/js/fhq.ws.admin.js similarity index 100% rename from admin-web-site/js/fhq.ws.admin.js rename to web-admin/js/fhq.ws.admin.js diff --git a/admin-web-site/js/libs/Chart-1.0.2.js b/web-admin/js/libs/Chart-1.0.2.js similarity index 100% rename from admin-web-site/js/libs/Chart-1.0.2.js rename to web-admin/js/libs/Chart-1.0.2.js diff --git a/admin-web-site/js/libs/bootstrap.min.js b/web-admin/js/libs/bootstrap.min.js similarity index 100% rename from admin-web-site/js/libs/bootstrap.min.js rename to web-admin/js/libs/bootstrap.min.js diff --git a/admin-web-site/js/libs/jquery-3.1.0.min.js b/web-admin/js/libs/jquery-3.1.0.min.js similarity index 100% rename from admin-web-site/js/libs/jquery-3.1.0.min.js rename to web-admin/js/libs/jquery-3.1.0.min.js diff --git a/admin-web-site/js/libs/jquery.bootstrap-growl.min.js b/web-admin/js/libs/jquery.bootstrap-growl.min.js similarity index 100% rename from admin-web-site/js/libs/jquery.bootstrap-growl.min.js rename to web-admin/js/libs/jquery.bootstrap-growl.min.js diff --git a/admin-web-site/js/libs/libfhqcli-web-js.js b/web-admin/js/libs/libfhqcli-web-js.js similarity index 100% rename from admin-web-site/js/libs/libfhqcli-web-js.js rename to web-admin/js/libs/libfhqcli-web-js.js diff --git a/admin-web-site/js/libs/popper.min.js b/web-admin/js/libs/popper.min.js similarity index 100% rename from admin-web-site/js/libs/popper.min.js rename to web-admin/js/libs/popper.min.js diff --git a/admin-web-site/js/libs/popper.min.js.map b/web-admin/js/libs/popper.min.js.map similarity index 100% rename from admin-web-site/js/libs/popper.min.js.map rename to web-admin/js/libs/popper.min.js.map diff --git a/admin-web-site/js/libs/showdown.min.js b/web-admin/js/libs/showdown.min.js similarity index 100% rename from admin-web-site/js/libs/showdown.min.js rename to web-admin/js/libs/showdown.min.js diff --git a/admin-web-site/js/libs/showdown.min.js.map b/web-admin/js/libs/showdown.min.js.map similarity index 100% rename from admin-web-site/js/libs/showdown.min.js.map rename to web-admin/js/libs/showdown.min.js.map diff --git a/admin-web-site/js/libs/simplemde.min.js b/web-admin/js/libs/simplemde.min.js similarity index 100% rename from admin-web-site/js/libs/simplemde.min.js rename to web-admin/js/libs/simplemde.min.js diff --git a/admin-web-site/js/libs/swa-pages.js b/web-admin/js/libs/swa-pages.js similarity index 100% rename from admin-web-site/js/libs/swa-pages.js rename to web-admin/js/libs/swa-pages.js diff --git a/user-web-site/.editorconfig b/web-user/.editorconfig similarity index 100% rename from user-web-site/.editorconfig rename to web-user/.editorconfig diff --git a/user-web-site/.gitignore b/web-user/.gitignore similarity index 100% rename from user-web-site/.gitignore rename to web-user/.gitignore diff --git a/user-web-site/LICENSE b/web-user/LICENSE similarity index 100% rename from user-web-site/LICENSE rename to web-user/LICENSE diff --git a/user-web-site/README.md b/web-user/README.md similarity index 98% rename from user-web-site/README.md rename to web-user/README.md index 6811c072..3542c27f 100644 --- a/user-web-site/README.md +++ b/web-user/README.md @@ -1,4 +1,4 @@ -# user-web-site +# web-user This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.0.1. diff --git a/user-web-site/angular.json b/web-user/angular.json similarity index 100% rename from user-web-site/angular.json rename to web-user/angular.json diff --git a/user-web-site/build_prod.sh b/web-user/build_prod.sh similarity index 100% rename from user-web-site/build_prod.sh rename to web-user/build_prod.sh diff --git a/user-web-site/e2e/protractor.conf.js b/web-user/e2e/protractor.conf.js similarity index 100% rename from user-web-site/e2e/protractor.conf.js rename to web-user/e2e/protractor.conf.js diff --git a/user-web-site/e2e/src/app.e2e-spec.ts b/web-user/e2e/src/app.e2e-spec.ts similarity index 100% rename from user-web-site/e2e/src/app.e2e-spec.ts rename to web-user/e2e/src/app.e2e-spec.ts diff --git a/user-web-site/e2e/src/app.po.ts b/web-user/e2e/src/app.po.ts similarity index 100% rename from user-web-site/e2e/src/app.po.ts rename to web-user/e2e/src/app.po.ts diff --git a/user-web-site/e2e/tsconfig.e2e.json b/web-user/e2e/tsconfig.e2e.json similarity index 100% rename from user-web-site/e2e/tsconfig.e2e.json rename to web-user/e2e/tsconfig.e2e.json diff --git a/user-web-site/package-lock.json b/web-user/package-lock.json similarity index 99% rename from user-web-site/package-lock.json rename to web-user/package-lock.json index dd7a92a0..d8eabd78 100644 --- a/user-web-site/package-lock.json +++ b/web-user/package-lock.json @@ -1,6 +1,6 @@ { - "name": "user-web-site", - "version": "0.2.36", + "name": "web-user", + "version": "0.2.37", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6907,7 +6907,8 @@ }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "inquirer": { diff --git a/user-web-site/package.json b/web-user/package.json similarity index 97% rename from user-web-site/package.json rename to web-user/package.json index 99c0ebec..35488791 100644 --- a/user-web-site/package.json +++ b/web-user/package.json @@ -1,6 +1,6 @@ { - "name": "user-web-site", - "version": "0.2.36", + "name": "web-user", + "version": "0.2.37", "repository": { "type": "git", "url": "git://github.com/freehackquest/fhq-server.git" diff --git a/user-web-site/src/.browserslistrc b/web-user/src/.browserslistrc similarity index 100% rename from user-web-site/src/.browserslistrc rename to web-user/src/.browserslistrc diff --git a/user-web-site/src/app/app-routing.module.ts b/web-user/src/app/app-routing.module.ts similarity index 100% rename from user-web-site/src/app/app-routing.module.ts rename to web-user/src/app/app-routing.module.ts diff --git a/user-web-site/src/app/app.component.css b/web-user/src/app/app.component.css similarity index 100% rename from user-web-site/src/app/app.component.css rename to web-user/src/app/app.component.css diff --git a/user-web-site/src/app/app.component.html b/web-user/src/app/app.component.html similarity index 100% rename from user-web-site/src/app/app.component.html rename to web-user/src/app/app.component.html diff --git a/user-web-site/src/app/app.component.spec.ts b/web-user/src/app/app.component.spec.ts similarity index 100% rename from user-web-site/src/app/app.component.spec.ts rename to web-user/src/app/app.component.spec.ts diff --git a/user-web-site/src/app/app.component.ts b/web-user/src/app/app.component.ts similarity index 99% rename from user-web-site/src/app/app.component.ts rename to web-user/src/app/app.component.ts index 8b80545a..c30dfb2d 100644 --- a/user-web-site/src/app/app.component.ts +++ b/web-user/src/app/app.component.ts @@ -29,8 +29,8 @@ export class AppComponent implements OnInit, OnDestroy { libVersion: string = ''; brokenConnection: boolean = false; profileMenuExpanded: boolean = false; - urlPath: String = ""; - userRole: String = ""; + urlPath: string = ""; + userRole: string = ""; schema = this.l10nConfig.schema; mobileQuery: MediaQueryList; localeCountyFlag = { diff --git a/user-web-site/src/app/app.module.ts b/web-user/src/app/app.module.ts similarity index 99% rename from user-web-site/src/app/app.module.ts rename to web-user/src/app/app.module.ts index 919a7f15..371afa3a 100644 --- a/user-web-site/src/app/app.module.ts +++ b/web-user/src/app/app.module.ts @@ -26,7 +26,7 @@ import { HttpClientModule } from '@angular/common/http'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { NgbModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { APP_BASE_HREF } from '@angular/common'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; diff --git a/user-web-site/src/app/block-contact-us/block-contact-us.component.css b/web-user/src/app/block-contact-us/block-contact-us.component.css similarity index 100% rename from user-web-site/src/app/block-contact-us/block-contact-us.component.css rename to web-user/src/app/block-contact-us/block-contact-us.component.css diff --git a/user-web-site/src/app/block-contact-us/block-contact-us.component.html b/web-user/src/app/block-contact-us/block-contact-us.component.html similarity index 100% rename from user-web-site/src/app/block-contact-us/block-contact-us.component.html rename to web-user/src/app/block-contact-us/block-contact-us.component.html diff --git a/user-web-site/src/app/block-contact-us/block-contact-us.component.spec.ts b/web-user/src/app/block-contact-us/block-contact-us.component.spec.ts similarity index 100% rename from user-web-site/src/app/block-contact-us/block-contact-us.component.spec.ts rename to web-user/src/app/block-contact-us/block-contact-us.component.spec.ts diff --git a/user-web-site/src/app/block-contact-us/block-contact-us.component.ts b/web-user/src/app/block-contact-us/block-contact-us.component.ts similarity index 100% rename from user-web-site/src/app/block-contact-us/block-contact-us.component.ts rename to web-user/src/app/block-contact-us/block-contact-us.component.ts diff --git a/user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.css b/web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.css similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.css rename to web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.css diff --git a/user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.html b/web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.html similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.html rename to web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.html diff --git a/user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.spec.ts b/web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.spec.ts similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.spec.ts rename to web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.spec.ts diff --git a/user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.ts b/web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.ts similarity index 88% rename from user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.ts rename to web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.ts index 9801f411..ab9f7728 100644 --- a/user-web-site/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.ts +++ b/web-user/src/app/dialogs/modal-dialog-quest-feedback/modal-dialog-quest-feedback.component.ts @@ -1,7 +1,5 @@ -import { Component, OnInit, Input, ChangeDetectorRef, NgZone, ViewChild, ElementRef } from '@angular/core'; +import { Component, OnInit, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ActivatedRoute } from '@angular/router'; -import { Router } from '@angular/router'; import { SpinnerService } from '../../services/spinner.service'; import { EmailValidatorService } from '../../services/email-validator.service'; import { FhqService } from '../../services/fhq.service'; @@ -15,9 +13,9 @@ import { FhqService } from '../../services/fhq.service'; export class ModalDialogQuestFeedbackComponent implements OnInit { errorMessage: string = null; successSended: boolean = false; - public questName: string = ""; - public questId: string = ""; - public questUrl: string = ""; + questName: string = ""; + questId: string = ""; + questUrl: string = ""; @ViewChild('feedbackEmail', { static: true }) feedbackEmail : ElementRef; @ViewChild('feedbackText', { static: true }) feedbackText : ElementRef; diff --git a/user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.css b/web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.css similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.css rename to web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.css diff --git a/user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.html b/web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.html similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.html rename to web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.html diff --git a/user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.spec.ts b/web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.spec.ts similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.spec.ts rename to web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.spec.ts diff --git a/user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.ts b/web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.ts similarity index 100% rename from user-web-site/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.ts rename to web-user/src/app/dialogs/modal-dialog-sign-in/modal-dialog-sign-in.component.ts diff --git a/user-web-site/src/app/l10n-config.ts b/web-user/src/app/l10n-config.ts similarity index 100% rename from user-web-site/src/app/l10n-config.ts rename to web-user/src/app/l10n-config.ts diff --git a/user-web-site/src/app/pager.service.spec.ts b/web-user/src/app/pager.service.spec.ts similarity index 100% rename from user-web-site/src/app/pager.service.spec.ts rename to web-user/src/app/pager.service.spec.ts diff --git a/user-web-site/src/app/pager.service.ts b/web-user/src/app/pager.service.ts similarity index 100% rename from user-web-site/src/app/pager.service.ts rename to web-user/src/app/pager.service.ts diff --git a/user-web-site/src/app/pages/about/about.component.css b/web-user/src/app/pages/about/about.component.css similarity index 100% rename from user-web-site/src/app/pages/about/about.component.css rename to web-user/src/app/pages/about/about.component.css diff --git a/user-web-site/src/app/pages/about/about.component.html b/web-user/src/app/pages/about/about.component.html similarity index 100% rename from user-web-site/src/app/pages/about/about.component.html rename to web-user/src/app/pages/about/about.component.html diff --git a/user-web-site/src/app/pages/about/about.component.spec.ts b/web-user/src/app/pages/about/about.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/about/about.component.spec.ts rename to web-user/src/app/pages/about/about.component.spec.ts diff --git a/user-web-site/src/app/pages/about/about.component.ts b/web-user/src/app/pages/about/about.component.ts similarity index 100% rename from user-web-site/src/app/pages/about/about.component.ts rename to web-user/src/app/pages/about/about.component.ts diff --git a/user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.css b/web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.css similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.css rename to web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.css diff --git a/user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.html b/web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.html similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.html rename to web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.html diff --git a/user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.spec.ts b/web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.spec.ts rename to web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.spec.ts diff --git a/user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.ts b/web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.ts similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.ts rename to web-user/src/app/pages/automation-ussr-presentation/automation-ussr-presentation.component.ts diff --git a/user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.css b/web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.css similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.css rename to web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.css diff --git a/user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.html b/web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.html similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.html rename to web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.html diff --git a/user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.spec.ts b/web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.spec.ts rename to web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.spec.ts diff --git a/user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.ts b/web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.ts similarity index 100% rename from user-web-site/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.ts rename to web-user/src/app/pages/automation-ussr-rating/automation-ussr-rating.component.ts diff --git a/user-web-site/src/app/pages/automation-ussr/automation-ussr.component.css b/web-user/src/app/pages/automation-ussr/automation-ussr.component.css similarity index 100% rename from user-web-site/src/app/pages/automation-ussr/automation-ussr.component.css rename to web-user/src/app/pages/automation-ussr/automation-ussr.component.css diff --git a/user-web-site/src/app/pages/automation-ussr/automation-ussr.component.html b/web-user/src/app/pages/automation-ussr/automation-ussr.component.html similarity index 100% rename from user-web-site/src/app/pages/automation-ussr/automation-ussr.component.html rename to web-user/src/app/pages/automation-ussr/automation-ussr.component.html diff --git a/user-web-site/src/app/pages/automation-ussr/automation-ussr.component.spec.ts b/web-user/src/app/pages/automation-ussr/automation-ussr.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/automation-ussr/automation-ussr.component.spec.ts rename to web-user/src/app/pages/automation-ussr/automation-ussr.component.spec.ts diff --git a/user-web-site/src/app/pages/automation-ussr/automation-ussr.component.ts b/web-user/src/app/pages/automation-ussr/automation-ussr.component.ts similarity index 100% rename from user-web-site/src/app/pages/automation-ussr/automation-ussr.component.ts rename to web-user/src/app/pages/automation-ussr/automation-ussr.component.ts diff --git a/user-web-site/src/app/pages/chat/chat.component.css b/web-user/src/app/pages/chat/chat.component.css similarity index 100% rename from user-web-site/src/app/pages/chat/chat.component.css rename to web-user/src/app/pages/chat/chat.component.css diff --git a/user-web-site/src/app/pages/chat/chat.component.html b/web-user/src/app/pages/chat/chat.component.html similarity index 100% rename from user-web-site/src/app/pages/chat/chat.component.html rename to web-user/src/app/pages/chat/chat.component.html diff --git a/user-web-site/src/app/pages/chat/chat.component.spec.ts b/web-user/src/app/pages/chat/chat.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/chat/chat.component.spec.ts rename to web-user/src/app/pages/chat/chat.component.spec.ts diff --git a/user-web-site/src/app/pages/chat/chat.component.ts b/web-user/src/app/pages/chat/chat.component.ts similarity index 100% rename from user-web-site/src/app/pages/chat/chat.component.ts rename to web-user/src/app/pages/chat/chat.component.ts diff --git a/user-web-site/src/app/pages/confidencial/confidencial.component.css b/web-user/src/app/pages/confidencial/confidencial.component.css similarity index 100% rename from user-web-site/src/app/pages/confidencial/confidencial.component.css rename to web-user/src/app/pages/confidencial/confidencial.component.css diff --git a/user-web-site/src/app/pages/confidencial/confidencial.component.html b/web-user/src/app/pages/confidencial/confidencial.component.html similarity index 100% rename from user-web-site/src/app/pages/confidencial/confidencial.component.html rename to web-user/src/app/pages/confidencial/confidencial.component.html diff --git a/user-web-site/src/app/pages/confidencial/confidencial.component.spec.ts b/web-user/src/app/pages/confidencial/confidencial.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/confidencial/confidencial.component.spec.ts rename to web-user/src/app/pages/confidencial/confidencial.component.spec.ts diff --git a/user-web-site/src/app/pages/confidencial/confidencial.component.ts b/web-user/src/app/pages/confidencial/confidencial.component.ts similarity index 100% rename from user-web-site/src/app/pages/confidencial/confidencial.component.ts rename to web-user/src/app/pages/confidencial/confidencial.component.ts diff --git a/user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.css b/web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.css similarity index 100% rename from user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.css rename to web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.css diff --git a/user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.html b/web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.html similarity index 100% rename from user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.html rename to web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.html diff --git a/user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.spec.ts b/web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.spec.ts rename to web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.spec.ts diff --git a/user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.ts b/web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.ts similarity index 100% rename from user-web-site/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.ts rename to web-user/src/app/pages/ctf-attack-defence/ctf-attack-defence.component.ts diff --git a/user-web-site/src/app/pages/ctf-wall/ctf-wall.component.css b/web-user/src/app/pages/ctf-wall/ctf-wall.component.css similarity index 100% rename from user-web-site/src/app/pages/ctf-wall/ctf-wall.component.css rename to web-user/src/app/pages/ctf-wall/ctf-wall.component.css diff --git a/user-web-site/src/app/pages/ctf-wall/ctf-wall.component.html b/web-user/src/app/pages/ctf-wall/ctf-wall.component.html similarity index 100% rename from user-web-site/src/app/pages/ctf-wall/ctf-wall.component.html rename to web-user/src/app/pages/ctf-wall/ctf-wall.component.html diff --git a/user-web-site/src/app/pages/ctf-wall/ctf-wall.component.spec.ts b/web-user/src/app/pages/ctf-wall/ctf-wall.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/ctf-wall/ctf-wall.component.spec.ts rename to web-user/src/app/pages/ctf-wall/ctf-wall.component.spec.ts diff --git a/user-web-site/src/app/pages/ctf-wall/ctf-wall.component.ts b/web-user/src/app/pages/ctf-wall/ctf-wall.component.ts similarity index 100% rename from user-web-site/src/app/pages/ctf-wall/ctf-wall.component.ts rename to web-user/src/app/pages/ctf-wall/ctf-wall.component.ts diff --git a/user-web-site/src/app/pages/donate/donate.component.css b/web-user/src/app/pages/donate/donate.component.css similarity index 100% rename from user-web-site/src/app/pages/donate/donate.component.css rename to web-user/src/app/pages/donate/donate.component.css diff --git a/user-web-site/src/app/pages/donate/donate.component.html b/web-user/src/app/pages/donate/donate.component.html similarity index 100% rename from user-web-site/src/app/pages/donate/donate.component.html rename to web-user/src/app/pages/donate/donate.component.html diff --git a/user-web-site/src/app/pages/donate/donate.component.spec.ts b/web-user/src/app/pages/donate/donate.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/donate/donate.component.spec.ts rename to web-user/src/app/pages/donate/donate.component.spec.ts diff --git a/user-web-site/src/app/pages/donate/donate.component.ts b/web-user/src/app/pages/donate/donate.component.ts similarity index 100% rename from user-web-site/src/app/pages/donate/donate.component.ts rename to web-user/src/app/pages/donate/donate.component.ts diff --git a/user-web-site/src/app/pages/feedback/feedback.component.css b/web-user/src/app/pages/feedback/feedback.component.css similarity index 100% rename from user-web-site/src/app/pages/feedback/feedback.component.css rename to web-user/src/app/pages/feedback/feedback.component.css diff --git a/user-web-site/src/app/pages/feedback/feedback.component.html b/web-user/src/app/pages/feedback/feedback.component.html similarity index 100% rename from user-web-site/src/app/pages/feedback/feedback.component.html rename to web-user/src/app/pages/feedback/feedback.component.html diff --git a/user-web-site/src/app/pages/feedback/feedback.component.spec.ts b/web-user/src/app/pages/feedback/feedback.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/feedback/feedback.component.spec.ts rename to web-user/src/app/pages/feedback/feedback.component.spec.ts diff --git a/user-web-site/src/app/pages/feedback/feedback.component.ts b/web-user/src/app/pages/feedback/feedback.component.ts similarity index 100% rename from user-web-site/src/app/pages/feedback/feedback.component.ts rename to web-user/src/app/pages/feedback/feedback.component.ts diff --git a/user-web-site/src/app/pages/games/games.component.css b/web-user/src/app/pages/games/games.component.css similarity index 100% rename from user-web-site/src/app/pages/games/games.component.css rename to web-user/src/app/pages/games/games.component.css diff --git a/user-web-site/src/app/pages/games/games.component.html b/web-user/src/app/pages/games/games.component.html similarity index 100% rename from user-web-site/src/app/pages/games/games.component.html rename to web-user/src/app/pages/games/games.component.html diff --git a/user-web-site/src/app/pages/games/games.component.spec.ts b/web-user/src/app/pages/games/games.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/games/games.component.spec.ts rename to web-user/src/app/pages/games/games.component.spec.ts diff --git a/user-web-site/src/app/pages/games/games.component.ts b/web-user/src/app/pages/games/games.component.ts similarity index 97% rename from user-web-site/src/app/pages/games/games.component.ts rename to web-user/src/app/pages/games/games.component.ts index 70d1968f..cf6a7d39 100644 --- a/user-web-site/src/app/pages/games/games.component.ts +++ b/web-user/src/app/pages/games/games.component.ts @@ -19,8 +19,8 @@ export class GamesComponent implements OnInit { onPage = 7; errorMessage: string = null; dataList: Array = []; - searchValue: String = ''; - summaryScore: Number = 0; + searchValue: string = ''; + summaryScore = 0; constructor( private _spinnerService: SpinnerService, diff --git a/user-web-site/src/app/pages/knowledge-base/knowledge-base.component.css b/web-user/src/app/pages/knowledge-base/knowledge-base.component.css similarity index 100% rename from user-web-site/src/app/pages/knowledge-base/knowledge-base.component.css rename to web-user/src/app/pages/knowledge-base/knowledge-base.component.css diff --git a/user-web-site/src/app/pages/knowledge-base/knowledge-base.component.html b/web-user/src/app/pages/knowledge-base/knowledge-base.component.html similarity index 100% rename from user-web-site/src/app/pages/knowledge-base/knowledge-base.component.html rename to web-user/src/app/pages/knowledge-base/knowledge-base.component.html diff --git a/user-web-site/src/app/pages/knowledge-base/knowledge-base.component.spec.ts b/web-user/src/app/pages/knowledge-base/knowledge-base.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/knowledge-base/knowledge-base.component.spec.ts rename to web-user/src/app/pages/knowledge-base/knowledge-base.component.spec.ts diff --git a/user-web-site/src/app/pages/knowledge-base/knowledge-base.component.ts b/web-user/src/app/pages/knowledge-base/knowledge-base.component.ts similarity index 92% rename from user-web-site/src/app/pages/knowledge-base/knowledge-base.component.ts rename to web-user/src/app/pages/knowledge-base/knowledge-base.component.ts index c8b97676..a7976583 100644 --- a/user-web-site/src/app/pages/knowledge-base/knowledge-base.component.ts +++ b/web-user/src/app/pages/knowledge-base/knowledge-base.component.ts @@ -18,16 +18,16 @@ import { L10nTranslationService } from 'angular-l10n'; export class KnowledgeBaseComponent implements OnInit { - public errorMessage: String = null; - public classbookId: Number = -1; - public articleName: String = ''; - public articleContentNaked: String = ''; - public articleContentNakedOriginal: String = ''; - public articleParents: Array = []; - public articleChilds: Array = []; - public editMode: boolean = false; - public editLang: String = null; - public infoMessage: String = null; + errorMessage: string = null; + classbookId: Number = -1; + articleName: string = ''; + articleContentNaked: string = ''; + articleContentNakedOriginal: string = ''; + articleParents: Array = []; + articleChilds: Array = []; + editMode: boolean = false; + editLang: string = null; + infoMessage: string = null; constructor( public _translation: L10nTranslationService, diff --git a/user-web-site/src/app/pages/map-activity/map-activity.component.css b/web-user/src/app/pages/map-activity/map-activity.component.css similarity index 100% rename from user-web-site/src/app/pages/map-activity/map-activity.component.css rename to web-user/src/app/pages/map-activity/map-activity.component.css diff --git a/user-web-site/src/app/pages/map-activity/map-activity.component.html b/web-user/src/app/pages/map-activity/map-activity.component.html similarity index 100% rename from user-web-site/src/app/pages/map-activity/map-activity.component.html rename to web-user/src/app/pages/map-activity/map-activity.component.html diff --git a/user-web-site/src/app/pages/map-activity/map-activity.component.spec.ts b/web-user/src/app/pages/map-activity/map-activity.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/map-activity/map-activity.component.spec.ts rename to web-user/src/app/pages/map-activity/map-activity.component.spec.ts diff --git a/user-web-site/src/app/pages/map-activity/map-activity.component.ts b/web-user/src/app/pages/map-activity/map-activity.component.ts similarity index 92% rename from user-web-site/src/app/pages/map-activity/map-activity.component.ts rename to web-user/src/app/pages/map-activity/map-activity.component.ts index 7652d031..dd6b57ca 100644 --- a/user-web-site/src/app/pages/map-activity/map-activity.component.ts +++ b/web-user/src/app/pages/map-activity/map-activity.component.ts @@ -16,11 +16,11 @@ import { Circle as CircleStyle, Fill, Stroke, Style, Text } from 'ol/style.js'; styleUrls: ['./map-activity.component.css'] }) export class MapActivityComponent implements OnInit { - latitude: number = 18.5204; - longitude: number = 73.8567; + latitude = 18.5204; + longitude = 73.8567; errorMessage: string = null; map: any; - distance: number = 20; + distance = 20; constructor( private _spinner: SpinnerService, @@ -56,17 +56,17 @@ export class MapActivityComponent implements OnInit { population: 1, })); - var source = new VectorSource({ + let source = new VectorSource({ features: features }); - var clusterSource = new Cluster({ + let clusterSource = new Cluster({ distance: this.distance, source: source }); - var styleCache = {}; - var clusters = new VectorLayer({ + let styleCache = {}; + let clusters = new VectorLayer({ source: clusterSource, style: function(feature: any) { var size = feature.get('features').length; @@ -95,7 +95,7 @@ export class MapActivityComponent implements OnInit { } }); - var raster = new TileLayer({ + let raster = new TileLayer({ source: new OSM() }); diff --git a/user-web-site/src/app/pages/news/news.component.css b/web-user/src/app/pages/news/news.component.css similarity index 100% rename from user-web-site/src/app/pages/news/news.component.css rename to web-user/src/app/pages/news/news.component.css diff --git a/user-web-site/src/app/pages/news/news.component.html b/web-user/src/app/pages/news/news.component.html similarity index 100% rename from user-web-site/src/app/pages/news/news.component.html rename to web-user/src/app/pages/news/news.component.html diff --git a/user-web-site/src/app/pages/news/news.component.spec.ts b/web-user/src/app/pages/news/news.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/news/news.component.spec.ts rename to web-user/src/app/pages/news/news.component.spec.ts diff --git a/user-web-site/src/app/pages/news/news.component.ts b/web-user/src/app/pages/news/news.component.ts similarity index 91% rename from user-web-site/src/app/pages/news/news.component.ts rename to web-user/src/app/pages/news/news.component.ts index cec75f50..ac02aca7 100644 --- a/user-web-site/src/app/pages/news/news.component.ts +++ b/web-user/src/app/pages/news/news.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit, Output, EventEmitter, ChangeDetectorRef } from '@ang import { SpinnerService } from '../../services/spinner.service'; import { Router, ActivatedRoute } from '@angular/router'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; -import { DomSanitizer } from '@angular/platform-browser'; import { escape } from 'lodash'; import { FhqService } from '../../services/fhq.service'; import { FormControl, Validators } from '@angular/forms'; @@ -18,7 +17,7 @@ declare var _: any; }) export class NewsComponent implements OnInit { @Output() loading = new EventEmitter(); - searchValue: String = ''; + searchValue: string = ''; searchControl = new FormControl(''); // formCtrlSub = new Subject(); @@ -114,13 +113,13 @@ export class NewsComponent implements OnInit { successResponse(r: any) { console.log(r); let newQueryParams = {} - if (this.searchValue != "") { + if (this.searchValue !== "") { newQueryParams["search"] = this.searchValue; } - if (this.pageIndex != 0) { + if (this.pageIndex !== 0) { newQueryParams["page_index"] = this.pageIndex; } - if (this.pageSize != this.pageSizeOptions[0]) { + if (this.pageSize !== this.pageSizeOptions[0]) { newQueryParams["page_size"] = this.pageSize; } @@ -142,7 +141,7 @@ export class NewsComponent implements OnInit { if (el.meta) { if (el.meta["useful_link"]) { const ul = el.meta["useful_link"]; - if (ul["action"] == "added" || ul["action"] == "updated") { + if (ul["action"] === "added" || ul["action"] === "updated") { el["links"].push({ "routeLink": "/useful-links/" + ul["id"], "text": ul["url"] @@ -152,7 +151,7 @@ export class NewsComponent implements OnInit { if (el.meta["quest"]) { const quest = el.meta["quest"]; - if (quest["action"] == "added" || quest["action"] == "updated" || quest["action"] == "passed") { + if (quest["action"] === "added" || quest["action"] === "updated" || quest["action"] === "passed") { el["links"].push({ "routeLink": "/quest/" + quest["id"], "text": quest["name"] @@ -162,7 +161,7 @@ export class NewsComponent implements OnInit { if (el.meta["user"]) { const u = el.meta["user"]; - if (u["action"] == "added" || u["action"] == "updated") { + if (u["action"] === "added" || u["action"] === "updated") { el["links"].push({ "routeLink": "/user/" + u["id"], "text": u["nick"] diff --git a/user-web-site/src/app/pages/page-not-found/page-not-found.component.css b/web-user/src/app/pages/page-not-found/page-not-found.component.css similarity index 100% rename from user-web-site/src/app/pages/page-not-found/page-not-found.component.css rename to web-user/src/app/pages/page-not-found/page-not-found.component.css diff --git a/user-web-site/src/app/pages/page-not-found/page-not-found.component.html b/web-user/src/app/pages/page-not-found/page-not-found.component.html similarity index 100% rename from user-web-site/src/app/pages/page-not-found/page-not-found.component.html rename to web-user/src/app/pages/page-not-found/page-not-found.component.html diff --git a/user-web-site/src/app/pages/page-not-found/page-not-found.component.spec.ts b/web-user/src/app/pages/page-not-found/page-not-found.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/page-not-found/page-not-found.component.spec.ts rename to web-user/src/app/pages/page-not-found/page-not-found.component.spec.ts diff --git a/user-web-site/src/app/pages/page-not-found/page-not-found.component.ts b/web-user/src/app/pages/page-not-found/page-not-found.component.ts similarity index 100% rename from user-web-site/src/app/pages/page-not-found/page-not-found.component.ts rename to web-user/src/app/pages/page-not-found/page-not-found.component.ts diff --git a/user-web-site/src/app/pages/quest-proposal/quest-proposal.component.css b/web-user/src/app/pages/quest-proposal/quest-proposal.component.css similarity index 100% rename from user-web-site/src/app/pages/quest-proposal/quest-proposal.component.css rename to web-user/src/app/pages/quest-proposal/quest-proposal.component.css diff --git a/user-web-site/src/app/pages/quest-proposal/quest-proposal.component.html b/web-user/src/app/pages/quest-proposal/quest-proposal.component.html similarity index 100% rename from user-web-site/src/app/pages/quest-proposal/quest-proposal.component.html rename to web-user/src/app/pages/quest-proposal/quest-proposal.component.html diff --git a/user-web-site/src/app/pages/quest-proposal/quest-proposal.component.spec.ts b/web-user/src/app/pages/quest-proposal/quest-proposal.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/quest-proposal/quest-proposal.component.spec.ts rename to web-user/src/app/pages/quest-proposal/quest-proposal.component.spec.ts diff --git a/user-web-site/src/app/pages/quest-proposal/quest-proposal.component.ts b/web-user/src/app/pages/quest-proposal/quest-proposal.component.ts similarity index 100% rename from user-web-site/src/app/pages/quest-proposal/quest-proposal.component.ts rename to web-user/src/app/pages/quest-proposal/quest-proposal.component.ts diff --git a/user-web-site/src/app/pages/quest/quest.component.css b/web-user/src/app/pages/quest/quest.component.css similarity index 100% rename from user-web-site/src/app/pages/quest/quest.component.css rename to web-user/src/app/pages/quest/quest.component.css diff --git a/user-web-site/src/app/pages/quest/quest.component.html b/web-user/src/app/pages/quest/quest.component.html similarity index 100% rename from user-web-site/src/app/pages/quest/quest.component.html rename to web-user/src/app/pages/quest/quest.component.html diff --git a/user-web-site/src/app/pages/quest/quest.component.spec.ts b/web-user/src/app/pages/quest/quest.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/quest/quest.component.spec.ts rename to web-user/src/app/pages/quest/quest.component.spec.ts diff --git a/user-web-site/src/app/pages/quest/quest.component.ts b/web-user/src/app/pages/quest/quest.component.ts similarity index 99% rename from user-web-site/src/app/pages/quest/quest.component.ts rename to web-user/src/app/pages/quest/quest.component.ts index ff537ba1..9a0df301 100644 --- a/user-web-site/src/app/pages/quest/quest.component.ts +++ b/web-user/src/app/pages/quest/quest.component.ts @@ -24,7 +24,7 @@ export class QuestComponent implements OnInit { questHints: any = []; showHints: boolean = false; quest: any = []; - questDescription: String = ''; + questDescription: string = ''; @ViewChild('questAnswer') questAnswer : ElementRef; errorCheckAnswerMessage: string = null; @@ -35,7 +35,7 @@ export class QuestComponent implements OnInit { questMyAnswers: any = []; showMyAnswers: boolean = false; errorAnswersMessage: string = null; - + @ViewChild('questWriteUpProposalLink') questWriteUpProposalLink : ElementRef; errorProposalWriteUpMessage: string = null; diff --git a/user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.css b/web-user/src/app/pages/quests-by-subject/quests-by-subject.component.css similarity index 100% rename from user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.css rename to web-user/src/app/pages/quests-by-subject/quests-by-subject.component.css diff --git a/user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.html b/web-user/src/app/pages/quests-by-subject/quests-by-subject.component.html similarity index 100% rename from user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.html rename to web-user/src/app/pages/quests-by-subject/quests-by-subject.component.html diff --git a/user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.spec.ts b/web-user/src/app/pages/quests-by-subject/quests-by-subject.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.spec.ts rename to web-user/src/app/pages/quests-by-subject/quests-by-subject.component.spec.ts diff --git a/user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.ts b/web-user/src/app/pages/quests-by-subject/quests-by-subject.component.ts similarity index 100% rename from user-web-site/src/app/pages/quests-by-subject/quests-by-subject.component.ts rename to web-user/src/app/pages/quests-by-subject/quests-by-subject.component.ts diff --git a/user-web-site/src/app/pages/quests/quests.component.css b/web-user/src/app/pages/quests/quests.component.css similarity index 100% rename from user-web-site/src/app/pages/quests/quests.component.css rename to web-user/src/app/pages/quests/quests.component.css diff --git a/user-web-site/src/app/pages/quests/quests.component.html b/web-user/src/app/pages/quests/quests.component.html similarity index 100% rename from user-web-site/src/app/pages/quests/quests.component.html rename to web-user/src/app/pages/quests/quests.component.html diff --git a/user-web-site/src/app/pages/quests/quests.component.spec.ts b/web-user/src/app/pages/quests/quests.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/quests/quests.component.spec.ts rename to web-user/src/app/pages/quests/quests.component.spec.ts diff --git a/user-web-site/src/app/pages/quests/quests.component.ts b/web-user/src/app/pages/quests/quests.component.ts similarity index 100% rename from user-web-site/src/app/pages/quests/quests.component.ts rename to web-user/src/app/pages/quests/quests.component.ts diff --git a/user-web-site/src/app/pages/registration/registration.component.css b/web-user/src/app/pages/registration/registration.component.css similarity index 100% rename from user-web-site/src/app/pages/registration/registration.component.css rename to web-user/src/app/pages/registration/registration.component.css diff --git a/user-web-site/src/app/pages/registration/registration.component.html b/web-user/src/app/pages/registration/registration.component.html similarity index 100% rename from user-web-site/src/app/pages/registration/registration.component.html rename to web-user/src/app/pages/registration/registration.component.html diff --git a/user-web-site/src/app/pages/registration/registration.component.spec.ts b/web-user/src/app/pages/registration/registration.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/registration/registration.component.spec.ts rename to web-user/src/app/pages/registration/registration.component.spec.ts diff --git a/user-web-site/src/app/pages/registration/registration.component.ts b/web-user/src/app/pages/registration/registration.component.ts similarity index 100% rename from user-web-site/src/app/pages/registration/registration.component.ts rename to web-user/src/app/pages/registration/registration.component.ts diff --git a/user-web-site/src/app/pages/reset-password/reset-password.component.css b/web-user/src/app/pages/reset-password/reset-password.component.css similarity index 100% rename from user-web-site/src/app/pages/reset-password/reset-password.component.css rename to web-user/src/app/pages/reset-password/reset-password.component.css diff --git a/user-web-site/src/app/pages/reset-password/reset-password.component.html b/web-user/src/app/pages/reset-password/reset-password.component.html similarity index 100% rename from user-web-site/src/app/pages/reset-password/reset-password.component.html rename to web-user/src/app/pages/reset-password/reset-password.component.html diff --git a/user-web-site/src/app/pages/reset-password/reset-password.component.spec.ts b/web-user/src/app/pages/reset-password/reset-password.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/reset-password/reset-password.component.spec.ts rename to web-user/src/app/pages/reset-password/reset-password.component.spec.ts diff --git a/user-web-site/src/app/pages/reset-password/reset-password.component.ts b/web-user/src/app/pages/reset-password/reset-password.component.ts similarity index 100% rename from user-web-site/src/app/pages/reset-password/reset-password.component.ts rename to web-user/src/app/pages/reset-password/reset-password.component.ts diff --git a/user-web-site/src/app/pages/scoreboard/scoreboard.component.css b/web-user/src/app/pages/scoreboard/scoreboard.component.css similarity index 100% rename from user-web-site/src/app/pages/scoreboard/scoreboard.component.css rename to web-user/src/app/pages/scoreboard/scoreboard.component.css diff --git a/user-web-site/src/app/pages/scoreboard/scoreboard.component.html b/web-user/src/app/pages/scoreboard/scoreboard.component.html similarity index 100% rename from user-web-site/src/app/pages/scoreboard/scoreboard.component.html rename to web-user/src/app/pages/scoreboard/scoreboard.component.html diff --git a/user-web-site/src/app/pages/scoreboard/scoreboard.component.spec.ts b/web-user/src/app/pages/scoreboard/scoreboard.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/scoreboard/scoreboard.component.spec.ts rename to web-user/src/app/pages/scoreboard/scoreboard.component.spec.ts diff --git a/user-web-site/src/app/pages/scoreboard/scoreboard.component.ts b/web-user/src/app/pages/scoreboard/scoreboard.component.ts similarity index 99% rename from user-web-site/src/app/pages/scoreboard/scoreboard.component.ts rename to web-user/src/app/pages/scoreboard/scoreboard.component.ts index 38aaa418..f473fa7d 100644 --- a/user-web-site/src/app/pages/scoreboard/scoreboard.component.ts +++ b/web-user/src/app/pages/scoreboard/scoreboard.component.ts @@ -19,7 +19,7 @@ export class ScoreboardComponent implements OnInit { errorMessage: string = null; dataList: Array = []; filteredDataList: Array = []; - searchValue: String = ''; + searchValue: string = ''; searchControl = new FormControl(''); formCtrlSub: Subscription; diff --git a/user-web-site/src/app/pages/server-api/server-api.component.css b/web-user/src/app/pages/server-api/server-api.component.css similarity index 100% rename from user-web-site/src/app/pages/server-api/server-api.component.css rename to web-user/src/app/pages/server-api/server-api.component.css diff --git a/user-web-site/src/app/pages/server-api/server-api.component.html b/web-user/src/app/pages/server-api/server-api.component.html similarity index 100% rename from user-web-site/src/app/pages/server-api/server-api.component.html rename to web-user/src/app/pages/server-api/server-api.component.html diff --git a/user-web-site/src/app/pages/server-api/server-api.component.spec.ts b/web-user/src/app/pages/server-api/server-api.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/server-api/server-api.component.spec.ts rename to web-user/src/app/pages/server-api/server-api.component.spec.ts diff --git a/user-web-site/src/app/pages/server-api/server-api.component.ts b/web-user/src/app/pages/server-api/server-api.component.ts similarity index 91% rename from user-web-site/src/app/pages/server-api/server-api.component.ts rename to web-user/src/app/pages/server-api/server-api.component.ts index bffc61ba..6c0f4538 100644 --- a/user-web-site/src/app/pages/server-api/server-api.component.ts +++ b/web-user/src/app/pages/server-api/server-api.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ChangeDetectorRef, Inject } from '@angular/core'; +import { Component, OnInit, ChangeDetectorRef } from '@angular/core'; import { SpinnerService } from '../../services/spinner.service'; import { PlatformLocation } from '@angular/common'; @@ -10,9 +10,9 @@ declare var fhq: any; styleUrls: ['./server-api.component.css'] }) export class ServerApiComponent implements OnInit { - apiVersion: String = ''; + apiVersion: string = ''; apisList: Array = []; - errorMessage: String = null; + errorMessage: string = null; serverWsPort: number = -1; serverWssPort: number = -1; serverHost: string = null; diff --git a/user-web-site/src/app/pages/useful-link-view/useful-link-view.component.css b/web-user/src/app/pages/useful-link-view/useful-link-view.component.css similarity index 100% rename from user-web-site/src/app/pages/useful-link-view/useful-link-view.component.css rename to web-user/src/app/pages/useful-link-view/useful-link-view.component.css diff --git a/user-web-site/src/app/pages/useful-link-view/useful-link-view.component.html b/web-user/src/app/pages/useful-link-view/useful-link-view.component.html similarity index 100% rename from user-web-site/src/app/pages/useful-link-view/useful-link-view.component.html rename to web-user/src/app/pages/useful-link-view/useful-link-view.component.html diff --git a/user-web-site/src/app/pages/useful-link-view/useful-link-view.component.spec.ts b/web-user/src/app/pages/useful-link-view/useful-link-view.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/useful-link-view/useful-link-view.component.spec.ts rename to web-user/src/app/pages/useful-link-view/useful-link-view.component.spec.ts diff --git a/user-web-site/src/app/pages/useful-link-view/useful-link-view.component.ts b/web-user/src/app/pages/useful-link-view/useful-link-view.component.ts similarity index 100% rename from user-web-site/src/app/pages/useful-link-view/useful-link-view.component.ts rename to web-user/src/app/pages/useful-link-view/useful-link-view.component.ts diff --git a/user-web-site/src/app/pages/useful-links/useful-links.component.css b/web-user/src/app/pages/useful-links/useful-links.component.css similarity index 100% rename from user-web-site/src/app/pages/useful-links/useful-links.component.css rename to web-user/src/app/pages/useful-links/useful-links.component.css diff --git a/user-web-site/src/app/pages/useful-links/useful-links.component.html b/web-user/src/app/pages/useful-links/useful-links.component.html similarity index 100% rename from user-web-site/src/app/pages/useful-links/useful-links.component.html rename to web-user/src/app/pages/useful-links/useful-links.component.html diff --git a/user-web-site/src/app/pages/useful-links/useful-links.component.spec.ts b/web-user/src/app/pages/useful-links/useful-links.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/useful-links/useful-links.component.spec.ts rename to web-user/src/app/pages/useful-links/useful-links.component.spec.ts diff --git a/user-web-site/src/app/pages/useful-links/useful-links.component.ts b/web-user/src/app/pages/useful-links/useful-links.component.ts similarity index 97% rename from user-web-site/src/app/pages/useful-links/useful-links.component.ts rename to web-user/src/app/pages/useful-links/useful-links.component.ts index cb9ed82a..90cbaf06 100644 --- a/user-web-site/src/app/pages/useful-links/useful-links.component.ts +++ b/web-user/src/app/pages/useful-links/useful-links.component.ts @@ -32,12 +32,12 @@ export interface UsefulLinkTag { styleUrls: ['./useful-links.component.css'] }) export class UsefulLinksComponent implements OnInit { - public usefullLinksData: UsefulLinkElement[] = []; + usefullLinksData: UsefulLinkElement[] = []; subscription: any; pageEvent: PageEvent; - pageIndex: number = 0; - pageSize: number = 5; - length: number = 0; + pageIndex = 0; + pageSize = 5; + length = 0; pageSizeOptions = [5, 10, 25, 50]; tagList: UsefulLinkTag[] = []; @@ -45,8 +45,8 @@ export class UsefulLinksComponent implements OnInit { errorMessage: string = null; - searchValue: String = ''; - private prevSearchValue: String = ''; + searchValue: string = ''; + private prevSearchValue: string = ''; searchControl = new FormControl(''); dataSource = new MatTableDataSource(); diff --git a/user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.css b/web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.css similarity index 100% rename from user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.css rename to web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.css diff --git a/user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.html b/web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.html similarity index 100% rename from user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.html rename to web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.html diff --git a/user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.spec.ts b/web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.spec.ts rename to web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.spec.ts diff --git a/user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.ts b/web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.ts similarity index 100% rename from user-web-site/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.ts rename to web-user/src/app/pages/user-favorites-useful-links/user-favorites-useful-links.component.ts diff --git a/user-web-site/src/app/pages/user-profile/user-profile.component.css b/web-user/src/app/pages/user-profile/user-profile.component.css similarity index 100% rename from user-web-site/src/app/pages/user-profile/user-profile.component.css rename to web-user/src/app/pages/user-profile/user-profile.component.css diff --git a/user-web-site/src/app/pages/user-profile/user-profile.component.html b/web-user/src/app/pages/user-profile/user-profile.component.html similarity index 100% rename from user-web-site/src/app/pages/user-profile/user-profile.component.html rename to web-user/src/app/pages/user-profile/user-profile.component.html diff --git a/user-web-site/src/app/pages/user-profile/user-profile.component.spec.ts b/web-user/src/app/pages/user-profile/user-profile.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/user-profile/user-profile.component.spec.ts rename to web-user/src/app/pages/user-profile/user-profile.component.spec.ts diff --git a/user-web-site/src/app/pages/user-profile/user-profile.component.ts b/web-user/src/app/pages/user-profile/user-profile.component.ts similarity index 100% rename from user-web-site/src/app/pages/user-profile/user-profile.component.ts rename to web-user/src/app/pages/user-profile/user-profile.component.ts diff --git a/user-web-site/src/app/pages/user-security/user-security.component.css b/web-user/src/app/pages/user-security/user-security.component.css similarity index 100% rename from user-web-site/src/app/pages/user-security/user-security.component.css rename to web-user/src/app/pages/user-security/user-security.component.css diff --git a/user-web-site/src/app/pages/user-security/user-security.component.html b/web-user/src/app/pages/user-security/user-security.component.html similarity index 100% rename from user-web-site/src/app/pages/user-security/user-security.component.html rename to web-user/src/app/pages/user-security/user-security.component.html diff --git a/user-web-site/src/app/pages/user-security/user-security.component.spec.ts b/web-user/src/app/pages/user-security/user-security.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/user-security/user-security.component.spec.ts rename to web-user/src/app/pages/user-security/user-security.component.spec.ts diff --git a/user-web-site/src/app/pages/user-security/user-security.component.ts b/web-user/src/app/pages/user-security/user-security.component.ts similarity index 96% rename from user-web-site/src/app/pages/user-security/user-security.component.ts rename to web-user/src/app/pages/user-security/user-security.component.ts index 6cbe59a1..30175d52 100644 --- a/user-web-site/src/app/pages/user-security/user-security.component.ts +++ b/web-user/src/app/pages/user-security/user-security.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core'; +import { Component, OnInit, ChangeDetectorRef } from '@angular/core'; import { FhqService } from '../../services/fhq.service'; import { SpinnerService } from '../../services/spinner.service'; import { Router } from '@angular/router'; diff --git a/user-web-site/src/app/pages/user-skills/user-skills.component.css b/web-user/src/app/pages/user-skills/user-skills.component.css similarity index 100% rename from user-web-site/src/app/pages/user-skills/user-skills.component.css rename to web-user/src/app/pages/user-skills/user-skills.component.css diff --git a/user-web-site/src/app/pages/user-skills/user-skills.component.html b/web-user/src/app/pages/user-skills/user-skills.component.html similarity index 100% rename from user-web-site/src/app/pages/user-skills/user-skills.component.html rename to web-user/src/app/pages/user-skills/user-skills.component.html diff --git a/user-web-site/src/app/pages/user-skills/user-skills.component.spec.ts b/web-user/src/app/pages/user-skills/user-skills.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/user-skills/user-skills.component.spec.ts rename to web-user/src/app/pages/user-skills/user-skills.component.spec.ts diff --git a/user-web-site/src/app/pages/user-skills/user-skills.component.ts b/web-user/src/app/pages/user-skills/user-skills.component.ts similarity index 100% rename from user-web-site/src/app/pages/user-skills/user-skills.component.ts rename to web-user/src/app/pages/user-skills/user-skills.component.ts diff --git a/user-web-site/src/app/pages/user-tokens/user-tokens.component.css b/web-user/src/app/pages/user-tokens/user-tokens.component.css similarity index 100% rename from user-web-site/src/app/pages/user-tokens/user-tokens.component.css rename to web-user/src/app/pages/user-tokens/user-tokens.component.css diff --git a/user-web-site/src/app/pages/user-tokens/user-tokens.component.html b/web-user/src/app/pages/user-tokens/user-tokens.component.html similarity index 100% rename from user-web-site/src/app/pages/user-tokens/user-tokens.component.html rename to web-user/src/app/pages/user-tokens/user-tokens.component.html diff --git a/user-web-site/src/app/pages/user-tokens/user-tokens.component.spec.ts b/web-user/src/app/pages/user-tokens/user-tokens.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/user-tokens/user-tokens.component.spec.ts rename to web-user/src/app/pages/user-tokens/user-tokens.component.spec.ts diff --git a/user-web-site/src/app/pages/user-tokens/user-tokens.component.ts b/web-user/src/app/pages/user-tokens/user-tokens.component.ts similarity index 100% rename from user-web-site/src/app/pages/user-tokens/user-tokens.component.ts rename to web-user/src/app/pages/user-tokens/user-tokens.component.ts diff --git a/user-web-site/src/app/pages/welcome/welcome.component.css b/web-user/src/app/pages/welcome/welcome.component.css similarity index 100% rename from user-web-site/src/app/pages/welcome/welcome.component.css rename to web-user/src/app/pages/welcome/welcome.component.css diff --git a/user-web-site/src/app/pages/welcome/welcome.component.html b/web-user/src/app/pages/welcome/welcome.component.html similarity index 100% rename from user-web-site/src/app/pages/welcome/welcome.component.html rename to web-user/src/app/pages/welcome/welcome.component.html diff --git a/user-web-site/src/app/pages/welcome/welcome.component.spec.ts b/web-user/src/app/pages/welcome/welcome.component.spec.ts similarity index 100% rename from user-web-site/src/app/pages/welcome/welcome.component.spec.ts rename to web-user/src/app/pages/welcome/welcome.component.spec.ts diff --git a/user-web-site/src/app/pages/welcome/welcome.component.ts b/web-user/src/app/pages/welcome/welcome.component.ts similarity index 100% rename from user-web-site/src/app/pages/welcome/welcome.component.ts rename to web-user/src/app/pages/welcome/welcome.component.ts diff --git a/user-web-site/src/app/services/email-validator.service.spec.ts b/web-user/src/app/services/email-validator.service.spec.ts similarity index 100% rename from user-web-site/src/app/services/email-validator.service.spec.ts rename to web-user/src/app/services/email-validator.service.spec.ts diff --git a/user-web-site/src/app/services/email-validator.service.ts b/web-user/src/app/services/email-validator.service.ts similarity index 92% rename from user-web-site/src/app/services/email-validator.service.ts rename to web-user/src/app/services/email-validator.service.ts index 8193ea88..830e3b0a 100644 --- a/user-web-site/src/app/services/email-validator.service.ts +++ b/web-user/src/app/services/email-validator.service.ts @@ -24,8 +24,8 @@ export class EmailValidatorService { emailWrongDomains['inbox.ry'] = {prop: ["inbox.ru"]}; emailWrongDomains['gamil.com'] = {prop: ["gmail.com"]}; - const re = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/; - let ret = {result: false, error: ""} + const re = /^\w+([\.-]?\w+){1,20}@\w+([\.-]?\w+){1,20}(\.\w{2,3})+$/; + let ret = {result: false, error: ""}; ret.result = re.test(email); if (!ret.result) { ret.result = false; diff --git a/user-web-site/src/app/services/fhq.service.spec.ts b/web-user/src/app/services/fhq.service.spec.ts similarity index 100% rename from user-web-site/src/app/services/fhq.service.spec.ts rename to web-user/src/app/services/fhq.service.spec.ts diff --git a/user-web-site/src/app/services/fhq.service.ts b/web-user/src/app/services/fhq.service.ts similarity index 97% rename from user-web-site/src/app/services/fhq.service.ts rename to web-user/src/app/services/fhq.service.ts index 15997a7b..e7ac8830 100644 --- a/user-web-site/src/app/services/fhq.service.ts +++ b/web-user/src/app/services/fhq.service.ts @@ -48,8 +48,7 @@ export class FhqService { } else if (data.type === 'warning') { message = "Warning: " + data.message } else { - // unknown type of message - message = "Warning: " + data.message + message = "Unknown: " + data.message } this._snackBar.open(message, action, { duration: 3000, diff --git a/user-web-site/src/app/services/libfreehackquest-client-angular.service.ts b/web-user/src/app/services/libfreehackquest-client-angular.service.ts similarity index 96% rename from user-web-site/src/app/services/libfreehackquest-client-angular.service.ts rename to web-user/src/app/services/libfreehackquest-client-angular.service.ts index 38afa105..5b055132 100644 --- a/user-web-site/src/app/services/libfreehackquest-client-angular.service.ts +++ b/web-user/src/app/services/libfreehackquest-client-angular.service.ts @@ -183,7 +183,7 @@ export class FreeHackQuestClient { }, 1000) } } - wsRequest(method: String, params: any): Observable { + wsRequest(method: string, params: any): Observable { this.messageId++ const msgid = "m" + this.messageId; let request = params; diff --git a/user-web-site/src/app/services/spinner.service.spec.ts b/web-user/src/app/services/spinner.service.spec.ts similarity index 100% rename from user-web-site/src/app/services/spinner.service.spec.ts rename to web-user/src/app/services/spinner.service.spec.ts diff --git a/user-web-site/src/app/services/spinner.service.ts b/web-user/src/app/services/spinner.service.ts similarity index 83% rename from user-web-site/src/app/services/spinner.service.ts rename to web-user/src/app/services/spinner.service.ts index 1bf0dc99..22cdd25a 100644 --- a/user-web-site/src/app/services/spinner.service.ts +++ b/web-user/src/app/services/spinner.service.ts @@ -13,7 +13,7 @@ export class SpinnerService { constructor(private overlay: Overlay) {} - public show(message = '') { + show(message = '') { if (this.showed) { console.warn("Already showed"); return; @@ -27,14 +27,14 @@ export class SpinnerService { // Create ComponentPortal that can be attached to a PortalHost const spinnerOverlayPortal = new ComponentPortal(SpinnerComponent); - const component = this.overlayRef.attach(spinnerOverlayPortal); // Attach ComponentPortal to PortalHost + this.overlayRef.attach(spinnerOverlayPortal); // Attach ComponentPortal to PortalHost } - public isShowed() { + isShowed() { return this.showed; } - public hide() { + hide() { if (!!this.overlayRef) { this.overlayRef.detach(); this.showed = false; diff --git a/user-web-site/src/app/spinner/spinner.component.css b/web-user/src/app/spinner/spinner.component.css similarity index 100% rename from user-web-site/src/app/spinner/spinner.component.css rename to web-user/src/app/spinner/spinner.component.css diff --git a/user-web-site/src/app/spinner/spinner.component.html b/web-user/src/app/spinner/spinner.component.html similarity index 100% rename from user-web-site/src/app/spinner/spinner.component.html rename to web-user/src/app/spinner/spinner.component.html diff --git a/user-web-site/src/app/spinner/spinner.component.spec.ts b/web-user/src/app/spinner/spinner.component.spec.ts similarity index 100% rename from user-web-site/src/app/spinner/spinner.component.spec.ts rename to web-user/src/app/spinner/spinner.component.spec.ts diff --git a/user-web-site/src/app/spinner/spinner.component.ts b/web-user/src/app/spinner/spinner.component.ts similarity index 100% rename from user-web-site/src/app/spinner/spinner.component.ts rename to web-user/src/app/spinner/spinner.component.ts diff --git a/user-web-site/src/assets/.gitkeep b/web-user/src/assets/.gitkeep similarity index 100% rename from user-web-site/src/assets/.gitkeep rename to web-user/src/assets/.gitkeep diff --git a/user-web-site/src/assets/automation_ussr/v20151221.zip b/web-user/src/assets/automation_ussr/v20151221.zip similarity index 100% rename from user-web-site/src/assets/automation_ussr/v20151221.zip rename to web-user/src/assets/automation_ussr/v20151221.zip diff --git a/user-web-site/src/assets/cyborgTheme/bootstrap.min.css b/web-user/src/assets/cyborgTheme/bootstrap.min.css similarity index 100% rename from user-web-site/src/assets/cyborgTheme/bootstrap.min.css rename to web-user/src/assets/cyborgTheme/bootstrap.min.css diff --git a/user-web-site/src/assets/fhqconfig.js b/web-user/src/assets/fhqconfig.js similarity index 100% rename from user-web-site/src/assets/fhqconfig.js rename to web-user/src/assets/fhqconfig.js diff --git a/user-web-site/src/assets/i18n/app-de.json b/web-user/src/assets/i18n/app-de.json similarity index 100% rename from user-web-site/src/assets/i18n/app-de.json rename to web-user/src/assets/i18n/app-de.json diff --git a/user-web-site/src/assets/i18n/app-en.json b/web-user/src/assets/i18n/app-en.json similarity index 100% rename from user-web-site/src/assets/i18n/app-en.json rename to web-user/src/assets/i18n/app-en.json diff --git a/user-web-site/src/assets/i18n/app-ru.json b/web-user/src/assets/i18n/app-ru.json similarity index 100% rename from user-web-site/src/assets/i18n/app-ru.json rename to web-user/src/assets/i18n/app-ru.json diff --git a/user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.eot b/web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.eot similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.eot rename to web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.eot diff --git a/user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ijmap b/web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ijmap similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ijmap rename to web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ijmap diff --git a/user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.svg b/web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.svg similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.svg rename to web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.svg diff --git a/user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ttf b/web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ttf similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ttf rename to web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.ttf diff --git a/user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff b/web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff rename to web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff diff --git a/user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff2 b/web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff2 similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff2 rename to web-user/src/assets/iconfont-v3.0.1/MaterialIcons-Regular.woff2 diff --git a/user-web-site/src/assets/iconfont-v3.0.1/README.md b/web-user/src/assets/iconfont-v3.0.1/README.md similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/README.md rename to web-user/src/assets/iconfont-v3.0.1/README.md diff --git a/user-web-site/src/assets/iconfont-v3.0.1/codepoints b/web-user/src/assets/iconfont-v3.0.1/codepoints similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/codepoints rename to web-user/src/assets/iconfont-v3.0.1/codepoints diff --git a/user-web-site/src/assets/iconfont-v3.0.1/material-icons.css b/web-user/src/assets/iconfont-v3.0.1/material-icons.css similarity index 100% rename from user-web-site/src/assets/iconfont-v3.0.1/material-icons.css rename to web-user/src/assets/iconfont-v3.0.1/material-icons.css diff --git a/user-web-site/src/assets/img/automation_ussr.png b/web-user/src/assets/img/automation_ussr.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr.png rename to web-user/src/assets/img/automation_ussr.png diff --git a/user-web-site/src/assets/img/automation_ussr_00-shtrafnic.png b/web-user/src/assets/img/automation_ussr_00-shtrafnic.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_00-shtrafnic.png rename to web-user/src/assets/img/automation_ussr_00-shtrafnic.png diff --git a/user-web-site/src/assets/img/automation_ussr_01-ryadovoi.png b/web-user/src/assets/img/automation_ussr_01-ryadovoi.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_01-ryadovoi.png rename to web-user/src/assets/img/automation_ussr_01-ryadovoi.png diff --git a/user-web-site/src/assets/img/automation_ussr_02-efreitor.png b/web-user/src/assets/img/automation_ussr_02-efreitor.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_02-efreitor.png rename to web-user/src/assets/img/automation_ussr_02-efreitor.png diff --git a/user-web-site/src/assets/img/automation_ussr_03-ml_serjant.png b/web-user/src/assets/img/automation_ussr_03-ml_serjant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_03-ml_serjant.png rename to web-user/src/assets/img/automation_ussr_03-ml_serjant.png diff --git a/user-web-site/src/assets/img/automation_ussr_04_serjant.png b/web-user/src/assets/img/automation_ussr_04_serjant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_04_serjant.png rename to web-user/src/assets/img/automation_ussr_04_serjant.png diff --git a/user-web-site/src/assets/img/automation_ussr_05-st_serjant.png b/web-user/src/assets/img/automation_ussr_05-st_serjant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_05-st_serjant.png rename to web-user/src/assets/img/automation_ussr_05-st_serjant.png diff --git a/user-web-site/src/assets/img/automation_ussr_06-starshina.png b/web-user/src/assets/img/automation_ussr_06-starshina.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_06-starshina.png rename to web-user/src/assets/img/automation_ussr_06-starshina.png diff --git a/user-web-site/src/assets/img/automation_ussr_07-praporschik.png b/web-user/src/assets/img/automation_ussr_07-praporschik.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_07-praporschik.png rename to web-user/src/assets/img/automation_ussr_07-praporschik.png diff --git a/user-web-site/src/assets/img/automation_ussr_08-st_praporschik.png b/web-user/src/assets/img/automation_ussr_08-st_praporschik.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_08-st_praporschik.png rename to web-user/src/assets/img/automation_ussr_08-st_praporschik.png diff --git a/user-web-site/src/assets/img/automation_ussr_09-ml_leitinant.png b/web-user/src/assets/img/automation_ussr_09-ml_leitinant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_09-ml_leitinant.png rename to web-user/src/assets/img/automation_ussr_09-ml_leitinant.png diff --git a/user-web-site/src/assets/img/automation_ussr_10-leitinant.png b/web-user/src/assets/img/automation_ussr_10-leitinant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_10-leitinant.png rename to web-user/src/assets/img/automation_ussr_10-leitinant.png diff --git a/user-web-site/src/assets/img/automation_ussr_11-st_leitinant.png b/web-user/src/assets/img/automation_ussr_11-st_leitinant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_11-st_leitinant.png rename to web-user/src/assets/img/automation_ussr_11-st_leitinant.png diff --git a/user-web-site/src/assets/img/automation_ussr_12-kapitan.png b/web-user/src/assets/img/automation_ussr_12-kapitan.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_12-kapitan.png rename to web-user/src/assets/img/automation_ussr_12-kapitan.png diff --git a/user-web-site/src/assets/img/automation_ussr_13-major.png b/web-user/src/assets/img/automation_ussr_13-major.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_13-major.png rename to web-user/src/assets/img/automation_ussr_13-major.png diff --git a/user-web-site/src/assets/img/automation_ussr_14-podpolkovnik.png b/web-user/src/assets/img/automation_ussr_14-podpolkovnik.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_14-podpolkovnik.png rename to web-user/src/assets/img/automation_ussr_14-podpolkovnik.png diff --git a/user-web-site/src/assets/img/automation_ussr_15-polkovnik.png b/web-user/src/assets/img/automation_ussr_15-polkovnik.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_15-polkovnik.png rename to web-user/src/assets/img/automation_ussr_15-polkovnik.png diff --git a/user-web-site/src/assets/img/automation_ussr_16-general_major.png b/web-user/src/assets/img/automation_ussr_16-general_major.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_16-general_major.png rename to web-user/src/assets/img/automation_ussr_16-general_major.png diff --git a/user-web-site/src/assets/img/automation_ussr_17-general_leitinant.png b/web-user/src/assets/img/automation_ussr_17-general_leitinant.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_17-general_leitinant.png rename to web-user/src/assets/img/automation_ussr_17-general_leitinant.png diff --git a/user-web-site/src/assets/img/automation_ussr_18-general_polkovnik.png b/web-user/src/assets/img/automation_ussr_18-general_polkovnik.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_18-general_polkovnik.png rename to web-user/src/assets/img/automation_ussr_18-general_polkovnik.png diff --git a/user-web-site/src/assets/img/automation_ussr_19-general_armii.png b/web-user/src/assets/img/automation_ussr_19-general_armii.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_19-general_armii.png rename to web-user/src/assets/img/automation_ussr_19-general_armii.png diff --git a/user-web-site/src/assets/img/automation_ussr_20-marshal.png b/web-user/src/assets/img/automation_ussr_20-marshal.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_20-marshal.png rename to web-user/src/assets/img/automation_ussr_20-marshal.png diff --git a/user-web-site/src/assets/img/automation_ussr_21-generalissimus.png b/web-user/src/assets/img/automation_ussr_21-generalissimus.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_21-generalissimus.png rename to web-user/src/assets/img/automation_ussr_21-generalissimus.png diff --git a/user-web-site/src/assets/img/automation_ussr_algorithm_block1.png b/web-user/src/assets/img/automation_ussr_algorithm_block1.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_algorithm_block1.png rename to web-user/src/assets/img/automation_ussr_algorithm_block1.png diff --git a/user-web-site/src/assets/img/automation_ussr_algorithm_block2.png b/web-user/src/assets/img/automation_ussr_algorithm_block2.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_algorithm_block2.png rename to web-user/src/assets/img/automation_ussr_algorithm_block2.png diff --git a/user-web-site/src/assets/img/automation_ussr_algorithm_block3.png b/web-user/src/assets/img/automation_ussr_algorithm_block3.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_algorithm_block3.png rename to web-user/src/assets/img/automation_ussr_algorithm_block3.png diff --git a/user-web-site/src/assets/img/automation_ussr_nano.png b/web-user/src/assets/img/automation_ussr_nano.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_nano.png rename to web-user/src/assets/img/automation_ussr_nano.png diff --git a/user-web-site/src/assets/img/automation_ussr_nc80.png b/web-user/src/assets/img/automation_ussr_nc80.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_nc80.png rename to web-user/src/assets/img/automation_ussr_nc80.png diff --git a/user-web-site/src/assets/img/automation_ussr_nmap.png b/web-user/src/assets/img/automation_ussr_nmap.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_nmap.png rename to web-user/src/assets/img/automation_ussr_nmap.png diff --git a/user-web-site/src/assets/img/automation_ussr_nmap_100200.png b/web-user/src/assets/img/automation_ussr_nmap_100200.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_nmap_100200.png rename to web-user/src/assets/img/automation_ussr_nmap_100200.png diff --git a/user-web-site/src/assets/img/automation_ussr_python_hello_world.png b/web-user/src/assets/img/automation_ussr_python_hello_world.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_python_hello_world.png rename to web-user/src/assets/img/automation_ussr_python_hello_world.png diff --git a/user-web-site/src/assets/img/automation_ussr_python_network.png b/web-user/src/assets/img/automation_ussr_python_network.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_python_network.png rename to web-user/src/assets/img/automation_ussr_python_network.png diff --git a/user-web-site/src/assets/img/automation_ussr_python_regexp.png b/web-user/src/assets/img/automation_ussr_python_regexp.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_python_regexp.png rename to web-user/src/assets/img/automation_ussr_python_regexp.png diff --git a/user-web-site/src/assets/img/automation_ussr_script00.png b/web-user/src/assets/img/automation_ussr_script00.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_script00.png rename to web-user/src/assets/img/automation_ussr_script00.png diff --git a/user-web-site/src/assets/img/automation_ussr_script10.png b/web-user/src/assets/img/automation_ussr_script10.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_script10.png rename to web-user/src/assets/img/automation_ussr_script10.png diff --git a/user-web-site/src/assets/img/automation_ussr_script11.png b/web-user/src/assets/img/automation_ussr_script11.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_script11.png rename to web-user/src/assets/img/automation_ussr_script11.png diff --git a/user-web-site/src/assets/img/automation_ussr_script20.png b/web-user/src/assets/img/automation_ussr_script20.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_script20.png rename to web-user/src/assets/img/automation_ussr_script20.png diff --git a/user-web-site/src/assets/img/automation_ussr_script30.png b/web-user/src/assets/img/automation_ussr_script30.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_script30.png rename to web-user/src/assets/img/automation_ussr_script30.png diff --git a/user-web-site/src/assets/img/automation_ussr_telnet80.png b/web-user/src/assets/img/automation_ussr_telnet80.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_telnet80.png rename to web-user/src/assets/img/automation_ussr_telnet80.png diff --git a/user-web-site/src/assets/img/automation_ussr_usually_game.png b/web-user/src/assets/img/automation_ussr_usually_game.png similarity index 100% rename from user-web-site/src/assets/img/automation_ussr_usually_game.png rename to web-user/src/assets/img/automation_ussr_usually_game.png diff --git a/user-web-site/src/assets/img/ctf01d/ctf01d-logo.png b/web-user/src/assets/img/ctf01d/ctf01d-logo.png similarity index 100% rename from user-web-site/src/assets/img/ctf01d/ctf01d-logo.png rename to web-user/src/assets/img/ctf01d/ctf01d-logo.png diff --git a/user-web-site/src/assets/img/event_games.png b/web-user/src/assets/img/event_games.png similarity index 100% rename from user-web-site/src/assets/img/event_games.png rename to web-user/src/assets/img/event_games.png diff --git a/user-web-site/src/assets/img/event_info.png b/web-user/src/assets/img/event_info.png similarity index 100% rename from user-web-site/src/assets/img/event_info.png rename to web-user/src/assets/img/event_info.png diff --git a/user-web-site/src/assets/img/event_quests.png b/web-user/src/assets/img/event_quests.png similarity index 100% rename from user-web-site/src/assets/img/event_quests.png rename to web-user/src/assets/img/event_quests.png diff --git a/user-web-site/src/assets/img/event_users.png b/web-user/src/assets/img/event_users.png similarity index 100% rename from user-web-site/src/assets/img/event_users.png rename to web-user/src/assets/img/event_users.png diff --git a/user-web-site/src/assets/img/event_warning.png b/web-user/src/assets/img/event_warning.png similarity index 100% rename from user-web-site/src/assets/img/event_warning.png rename to web-user/src/assets/img/event_warning.png diff --git a/user-web-site/src/assets/img/fhq_2017_white.png b/web-user/src/assets/img/fhq_2017_white.png similarity index 100% rename from user-web-site/src/assets/img/fhq_2017_white.png rename to web-user/src/assets/img/fhq_2017_white.png diff --git a/user-web-site/src/assets/img/loader.gif b/web-user/src/assets/img/loader.gif similarity index 100% rename from user-web-site/src/assets/img/loader.gif rename to web-user/src/assets/img/loader.gif diff --git a/user-web-site/src/assets/img/menu_user.png b/web-user/src/assets/img/menu_user.png similarity index 100% rename from user-web-site/src/assets/img/menu_user.png rename to web-user/src/assets/img/menu_user.png diff --git a/user-web-site/src/assets/img/menu_users.png b/web-user/src/assets/img/menu_users.png similarity index 100% rename from user-web-site/src/assets/img/menu_users.png rename to web-user/src/assets/img/menu_users.png diff --git a/user-web-site/src/assets/img/quest_subject_admin.png b/web-user/src/assets/img/quest_subject_admin.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_admin.png rename to web-user/src/assets/img/quest_subject_admin.png diff --git a/user-web-site/src/assets/img/quest_subject_crypto.png b/web-user/src/assets/img/quest_subject_crypto.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_crypto.png rename to web-user/src/assets/img/quest_subject_crypto.png diff --git a/user-web-site/src/assets/img/quest_subject_enjoy.png b/web-user/src/assets/img/quest_subject_enjoy.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_enjoy.png rename to web-user/src/assets/img/quest_subject_enjoy.png diff --git a/user-web-site/src/assets/img/quest_subject_forensics.png b/web-user/src/assets/img/quest_subject_forensics.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_forensics.png rename to web-user/src/assets/img/quest_subject_forensics.png diff --git a/user-web-site/src/assets/img/quest_subject_hashes.png b/web-user/src/assets/img/quest_subject_hashes.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_hashes.png rename to web-user/src/assets/img/quest_subject_hashes.png diff --git a/user-web-site/src/assets/img/quest_subject_network.png b/web-user/src/assets/img/quest_subject_network.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_network.png rename to web-user/src/assets/img/quest_subject_network.png diff --git a/user-web-site/src/assets/img/quest_subject_ppc.png b/web-user/src/assets/img/quest_subject_ppc.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_ppc.png rename to web-user/src/assets/img/quest_subject_ppc.png diff --git a/user-web-site/src/assets/img/quest_subject_recon.png b/web-user/src/assets/img/quest_subject_recon.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_recon.png rename to web-user/src/assets/img/quest_subject_recon.png diff --git a/user-web-site/src/assets/img/quest_subject_reverse.png b/web-user/src/assets/img/quest_subject_reverse.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_reverse.png rename to web-user/src/assets/img/quest_subject_reverse.png diff --git a/user-web-site/src/assets/img/quest_subject_stego.png b/web-user/src/assets/img/quest_subject_stego.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_stego.png rename to web-user/src/assets/img/quest_subject_stego.png diff --git a/user-web-site/src/assets/img/quest_subject_trivia.png b/web-user/src/assets/img/quest_subject_trivia.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_trivia.png rename to web-user/src/assets/img/quest_subject_trivia.png diff --git a/user-web-site/src/assets/img/quest_subject_unknown.png b/web-user/src/assets/img/quest_subject_unknown.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_unknown.png rename to web-user/src/assets/img/quest_subject_unknown.png diff --git a/user-web-site/src/assets/img/quest_subject_web.png b/web-user/src/assets/img/quest_subject_web.png similarity index 100% rename from user-web-site/src/assets/img/quest_subject_web.png rename to web-user/src/assets/img/quest_subject_web.png diff --git a/user-web-site/src/assets/img/welcome/about.png b/web-user/src/assets/img/welcome/about.png similarity index 100% rename from user-web-site/src/assets/img/welcome/about.png rename to web-user/src/assets/img/welcome/about.png diff --git a/user-web-site/src/assets/simplemde.min.css b/web-user/src/assets/simplemde.min.css similarity index 100% rename from user-web-site/src/assets/simplemde.min.css rename to web-user/src/assets/simplemde.min.css diff --git a/user-web-site/src/environments/environment.prod.ts b/web-user/src/environments/environment.prod.ts similarity index 100% rename from user-web-site/src/environments/environment.prod.ts rename to web-user/src/environments/environment.prod.ts diff --git a/user-web-site/src/environments/environment.ts b/web-user/src/environments/environment.ts similarity index 100% rename from user-web-site/src/environments/environment.ts rename to web-user/src/environments/environment.ts diff --git a/user-web-site/src/favicon.ico b/web-user/src/favicon.ico similarity index 100% rename from user-web-site/src/favicon.ico rename to web-user/src/favicon.ico diff --git a/user-web-site/src/index.html b/web-user/src/index.html similarity index 100% rename from user-web-site/src/index.html rename to web-user/src/index.html diff --git a/user-web-site/src/karma.conf.js b/web-user/src/karma.conf.js similarity index 100% rename from user-web-site/src/karma.conf.js rename to web-user/src/karma.conf.js diff --git a/user-web-site/src/main.ts b/web-user/src/main.ts similarity index 100% rename from user-web-site/src/main.ts rename to web-user/src/main.ts diff --git a/user-web-site/src/polyfills.ts b/web-user/src/polyfills.ts similarity index 100% rename from user-web-site/src/polyfills.ts rename to web-user/src/polyfills.ts diff --git a/user-web-site/src/styles.css b/web-user/src/styles.css similarity index 100% rename from user-web-site/src/styles.css rename to web-user/src/styles.css diff --git a/user-web-site/src/styles.scss b/web-user/src/styles.scss similarity index 100% rename from user-web-site/src/styles.scss rename to web-user/src/styles.scss diff --git a/user-web-site/src/test.ts b/web-user/src/test.ts similarity index 100% rename from user-web-site/src/test.ts rename to web-user/src/test.ts diff --git a/user-web-site/src/tsconfig.app.json b/web-user/src/tsconfig.app.json similarity index 100% rename from user-web-site/src/tsconfig.app.json rename to web-user/src/tsconfig.app.json diff --git a/user-web-site/src/tsconfig.spec.json b/web-user/src/tsconfig.spec.json similarity index 100% rename from user-web-site/src/tsconfig.spec.json rename to web-user/src/tsconfig.spec.json diff --git a/user-web-site/src/tslint.json b/web-user/src/tslint.json similarity index 100% rename from user-web-site/src/tslint.json rename to web-user/src/tslint.json diff --git a/user-web-site/start-dev.sh b/web-user/start-dev.sh similarity index 100% rename from user-web-site/start-dev.sh rename to web-user/start-dev.sh diff --git a/user-web-site/tsconfig.base.json b/web-user/tsconfig.base.json similarity index 100% rename from user-web-site/tsconfig.base.json rename to web-user/tsconfig.base.json diff --git a/user-web-site/tsconfig.json b/web-user/tsconfig.json similarity index 100% rename from user-web-site/tsconfig.json rename to web-user/tsconfig.json diff --git a/user-web-site/tslint.json b/web-user/tslint.json similarity index 100% rename from user-web-site/tslint.json rename to web-user/tslint.json diff --git a/fhq-server/wsjcpp.yml b/wsjcpp.yml similarity index 99% rename from fhq-server/wsjcpp.yml rename to wsjcpp.yml index 82b1f8a3..a87ee052 100644 --- a/fhq-server/wsjcpp.yml +++ b/wsjcpp.yml @@ -3,7 +3,7 @@ cmake_minimum_required: 3.0 cmake_cxx_standard: 11 name: "fhq-server" -version: v0.2.36 +version: v0.2.37 description: "This is an open source platform for competitions of computer security." issues: "https://github.com/freehackquest/fhq-server/issues"