diff --git a/README.md b/README.md index d9e46e86..99903132 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ A portable and scalable SCADA/IIoT-I4.0 platform centered on the MongoDB databas ![](https://img.shields.io/badge/nodejs-20-green 'Node.js 20+') ![](https://img.shields.io/badge/golang-1.21-green 'Go 1.21+') -![](https://img.shields.io/badge/dotnet-6.0-green 'Dotnet 6.0') +![](https://img.shields.io/badge/dotnet-8.0-green 'Dotnet 8.0') ![](https://img.shields.io/badge/mongodb-6.0-green 'MongoDB 6.0+') -![](https://img.shields.io/badge/postgresql-12-green 'PostgreSQL 12+') +![](https://img.shields.io/badge/postgresql-16-green 'PostgreSQL 16') ![](https://img.shields.io/badge/timescaledb-2.0-green 'TimescaleDB 2.0') -![](https://img.shields.io/badge/grafana-9-green 'Grafana 9+') +![](https://img.shields.io/badge/grafana-11-green 'Grafana 11') ![](https://img.shields.io/badge/linux-x86--64-green 'Linux x86-64') ![](https://img.shields.io/badge/linux-ARM-green 'Linux ARM-64') @@ -28,7 +28,7 @@ A portable and scalable SCADA/IIoT-I4.0 platform centered on the MongoDB databas ![](https://img.shields.io/badge/MQTT-green 'MQTT') ![](https://img.shields.io/badge/Sparkplug--B-green 'Sparkplug B') ![](https://img.shields.io/badge/OPC--UA-green 'OPC-UA') -![](https://img.shields.io/badge/OPC--DA-yellow 'OPC-DA') +![](https://img.shields.io/badge/OPC--DA-green 'OPC-DA') ![](https://img.shields.io/badge/Modbus-green 'Modbus') ![](https://img.shields.io/badge/license-GPL-green 'License GPL') @@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - MongoDB as the real-time core database, persistence layer, config store, SOE historian. - Event-based realtime async data processing with MongoDB Change Streams. - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM. -- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha). +- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.39-alpha). - Unlimited tags, servers, and users. - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments. - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node. @@ -89,7 +89,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. ## Documentation - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md) -- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha) +- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.39-alpha) - [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation) - [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md) - [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md) diff --git a/compile-docker/docker-compose.yaml b/compile-docker/docker-compose.yaml index 7d0ef44c..ef06e028 100644 --- a/compile-docker/docker-compose.yaml +++ b/compile-docker/docker-compose.yaml @@ -155,15 +155,6 @@ services: volumes: - ../src/server_realtime_auth:/server_realtime_auth - htdocs_admin_update: - image: node:20-alpine - container_name: js_htdocs_admin_update - command: sh -c "apk add --update npm && npm install -g npm && cd /htdocs-admin && npm install && npm run build && chmod -R 777 node_modules" - volumes: - - ../src/htdocs-admin:/htdocs-admin - environment: - - NODE_OPTIONS=--openssl-legacy-provider - alarm_beep_update: image: node:20-alpine container_name: js_alarm_beep_update @@ -198,3 +189,10 @@ services: command: sh -c "apk add --update npm && npm install -g npm && cd /mqtt-sparkplug && npm install" volumes: - ../src/mqtt-sparkplug:/mqtt-sparkplug + + htdocs_admin_update: + image: node:20-alpine + container_name: js_admin_ui_update + command: sh -c "apk add --update npm && npm install -g npm && cd /AdminUI && npm install && npm run build && chmod -R 777 node_modules" + volumes: + - ../src/AdminUI:/AdminUI diff --git a/conf-templates/kaw2.svg b/conf-templates/kaw2.svg index cf4c6dad..a8eafa05 100644 --- a/conf-templates/kaw2.svg +++ b/conf-templates/kaw2.svg @@ -15,7 +15,7 @@ height="1500" id="svg2" version="1.1" - inkscape:version="0.92.3 (cc100de, 2018-03-31, custom)" + inkscape:version="0.92.4 (e05b578f1, 2019-02-26, custom)" onload="var src; if (document.documentURI) src = document.documentURI; else if (this.getSrc) src = this.getSrc(); else src = document.location.href + ''; try {parent.preload.load(src);}catch(e) {}" sodipodi:docname="kaw2.svg"> TR5 - - - 1 - 86BF - + KOR1» - - + id="tspan6778-1-5-8-4-8-4" + x="3.1367917" + y="-340.33975">KIK3» + + KNH2» - - + id="tspan6778-1-5-8-4-8-7" + x="3.1367917" + y="-362.33975">KNH2» + + KIK3» - + id="tspan6778-1-5-8-4-8" + x="3.1367912" + y="-384.33975">KOR1» + + transform="translate(-26,-404.36212)"> + transform="translate(-20,-68.36212)"> + sodipodi:docname="knh2.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -36,22 +35,24 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="1.9448922" - inkscape:cx="210.54107" - inkscape:cy="1378.3714" + inkscape:zoom="0.9724461" + inkscape:cx="416.98969" + inkscape:cy="468.40642" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" - inkscape:window-width="1600" - inkscape:window-height="877" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-width="1920" + inkscape:window-height="1051" + inkscape:window-x="345" + inkscape:window-y="1341" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:snap-grids="true" inkscape:snap-to-guides="false" - inkscape:guide-bbox="true"> + inkscape:guide-bbox="true" + inkscape:pagecheckerboard="0" + inkscape:blackoutopacity="0.0"> + + + inkscape:swatch="solid"> + inkscape:swatch="solid"> + inkscape:swatch="solid"> + inkscape:swatch="solid"> + inkscape:swatch="solid"> + inkscape:swatch="solid"> + color-interpolation-filters="sRGB" + x="-0.0576" + y="-0.068571429" + width="1.1152" + height="1.1371429"> @@ -355,7 +372,11 @@ inkscape:label="Simple blur" inkscape:menu="ABCs" inkscape:menu-tooltip="Simple Gaussian blur, same as the blur slider in Fill and Stroke dialog" - color-interpolation-filters="sRGB"> + color-interpolation-filters="sRGB" + x="-0.0576" + y="-0.068571429" + width="1.1152" + height="1.1371429"> @@ -392,56 +413,56 @@ inkscape:label="Layer 1"> %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f Med + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Med %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f °C + id="tspan763-4-2" + style="font-size:18px;line-height:1.25">°C Não apagar este modelos + sodipodi:role="line" + style="font-size:21.3539px;line-height:1.25;font-family:sans-serif">Não apagar este modelos Duplicar estes + y="-432.63782" + style="font-size:10px;line-height:1.25;font-family:sans-serif">Duplicar estes Modelos + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">Modelos 2• + id="tspan5821-1" + style="font-size:12px;line-height:1.25">2• 525kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">525kV 230kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">230kV 138kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">138kV 69kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">69kV <= 23kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif"><= 23kV %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f Unidade + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Unidade %5.1f + y="-201.63782" + style="font-size:22px;line-height:1.25">%5.1f %4.0f + y="-176.63782" + style="font-size:22px;line-height:1.25">%4.0f %5.1f + y="-125.63783" + style="font-size:22px;line-height:1.25">%5.1f %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MVA + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVA %5.1f + y="-251.63782" + style="font-size:22px;line-height:1.25">%5.1f MVA + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVA MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr AMP + sodipodi:role="line" + style="font-size:18px;line-height:1.25">AMP 230kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">230kV %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f 138kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">138kV 525kV + y="195.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">525kV 230kV + y="222.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">230kV 138kV + y="252.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">138kV 69kV + y="282.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">69kV <= 23kV + y="311.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif"><= 23kV %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f kV + id="tspan763" + style="font-size:18px;line-height:1.25">kV %2.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%2.0f TAP + sodipodi:role="line" + style="font-size:18px;line-height:1.25">TAP %2.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%2.0f TAP + sodipodi:role="line" + style="font-size:18px;line-height:1.25">TAP Texto Estático + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Texto Estático Texto Estático + y="-279.63782" + style="font-size:18px;line-height:1.25">Texto Estático ON / OFF + sodipodi:role="line" + style="font-size:18px;line-height:1.25">ON / OFF Quadro de status + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Quadro de status Norm / Oper + y="282.36218" + style="font-size:18px;line-height:1.25">Norm / Oper 86 BF + y="262.36218" + style="font-size:18px;line-height:1.25">86 BF Norm / Oper + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Norm / Oper Quadro de status + y="438.36218" + style="font-size:18px;line-height:1.25">Quadro de status %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f 69kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">69kV %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f kV + id="tspan763-7" + style="font-size:18px;line-height:1.25">kV %5.2f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.2f Hz + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Hz %5.2f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.2f Hz + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Hz %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f <23kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25"><23kV %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f kV + id="tspan6351" + style="font-size:18px;line-height:1.25">kV 525kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">525kV LT XYZ2 C1 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">LT XYZ2 C1 LT XYZ2 C1 + y="158.36218" + style="font-size:24px;line-height:1.25">LT XYZ2 C1 %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f VcaVcc + y="20.362175" + style="font-size:18px;line-height:1.25">VcaVcc %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f Vca/Vcc + id="tspan12951" + style="font-size:18px;line-height:1.25">Vca/Vcc Quadro de alarme + id="tspan13316" + style="font-size:18px;line-height:1.25">Quadro de alarme 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 1 + y="-222.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 2 + y="-182.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">2 3 + y="-145.14044" + style="font-size:20px;line-height:1.25;font-family:sans-serif">3 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 1 + y="-222.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 2 + y="-182.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">2 3 + y="-145.14044" + style="font-size:20px;line-height:1.25;font-family:sans-serif">3 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f 44kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">44kV %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f kV + id="tspan763-7-5" + style="font-size:18px;line-height:1.25">kV 2• + y="-364.00565" + style="font-size:12px;line-height:1.25">2• 0 + y="-361.26733" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 2• + id="tspan5821-1-7" + style="font-size:12px;line-height:1.25">2• Barra + y="168.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">Barra °C + sodipodi:role="line" + style="font-size:18px;line-height:1.25">°C %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f °C + id="tspan763-4" + style="font-size:18px;line-height:1.25">°C DigitalDigitalAparece quando desligaAparece quando desligaE alarme não foi reconhecido + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">E alarme não foi reconhecido Limites AnalógicosLimites AnalógicosAparece quando violado limiteAparece quando violado limiteE alarme não foi reconhecido + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">E alarme não foi reconhecido Proteção tipo bloqueioProteção tipo bloqueioAparece qunado bloqueadoAparece qunado bloqueadomesmo que reconhecido + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">mesmo que reconhecido Quadro de status + id="tspan11232" + style="font-size:18px;line-height:1.25">Quadro de status KNH2 + y="-390.96606" + style="font-size:48px;line-height:1.25">KNH2 kV 230kV 230A Bar + x="26.003679" + sodipodi:role="line" + style="font-size:14px;line-height:1">A Bar 250 + y="-219.52805" + style="font-size:10px;line-height:1.25">250 230 + y="-179.52805" + style="font-size:10px;line-height:1.25">230 210 + y="-139.52805" + style="font-size:10px;line-height:1.25">210 30min + id="tspan_plot_unid_time-0" + style="font-size:10px;line-height:1.25">30min kV 230 / A Bar + y="-211.29659" + style="font-size:12px;line-height:1.25">kV 230 / A Bar %5.1f + sodipodi:role="line" + style="font-size:12px;line-height:1.25">%5.1f %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">kV 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 %5.2f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.2f Hz + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Hz kV 230kV 230B Bar + x="26.003679" + sodipodi:role="line" + style="font-size:14px;line-height:1">B Bar 250 + y="-219.52805" + style="font-size:10px;line-height:1.25">250 230 + y="-179.52805" + style="font-size:10px;line-height:1.25">230 210 + y="-139.52805" + style="font-size:10px;line-height:1.25">210 30min + id="tspan_plot_unid_time-1" + style="font-size:10px;line-height:1.25">30min kV 230 / B Bar + y="-211.29659" + style="font-size:12px;line-height:1.25">kV 230 / B Bar %5.1f + sodipodi:role="line" + style="font-size:12px;line-height:1.25">%5.1f %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">kV 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 %5.2f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.2f Hz + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Hz INC + y="540" + style="font-size:14.0006px;line-height:1.25">INC Telecont + y="540" + style="font-size:14.0006px;line-height:1.25">Telecont 24-1• + y="-364.00565" + style="font-size:12px;line-height:1.25">24-1• 0 + y="-361.26733" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 2• + id="tspan5821-1-6-1592" + style="font-size:12px;line-height:1.25">2• 4• + id="tspan5821-1-5-1592" + style="font-size:12px;line-height:1.25">4• u^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">u^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW u^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">u^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">kV %5.2f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.2f Hz + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Hz KIN1 C1 + y="16" + style="font-size:16px;line-height:1.25">KIN1 C1 1 + id="tspan4773-4-8-1586" + style="font-size:12px;line-height:1.25">1 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 6 + y="-293.05743" + style="font-size:12px;line-height:1.25">6 8 + y="-293.05743" + style="font-size:12px;line-height:1.25">8 10 + y="-293.05743" + style="font-size:12px;line-height:1.25">10 12 + y="-293.05743" + style="font-size:12px;line-height:1.25">12 INC + y="540" + style="font-size:14.0006px;line-height:1.25">INC Telecont + y="540" + style="font-size:14.0006px;line-height:1.25">Telecont KHB1 C1 + y="0" + style="font-size:16px;line-height:1.25">KHB1 C1 30• + y="-293.05743" + style="font-size:12px;line-height:1.25">30• 34• + y="-293.05743" + style="font-size:12px;line-height:1.25">34• 36• + y="-293.05743" + style="font-size:12px;line-height:1.25">36• 1 + y="-313.63782" + style="font-size:12px;line-height:1.25">1 INC + y="540" + style="font-size:14.0006px;line-height:1.25">INC Telecont + y="540" + style="font-size:14.0006px;line-height:1.25">Telecont %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MVA + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVA d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">kV 7• + id="tspan4773-4-8-1587" + style="font-size:12px;line-height:1.25">7• 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 54• + y="-293.05743" + style="font-size:12px;line-height:1.25">54• 56• + y="-293.05743" + style="font-size:12px;line-height:1.25">56• 58• + y="-293.05743" + style="font-size:12px;line-height:1.25">58• 60• + y="-293.05743" + style="font-size:12px;line-height:1.25">60• 7 + y="-313.63782" + style="font-size:12px;line-height:1.25">7 A + id="tspan3360" + style="font-size:24px;line-height:1.25">A B + y="0" + style="font-size:24px;line-height:1.25">B G-1 + y="-68" + style="font-size:16px;line-height:1.25">G-1 %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MVA + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVA d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + sodipodi:role="line" + style="font-size:18px;line-height:1.25">kV 32• + y="-293.05743" + style="font-size:12px;line-height:1.25">32• 4• + id="tspan4773-4-8-1588" + style="font-size:12px;line-height:1.25">4• 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 BLOQ + y="540" + style="font-size:14.0006px;line-height:1.25">BLOQ (79)• + y="540" + style="font-size:14.0006px;line-height:1.25">(79)• BLOQ + y="540" + style="font-size:14.0006px;line-height:1.25">BLOQ (79)• + y="540" + style="font-size:14.0006px;line-height:1.25">(79)• 230kV Sector + y="0" + style="font-size:24px;line-height:1.25">230kV Sector + GraphQL Example + Results diff --git a/conf-templates/kor1-PergolaGrid.svg b/conf-templates/kor1-PergolaGrid.svg new file mode 100644 index 00000000..095f1e6d --- /dev/null +++ b/conf-templates/kor1-PergolaGrid.svg @@ -0,0 +1,11047 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + KIN1 + + + KOR1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Não apagar este modelos + + + + + Duplicar estes + Modelos + + + + + + + + + + + + + + + + + + 525kV + 230kV + 138kV + 69kV + <= 23kV + + + + + + + + + + + + + + + + + + + + + + + + + %5.1f + Unidade + %5.1f + %4.0f + %5.1f + + %5.1f + MW + + + %5.1f + MVAr + + + %4.0f + A + + + %5.1f + kV + + + %5.1f + MVA + + %5.1f + MVA + MW + MVAr + AMP + 230kV + %5.1f + 138kV + + + + + + + + 525kV + 230kV + 138kV + 69kV + <= 23kV + + %5.1f + kV + + + + + + + %2.0f + TAP + + %2.0f + TAP + + Texto Estático + Texto Estático + + + + ON / OFF + Quadro de status + + + + Norm / Oper + 86 BF + Norm / Oper + + + + + + + 12¬ + 14¬ + 3• + 16¬ + 6¬   + 8¬ + 2• + 10¬ + + + + + + + + + + + + + + + + + + + 1• + 2• + + + + + + + + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + + u^%5.1f + MVAr + + + %4.0f + A + + + %2.0f + TAP• + + + %4.1f + 69kV + + %4.1f + kV + + %5.2f + Hz + + %5.2f + Hz + + %4.1f + <23kV + + %4.1f + kV + + %5.1f + + %5.1f + kV + + 525kV + + %5.1f + kV + + AL-17 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + LT XYZ2 C1 + LT XYZ2 C1 + AL-16 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + + 30¬ + 32¬ + 24-1• + 23kV Sector + + + 48¬ + 50¬ + 8• + 46¬ + 18¬ + 20¬ + 4• + 22¬ + + + + + + + + + + + + + + + + + + AL-15 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + AL-14 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + + 24¬ + 26¬ + 5• + 28¬ + + + + + + + + + AL-13 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + + 34¬ + 36¬ + 6• + 38¬ + + + + + + + + + AL-12 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + + 40¬ + 42¬ + 7• + 44¬ + + + + + + + + + AL-11 + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + Transf. + + d^%5.1f + MW + + + d^%5.1f + MVAr + + + %4.0f + A + + + + + + + + + + + + FU-2¬ + 4 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + %4.1f + kV + + %5.1f + VcaVcc + + %5.1f + Vca/Vcc + + + %5.1f + Vca + + + %5.1f + MVA + + KPL4 C1 + + + Quadro de alarme + + Loc. + + 230kV Sector + ►TR-1 + TR-1 + + 0 + + + + + + 0 + + + + 1 + + + + 2 + + + + 3 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + 0 + + + + + + 0 + + + + 1 + + + + 2 + + + + 3 + + + + 1 + + + + 1 + + + + 1 + + + + + 0 + + 0 + + + 0 + + + + 0 + + + + + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + + + + + Telec + Telec + + + + + + + + 50F + + + + 50N + + + + 51F + + + + 51N + + + + 79 + + + + 62BF + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 50N + + + + 51F + + + + 51N + + + + 79 + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 50N + + + + 51F + + + + 51N + + + + 79 + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 50N + + + + 51F + + + + 51N + + + + 79 + + + + 62BF + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 50N + + + + 51F + + + + 51N + + + + 79 + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 50N + + + + 79 + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 51F + + + + 79 + + + + + 79IN + 79EX + + + + + 5051N + 5051N + + + + + Telec + Telec + + + + 50F + + + + 51F + + + + 79 + + + + 50N + + + + 51N + + + + 50N + + + + 51N + + + + 51F + + + + 51N + + + + + Telec + Telec + + + + + 86T + OPE + + + + + CDC + LOCAL + + + + + CDC + BLOQ + + + + + VF1 + DESL + + + + + VF2 + DESL + + + + + 90 + EXC + + + + + 90 + MAN + + P + T + + + + + + + kV230 + + + + + + + + kV23 + + + + + + + + MVATR1 + + + u^%5.1f + MW + + + + + + Bal.MW + + + + + + + + + + + + + + + + + + + + + + + 250 + 230 + 210 + 30min + kV / 230 + + + + + %5.1f + + + + + + + + + + + + + + + + + + + + + + + 60 + 30 + 0 + 30min + MVA TR1 + + + + + %5.1f + + + + + + + + + + + + + + + + + + + + + + + 25 + 23 + 21 + 30min + kV / 23 + + + + + %5.1f + + + + Quadro de status + + + AL11 + AL12 + AL13 + AL14 + AL15 + AL17 + AL16 + + + + 230 + + + + + + + + 1 + kV 230 Barra P + 250 + 210 + %.1f + + + + + + + + + + + + + + + + + + + OPEN + + + + CLOSE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %02.1f + + TR1 TAP CONTROL + TAP CTRL + XCBR + + + + + + + + diff --git a/conf-templates/kor1.svg b/conf-templates/kor1.svg index f7c05b5f..b34f4adf 100644 --- a/conf-templates/kor1.svg +++ b/conf-templates/kor1.svg @@ -15,7 +15,7 @@ height="1500" id="svg2" version="1.1" - inkscape:version="0.91 r13865" + inkscape:version="0.92.4 (e05b578f1, 2019-02-26, custom)" onload="var src; if (document.documentURI) src = document.documentURI; else if (this.getSrc) src = this.getSrc(); else src = document.location.href + ''; try {parent.preload.load(src);}catch(e) {}" sodipodi:docname="kor1.svg"> KIN1 + y="-397.63782" + style="font-size:24px;line-height:1.25">KIN1 + transform="matrix(0.28590565,0,0,0.27608176,11.83407,-312.60482)"> KOR1 + y="-390.96606" + style="font-size:48px;line-height:1.25">KOR1 Não apagar este modelos + y="-427.63782" + style="font-size:10px;line-height:1.25;font-family:sans-serif">Não apagar este modelos @@ -1241,27 +1241,27 @@ y="-377.63782" /> Duplicar estes + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">Duplicar estes Modelos + y="-397.63782" + style="font-size:10px;line-height:1.25;font-family:sans-serif">Modelos 525kV + y="99.362183" + style="font-size:10px;line-height:1.25;font-family:sans-serif">525kV 230kV + y="126.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">230kV 138kV + y="156.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">138kV 69kV + y="186.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif">69kV <= 23kV + y="215.36218" + style="font-size:10px;line-height:1.25;font-family:sans-serif"><= 23kV %5.1f + y="-232.63782" + style="font-size:22px;line-height:1.25">%5.1f Unidade + y="-287.63782" + style="font-size:18px;line-height:1.25">Unidade %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f MVAr + y="-358.36484" + style="font-size:18px;line-height:1.25">MVAr %4.0f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.0f A + y="-358.36484" + style="font-size:18px;line-height:1.25">A %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f kV + id="tspan4862" + style="font-size:18px;line-height:1.25">kV %5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.1f MVA + y="-358.36484" + style="font-size:18px;line-height:1.25">MVA %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MVA + y="-257.63782" + style="font-size:18px;line-height:1.25">MVA MW + y="-232.63782" + style="font-size:18px;line-height:1.25">MW MVAr + y="-207.63782" + style="font-size:18px;line-height:1.25">MVAr AMP + y="-182.63782" + style="font-size:18px;line-height:1.25">AMP 230kV + y="-131.63782" + style="font-size:18px;line-height:1.25">230kV %5.1f + y="-105.63783" + style="font-size:22px;line-height:1.25">%5.1f 138kV + y="-105.63782" + style="font-size:18px;line-height:1.25">138kV 525kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">525kV 230kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">230kV 138kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">138kV 69kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">69kV <= 23kV + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif"><= 23kV %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV %2.0f + y="-33.637817" + style="font-size:22px;line-height:1.25">%2.0f TAP + y="-33.637817" + style="font-size:18px;line-height:1.25">TAP %2.0f + y="-357.63782" + style="font-size:22px;line-height:1.25">%2.0f TAP + y="-358.36484" + style="font-size:18px;line-height:1.25">TAP Texto Estático + y="-307.63782" + style="font-size:18px;line-height:1.25">Texto Estático Texto Estático + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Texto Estático ON / OFF + y="82.362183" + style="font-size:18px;line-height:1.25">ON / OFF Quadro de status + y="62.362183" + style="font-size:18px;line-height:1.25">Quadro de status Norm / Oper + sodipodi:role="line" + style="font-size:18px;line-height:1.25">Norm / Oper 86 BF + sodipodi:role="line" + style="font-size:18px;line-height:1.25">86 BF Norm / Oper + y="282.36218" + style="font-size:18px;line-height:1.25">Norm / Oper 12¬ + y="56.362183" + style="font-size:12px;line-height:1.25">12¬ 14¬ + y="136.36218" + style="font-size:12px;line-height:1.25">14¬ 3• + y="97.362183" + style="font-size:12px;line-height:1.25">3• 16¬ + y="176.36218" + style="font-size:12px;line-height:1.25">16¬ 6¬6¬  + id="tspan2038" + style="font-size:12px;line-height:1.25">  8¬ + id="tspan4769" + style="font-size:12px;line-height:1.25">8¬ 2• + id="tspan4773" + style="font-size:12px;line-height:1.25">2• 10¬ + id="tspan4797" + style="font-size:12px;line-height:1.25">10¬ 1• + sodipodi:role="line" + style="font-size:12px;line-height:1.25">1• 2• + y="-313.63782" + style="font-size:12px;line-height:1.25">2• d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + y="-358.36484" + style="font-size:18px;line-height:1.25">MVAr %4.0f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.0f A + y="-358.36484" + style="font-size:18px;line-height:1.25">A u^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">u^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A %2.0f + id="tspan5943" + style="font-size:22px;line-height:1.25">%2.0f TAP• + sodipodi:role="line" + style="font-size:18px;line-height:1.25">TAP• %4.1f + y="-83.637817" + style="font-size:22px;line-height:1.25">%4.1f 69kV + y="-83.637817" + style="font-size:18px;line-height:1.25">69kV %4.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV %5.2f + y="-11.637817" + style="font-size:22px;line-height:1.25">%5.2f Hz + y="-11.637817" + style="font-size:18px;line-height:1.25">Hz %5.2f + y="-357.63782" + style="font-size:22px;line-height:1.25">%5.2f Hz + y="-358.36484" + style="font-size:18px;line-height:1.25">Hz %4.1f + y="-59.637817" + style="font-size:22px;line-height:1.25">%4.1f <23kV + y="-59.637817" + style="font-size:18px;line-height:1.25"><23kV %4.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.1f kV + id="tspan6327" + style="font-size:18px;line-height:1.25">kV %5.1f + y="-157.63783" + style="font-size:22px;line-height:1.25">%5.1f %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV 525kV + y="-157.63782" + style="font-size:18px;line-height:1.25">525kV %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV AL-17 + y="259.36218" + style="font-size:24px;line-height:1.25">AL-17 d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + y="-358.36484" + style="font-size:18px;line-height:1.25">MVAr %4.0f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.0f A + y="-358.36484" + style="font-size:18px;line-height:1.25">A LT XYZ2 C1 + y="62.362179" + style="font-size:24px;line-height:1.25">LT XYZ2 C1 LT XYZ2 C1 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">LT XYZ2 C1 AL-16 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">AL-16 d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A 30¬ + y="57.362183" + style="font-size:12px;line-height:1.25">30¬ 32¬ + y="177.36218" + style="font-size:12px;line-height:1.25">32¬ 24-1• + y="96.362183" + style="font-size:12px;line-height:1.25">24-1• 23kV Sector + y="17.362181" + style="font-size:24px;line-height:1.25">23kV Sector 48¬ + id="tspan5537" + style="font-size:12px;line-height:1.25">48¬ 50¬ + id="tspan5541" + style="font-size:12px;line-height:1.25">50¬ 8• + id="tspan5545" + style="font-size:12px;line-height:1.25">8• 46¬ + id="tspan5565" + style="font-size:12px;line-height:1.25">46¬ 18¬ + y="57.362183" + style="font-size:12px;line-height:1.25">18¬ 20¬ + y="137.36218" + style="font-size:12px;line-height:1.25">20¬ 4• + y="98.362183" + style="font-size:12px;line-height:1.25">4• 22¬ + y="177.36218" + style="font-size:12px;line-height:1.25">22¬ AL-15 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">AL-15 d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A AL-14 + y="260.36218" + style="font-size:24px;line-height:1.25">AL-14 d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + y="-358.36484" + style="font-size:18px;line-height:1.25">MVAr %4.0f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.0f A + y="-358.36484" + style="font-size:18px;line-height:1.25">A 24¬ + y="57.362183" + style="font-size:12px;line-height:1.25">24¬ 26¬ + y="137.36218" + style="font-size:12px;line-height:1.25">26¬ 5• + y="98.362183" + style="font-size:12px;line-height:1.25">5• 28¬ + y="177.36218" + style="font-size:12px;line-height:1.25">28¬ AL-13 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">AL-13 d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A 34¬ + id="tspan5855" + style="font-size:12px;line-height:1.25">34¬ 36¬ + id="tspan5859" + style="font-size:12px;line-height:1.25">36¬ 6• + id="tspan5863" + style="font-size:12px;line-height:1.25">6• 38¬ + id="tspan5884" + style="font-size:12px;line-height:1.25">38¬ AL-12 + y="260.36218" + style="font-size:24px;line-height:1.25">AL-12 d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MW + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MW d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + y="-358.36484" + style="font-size:18px;line-height:1.25">MVAr %4.0f + y="-357.63782" + style="font-size:22px;line-height:1.25">%4.0f A + y="-358.36484" + style="font-size:18px;line-height:1.25">A 40¬ + y="57.362183" + style="font-size:12px;line-height:1.25">40¬ 42¬ + y="137.36218" + style="font-size:12px;line-height:1.25">42¬ 7• + y="98.362183" + style="font-size:12px;line-height:1.25">7• 44¬ + y="177.36218" + style="font-size:12px;line-height:1.25">44¬ AL-11 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">AL-11 d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A Transf. + sodipodi:role="line" + style="font-size:24px;line-height:1.25">Transf. d^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">d^%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW d^%5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">d^%5.1f MVAr + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVAr %4.0f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.0f A + sodipodi:role="line" + style="font-size:18px;line-height:1.25">A FU-2¬ + y="54.860378" + style="font-size:8.29476547px;line-height:1.25">FU-2¬ 4 + id="tspan10024" + style="font-size:12px;line-height:1.25">4 1 + id="tspan10048" + style="font-size:12px;line-height:1.25">1 + y="560" + style="font-size:40px;line-height:1.25;font-family:sans-serif">  %4.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%4.1f kV + y="-358.36484" + style="font-size:18px;line-height:1.25">kV %5.1f + y="14.362165" + style="font-size:22px;line-height:1.25">%5.1f VcaVcc + sodipodi:role="line" + style="font-size:18px;line-height:1.25">VcaVcc %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f Vca/Vcc + y="-358.36484" + style="font-size:18px;line-height:1.25">Vca/Vcc %5.1f + y="-357.63782" + style="font-size:18px;line-height:1.25">%5.1f Vca + id="tspan12961" + style="font-size:14px;line-height:1.25">Vca %5.1f + sodipodi:role="line" + style="font-size:22px;line-height:1.25">%5.1f MVA + sodipodi:role="line" + style="font-size:18px;line-height:1.25">MVA KPL4 C1 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">KPL4 C1 Quadro de alarme + y="412.36218" + style="font-size:18px;line-height:1.25">Quadro de alarme Loc. + y="100.36218" + style="font-size:18px;line-height:1.25">Loc. 230kV Sector + sodipodi:role="line" + style="font-size:24px;line-height:1.25">230kV Sector ►TR-1 + sodipodi:role="line" + style="font-size:24px;line-height:1.25">►TR-1 TR-1 + y="267.80792" + style="font-size:24px;line-height:1.25">TR-1 0 + y="-427.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 2 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">2 3 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">3 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-274.63782" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-242.3891" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 2 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">2 3 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">3 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 1 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">1 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + y="-37.637821" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 0 + sodipodi:role="line" + style="font-size:20px;line-height:1.25;font-family:sans-serif">0 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 62BF + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">62BF 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 62BF + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">62BF 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 79IN + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">79IN 79EX + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">79EX 5051N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">5051N 5051N + y="535.78485" + style="font-size:13.99977875px;line-height:1.25">5051N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 50F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50F 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 79 + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">79 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 50N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">50N 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N 51F + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51F 51N + y="535.48022" + style="font-size:13.99977875px;line-height:1.25">51N Telec + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">Telec Telec + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">Telec 86T + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">86T OPE + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">OPE CDC + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">CDC LOCAL + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">LOCAL CDC + y="535.48022" + style="font-size:13.99986458px;line-height:1.25">CDC BLOQ + y="535.78485" + style="font-size:13.99986458px;line-height:1.25">BLOQ VF1 + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">VF1 DESL + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">DESL VF2 + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">VF2 DESL + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">DESL 90 + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">90 EXC + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">EXC 90 + y="535.48022" + style="font-size:14.00057793px;line-height:1.25">90 MAN + y="535.78485" + style="font-size:14.00057793px;line-height:1.25">MAN P + y="39.548565" + style="font-size:24px;line-height:1.25">P T + y="202.20978" + style="font-size:24px;line-height:1.25">T kVkV230 + sodipodi:role="line" + style="font-size:14px;line-height:1">230 kVkV23 + sodipodi:role="line" + style="font-size:14px;line-height:1">23 MVAMVATR1 + sodipodi:role="line" + style="font-size:14px;line-height:1">TR1 u^%5.1f + y="-357.63782" + style="font-size:22px;line-height:1.25">u^%5.1f MW + y="-358.36484" + style="font-size:18px;line-height:1.25">MW Bal.Bal.MW + sodipodi:role="line" + style="font-size:14px;line-height:1">MW 250 + y="-219.52805" + style="font-size:10px;line-height:1.25">250 230 + y="-179.52805" + style="font-size:10px;line-height:1.25">230 210 + y="-139.52805" + style="font-size:10px;line-height:1.25">210 30min + id="tspan1129-5-1-5" + style="font-size:10px;line-height:1.25">30min kV / 230 + y="-211.29659" + style="font-size:12px;line-height:1.25">kV / 230 %5.1f + sodipodi:role="line" + style="font-size:12px;line-height:1.25">%5.1f 60 + y="-219.52805" + style="font-size:10px;line-height:1.25">60 30 + y="-179.52805" + style="font-size:10px;line-height:1.25">30 0 + y="-139.52805" + style="font-size:10px;line-height:1.25">0 30min + id="tspan1129-5-1-5-6" + style="font-size:10px;line-height:1.25">30min MVA TR1 + y="-211.29659" + style="font-size:12px;line-height:1.25">MVA TR1 %5.1f + sodipodi:role="line" + style="font-size:12px;line-height:1.25">%5.1f 25 + y="-219.52805" + style="font-size:10px;line-height:1.25">25 23 + y="-179.52805" + style="font-size:10px;line-height:1.25">23 21 + y="-139.52805" + style="font-size:10px;line-height:1.25">21 30min + id="tspan1129-5-1-5-0" + style="font-size:10px;line-height:1.25">30min kV / 23 + y="-211.29659" + style="font-size:12px;line-height:1.25">kV / 23 %5.1f + sodipodi:role="line" + style="font-size:12px;line-height:1.25">%5.1f Quadro de status + id="tspan8040-9" + style="font-size:18px;line-height:1.25">Quadro de status AL11 + y="47.922966" + style="font-size:12px;line-height:1.25">AL11 AL12 + y="92.362183" + style="font-size:12px;line-height:1.25">AL12 AL13 + y="181.36218" + style="font-size:12px;line-height:1.25">AL13 AL14 + y="238.36218" + style="font-size:12px;line-height:1.25">AL14 AL15 + y="238.36218" + style="font-size:12px;line-height:1.25">AL15 AL17 + y="92.362183" + style="font-size:12px;line-height:1.25">AL17 AL16 + y="181.36218" + style="font-size:12px;line-height:1.25">AL16 230 + y="-712.50189" + style="font-size:10.35076046px;line-height:1.25">230 1 + y="-746.20428" + style="font-size:13.33332729px;line-height:1.25;font-family:sans-serif">1 kV 230 Barra P + dx="-1.318602" + style="font-size:13.05375004px;line-height:-352.54998779">kV 230 Barra P 250 + y="-712.48779" + style="font-size:10.35076046px;line-height:1.25">250 210 + y="-712.48779" + style="font-size:10.35076046px;line-height:1.25">210 %.1f + sodipodi:role="line" + style="font-size:13.98411369px;line-height:1.25">%.1f + inkscape:label="{"attr":"popup","height":400,"src":"block","width":500,"x":100,"y":100},{"align":"Right","attr":"set","prompt":"","src":"window.ShowHideTranslate(\"gTR1\",0,0);WebSAGE.makeDraggable(thisobj);","tag":"#exec","type":"Data"}"> OPEN + y="6.1921754" + style="font-size:13.8399477px;line-height:1.25">OPEN CLOSE + y="5.5002122" + style="font-size:13.8399477px;line-height:1.25">CLOSE %02.1f + sodipodi:role="line" + style="font-size:10.68659592px;line-height:1.25">%02.1f TR1 TAP CONTROL + sodipodi:role="line" + style="font-size:14.08393955px;line-height:1.25">TR1 TAP CONTROL TAP CTRL + sodipodi:role="line" + style="font-size:14.08393955px;line-height:1.25">TAP CTRL XCBR + sodipodi:role="line" + style="font-size:14.08393955px;line-height:1.25">XCBR + diff --git a/conf-templates/nginx_http.conf b/conf-templates/nginx_http.conf index cad80433..32c0003c 100644 --- a/conf-templates/nginx_http.conf +++ b/conf-templates/nginx_http.conf @@ -21,78 +21,27 @@ include nginx_access_control.conf; location / { - root "c:/json-scada/src/htdocs/"; - index index.html; - } - - location /index.html { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://127.0.0.1:8080/; - } - - location /login/ { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://127.0.0.1:8080/login/; - } - - location /admin/ { + proxy_pass http://jsonscadarealtimewebserver/; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $http_host; - proxy_pass http://127.0.0.1:8080/admin/; - } - - # OPC-like Realtime/Hist API - location /Invoke/ { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://127.0.0.1:8080/Invoke/; - } - - # reverse proxy, redirect ajax requests to OSHMI webserver.exe - location /htdocs/shellapi.rjs { - proxy_pass http://jsonscadarealtimewebserver/htdocs/shellapi.rjs; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - - # reverse proxy, redirect grafana requests (pass it to nodejs server_realtime_auth that redirects to grafana) - location /grafana/ { - proxy_pass http://127.0.0.1:8080/grafana/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - - # reverse proxy, redirect metabase requests (pass it to nodejs server_realtime_auth that redirects to metabase) - location /metabase/ { - proxy_pass http://127.0.0.1:8080/metabase/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } # reverse proxy, redirect log.io requests (pass it to nodejs server_realtime_auth that redirects to log.io server) location /log-io/ { - proxy_pass http://127.0.0.1:8080/log-io/; + proxy_pass http://jsonscadarealtimewebserver/log-io/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } location /socket.io/ { - proxy_pass http://127.0.0.1:8080/socket.io/; + proxy_pass http://jsonscadarealtimewebserver/socket.io/; proxy_set_header Host $host; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } - # log.io build static files + # log.io build static files location /static { alias c:/json-scada/src/log-io/ui/build/static; access_log off; @@ -121,14 +70,14 @@ location ~ ^/svg/.+(\.svg|\.js)$ { add_header Cache-Control "no-cache, must-revalidate"; etag on; - root "c:/json-scada/src/htdocs/"; + root "c:/json-scada/"; } # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # location ~ .php$ { include ../platform-windows/nginx_php-runtime/conf/fastcgi_params; - root "c:/json-scada/src/htdocs/"; + root "c:/json-scada/src/AdminUI/dist"; fastcgi_pass phpbackend; fastcgi_keep_conn on; fastcgi_index index.php; diff --git a/conf-templates/nginx_https.conf b/conf-templates/nginx_https.conf index 2a782b0c..efd6a0a9 100644 --- a/conf-templates/nginx_https.conf +++ b/conf-templates/nginx_https.conf @@ -33,93 +33,37 @@ # include nginx_access_control.conf; # location / { -# root "c:/json-scada/src/htdocs/"; -# index index.html; - -# # For user authentication (use htpasswd.exe command to manage users): -# # auth_basic "Restricted"; # For Basic Auth -# # auth_basic_user_file "c:/json-scada/conf/.htpasswd"; # For Basic Auth -# } - -# location /index.html { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://127.0.0.1:8080/; -# } - -# location /login/ { +# proxy_pass http://jsonscadarealtimewebserver/; # proxy_set_header X-Forwarded-For $remote_addr; # proxy_set_header X-Real-IP $remote_addr; # proxy_set_header Host $http_host; -# proxy_pass http://127.0.0.1:8080/login/; # } - -# location /admin/ { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://127.0.0.1:8080/admin/; -# } - -# # OPC-like Realtime/Hist API -# location /Invoke/ { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://127.0.0.1:8080/Invoke/; -# } - - -# # reverse proxy, redirect ajax requests to OSHMI webserver.exe -# location /htdocs/shellapi.rjs { -# proxy_pass http://jsonscadarealtimewebserver/htdocs/shellapi.rjs; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; +# +# # reverse proxy, redirect log.io requests (pass it to nodejs server_realtime_auth that redirects to log.io server) +# location /log-io/ { +# proxy_pass http://jsonscadarealtimewebserver/log-io/; +# proxy_set_header Host $host; +# proxy_set_header X-Real-IP $remote_addr; # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# } - -# # reverse proxy, redirect grafana requests (pass it to nodejs server_realtime_auth that redirects to grafana) -# location /grafana/ { -# proxy_pass http://127.0.0.1:8080/grafana/; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# } - -# # reverse proxy, redirect metabase requests (pass it to nodejs server_realtime_auth that redirects to metabase) -# location /metabase/ { -# proxy_pass http://127.0.0.1:8080/metabase/; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# } - -# # reverse proxy, redirect log.io requests (pass it to nodejs server_realtime_auth that redirects to log.io server) -# location /log-io/ { -# proxy_pass http://127.0.0.1:8080/log-io/; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# } -# location /socket.io/ { -# proxy_pass http://127.0.0.1:8080/socket.io/; -# proxy_set_header Host $host; -# proxy_http_version 1.1; -# proxy_set_header Upgrade $http_upgrade; -# proxy_set_header Connection "upgrade"; -# } -# # log.io build static files -# location /static { -# alias c:/json-scada/src/log-io/ui/build/static; -# access_log off; -# expires max; -# } -# location /manifest.json { -# alias c:/json-scada/src/log-io/ui/build/manifest.json; -# access_log off; -# expires max; -# } +# } +# location /socket.io/ { +# proxy_pass http://jsonscadarealtimewebserver/socket.io/; +# proxy_set_header Host $host; +# proxy_http_version 1.1; +# proxy_set_header Upgrade $http_upgrade; +# proxy_set_header Connection "upgrade"; +# } +# # log.io build static files +# location /static { +# alias c:/json-scada/src/log-io/ui/build/static; +# access_log off; +# expires max; +# } +# location /manifest.json { +# alias c:/json-scada/src/log-io/ui/build/manifest.json; +# access_log off; +# expires max; +# } # #error_page 404 /404.html; @@ -140,7 +84,7 @@ # location ~ ^/svg/.+(\.svg|\.js)$ { # add_header Cache-Control "no-cache, must-revalidate"; # etag on; -# root "c:/json-scada/src/htdocs/"; +# root "c:/json-scada/"; # } # # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 diff --git a/conf-templates/screen_list.js b/conf-templates/screen_list.js index b54534d4..34fc809e 100644 --- a/conf-templates/screen_list.js +++ b/conf-templates/screen_list.js @@ -3,23 +3,20 @@ // There can't be any spaces after the "\" character in the lines below optionhtml = "\ -\ +\ \ - \ + \ \ \ - \ + \ \ \ - \ + \ \ \ - \ + \ \ -\ -\ -\ -\ -\ +\ +\ \ "; diff --git a/conf/json-scada.json b/conf/json-scada.json index 98d572a9..3aadba9c 100644 --- a/conf/json-scada.json +++ b/conf/json-scada.json @@ -1,7 +1,5 @@ { "nodeName" : "mainNode", - "mongoConnectionString": "mongodb://localhost:27017/json_scada?replicaSet=rs1&readPreference=primary&ssl=false", - "mongoDatabaseName": "json_scada", - - "mongoConnectionString2": "mongodb://192.168.0.10:17017,192.168.0.15:17017/json_scada?replicaSet=rs1&readPreference=primary&ssl=false" + "mongoConnectionString": "mongodb://127.0.0.1/json_scada?tls=false&directConnection=true", + "mongoDatabaseName": "json_scada" } diff --git a/demo-docker/conf/nginx-conf.d/json_scada_http.conf b/demo-docker/conf/nginx-conf.d/json_scada_http.conf index 542acd09..40ba16e8 100644 --- a/demo-docker/conf/nginx-conf.d/json_scada_http.conf +++ b/demo-docker/conf/nginx-conf.d/json_scada_http.conf @@ -32,54 +32,11 @@ # deny all; - #location / { - # root "/home/jsonscada/json-scada/src/htdocs/"; - # index index.html; - #} - location / { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; proxy_pass http://jsonscadarealtimewebserver/; - } - - location /login/ { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://jsonscadarealtimewebserver/login/; - } - - location /admin/ { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://jsonscadarealtimewebserver/admin/; - } - - # OPC-like Realtime/Hist API - location /Invoke/ { proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $http_host; - proxy_pass http://jsonscadarealtimewebserver/Invoke/; - } - -# # reverse proxy, redirect ajax requests to OSHMI webserver.exe -# location /htdocs/shellapi.rjs { -# proxy_pass http://jsonscadarealtimewebserver/htdocs/shellapi.rjs; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# } - - # reverse proxy, redirect grafana requests (pass it to nodejs server_realtime_auth that redirects to grafana) - location /grafana/ { - proxy_pass http://jsonscadarealtimewebserver/grafana/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } # redirect server error pages to the static page /50x.html @@ -99,14 +56,14 @@ #location ~ ^/svg/.+(\.svg|\.js)$ { # add_header Cache-Control "no-cache, must-revalidate"; # etag on; - # root "c:/json-scada/src/htdocs/"; + # root "/"; #} # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # location ~ .php$ { include fastcgi.conf; - root "/home/jsonscada/json-scada/src/htdocs/"; + root "/AdminUI/dist/"; fastcgi_pass phpbackend; fastcgi_keep_conn on; fastcgi_index index.php; diff --git a/demo-docker/conf/nginx-conf.d/json_scada_https.conf b/demo-docker/conf/nginx-conf.d/json_scada_https.conf index ed366a99..c362c34e 100644 --- a/demo-docker/conf/nginx-conf.d/json_scada_https.conf +++ b/demo-docker/conf/nginx-conf.d/json_scada_https.conf @@ -37,46 +37,11 @@ # # deny all; -# #location / { -# # root "/home/jsonscada/json-scada/src/htdocs/"; -# # index index.html; -# #} - # location / { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; # proxy_pass http://jsonscadarealtimewebserver/; -# } - -# location /login/ { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://jsonscadarealtimewebserver/login/; -# } - -# location /admin/ { # proxy_set_header X-Forwarded-For $remote_addr; # proxy_set_header X-Real-IP $remote_addr; # proxy_set_header Host $http_host; -# proxy_pass http://jsonscadarealtimewebserver/admin/; -# } - -# # OPC-like Realtime/Hist API -# location /Invoke/ { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://jsonscadarealtimewebserver/Invoke/; -# } - -# # reverse proxy, redirect grafana requests (pass it to nodejs server_realtime_auth that redirects to grafana) -# location /grafana/ { -# proxy_pass http://jsonscadarealtimewebserver/grafana/; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # } # #error_page 404 /404.html; @@ -98,14 +63,14 @@ # #location ~ ^/svg/.+(\.svg|\.js)$ { # # add_header Cache-Control "no-cache, must-revalidate"; # # etag on; -# # root "/home/jsonscada/json-scada/src/htdocs/"; +# # root "/"; # #} # # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # # # location ~ .php$ { # include fastcgi.conf; -# root "/home/jsonscada/json-scada/src/htdocs/"; +# root "/AdminUI/dist/"; # fastcgi_pass phpbackend; # fastcgi_keep_conn on; # fastcgi_index index.php; diff --git a/demo-docker/docker-compose.yaml b/demo-docker/docker-compose.yaml index 1b5bc10c..d919e66e 100644 --- a/demo-docker/docker-compose.yaml +++ b/demo-docker/docker-compose.yaml @@ -1,6 +1,7 @@ # {json:scada} Demo - (c) 2020-2024 - Ricardo L. Olsen -# ACCESS VIA WEB BROWSER AT http://127.0.0.1/login/login.html +# ACCESS VIA WEB BROWSER AT http://127.0.0.1/ +# Server must have tcp port 80 free! # Must be online to connect to IEC60870-5-104 live demo server at 207.180.242.96:2404. services: @@ -9,11 +10,11 @@ services: # must create a mongodb instance or cluster with a replica set jsdemo_mongorsn1: - image: mongo:7.0 + image: mongo:8.0 container_name: jsdemo_mongors1 hostname: jsdemo_mongorsn1 restart: unless-stopped - command: "mongod --bind_ip_all --replSet rs1 --wiredTigerCacheSizeGB 2 --dbpath /data/db --port 27017" + command: "mongod --bind_ip_all --replSet rs1 --wiredTigerCacheSizeGB 1 --dbpath /data/db --port 27017" extra_hosts: - "jsdemo_mongorsn1:127.0.0.1" volumes: @@ -145,11 +146,12 @@ services: iec104client: image: mcr.microsoft.com/dotnet/sdk:8.0 container_name: jsdemo_iec104client - command: sh -c "sleep 20 && /jsonscada_bin/iec104client" + command: sh -c "sleep 60 && /jsonscada_bin/iec104client" restart: unless-stopped volumes: - ./conf:/conf - ./bin:/jsonscada_bin + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -159,11 +161,12 @@ services: iec104server: image: mcr.microsoft.com/dotnet/sdk:8.0 container_name: jsdemo_iec104server - command: sh -c "sleep 20 && /jsonscada_bin/iec104server" + command: sh -c "sleep 60 && /jsonscada_bin/iec104server" restart: unless-stopped volumes: - ./conf:/conf - ./bin:/jsonscada_bin + - ./log:/log links: - jsdemo_mongorsn1 # exports the iec 104 server port to the host @@ -178,12 +181,13 @@ services: cs_data_processor: image: node:20-alpine container_name: jsdemo_cs_data_processor - command: sh -c "cd /cs_data_processor && sleep 10 && node cs_data_processor.js" + command: sh -c "cd /cs_data_processor && sleep 50 && node cs_data_processor.js" restart: unless-stopped volumes: - ../src/cs_data_processor:/cs_data_processor - ./sql:/sql - ./conf:/conf + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -193,11 +197,12 @@ services: cs_custom_processor: image: node:20-alpine container_name: jsdemo_cs_custom_processor - command: sh -c "cd /cs_custom_processor && sleep 10 && node cs_custom_processor.js" + command: sh -c "cd /cs_custom_processor && sleep 50 && node cs_custom_processor.js" restart: unless-stopped volumes: - ../src/cs_custom_processor:/cs_custom_processor - ./conf:/conf + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -207,7 +212,7 @@ services: config_server_excel: image: node:20-alpine container_name: jsdemo_config_server_excel - command: sh -c "cd /config_server_for_excel && sleep 10 && node index.js" + command: sh -c "cd /config_server_for_excel && sleep 60 && node index.js" restart: unless-stopped environment: - JS_CSEXCEL_IP_BIND=0.0.0.0 @@ -219,6 +224,7 @@ services: volumes: - ../src/config_server_for_excel:/config_server_for_excel - ./conf:/conf + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -228,11 +234,12 @@ services: mqtt-sparkplug: image: node:20-alpine container_name: jsdemo_mqtt-sparkplug - command: sh -c "cd /mqtt-sparkplug && sleep 20 && node index.js" + command: sh -c "cd /mqtt-sparkplug && sleep 60 && node index.js" restart: unless-stopped volumes: - ../src/mqtt-sparkplug:/mqtt-sparkplug - ./conf:/conf + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -242,7 +249,7 @@ services: opcua_server: image: node:20-alpine container_name: jsdemo_opcua_server - command: sh -c "cd /OPC-UA-Server && sleep 10 && node index.js" + command: sh -c "cd /OPC-UA-Server && sleep 60 && node index.js" restart: unless-stopped ports: - 4840:4840 @@ -251,6 +258,7 @@ services: volumes: - ../src/OPC-UA-Server:/OPC-UA-Server - ./conf:/conf + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -260,7 +268,7 @@ services: server_realtime: image: node:20-alpine container_name: jsdemo_server_realtime_auth - command: sh -c "cd /server_realtime_auth && sleep 10 && node index.js" + command: sh -c "cd /server_realtime_auth && sleep 50 && node index.js" restart: unless-stopped environment: - JS_IP_BIND=0.0.0.0 @@ -273,10 +281,13 @@ services: - PGPASSWORD= volumes: - ../src/server_realtime_auth:/server_realtime_auth - - ../src/htdocs:/htdocs - - ../src/htdocs-admin:/htdocs-admin - - ../src/htdocs-login:/htdocs-login + #- ../src/htdocs:/htdocs + #- ../src/htdocs-admin:/htdocs-admin + #- ../src/htdocs-login:/htdocs-login + - ../src/AdminUI:/AdminUI + - ../svg:/svg - ./conf:/conf + - ./log:/log links: - jsdemo_mongorsn1 - grafana @@ -292,11 +303,12 @@ services: calculations: image: node:20-alpine container_name: jsdemo_calculations - command: sh -c "sleep 15 && cd /jsonscada_bin/ && ./calculations" + command: sh -c "sleep 50 && cd /jsonscada_bin/ && ./calculations" restart: unless-stopped volumes: - ./conf:/conf - ./bin:/jsonscada_bin + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -308,18 +320,22 @@ services: container_name: jsdemo_dnp3_client_wine #dpkg --add-architecture i386 && apt update && apt install -y xvfb wget libfreetype6 wine wine32:i386 && cd /root && #apt update && apt install -y xvfb wget libfreetype6 wine && cd /root && - command: sh -c "export DISPLAY=:0.0 && cd /jsonscada_bin && + command: sh -c "export DISPLAY=:0.0 && export WINEDEBUG=-all && rm -rf /tmp/.X0-lock && (Xvfb :0 -screen 0 1024x768x16 &) && + cd /tmp && wget -nc https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ; wget -nc https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks ; sh ./winetricks win10 && wine dotnet-runtime-6.0.33-win-x64.exe /q && + cd /jsonscada_bin && + sleep 40 && wine Dnp3Client.exe " restart: unless-stopped volumes: - ./conf:/conf - ./bin_win:/jsonscada_bin + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -331,18 +347,22 @@ services: container_name: jsdemo_opcda_client_wine #dpkg --add-architecture i386 && apt update && apt install -y xvfb wget libfreetype6 wine wine32:i386 && cd /root && #apt update && apt install -y xvfb wget libfreetype6 wine && cd /root && - command: sh -c "export DISPLAY=:0.0 && cd /jsonscada_bin && + command: sh -c "export DISPLAY=:0.0 && export WINEDEBUG=-all && rm -rf /tmp/.X0-lock && (Xvfb :0 -screen 0 1024x768x16 &) && + cd /tmp && wget -nc https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ; wget -nc https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks ; sh ./winetricks win10 && wine dotnet-runtime-6.0.33-win-x64.exe /q && + cd /jsonscada_bin && + sleep 40 && wine OPC-DA-Client.exe " restart: unless-stopped volumes: - ./conf:/conf - ./bin_win:/jsonscada_bin + - ./log:/log links: - jsdemo_mongorsn1 networks: @@ -372,9 +392,8 @@ services: - ./conf/nginx.conf:/etc/nginx/nginx.conf - ./conf/fastcgi.conf:/etc/nginx/fastcgi.conf - ./conf/nginx-conf.d:/etc/nginx/conf.d - - ../src/htdocs:/htdocs - - ../src/htdocs-admin:/htdocs-admin - - ../src/htdocs-login:/htdocs-login + - ../src/AdminUI:/AdminUI + - ../svg:/svg restart: unless-stopped links: - server_realtime diff --git a/demo-docker/mongo_seed/files/a.sh b/demo-docker/mongo_seed/files/a.sh new file mode 100644 index 00000000..96a9eefb --- /dev/null +++ b/demo-docker/mongo_seed/files/a.sh @@ -0,0 +1,2 @@ +#!/bin/sh +sleep 5 diff --git a/demo-docker/mongo_seed/files/a_rs-init.js b/demo-docker/mongo_seed/files/b_rs-init.js similarity index 100% rename from demo-docker/mongo_seed/files/a_rs-init.js rename to demo-docker/mongo_seed/files/b_rs-init.js diff --git a/demo-docker/mongo_seed/files/c.sh b/demo-docker/mongo_seed/files/c.sh new file mode 100644 index 00000000..96a9eefb --- /dev/null +++ b/demo-docker/mongo_seed/files/c.sh @@ -0,0 +1,2 @@ +#!/bin/sh +sleep 5 diff --git a/demo-docker/mongo_seed/files/b_create-db.js b/demo-docker/mongo_seed/files/d_create-db.js similarity index 100% rename from demo-docker/mongo_seed/files/b_create-db.js rename to demo-docker/mongo_seed/files/d_create-db.js diff --git a/demo-docker/mongo_seed/files/demo_connections.json b/demo-docker/mongo_seed/files/demo_connections.json index 4346aa53..cd565f96 100644 --- a/demo-docker/mongo_seed/files/demo_connections.json +++ b/demo-docker/mongo_seed/files/demo_connections.json @@ -1,5 +1,5 @@ {"_id":{"$oid":"5f108e3e3d8adfd3eccb206e"},"protocolDriver":"IEC60870-5-104_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1001,"name":"IEC104DIST","description":"Demo distribution of IEC 104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:2404","ipAddresses":[],"localLinkAddress":1.0,"remoteLinkAddress":2.0,"giInterval":null,"testCommandInterval":0.0,"timeSyncInterval":0.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"serverModeMultiActive":true,"maxClientConnections":20.0,"maxQueueSize":5000.0,"stats":null} -{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["207.180.242.96:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null} +{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["129.153.76.210:2404","150.230.171.172:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null} {"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCClient1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"c:\\json-scada\\conf\\Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null} {"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://test.mosquitto.org:1883"],"topics":["spBv1.0/Edge Nodes/#","spBv1.0/MIMIC/#","home/Solax/livedata/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null} {"_id":{"$oid":"60da25c2040e43523c8f4f57"},"protocolDriver":"OPC-UA_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":123,"name":"OPC-UA DIST","description":"Test distribution of OPC-UA","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:4840","ipAddresses":[],"groupId":"UA/Test","topics":["KOR1","KAW2"],"stats":null} diff --git a/demo-docker/mongo_seed/files/demo_connections_linux.json b/demo-docker/mongo_seed/files/demo_connections_linux.json index d666d982..d82b8da5 100644 --- a/demo-docker/mongo_seed/files/demo_connections_linux.json +++ b/demo-docker/mongo_seed/files/demo_connections_linux.json @@ -1,5 +1,5 @@ {"_id":{"$oid":"5f108e3e3d8adfd3eccb206e"},"protocolDriver":"IEC60870-5-104_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1001,"name":"IEC104DIST","description":"Demo distribution of IEC 104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:2404","ipAddresses":[],"localLinkAddress":1.0,"remoteLinkAddress":2.0,"giInterval":null,"testCommandInterval":0.0,"timeSyncInterval":0.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"serverModeMultiActive":true,"maxClientConnections":20.0,"maxQueueSize":5000.0,"stats":null} -{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["207.180.242.96:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null} +{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["129.153.76.210:2404","150.230.171.172:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null} {"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCClient1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"/home/jsonscada/json-scada/conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null} {"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://test.mosquitto.org:1883"],"topics":["spBv1.0/Edge Nodes/#","spBv1.0/MIMIC/#","home/Solax/livedata/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null} {"_id":{"$oid":"60da25c2040e43523c8f4f57"},"protocolDriver":"OPC-UA_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":123,"name":"OPC-UA DIST","description":"Test distribution of OPC-UA","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:4840","ipAddresses":[],"groupId":"UA/Test","topics":["KOR1","KAW2"],"stats":null} diff --git a/demo-docker/mongo_seed/files/init.sh b/demo-docker/mongo_seed/files/init.sh index 44bd410f..74a44f6e 100755 --- a/demo-docker/mongo_seed/files/init.sh +++ b/demo-docker/mongo_seed/files/init.sh @@ -7,4 +7,4 @@ mongoimport --db $MONGO_INITDB_DATABASE --collection processInstances --type jso mongoimport --db $MONGO_INITDB_DATABASE --collection users --type json --file /docker-entrypoint-initdb.d/demo_users.json mongoimport --db $MONGO_INITDB_DATABASE --collection roles --type json --file /docker-entrypoint-initdb.d/demo_roles.json # mark tags as demo to make it easy to remove later -mongo $MONGO_INITDB_DATABASE --eval 'db.realtimeData.updateMany({_id:{$gt:0}},{$set:{dbId:"demo"}})' +mongosh $MONGO_INITDB_DATABASE --eval 'db.realtimeData.updateMany({_id:{$gt:0}},{$set:{dbId:"demo"}})' diff --git a/index.md b/index.md index 6d5d6adf..da41b856 100644 --- a/index.md +++ b/index.md @@ -7,13 +7,13 @@ A portable and scalable SCADA/IIoT-I4.0 platform centered on the MongoDB database server. ![](https://img.shields.io/badge/nodejs-20-green 'Node.js 20+') -![](https://img.shields.io/badge/golang-1.21-green 'Go 1.21+') -![](https://img.shields.io/badge/dotnet-6.0-green 'Dotnet 6.0') +![](https://img.shields.io/badge/golang-.21-green 'Go 1.21+') +![](https://img.shields.io/badge/dotnet-8.0-green 'Dotnet 8.0') ![](https://img.shields.io/badge/mongodb-6.0-green 'MongoDB 6.0+') -![](https://img.shields.io/badge/postgresql-12-green 'PostgreSQL 12+') +![](https://img.shields.io/badge/postgresql-16-green 'PostgreSQL 16') ![](https://img.shields.io/badge/timescaledb-2.0-green 'TimescaleDB 2.0') -![](https://img.shields.io/badge/grafana-9-green 'Grafana 9+') +![](https://img.shields.io/badge/grafana-11-green 'Grafana 11') ![](https://img.shields.io/badge/linux-x86--64-green 'Linux x86-64') ![](https://img.shields.io/badge/linux-ARM-green 'Linux ARM-64') @@ -28,7 +28,7 @@ A portable and scalable SCADA/IIoT-I4.0 platform centered on the MongoDB databas ![](https://img.shields.io/badge/MQTT-green 'MQTT') ![](https://img.shields.io/badge/Sparkplug--B-green 'Sparkplug B') ![](https://img.shields.io/badge/OPC--UA-green 'OPC-UA') -![](https://img.shields.io/badge/OPC--DA-yellow 'OPC-DA') +![](https://img.shields.io/badge/OPC--DA-green 'OPC-DA') ![](https://img.shields.io/badge/Modbus-green 'Modbus') ![](https://img.shields.io/badge/license-GPL-green 'License GPL') @@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - MongoDB as the real-time core database, persistence layer, config store, SOE historian. - Event-based realtime async data processing with MongoDB Change Streams. - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM. -- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha). +- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.39-alpha). - Unlimited tags, servers, and users. - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments. - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node. @@ -89,7 +89,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. ## Documentation - [Generic Install Guide](docs/install.md) -- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha) +- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.39-alpha) - [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation) - [Install Guide](docs/install.md) - [Docker Demo](demo-docker/README.md) diff --git a/platform-linux/build.sh b/platform-linux/build.sh index 3d18fe52..c47f1fe8 100755 --- a/platform-linux/build.sh +++ b/platform-linux/build.sh @@ -78,11 +78,6 @@ cd ../oshmi2json npm install cd ../oshmi_sync npm install -cd ../htdocs-admin -export NODE_OPTIONS=--openssl-legacy-provider -npm install -npm run build -export NODE_OPTIONS= cd ../shell-api npm install cd ../alarm_beep @@ -102,6 +97,10 @@ npm install cd ../mongowr npm install +cd ../AdminUI +npm install +npm run build + cd ../log-io/ui npm install npm run build @@ -112,5 +111,6 @@ cd ../inputs/file npm install npm run build + cd ../../../.. diff --git a/platform-linux/export_project.sh b/platform-linux/export_project.sh new file mode 100644 index 00000000..5824a748 --- /dev/null +++ b/platform-linux/export_project.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# to be completed and tested + +JSPATH=~/json-scada +TMPPATH=$JSPATH/tmp +MONGOBIN=/usr/bin +JAVAPATH=/usr/bin +TARPATH=/usr/bin +SVGPATH=$JSPATH/svg +mongoConnectionString=mongodb://127.0.0.1/json_scada?tls=false&directConnection=true +database=json_scada + +# read JSON config file + +mkdir -c $TMPPATH +rm -rf $TMPPATH/*.* + +mongoexport.exe --uri "$mongoConnectionString" --db $database --collection realtimeData --out $TMPPATH\realtimeData.json +mongoexport.exe --uri "$mongoConnectionString" --db $database --collection processInstances --out $TMPPATH\processInstances.json +mongoexport.exe --uri "$mongoConnectionString" --db $database --collection protocolDriverInstances --out $TMPPATH\protocolDriverInstances.json +mongoexport.exe --uri "$mongoConnectionString" --db $database --collection protocolConnections --out $TMPPATH\protocolConnections.json +mongoexport.exe --uri "$mongoConnectionString" --db $database --collection users --out $TMPPATH\users.json +mongoexport.exe --uri "$mongoConnectionString" --db $database --collection roles --out $TMPPATH\roles.json +# optional historical data +# mongoexport.exe --uri "$mongoConnectionString" --db $database --collection hist --out $TMPPATH\hist.json +# mongoexport.exe --uri "$mongoConnectionString" --db $database --collection backfillData --out $TMPPATH\backfillData.json +# mongoexport.exe --uri "$mongoConnectionString" --db $database --collection soeData --out $TMPPATH\soeData.json +# mongoexport.exe --uri "$mongoConnectionString" --db $database --collection userActions --out $TMPPATH\userActions.json + +copy %SVGPATH%\*.svg %TMPPATH%\ +copy %SVGPATH%\screen_list.js %TMPPATH%\ +# optional +# copy %JSPATH%\conf\*.* %TMPPATH%\ + +# zip files diff --git a/platform-linux/import_project.sh b/platform-linux/import_project.sh new file mode 100644 index 00000000..08fa5f03 --- /dev/null +++ b/platform-linux/import_project.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# to be completed and tested + +JSPATH=~/json-scada +TMPPATH=$JSPATH/tmp +MONGOBIN=/usr/bin +JAVAPATH=/usr/bin +TARPATH=/usr/bin +SVGPATH=$JSPATH/svg +mongoConnectionString=mongodb://127.0.0.1/json_scada?tls=false&directConnection=true +database=json_scada +FLAGS=--mode=upsert + +# read JSON config file + +mkdir -c $TMPPATH +rm -rf $TMPPATH/*.* + +mongosh --quiet --eval "db.realtimeData.deleteMany({})" "$mongoConnectionString" +mongosh --quiet --eval "db.processInstances.deleteMany({})" "$mongoConnectionString" +mongosh --quiet --eval "db.protocolConnections.deleteMany({})" "$mongoConnectionString" +mongosh --quiet --eval "db.protocolDriverInstances.deleteMany({})" "$mongoConnectionString" +mongosh --quiet --eval "db.users.deleteMany({})" "$mongoConnectionString" +mongosh --quiet --eval "db.roles.deleteMany({})" "$mongoConnectionString" + +mongoimport.exe --uri "$mongoConnectionString" --db $database --collection roles $FLAGS --file roles.json +mongoimport.exe --uri "$mongoConnectionString" --db $database --collection users $FLAGS --file users.json +mongoimport.exe --uri "$mongoConnectionString" --db $database --collection processInstances $FLAGS --file processInstances.json +mongoimport.exe --uri "$mongoConnectionString" --db $database --collection protocolDriverInstances $FLAGS --file protocolDriverInstances.json +mongoimport.exe --uri "$mongoConnectionString" --db $database --collection protocolConnections $FLAGS --file protocolConnections.json +mongoimport.exe --uri "$mongoConnectionString" --db $database --collection realtimeData $FLAGS --file realtimeData.json +# optional historical data +# mongoimport.exe --uri "$mongoConnectionString" --db $database --collection hist --file hist.json $FLAGS +# mongoimport.exe --uri "$mongoConnectionString" --db $database --collection backfillData --file backfillData.json $FLAGS +# mongoimport.exe --uri "$mongoConnectionString" --db $database --collection soeData --file soeData.json $FLAGS +# mongoimport.exe --uri "$mongoConnectionString" --db $database --collection userActions --file userActions.json $FLAGS + +cp $TMPPATH%\*.svg %SVGPATH%\*.svg /Y +cp %TMPPATH%\screen_list.js %SVGPATH%\ /Y +# optional +# copy %TMPPATH%\ %JSPATH%\conf\*.* diff --git a/platform-linux/restart_processes.sh b/platform-linux/restart_processes.sh new file mode 100644 index 00000000..ac0878d7 --- /dev/null +++ b/platform-linux/restart_processes.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +supervisorctl restart all + diff --git a/platform-linux/restart_protocols.sh b/platform-linux/restart_protocols.sh new file mode 100644 index 00000000..ac0878d7 --- /dev/null +++ b/platform-linux/restart_protocols.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +supervisorctl restart all + diff --git a/platform-mac/build.sh b/platform-mac/build.sh index e28d6dec..23b5eb93 100755 --- a/platform-mac/build.sh +++ b/platform-mac/build.sh @@ -68,11 +68,6 @@ cd ../oshmi2json npm install cd ../oshmi_sync npm install -cd ../htdocs-admin -export NODE_OPTIONS=--openssl-legacy-provider -npm install -npm run build -export NODE_OPTIONS= cd ../shell-api npm install cd ../alarm_beep @@ -101,4 +96,15 @@ cd ../inputs/file npm install npm run build +cd ../AdminUI +npm install +npm run build + +# deprecated +cd ../htdocs-admin +export NODE_OPTIONS=--openssl-legacy-provider +npm install +npm run build +export NODE_OPTIONS= + cd ../../../.. diff --git a/platform-rhel9/json_scada_http.conf b/platform-rhel9/json_scada_http.conf index 0c56b87e..67c15481 100644 --- a/platform-rhel9/json_scada_http.conf +++ b/platform-rhel9/json_scada_http.conf @@ -38,48 +38,10 @@ #} location / { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; proxy_pass http://jsonscadarealtimewebserver/; - } - - location /login/ { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://jsonscadarealtimewebserver/login/; - } - - location /admin/ { proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $http_host; - proxy_pass http://jsonscadarealtimewebserver/admin/; - } - - # OPC-like Realtime/Hist API - location /Invoke/ { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_pass http://jsonscadarealtimewebserver/Invoke/; - } - -# # reverse proxy, redirect ajax requests to OSHMI webserver.exe -# location /htdocs/shellapi.rjs { -# proxy_pass http://jsonscadarealtimewebserver/htdocs/shellapi.rjs; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# } - - # reverse proxy, redirect grafana requests (pass it to nodejs server_realtime_auth that redirects to grafana) - location /grafana/ { - proxy_pass http://jsonscadarealtimewebserver/grafana/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } # redirect server error pages to the static page /50x.html @@ -106,7 +68,7 @@ # location ~ .php$ { include fastcgi.conf; - root "/home/jsonscada/json-scada/src/htdocs/"; + root "/home/jsonscada/json-scada/svg/"; fastcgi_pass phpbackend; fastcgi_keep_conn on; fastcgi_index index.php; diff --git a/platform-rhel9/json_scada_https.conf b/platform-rhel9/json_scada_https.conf index bd0b3d26..ac3c3e0b 100644 --- a/platform-rhel9/json_scada_https.conf +++ b/platform-rhel9/json_scada_https.conf @@ -43,40 +43,10 @@ # #} # location / { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; # proxy_pass http://jsonscadarealtimewebserver/; -# } - -# location /login/ { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://jsonscadarealtimewebserver/login/; -# } - -# location /admin/ { -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header Host $http_host; -# proxy_pass http://jsonscadarealtimewebserver/admin/; -# } - -# # OPC-like Realtime/Hist API -# location /Invoke/ { # proxy_set_header X-Forwarded-For $remote_addr; # proxy_set_header X-Real-IP $remote_addr; # proxy_set_header Host $http_host; -# proxy_pass http://jsonscadarealtimewebserver/Invoke/; -# } - -# # reverse proxy, redirect grafana requests (pass it to nodejs server_realtime_auth that redirects to grafana) -# location /grafana/ { -# proxy_pass http://jsonscadarealtimewebserver/grafana/; -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # } # #error_page 404 /404.html; @@ -98,7 +68,7 @@ # #location ~ ^/svg/.+(\.svg|\.js)$ { # # add_header Cache-Control "no-cache, must-revalidate"; # # etag on; -# # root "/home/jsonscada/json-scada/src/htdocs/"; +# # root "/home/jsonscada/json-scada/svg/"; # #} # # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 diff --git a/platform-windows/build.bat b/platform-windows/build.bat index fafd4daa..0f82d7fe 100644 --- a/platform-windows/build.bat +++ b/platform-windows/build.bat @@ -1,10 +1,10 @@ echo This script builds JSON-SCADA Windows x64 binaries and restores NodeJS NPM modules. echo Required tools: -echo - Dotnet Core SDK 6.0 -echo - Golang 1.14+ +echo - Dotnet Core SDK 8.0 +echo - Golang 1.22+ echo - Node.js 20+ -set JSPATH=c:\json-scada +set JSPATH=\json-scada set SRCPATH=%JSPATH%\src set BINPATH=%JSPATH%\bin set BINWINPATH=%JSPATH%\demo-docker\bin_win @@ -115,11 +115,9 @@ call %NPM% install cd %SRCPATH%\shell-api call %NPM% install -cd %SRCPATH%\htdocs-admin -set NODE_OPTIONS=--openssl-legacy-provider +cd %SRCPATH%\AdminUI call %NPM% install call %NPM% run build -set NODE_OPTIONS= cd %SRCPATH%\grafana_alert2event call %NPM% install @@ -158,10 +156,18 @@ call %NPM% run build cd %SRCPATH%\log-io\server call %NPM% install call %NPM% run build +call %NPM% prune --omit=dev cd %SRCPATH%\log-io\inputs\file call %NPM% install +call %NPM% run build +call %NPM% prune --omit=dev +rem deprecated +cd %SRCPATH%\htdocs-admin +set NODE_OPTIONS=--openssl-legacy-provider +call %NPM% install call %NPM% run build +set NODE_OPTIONS= cd %JSPATH%\platform-windows diff --git a/platform-windows/buildupd.bat b/platform-windows/buildupd.bat index 69695785..a3239a39 100644 --- a/platform-windows/buildupd.bat +++ b/platform-windows/buildupd.bat @@ -1,10 +1,10 @@ -echo This script builds JSON-SCADA Windows x64 binaries and restores NodeJS NPM modules. +echo This script builds JSON-SCADA Windows x64 binaries and updates NodeJS NPM modules. echo Required tools: -echo - Dotnet Core SDK 6.0 -echo - Golang 1.14+ +echo - Dotnet Core SDK 8.0 +echo - Golang 1.22+ echo - Node.js 20+ -set JSPATH=c:\json-scada +set JSPATH=\json-scada set SRCPATH=%JSPATH%\src set BINPATH=%JSPATH%\bin set BINWINPATH=%JSPATH%\demo-docker\bin_win @@ -115,12 +115,10 @@ call %NPM% update cd %SRCPATH%\shell-api call %NPM% i --package-lock-only call %NPM% update -cd %SRCPATH%\htdocs-admin -set NODE_OPTIONS=--openssl-legacy-provider +cd %SRCPATH%\AdminUI call %NPM% i --package-lock-only call %NPM% update call %NPM% run build -set NODE_OPTIONS= cd %SRCPATH%\grafana_alert2event call %NPM% i --package-lock-only call %NPM% update @@ -151,17 +149,33 @@ call %NPM% update cd %SRCPATH%\mongowr call %NPM% i --package-lock-only call %NPM% update + cd %SRCPATH%\log-io\ui call %NPM% i --package-lock-only -call %NPM% update +rem call %NPM% update +call %NPM% install call %NPM% run build + cd %SRCPATH%\log-io\server call %NPM% i --package-lock-only -call %NPM% update +rem call %NPM% update +call %NPM% install call %NPM% run build +call %NPM% prune --omit=dev + cd %SRCPATH%\log-io\inputs\file call %NPM% i --package-lock-only +rem call %NPM% update +call %NPM% install +call %NPM% run build +call %NPM% prune --omit=dev + +rem deprecated +cd %SRCPATH%\htdocs-admin +set NODE_OPTIONS=--openssl-legacy-provider +call %NPM% i --package-lock-only call %NPM% update call %NPM% run build +set NODE_OPTIONS= cd %JSPATH%\platform-windows diff --git a/platform-windows/create_services.bat b/platform-windows/create_services.bat index 0a6f5fb8..8c7e0645 100644 --- a/platform-windows/create_services.bat +++ b/platform-windows/create_services.bat @@ -55,13 +55,7 @@ nssm set JSON_SCADA_cs_custom_processor AppRotateBytes 10000000 nssm set JSON_SCADA_cs_custom_processor Start SERVICE_AUTO_START -REM CHOOSE ONE: server_realtime (no user control) or server_realtime_auth (token based auth and RBAC) - -REM nssm install JSON_SCADA_server_realtime "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime\index.js" NOAUTH -REM nssm set JSON_SCADA_server_realtime AppDirectory "C:\json-scada\src\server_realtime" -REM nssm set JSON_SCADA_server_realtime Start SERVICE_AUTO_START -REM Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html) -REM nssm set JSON_SCADA_server_realtime AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada +REM server_realtime_auth (token based auth and RBAC) REM CREATE A RANDOM SECRET FOR JWT ENCRYPTION setlocal EnableDelayedExpansion @@ -113,11 +107,6 @@ nssm set JSON_SCADA_config_server_excel Start SERVICE_DEMAND_START nssm set JSON_SCADA_config_server_excel AppEnvironmentExtra JS_CSEXCEL_IP_BIND=0.0.0.0 JS_CSEXCEL_HTTP_PORT=10001 rem JS_CSEXCEL_IP_BIND=127.0.0.1 to enable just local access -REM Just for use with OSHMI HMI Shell -REM nssm install JSON_SCADA_shell_api "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\shell-api\shell-api.js" -REM nssm set JSON_SCADA_shell_api AppDirectory "C:\json-scada\src\shell-api" -REM nssm set JSON_SCADA_shell_api Start SERVICE_AUTO_START - nssm install JSON_SCADA_process_rtdata "C:\json-scada\sql\process_pg_rtdata.bat" nssm set JSON_SCADA_process_rtdata AppDirectory "C:\json-scada\sql" nssm set JSON_SCADA_process_rtdata Start SERVICE_AUTO_START @@ -195,9 +184,9 @@ nssm set JSON_SCADA_opcuaclient Start SERVICE_DEMAND_START nssm install JSON_SCADA_opcdaclient "C:\json-scada\bin\OPC-DA-Client.exe" 1 2 nssm set JSON_SCADA_opcdaclient AppStdout C:\json-scada\log\opcdaclient.log -nssm set JSON_SCADA_opduaclient AppRotateOnline 1 -nssm set JSON_SCADA_opduaclient AppRotateBytes 10000000 -nssm set JSON_SCADA_opduaclient Start SERVICE_DEMAND_START +nssm set JSON_SCADA_opcdaclient AppRotateOnline 1 +nssm set JSON_SCADA_opcdaclient AppRotateBytes 10000000 +nssm set JSON_SCADA_opcdaclient Start SERVICE_DEMAND_START nssm install JSON_SCADA_iec61850client "C:\json-scada\bin\iec61850_client.exe" 1 2 nssm set JSON_SCADA_iec61850client AppStdout C:\json-scada\log\iec61850client.log @@ -229,7 +218,7 @@ nssm set JSON_SCADA_opcuaserver AppDirectory "C:\json-scada\src\OPC-UA-Server" nssm set JSON_SCADA_opcuaserver AppStdout C:\json-scada\log\opcuaserver.log nssm set JSON_SCADA_opcuaserver AppRotateOnline 1 nssm set JSON_SCADA_opcuaserver AppRotateBytes 10000000 -nssm set JSON_SCADA_opcuaserver Start SERVICE_DEMAND_START +nssm set JSON_SCADA_opcuaserver Start SERVICE_AUTO_START REM service for telegraf listener nssm install JSON_SCADA_telegraf_listener "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\telegraf-listener\index.js" diff --git a/platform-windows/export_project.bat b/platform-windows/export_project.bat index 46726a55..024a0e58 100644 --- a/platform-windows/export_project.bat +++ b/platform-windows/export_project.bat @@ -1,11 +1,10 @@ @ECHO OFF set JSPATH=c:\json-scada set TMPPATH=%JSPATH%\tmp -set MONGO_CONNECT_STRING=mongodb://192.168.239.133/?tls=false&directConnection=true set MONGOBIN=%JSPATH%\platform-windows\mongodb-runtime\bin set JAVAPATH=%JSPATH%\platform-windows\jdk-runtime\bin set TARPATH=%JSPATH%\platform-windows -set SVGPATH=%JSPATH%\src\AdminUI\dist\svg +set SVGPATH=%JSPATH%\svg set mongoConnectionString=mongodb://127.0.0.1/json_scada?tls=false&directConnection=true set database=json_scada set tlsCaPemFile= @@ -17,9 +16,9 @@ set tlsAllowInvalidHostnames=true set tlsAllowChainErrors=true set tlsInsecure=false -cd %JSPATH%\platform-windows\ +cd /d %JSPATH%\platform-windows\ -IF [%1]==[] ( SET "OUTPUTFILE=jsproject.zip" ) ELSE ( SET "OUTPUTFILE=%1" ) +if [%1]==[] ( SET "OUTPUTFILE=jsproject.zip" ) ELSE ( SET "OUTPUTFILE=%1" ) for /f "tokens=* delims=" %%a in ('jsonextractor.bat ..\conf\json-scada.json mongoConnectionString') do set "mongoConnectionString=%%~a" for /f "tokens=* delims=" %%a in ('jsonextractor.bat ..\conf\json-scada.json database') do set "database=%%~a" @@ -55,8 +54,8 @@ rem optional rem copy %JSPATH%\conf\*.* %TMPPATH%\ rem %TARPATH%\tar -a -c -f %TMPPATH%\jsproject.zip -C %TMPPATH% *.json -cd %TMPPATH% +cd /d %TMPPATH% %JAVAPATH%\jar -cfM %OUTPUTFILE% *.json %JAVAPATH%\jar -ufM %OUTPUTFILE% *.js %JAVAPATH%\jar -ufM %OUTPUTFILE% *.svg -cd %JSPATH%\platform-windows\ \ No newline at end of file +cd /d %JSPATH%\platform-windows\ \ No newline at end of file diff --git a/platform-windows/import_project.bat b/platform-windows/import_project.bat index 58d53fa1..8a8eb975 100644 --- a/platform-windows/import_project.bat +++ b/platform-windows/import_project.bat @@ -1,11 +1,10 @@ @ECHO OFF set JSPATH=c:\json-scada set TMPPATH=%JSPATH%\tmp -set MONGO_CONNECT_STRING=mongodb://192.168.239.133/?tls=false&directConnection=true set MONGOBIN=%JSPATH%\platform-windows\mongodb-runtime\bin set JAVAPATH=%JSPATH%\platform-windows\jdk-runtime\bin set TARPATH=%JSPATH%\platform-windows -set SVGPATH=%JSPATH%\src\AdminUI\dist\svg +set SVGPATH=%JSPATH%\svg set mongoConnectionString=mongodb://127.0.0.1/json_scada?tls=false&directConnection=true set database=json_scada set tlsCaPemFile= @@ -17,9 +16,9 @@ set tlsAllowInvalidHostnames=true set tlsAllowChainErrors=true set tlsInsecure=false -cd %JSPATH%\platform-windows\ +cd /d %JSPATH%\platform-windows\ -IF [%1]==[] ( SET "INPUTFILE=jsproject.zip" ) ELSE ( SET "INPUTFILE=%1" ) +if [%1]==[] ( SET "INPUTFILE=" ) ELSE ( SET "INPUTFILE=%1" ) for /f "tokens=* delims=" %%a in ('jsonextractor.bat ..\conf\json-scada.json mongoConnectionString') do set "mongoConnectionString=%%~a" for /f "tokens=* delims=" %%a in ('jsonextractor.bat ..\conf\json-scada.json database') do set "database=%%~a" @@ -35,16 +34,19 @@ rem set TLSFLAGS=--sslCAFile=%tlsCaPemFile% --sslPEMKeyFile=%tlsClientPemFile% - rem echo "%TLSFLAGS%" if not exist "%TMPPATH%" mkdir "%TMPPATH%" -cd %TMPPATH% +cd /d %TMPPATH% -del %TMPPATH%\*.json /Q -del %TMPPATH%\*.js /Q -del %TMPPATH%\*.svg /Q -del %TMPPATH%\*.conf /Q -del %TMPPATH%\*.xml /Q -del %TMPPATH%\*.ini /Q +if not [%INPUTFILE%]==[] ( + + del %TMPPATH%\*.json /Q + del %TMPPATH%\*.js /Q + del %TMPPATH%\*.svg /Q + del %TMPPATH%\*.conf /Q + del %TMPPATH%\*.xml /Q + del %TMPPATH%\*.ini /Q -%JAVAPATH%\jar -xf %INPUTFILE% + %JAVAPATH%\jar -xf %INPUTFILE% +) set FLAGS=--mode=upsert @@ -72,4 +74,4 @@ copy %TMPPATH%\screen_list.js %SVGPATH%\ /Y rem optional rem copy %TMPPATH%\ %JSPATH%\conf\*.* -cd %JSPATH%\platform-windows\ \ No newline at end of file +cd /d %JSPATH%\platform-windows\ \ No newline at end of file diff --git a/platform-windows/json-scada.nsi b/platform-windows/json-scada.nsi index 872e91be..f524aecd 100644 --- a/platform-windows/json-scada.nsi +++ b/platform-windows/json-scada.nsi @@ -17,8 +17,8 @@ RequestExecutionLevel admin ;-------------------------------- -!define VERSION "v.0.38" -!define VERSION_ "0.38.0.0" +!define VERSION "v.0.39" +!define VERSION_ "0.39.0.0" Function .onInit System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e' @@ -43,7 +43,7 @@ SetCompress off !define /date DATEBAR "%d/%m/%Y" Name "JSON-SCADA" Caption "{json:scada} Installer ${VERSION} ${DATEBAR}" -Icon "..\src\htdocs\images\j-s-256.ico" +Icon "..\src\AdminUI\public\images\j-s-256.ico" !define /date DATE "%d_%m_%Y" OutFile "installer-release\json-scada_setup_${VERSION}.exe" @@ -113,14 +113,12 @@ SetRegView 64 nsExec::Exec 'net stop JSON_SCADA_calculations' nsExec::Exec 'net stop JSON_SCADA_cs_data_processor' nsExec::Exec 'net stop JSON_SCADA_cs_custom_processor' - nsExec::Exec 'net stop JSON_SCADA_server_realtime' nsExec::Exec 'net stop JSON_SCADA_server_realtime_auth' nsExec::Exec 'net stop JSON_SCADA_config_server_excel' nsExec::Exec 'net stop JSON_SCADA_demo_simul' nsExec::Exec 'net stop JSON_SCADA_mongofw' nsExec::Exec 'net stop JSON_SCADA_mongowr' nsExec::Exec 'net stop JSON_SCADA_alarm_beeep' - nsExec::Exec 'net stop JSON_SCADA_shell_api' nsExec::Exec 'net stop JSON_SCADA_process_rtdata' nsExec::Exec 'net stop JSON_SCADA_process_hist' nsExec::Exec 'net stop JSON_SCADA_iec101client' @@ -247,7 +245,7 @@ SetRegView 64 File /a "..\platform-windows\nssm.exe" File /a "..\platform-windows\sounder.exe" File /a "..\platform-windows\vc_redist.x64.exe" - File /a "..\platform-windows\dotnet-runtime-8.0.8-win-x64.exe" + File /a "..\platform-windows\dotnet-runtime-8.0.10-win-x64.exe" File /a "..\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" ;File /a "..\platform-windows\gbda_aut.dll" ;File /a "..\platform-windows\gbhda_aw.dll" @@ -266,7 +264,7 @@ SetRegView 64 Sleep 1000 ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet' Sleep 1000 - ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.8-win-x64.exe" /install /passive /quiet' + ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.10-win-x64.exe" /install /passive /quiet' Sleep 1000 ExecWait 'msiexec /i "$INSTDIR\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" /qn' Sleep 1000 @@ -331,29 +329,39 @@ SetRegView 64 File /a "..\src\certificate-creator\server.conf" File /a "..\src\certificate-creator\create_certs.sh" - SetOutPath $INSTDIR\src\htdocs - File /a "..\src\htdocs\*.*" - File /a ".\release_notes.txt" - SetOutPath $INSTDIR\src\htdocs\sounds - File /a "..\src\htdocs\sounds\critical.wav" - File /a "..\src\htdocs\sounds\noncritical.wav" - SetOutPath $INSTDIR\src\htdocs\scripts - File /a /r "..\src\htdocs\scripts\*.*" - SetOutPath $INSTDIR\src\htdocs\sage-cepel-displays - File /a "..\src\htdocs\sage-cepel-displays\README.md" - SetOutPath $INSTDIR\src\htdocs\images - File /a /r "..\src\htdocs\images\*.*" - SetOutPath $INSTDIR\src\htdocs\charts - File /a /r "..\src\htdocs\charts\*.*" - SetOutPath $INSTDIR\src\htdocs\lib - File /a /r "..\src\htdocs\lib\*.*" - SetOutPath $INSTDIR\src\htdocs\i18n - File /a /r "..\src\htdocs\i18n\*.*" - - SetOutPath $INSTDIR\src\htdocs-admin - File /a /r "..\src\htdocs-admin\*.*" - SetOutPath $INSTDIR\src\htdocs-login - File /a /r "..\src\htdocs-login\*.*" + SetOutPath $INSTDIR\svg + File /a "..\conf-templates\*.svg" + File /a "..\conf-templates\screen_list.js" + SetOutPath $INSTDIR\src\AdminUI + File /a "..\src\AdminUI\*.*" + SetOutPath $INSTDIR\src\AdminUI\src + File /a /r "..\src\AdminUI\src\*.*" + SetOutPath $INSTDIR\src\AdminUI\dist + File /a /r "..\src\AdminUI\dist\*.*" + File /a ".\release_notes.txt" + + #SetOutPath $INSTDIR\src\htdocs + #File /a "..\src\htdocs\*.*" + #File /a ".\release_notes.txt" + #SetOutPath $INSTDIR\src\htdocs\sounds + #File /a "..\src\htdocs\sounds\critical.wav" + #File /a "..\src\htdocs\sounds\noncritical.wav" + #SetOutPath $INSTDIR\src\htdocs\scripts + #File /a /r "..\src\htdocs\scripts\*.*" + #SetOutPath $INSTDIR\src\htdocs\sage-cepel-displays + #File /a "..\src\htdocs\sage-cepel-displays\README.md" + #SetOutPath $INSTDIR\src\htdocs\images + #File /a /r "..\src\htdocs\images\*.*" + #SetOutPath $INSTDIR\src\htdocs\charts + #File /a /r "..\src\htdocs\charts\*.*" + #SetOutPath $INSTDIR\src\htdocs\lib + #File /a /r "..\src\htdocs\lib\*.*" + #SetOutPath $INSTDIR\src\htdocs\i18n + #File /a /r "..\src\htdocs\i18n\*.*" + #SetOutPath $INSTDIR\src\htdocs-admin + #File /a /r "..\src\htdocs-admin\*.*" + #SetOutPath $INSTDIR\src\htdocs-login + #File /a /r "..\src\htdocs-login\*.*" SetOutPath $INSTDIR\src\demo_simul File /a /r "..\src\demo_simul\*.*" @@ -370,9 +378,6 @@ SetRegView 64 SetOutPath $INSTDIR\src\alarm_beep File /a /r "..\src\alarm_beep\*.*" - SetOutPath $INSTDIR\src\shell-api - File /a /r "..\src\shell-api\*.*" - SetOutPath $INSTDIR\src\backup-mongo File /a /r "..\src\backup-mongo\*.*" @@ -400,9 +405,6 @@ SetRegView 64 SetOutPath $INSTDIR\src\config_server_for_excel\node_modules File /a /r "..\src\config_Server_for_excel\node_modules\*.*" - SetOutPath $INSTDIR\src\server_realtime - File /a /r "..\src\server_realtime\*.*" - SetOutPath $INSTDIR\src\server_realtime_auth File /a /r "..\src\server_realtime_auth\*.*" @@ -466,11 +468,11 @@ SetRegView 64 SetOverwrite off - SetOutPath $INSTDIR\src\htdocs\conf - File /a /r "..\src\htdocs\conf\*.*" + SetOutPath $INSTDIR\src\AdminUI\public\conf + File /a /r "..\src\AdminUI\public\conf\*.*" - SetOutPath $INSTDIR\src\htdocs\svg - File /a /r "..\src\htdocs\svg\*.*" + SetOutPath $INSTDIR\svg + File /a /r "..\svg\*.*" SetOutPath $INSTDIR\src\cs_custom_processor File /a "..\src\cs_custom_processor\customized_module.js" @@ -555,11 +557,6 @@ Section "Uninstall" !define SC `$SYSDIR\sc.exe` - ExecWait `"${SC}" stop "JSON_SCADA_server_realtime"` - Sleep 50 - ExecWait `"${SC}" delete "JSON_SCADA_server_realtime"` - ClearErrors - ExecWait `"${SC}" stop "JSON_SCADA_server_realtime_auth"` Sleep 50 ExecWait `"${SC}" delete "JSON_SCADA_server_realtime_auth"` diff --git a/platform-windows/release_notes.txt b/platform-windows/release_notes.txt index f25588b9..01d642da 100644 --- a/platform-windows/release_notes.txt +++ b/platform-windows/release_notes.txt @@ -135,6 +135,40 @@ Inkscape+SAGE: ------------------------------------------------------------------- +Notes for version 0.39: + +* ATTENTION: The default SVG folder was moved to "c:\json-scada\svg\". + +* Default login credentials: username=admin password=jsonscada. +* Metabase credentials: username=json@scada.com password=jsonscada123. +* New reconstructed and improved web UI based on Vuetify 3. +* New option to export and import project files. +* Improved MQTT/Sparkplug-B Client driver. +* Demo simulator now works with recent versions of MongoDB. +* SVG displays can now use the Pergola library. +* Added GraphQL server. +* Avoid deadlocks on PostgreSQL updates/inserts. +* IEC 104 Server allows for TLS 1.2 and 1.3 connections. +* NPM packages updated. +* Dotnet runtime updated to 8.0.10. +* MongoDB Community Server updated to 8.0.1. +* MongoDB Compass updated to 1.44.4. +* Grafana updated to 11.2.2. +* Nodejs runtime updated to 20.18.0. +* Telegraf runtime updated to 1.32.1. + +Requirements and recommendations: + +* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 20GB of free space in the "C:" drive. +* Administrative rights. corporate Windows policies may cause problems with the creation of services and the opening of TCP ports. +* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000. Other ports may be required for optional services and protocols. +* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts. +* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version. +* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur. +* MongoDB requires AVX instructions on x86 CPU. + +------------------------------------------------------------------- + Notes for version 0.38: * Default login credentials: username=admin password=jsonscada. diff --git a/platform-windows/remove_services.bat b/platform-windows/remove_services.bat index d3891d97..a897a2a8 100644 --- a/platform-windows/remove_services.bat +++ b/platform-windows/remove_services.bat @@ -29,13 +29,11 @@ nssm remove JSON_SCADA_metabase confirm nssm remove JSON_SCADA_mongodb confirm nssm remove JSON_SCADA_cs_data_processor confirm nssm remove JSON_SCADA_cs_custom_processor confirm -nssm remove JSON_SCADA_server_realtime confirm nssm remove JSON_SCADA_server_realtime_auth confirm nssm remove JSON_SCADA_calculations confirm nssm remove JSON_SCADA_process_rtdata confirm nssm remove JSON_SCADA_process_hist confirm nssm remove JSON_SCADA_alarm_beep confirm -nssm remove JSON_SCADA_shell_api confirm nssm remove JSON_SCADA_demo_simul confirm nssm remove JSON_SCADA_mongofw confirm nssm remove JSON_SCADA_mongowr confirm diff --git a/platform-windows/restart_protocols.bat b/platform-windows/restart_protocols.bat new file mode 100644 index 00000000..e380fd8f --- /dev/null +++ b/platform-windows/restart_protocols.bat @@ -0,0 +1,53 @@ +@echo off +echo This script requires administative rights! +echo Please execute it as administrator. +echo This script is to be called from a windows service (do not use call or start or powershell) + +rem RESTART protocol services + +rem stop protocol services +net stop JSON_SCADA_demo_simul +net stop JSON_SCADA_mongofw +net stop JSON_SCADA_mongowr +net stop JSON_SCADA_iec104client +net stop JSON_SCADA_iec101client +net stop JSON_SCADA_dnp3client +net stop JSON_SCADA_opcuaclient +net stop JSON_SCADA_opcdaclient +net stop JSON_SCADA_iec61850client +net stop JSON_SCADA_i104m +net stop JSON_SCADA_plctags +net stop JSON_SCADA_iccpclient +net stop JSON_SCADA_mqttsparkplugclient +net stop JSON_SCADA_plc4xclient +net stop JSON_SCADA_telegraf_runtime +net stop JSON_SCADA_telegraf_listener +net stop JSON_SCADA_iec104server +net stop JSON_SCADA_iec101server +net stop JSON_SCADA_opcuaserver +net stop JSON_SCADA_iccpserver + +REM ADJUST HERE THE SERVICES YOU WANT TO START + +REM net start JSON_SCADA_demo_simul +REM net start JSON_SCADA_mongofw +REM net start JSON_SCADA_mongowr +net start JSON_SCADA_iec104client +rem net start JSON_SCADA_iec101client +rem net start JSON_SCADA_iccpclient +net start JSON_SCADA_mqttsparkplugclient +rem net start JSON_SCADA_plc4xclient +net start JSON_SCADA_telegraf_listener +net start JSON_SCADA_telegraf_runtime +REM net start JSON_SCADA_iec104server +REM net start JSON_SCADA_iec101server +REM net start JSON_SCADA_iccpserver +REM net start JSON_SCADA_iec101client +REM net start JSON_SCADA_dnp3client +net start JSON_SCADA_opcuaclient +rem net start JSON_SCADA_opcdaclient +REM net start JSON_SCADA_iec61850client +REM net start JSON_SCADA_i104m +REM net start JSON_SCADA_plctags +net start JSON_SCADA_opcuaserver + diff --git a/platform-windows/restart_services.bat b/platform-windows/restart_services.bat new file mode 100644 index 00000000..1cc381b1 --- /dev/null +++ b/platform-windows/restart_services.bat @@ -0,0 +1,92 @@ +@echo off +echo This script requires administative rights! +echo Please execute it as administrator. +echo This script is to be called from a windows service (do not use call or start or powershell) + +rem RESTART JSON-SCADA services +net stop JSON_SCADA_nginx +net stop JSON_SCADA_php +rem net stop JSON_SCADA_server_realtime_auth +net stop JSON_SCADA_alarm_beep +net stop JSON_SCADA_config_server_excel + +net stop JSON_SCADA_demo_simul +net stop JSON_SCADA_mongofw +net stop JSON_SCADA_mongowr +net stop JSON_SCADA_iec104client +net stop JSON_SCADA_iec101client +net stop JSON_SCADA_dnp3client +net stop JSON_SCADA_opcuaclient +net stop JSON_SCADA_opcdaclient +net stop JSON_SCADA_iec61850client +net stop JSON_SCADA_i104m +net stop JSON_SCADA_plctags +net stop JSON_SCADA_iccpclient +net stop JSON_SCADA_mqttsparkplugclient +net stop JSON_SCADA_plc4xclient +net stop JSON_SCADA_telegraf_runtime +net stop JSON_SCADA_telegraf_listener +net stop JSON_SCADA_iec104server +net stop JSON_SCADA_iec101server +net stop JSON_SCADA_opcuaserver +net stop JSON_SCADA_iccpserver + +REM STOP OTHER PROCESSES +net stop JSON_SCADA_log_io_file +net stop JSON_SCADA_log_io_server +net stop JSON_SCADA_calculations +net stop JSON_SCADA_cs_data_processor +net stop JSON_SCADA_cs_custom_processor +net stop JSON_SCADA_process_rtdata +net stop JSON_SCADA_process_hist +REM STOP GRAFANA/METABASE AND DATABASE SERVERS +net stop JSON_SCADA_grafana +net stop JSON_SCADA_metabase +net stop JSON_SCADA_mongodb +net stop JSON_SCADA_postgresql + + +REM ADJUST HERE THE SERVICES YOU WANT TO START + +net start JSON_SCADA_log_io_server +net start JSON_SCADA_postgresql +net start JSON_SCADA_mongodb + +ping -n 4 127.0.0.1 + +net start JSON_SCADA_log_io_file +net start JSON_SCADA_cs_data_processor +net start JSON_SCADA_cs_custom_processor +net start JSON_SCADA_server_realtime_auth +net start JSON_SCADA_calculations +net start JSON_SCADA_process_rtdata +net start JSON_SCADA_process_hist +REM net start JSON_SCADA_config_server_excel +REM net start JSON_SCADA_alarm_beep +net start JSON_SCADA_grafana +net start JSON_SCADA_metabase + +REM net start JSON_SCADA_demo_simul +REM net start JSON_SCADA_mongofw +REM net start JSON_SCADA_mongowr +net start JSON_SCADA_iec104client +rem net start JSON_SCADA_iec101client +rem net start JSON_SCADA_iccpclient +net start JSON_SCADA_mqttsparkplugclient +rem net start JSON_SCADA_plc4xclient +net start JSON_SCADA_telegraf_listener +net start JSON_SCADA_telegraf_runtime +REM net start JSON_SCADA_iec104server +REM net start JSON_SCADA_iec101server +REM net start JSON_SCADA_iccpserver +REM net start JSON_SCADA_iec101client +REM net start JSON_SCADA_dnp3client +net start JSON_SCADA_opcuaclient +rem net start JSON_SCADA_opcdaclient +REM net start JSON_SCADA_iec61850client +REM net start JSON_SCADA_i104m +REM net start JSON_SCADA_plctags +net start JSON_SCADA_opcuaserver + +net start JSON_SCADA_php +net start JSON_SCADA_nginx diff --git a/platform-windows/start_protocols.bat b/platform-windows/start_protocols.bat new file mode 100644 index 00000000..83d9ccc7 --- /dev/null +++ b/platform-windows/start_protocols.bat @@ -0,0 +1,31 @@ +@echo off +echo This script requires administative rights! +echo Please execute it as administrator. + +if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b) + +rem Start protocol services + +REM SELECT PROTOCOLS TO START + +REM net start JSON_SCADA_demo_simul +REM net start JSON_SCADA_mongofw +REM net start JSON_SCADA_mongowr +net start JSON_SCADA_iec104client +rem net start JSON_SCADA_iec101client +rem net start JSON_SCADA_iccpclient +net start JSON_SCADA_mqttsparkplugclient +rem net start JSON_SCADA_plc4xclient +net start JSON_SCADA_telegraf_listener +net start JSON_SCADA_telegraf_runtime +REM net start JSON_SCADA_iec104server +REM net start JSON_SCADA_iec101server +REM net start JSON_SCADA_iccpserver +REM net start JSON_SCADA_iec101client +REM net start JSON_SCADA_dnp3client +net start JSON_SCADA_opcuaclient +rem net start JSON_SCADA_opcdaclient +REM net start JSON_SCADA_iec61850client +REM net start JSON_SCADA_i104m +REM net start JSON_SCADA_plctags +net start JSON_SCADA_opcuaserver diff --git a/platform-windows/start_services.bat b/platform-windows/start_services.bat index 5afb46d8..419f99de 100644 --- a/platform-windows/start_services.bat +++ b/platform-windows/start_services.bat @@ -6,51 +6,28 @@ if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b) rem Start services, uncomment the services you need -cd \json-scada\platform-windows - -nssm start JSON_SCADA_log_io_server +net start JSON_SCADA_log_io_server net start JSON_SCADA_postgresql -nssm start JSON_SCADA_mongodb +net start JSON_SCADA_mongodb ping -n 5 127.0.0.1 -nssm start JSON_SCADA_log_io_file -nssm start JSON_SCADA_cs_data_processor -nssm start JSON_SCADA_cs_custom_processor -rem nssm start JSON_SCADA_server_realtime -nssm start JSON_SCADA_server_realtime_auth -nssm start JSON_SCADA_calculations -nssm start JSON_SCADA_process_rtdata -nssm start JSON_SCADA_process_hist -REM nssm start JSON_SCADA_config_server_excel -REM nssm start JSON_SCADA_alarm_beep -REM nssm start JSON_SCADA_shell_api -REM nssm start JSON_SCADA_demo_simul -REM nssm start JSON_SCADA_mongofw -REM nssm start JSON_SCADA_mongowr - -REM SELECT PROTOCOLS TO START -nssm start JSON_SCADA_iec104client -rem nssm start JSON_SCADA_iec101client -rem nssm start JSON_SCADA_iccpclient -nssm start JSON_SCADA_mqttsparkplugclient -rem nssm start JSON_SCADA_plc4xclient -nssm start JSON_SCADA_telegraf_listener -net start JSON_SCADA_telegraf_runtime -REM nssm start JSON_SCADA_iec104server -REM nssm start JSON_SCADA_iec101server -REM nssm start JSON_SCADA_iccpserver -REM nssm start JSON_SCADA_iec101client -REM nssm start JSON_SCADA_dnp3client -nssm start JSON_SCADA_opcuaclient -rem nssm start JSON_SCADA_opcdaclient -REM nssm start JSON_SCADA_iec61850client -REM nssm start JSON_SCADA_i104m -REM nssm start JSON_SCADA_plctags -REM nssm start JSON_SCADA_opcuaserver - -nssm start JSON_SCADA_grafana -nssm start JSON_SCADA_metabase - -nssm start JSON_SCADA_php -nssm start JSON_SCADA_nginx +net start JSON_SCADA_log_io_file +net start JSON_SCADA_cs_data_processor +net start JSON_SCADA_cs_custom_processor +net start JSON_SCADA_server_realtime_auth +net start JSON_SCADA_calculations +net start JSON_SCADA_process_rtdata +net start JSON_SCADA_process_hist +REM net start JSON_SCADA_config_server_excel +REM net start JSON_SCADA_alarm_beep + +call start_protocols.bat + +ping -n 3 127.0.0.1 + +net start JSON_SCADA_grafana +net start JSON_SCADA_metabase + +net start JSON_SCADA_php +net start JSON_SCADA_nginx diff --git a/platform-windows/stop_protocols.bat b/platform-windows/stop_protocols.bat new file mode 100644 index 00000000..fb16c651 --- /dev/null +++ b/platform-windows/stop_protocols.bat @@ -0,0 +1,34 @@ +@echo off +echo This script requires administative rights! +echo Please execute it as administrator. + +if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b) + +rem Stop protocol services + +REM STOP PROTOCOL CLIENTS +net stop JSON_SCADA_demo_simul +net stop JSON_SCADA_mongofw +net stop JSON_SCADA_mongowr +net stop JSON_SCADA_iec104client +net stop JSON_SCADA_iec101client +net stop JSON_SCADA_dnp3client +net stop JSON_SCADA_opcuaclient +net stop JSON_SCADA_opcdaclient +net stop JSON_SCADA_iec61850client +net stop JSON_SCADA_i104m +net stop JSON_SCADA_plctags +net stop JSON_SCADA_iccpclient +net stop JSON_SCADA_mqttsparkplugclient +net stop JSON_SCADA_plc4xclient +net stop JSON_SCADA_telegraf_runtime +net stop JSON_SCADA_telegraf_listener +ping -n 2 + +REM STOP PROTOCOL SERVERS +net stop JSON_SCADA_iec104server +net stop JSON_SCADA_iec101server +net stop JSON_SCADA_opcuaserver +net stop JSON_SCADA_iccpserver +ping -n 2 + diff --git a/platform-windows/stop_services.bat b/platform-windows/stop_services.bat index eead8c38..570c6fb4 100644 --- a/platform-windows/stop_services.bat +++ b/platform-windows/stop_services.bat @@ -6,59 +6,31 @@ if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b) rem Stop services -cd \json-scada\platform-windows - REM FIRST STOP USERS -nssm stop JSON_SCADA_nginx -nssm stop JSON_SCADA_php -nssm stop JSON_SCADA_server_realtime -nssm stop JSON_SCADA_server_realtime_auth -nssm stop JSON_SCADA_alarm_beep -nssm stop JSON_SCADA_shell_api -nssm stop JSON_SCADA_config_server_excel -nssm stop JSON_SCADA_demo_simul -nssm stop JSON_SCADA_mongofw -nssm stop JSON_SCADA_mongowr - -ping -n 2 - -REM STOP PROTOCOL CLIENTS -nssm stop JSON_SCADA_iec104client -nssm stop JSON_SCADA_iec101client -nssm stop JSON_SCADA_dnp3client -nssm stop JSON_SCADA_opcuaclient -nssm stop JSON_SCADA_opcdaclient -nssm stop JSON_SCADA_iec61850client -nssm stop JSON_SCADA_i104m -nssm stop JSON_SCADA_plctags -nssm stop JSON_SCADA_iccpclient -net stop JSON_SCADA_telegraf_runtime -nssm stop JSON_SCADA_telegraf_listener -nssm stop JSON_SCADA_mqttsparkplugclient -nssm stop JSON_SCADA_plc4xclient -ping -n 3 - -REM STOP PROTOCOL SERVERS -nssm stop JSON_SCADA_iec104server -nssm stop JSON_SCADA_iec101server -nssm stop JSON_SCADA_opcuaserver -nssm stop JSON_SCADA_iccpserver +net stop JSON_SCADA_nginx +net stop JSON_SCADA_php +net stop JSON_SCADA_server_realtime_auth +net stop JSON_SCADA_alarm_beep +net stop JSON_SCADA_config_server_excel + +REM STOP PROTOCOL DRIVERS +call stop_protocols.bat ping -n 2 REM STOP OTHER PROCESSES -nssm stop JSON_SCADA_calculations -nssm stop JSON_SCADA_cs_data_processor -nssm stop JSON_SCADA_cs_custom_processor +net stop JSON_SCADA_calculations +net stop JSON_SCADA_cs_data_processor +net stop JSON_SCADA_cs_custom_processor ping -n 2 -nssm stop JSON_SCADA_process_rtdata -nssm stop JSON_SCADA_process_hist +net stop JSON_SCADA_process_rtdata +net stop JSON_SCADA_process_hist ping -n 3 REM STOP GRAFANA/METABASE AND DATABASE SERVERS -nssm stop JSON_SCADA_grafana -nssm stop JSON_SCADA_metabase -nssm stop JSON_SCADA_mongodb +net stop JSON_SCADA_grafana +net stop JSON_SCADA_metabase +net stop JSON_SCADA_mongodb net stop JSON_SCADA_postgresql -nssm stop JSON_SCADA_log_io_file -nssm stop JSON_SCADA_log_io_server +net stop JSON_SCADA_log_io_file +net stop JSON_SCADA_log_io_server diff --git a/src/AdminUI/package-lock.json b/src/AdminUI/package-lock.json index f27e7472..5d501a81 100644 --- a/src/AdminUI/package-lock.json +++ b/src/AdminUI/package-lock.json @@ -46,30 +46,30 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", - "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", + "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", + "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", - "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz", + "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==", "license": "MIT", "dependencies": { - "@babel/types": "^7.25.6" + "@babel/types": "^7.25.8" }, "bin": { "parser": "bin/babel-parser.js" @@ -79,13 +79,13 @@ } }, "node_modules/@babel/types": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", - "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz", + "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.24.8", - "@babel/helper-validator-identifier": "^7.24.7", + "@babel/helper-string-parser": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -559,13 +559,13 @@ "license": "BSD-3-Clause" }, "node_modules/@intlify/core-base": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-10.0.3.tgz", - "integrity": "sha512-ysJnTGDtuXPa6R2Ii4JIvfMVvDahUUny3aY8+P4r6/0TYHkblgzIMjV6cAn60em67AB0M7OWNAdcAVfWWeN8Qg==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-10.0.4.tgz", + "integrity": "sha512-GG428DkrrWCMhxRMRQZjuS7zmSUzarYcaHJqG9VB8dXAxw4iQDoKVQ7ChJRB6ZtsCsX3Jse1PEUlHrJiyQrOTg==", "license": "MIT", "dependencies": { - "@intlify/message-compiler": "10.0.3", - "@intlify/shared": "10.0.3" + "@intlify/message-compiler": "10.0.4", + "@intlify/shared": "10.0.4" }, "engines": { "node": ">= 16" @@ -575,12 +575,12 @@ } }, "node_modules/@intlify/message-compiler": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-10.0.3.tgz", - "integrity": "sha512-KC2fG8nCzSYmXjHptEt6i/xM3k6S2szsPaHDCRgWKEYAbeHe6JFm6X4KRw3Csy112A8CxpavMi1dh3h7khwV5w==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-10.0.4.tgz", + "integrity": "sha512-AFbhEo10DP095/45EauinQJ5hJ3rJUmuuqltGguvc3WsvezZN+g8qNHLGWKu60FHQVizMrQY7VJ+zVlBXlQQkQ==", "license": "MIT", "dependencies": { - "@intlify/shared": "10.0.3", + "@intlify/shared": "10.0.4", "source-map-js": "^1.0.2" }, "engines": { @@ -591,9 +591,9 @@ } }, "node_modules/@intlify/shared": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-10.0.3.tgz", - "integrity": "sha512-PWxrCb6fDlnoGLnXLlWu6d7o/HdWACB9TjRnpLro+9uyfqgWA9hvqg5vekcPRyraTieV5srCbTk/ldYw9V3LHw==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-10.0.4.tgz", + "integrity": "sha512-ukFn0I01HsSgr3VYhYcvkTCLS7rGa0gw4A4AMpcy/A9xx/zRJy7PS2BElMXLwUazVFMAr5zuiTk3MQeoeGXaJg==", "license": "MIT", "engines": { "node": ">= 16" @@ -659,9 +659,9 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", - "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.2.tgz", + "integrity": "sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==", "dev": true, "license": "MIT", "dependencies": { @@ -682,9 +682,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", - "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz", + "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==", "cpu": [ "arm" ], @@ -695,9 +695,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", - "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz", + "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==", "cpu": [ "arm64" ], @@ -708,9 +708,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", - "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz", + "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==", "cpu": [ "arm64" ], @@ -721,9 +721,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", - "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz", + "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==", "cpu": [ "x64" ], @@ -734,9 +734,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", - "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz", + "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==", "cpu": [ "arm" ], @@ -747,9 +747,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", - "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz", + "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==", "cpu": [ "arm" ], @@ -760,9 +760,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", - "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz", + "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==", "cpu": [ "arm64" ], @@ -773,9 +773,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", - "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz", + "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==", "cpu": [ "arm64" ], @@ -786,9 +786,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", - "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz", + "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==", "cpu": [ "ppc64" ], @@ -799,9 +799,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", - "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz", + "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==", "cpu": [ "riscv64" ], @@ -812,9 +812,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", - "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz", + "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==", "cpu": [ "s390x" ], @@ -825,9 +825,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", - "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz", + "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==", "cpu": [ "x64" ], @@ -838,9 +838,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", - "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz", + "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==", "cpu": [ "x64" ], @@ -851,9 +851,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", - "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz", + "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==", "cpu": [ "arm64" ], @@ -864,9 +864,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", - "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz", + "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==", "cpu": [ "ia32" ], @@ -877,9 +877,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", - "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz", + "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==", "cpu": [ "x64" ], @@ -900,7 +900,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@types/json5": { @@ -958,39 +958,39 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.8.tgz", - "integrity": "sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.12.tgz", + "integrity": "sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==", "license": "MIT", "dependencies": { "@babel/parser": "^7.25.3", - "@vue/shared": "3.5.8", + "@vue/shared": "3.5.12", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz", - "integrity": "sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz", + "integrity": "sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==", "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.5.8", - "@vue/shared": "3.5.8" + "@vue/compiler-core": "3.5.12", + "@vue/shared": "3.5.12" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.8.tgz", - "integrity": "sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.12.tgz", + "integrity": "sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==", "license": "MIT", "dependencies": { "@babel/parser": "^7.25.3", - "@vue/compiler-core": "3.5.8", - "@vue/compiler-dom": "3.5.8", - "@vue/compiler-ssr": "3.5.8", - "@vue/shared": "3.5.8", + "@vue/compiler-core": "3.5.12", + "@vue/compiler-dom": "3.5.12", + "@vue/compiler-ssr": "3.5.12", + "@vue/shared": "3.5.12", "estree-walker": "^2.0.2", "magic-string": "^0.30.11", "postcss": "^8.4.47", @@ -998,13 +998,13 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.8.tgz", - "integrity": "sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.12.tgz", + "integrity": "sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.8", - "@vue/shared": "3.5.8" + "@vue/compiler-dom": "3.5.12", + "@vue/shared": "3.5.12" } }, "node_modules/@vue/devtools-api": { @@ -1014,53 +1014,53 @@ "license": "MIT" }, "node_modules/@vue/reactivity": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.8.tgz", - "integrity": "sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.12.tgz", + "integrity": "sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==", "license": "MIT", "dependencies": { - "@vue/shared": "3.5.8" + "@vue/shared": "3.5.12" } }, "node_modules/@vue/runtime-core": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.8.tgz", - "integrity": "sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.12.tgz", + "integrity": "sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.8", - "@vue/shared": "3.5.8" + "@vue/reactivity": "3.5.12", + "@vue/shared": "3.5.12" } }, "node_modules/@vue/runtime-dom": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.8.tgz", - "integrity": "sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.12.tgz", + "integrity": "sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.8", - "@vue/runtime-core": "3.5.8", - "@vue/shared": "3.5.8", + "@vue/reactivity": "3.5.12", + "@vue/runtime-core": "3.5.12", + "@vue/shared": "3.5.12", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.8.tgz", - "integrity": "sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.12.tgz", + "integrity": "sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==", "license": "MIT", "dependencies": { - "@vue/compiler-ssr": "3.5.8", - "@vue/shared": "3.5.8" + "@vue/compiler-ssr": "3.5.12", + "@vue/shared": "3.5.12" }, "peerDependencies": { - "vue": "3.5.8" + "vue": "3.5.12" } }, "node_modules/@vue/shared": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.8.tgz", - "integrity": "sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.12.tgz", + "integrity": "sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==", "license": "MIT" }, "node_modules/@vuetify/loader-shared": { @@ -1285,9 +1285,9 @@ } }, "node_modules/ast-kit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ast-kit/-/ast-kit-1.2.0.tgz", - "integrity": "sha512-7TnogTQQZEagrHcOcddY0PqXPxVqFoNPPsKoa42Peyc83iinzT+QPKoRLDmzpaUVWZbgqSoHtezsTIoJyyBE+Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ast-kit/-/ast-kit-1.2.1.tgz", + "integrity": "sha512-h31wotR7rkFLrlmGPn0kGqOZ/n5EQFvp7dBs400chpHDhHc8BK3gpvyHDluRujuGgeoTAv3dSIMz9BI3JxAWyQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1528,9 +1528,9 @@ "license": "MIT" }, "node_modules/confbox": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz", - "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz", + "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==", "dev": true, "license": "MIT" }, @@ -1915,6 +1915,7 @@ "version": "8.57.1", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", "dependencies": { @@ -2049,9 +2050,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz", - "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", "dev": true, "license": "MIT", "dependencies": { @@ -2119,9 +2120,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz", - "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", "dev": true, "license": "MIT", "dependencies": { @@ -2133,7 +2134,7 @@ "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.9.0", + "eslint-module-utils": "^2.12.0", "hasown": "^2.0.2", "is-core-module": "^2.15.1", "is-glob": "^4.0.3", @@ -2142,13 +2143,14 @@ "object.groupby": "^1.0.3", "object.values": "^1.2.0", "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" }, "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" } }, "node_modules/eslint-plugin-import/node_modules/debug": { @@ -2254,9 +2256,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.28.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz", - "integrity": "sha512-ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==", + "version": "9.29.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.29.0.tgz", + "integrity": "sha512-hamyjrBhNH6Li6R1h1VF9KHfshJlKgKEg3ARbGTn72CMNDSMhWbgC7NdkRDEh25AFW+4SDATzyNM+3gWuZii8g==", "dev": true, "license": "MIT", "dependencies": { @@ -3361,9 +3363,9 @@ } }, "node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "version": "0.30.12", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz", + "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==", "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" @@ -3430,16 +3432,16 @@ } }, "node_modules/mlly": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz", - "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz", + "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.11.3", + "acorn": "^8.12.1", "pathe": "^1.1.2", - "pkg-types": "^1.1.1", - "ufo": "^1.5.3" + "pkg-types": "^1.2.0", + "ufo": "^1.5.4" } }, "node_modules/ms": { @@ -3728,14 +3730,14 @@ } }, "node_modules/pkg-types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz", - "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz", + "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==", "dev": true, "license": "MIT", "dependencies": { - "confbox": "^0.1.7", - "mlly": "^1.7.1", + "confbox": "^0.1.8", + "mlly": "^1.7.2", "pathe": "^1.1.2" } }, @@ -3846,16 +3848,16 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -3950,13 +3952,13 @@ "license": "Apache-2.0" }, "node_modules/rollup": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", - "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz", + "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==", "devOptional": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -3966,32 +3968,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.22.4", - "@rollup/rollup-android-arm64": "4.22.4", - "@rollup/rollup-darwin-arm64": "4.22.4", - "@rollup/rollup-darwin-x64": "4.22.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", - "@rollup/rollup-linux-arm-musleabihf": "4.22.4", - "@rollup/rollup-linux-arm64-gnu": "4.22.4", - "@rollup/rollup-linux-arm64-musl": "4.22.4", - "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", - "@rollup/rollup-linux-riscv64-gnu": "4.22.4", - "@rollup/rollup-linux-s390x-gnu": "4.22.4", - "@rollup/rollup-linux-x64-gnu": "4.22.4", - "@rollup/rollup-linux-x64-musl": "4.22.4", - "@rollup/rollup-win32-arm64-msvc": "4.22.4", - "@rollup/rollup-win32-ia32-msvc": "4.22.4", - "@rollup/rollup-win32-x64-msvc": "4.22.4", + "@rollup/rollup-android-arm-eabi": "4.24.0", + "@rollup/rollup-android-arm64": "4.24.0", + "@rollup/rollup-darwin-arm64": "4.24.0", + "@rollup/rollup-darwin-x64": "4.24.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.0", + "@rollup/rollup-linux-arm-musleabihf": "4.24.0", + "@rollup/rollup-linux-arm64-gnu": "4.24.0", + "@rollup/rollup-linux-arm64-musl": "4.24.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0", + "@rollup/rollup-linux-riscv64-gnu": "4.24.0", + "@rollup/rollup-linux-s390x-gnu": "4.24.0", + "@rollup/rollup-linux-x64-gnu": "4.24.0", + "@rollup/rollup-linux-x64-musl": "4.24.0", + "@rollup/rollup-win32-arm64-msvc": "4.24.0", + "@rollup/rollup-win32-ia32-msvc": "4.24.0", + "@rollup/rollup-win32-x64-msvc": "4.24.0", "fsevents": "~2.3.2" } }, - "node_modules/rollup/node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "devOptional": true, - "license": "MIT" - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4634,9 +4629,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.4.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz", - "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==", + "version": "5.4.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz", + "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==", "devOptional": true, "license": "MIT", "dependencies": { @@ -4714,16 +4709,16 @@ } }, "node_modules/vue": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.8.tgz", - "integrity": "sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.12.tgz", + "integrity": "sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.8", - "@vue/compiler-sfc": "3.5.8", - "@vue/runtime-dom": "3.5.8", - "@vue/server-renderer": "3.5.8", - "@vue/shared": "3.5.8" + "@vue/compiler-dom": "3.5.12", + "@vue/compiler-sfc": "3.5.12", + "@vue/runtime-dom": "3.5.12", + "@vue/server-renderer": "3.5.12", + "@vue/shared": "3.5.12" }, "peerDependencies": { "typescript": "*" @@ -4773,13 +4768,13 @@ } }, "node_modules/vue-i18n": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.3.tgz", - "integrity": "sha512-8ul2S4Hy9orKs7eOlkw/zqnVu98GttUdyIMRyjoMpv6hFPxnybgBLdep/UCmdan5kUHyxqMnr2cGHTBuPBYJaw==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.4.tgz", + "integrity": "sha512-1xkzVxqBLk2ZFOmeI+B5r1J7aD/WtNJ4j9k2mcFcQo5BnOmHBmD7z4/oZohh96AAaRZ4Q7mNQvxc9h+aT+Md3w==", "license": "MIT", "dependencies": { - "@intlify/core-base": "10.0.3", - "@intlify/shared": "10.0.3", + "@intlify/core-base": "10.0.4", + "@intlify/shared": "10.0.4", "@vue/devtools-api": "^6.5.0" }, "engines": { diff --git a/src/AdminUI/package.json b/src/AdminUI/package.json index 677d4a84..d835a606 100644 --- a/src/AdminUI/package.json +++ b/src/AdminUI/package.json @@ -1,6 +1,6 @@ { "name": "admin-ui", - "version": "0.0.0", + "version": "0.1.0", "scripts": { "dev": "vite", "build": "vite build", diff --git a/src/htdocs-admin/.prettierrc.json b/src/AdminUI/public/.prettierrc.json similarity index 100% rename from src/htdocs-admin/.prettierrc.json rename to src/AdminUI/public/.prettierrc.json diff --git a/src/htdocs/about.html b/src/AdminUI/public/about.html similarity index 100% rename from src/htdocs/about.html rename to src/AdminUI/public/about.html diff --git a/src/htdocs/almbox.html b/src/AdminUI/public/almbox.html similarity index 100% rename from src/htdocs/almbox.html rename to src/AdminUI/public/almbox.html diff --git a/src/htdocs/charts/area.json b/src/AdminUI/public/charts/area.json similarity index 100% rename from src/htdocs/charts/area.json rename to src/AdminUI/public/charts/area.json diff --git a/src/htdocs/charts/area2.json b/src/AdminUI/public/charts/area2.json similarity index 100% rename from src/htdocs/charts/area2.json rename to src/AdminUI/public/charts/area2.json diff --git a/src/htdocs/charts/area_hist.json b/src/AdminUI/public/charts/area_hist.json similarity index 100% rename from src/htdocs/charts/area_hist.json rename to src/AdminUI/public/charts/area_hist.json diff --git a/src/htdocs/charts/area_hist_800.json b/src/AdminUI/public/charts/area_hist_800.json similarity index 100% rename from src/htdocs/charts/area_hist_800.json rename to src/AdminUI/public/charts/area_hist_800.json diff --git a/src/htdocs/charts/bar-line.json b/src/AdminUI/public/charts/bar-line.json similarity index 100% rename from src/htdocs/charts/bar-line.json rename to src/AdminUI/public/charts/bar-line.json diff --git a/src/htdocs/charts/bar-line2.json b/src/AdminUI/public/charts/bar-line2.json similarity index 100% rename from src/htdocs/charts/bar-line2.json rename to src/AdminUI/public/charts/bar-line2.json diff --git a/src/htdocs/charts/bars-vega3.json b/src/AdminUI/public/charts/bars-vega3.json similarity index 100% rename from src/htdocs/charts/bars-vega3.json rename to src/AdminUI/public/charts/bars-vega3.json diff --git a/src/htdocs/charts/carga_sin.json b/src/AdminUI/public/charts/carga_sin.json similarity index 100% rename from src/htdocs/charts/carga_sin.json rename to src/AdminUI/public/charts/carga_sin.json diff --git a/src/htdocs/charts/grouped_bar.json b/src/AdminUI/public/charts/grouped_bar.json similarity index 100% rename from src/htdocs/charts/grouped_bar.json rename to src/AdminUI/public/charts/grouped_bar.json diff --git a/src/htdocs/charts/pizza_correntes-vega3.json b/src/AdminUI/public/charts/pizza_correntes-vega3.json similarity index 100% rename from src/htdocs/charts/pizza_correntes-vega3.json rename to src/AdminUI/public/charts/pizza_correntes-vega3.json diff --git a/src/htdocs/charts/pizza_correntes.json b/src/AdminUI/public/charts/pizza_correntes.json similarity index 100% rename from src/htdocs/charts/pizza_correntes.json rename to src/AdminUI/public/charts/pizza_correntes.json diff --git a/src/htdocs/charts/pizza_regioes.json b/src/AdminUI/public/charts/pizza_regioes.json similarity index 100% rename from src/htdocs/charts/pizza_regioes.json rename to src/AdminUI/public/charts/pizza_regioes.json diff --git a/src/htdocs/charts/pizza_regioes2.json b/src/AdminUI/public/charts/pizza_regioes2.json similarity index 100% rename from src/htdocs/charts/pizza_regioes2.json rename to src/AdminUI/public/charts/pizza_regioes2.json diff --git a/src/htdocs/charts/stacked.json b/src/AdminUI/public/charts/stacked.json similarity index 100% rename from src/htdocs/charts/stacked.json rename to src/AdminUI/public/charts/stacked.json diff --git a/src/htdocs/charts/teste-vega-json.json b/src/AdminUI/public/charts/teste-vega-json.json similarity index 100% rename from src/htdocs/charts/teste-vega-json.json rename to src/AdminUI/public/charts/teste-vega-json.json diff --git a/src/htdocs/charts/teste-vega-json2.json b/src/AdminUI/public/charts/teste-vega-json2.json similarity index 100% rename from src/htdocs/charts/teste-vega-json2.json rename to src/AdminUI/public/charts/teste-vega-json2.json diff --git a/src/htdocs/charts/teste-vega-json3.json b/src/AdminUI/public/charts/teste-vega-json3.json similarity index 100% rename from src/htdocs/charts/teste-vega-json3.json rename to src/AdminUI/public/charts/teste-vega-json3.json diff --git a/src/htdocs/charts/teste-vega3-json.json b/src/AdminUI/public/charts/teste-vega3-json.json similarity index 100% rename from src/htdocs/charts/teste-vega3-json.json rename to src/AdminUI/public/charts/teste-vega3-json.json diff --git a/src/htdocs/charts/vega_bar.json b/src/AdminUI/public/charts/vega_bar.json similarity index 100% rename from src/htdocs/charts/vega_bar.json rename to src/AdminUI/public/charts/vega_bar.json diff --git a/src/htdocs/charts/vega_bar_simple.json b/src/AdminUI/public/charts/vega_bar_simple.json similarity index 100% rename from src/htdocs/charts/vega_bar_simple.json rename to src/AdminUI/public/charts/vega_bar_simple.json diff --git a/src/htdocs/charts/vega_lite_bar.json b/src/AdminUI/public/charts/vega_lite_bar.json similarity index 100% rename from src/htdocs/charts/vega_lite_bar.json rename to src/AdminUI/public/charts/vega_lite_bar.json diff --git a/src/htdocs/conf/config_viewers.js b/src/AdminUI/public/conf/config_viewers.js similarity index 100% rename from src/htdocs/conf/config_viewers.js rename to src/AdminUI/public/conf/config_viewers.js diff --git a/src/htdocs/config_viewers_default.js b/src/AdminUI/public/config_viewers_default.js similarity index 100% rename from src/htdocs/config_viewers_default.js rename to src/AdminUI/public/config_viewers_default.js diff --git a/src/htdocs/dialogstyle.css b/src/AdminUI/public/dialogstyle.css similarity index 100% rename from src/htdocs/dialogstyle.css rename to src/AdminUI/public/dialogstyle.css diff --git a/src/htdocs/display.html b/src/AdminUI/public/display.html similarity index 100% rename from src/htdocs/display.html rename to src/AdminUI/public/display.html diff --git a/src/htdocs/dlgcomando.html b/src/AdminUI/public/dlgcomando.html similarity index 100% rename from src/htdocs/dlgcomando.html rename to src/AdminUI/public/dlgcomando.html diff --git a/src/htdocs/dlginfo.html b/src/AdminUI/public/dlginfo.html similarity index 100% rename from src/htdocs/dlginfo.html rename to src/AdminUI/public/dlginfo.html diff --git a/src/htdocs/events.html b/src/AdminUI/public/events.html similarity index 100% rename from src/htdocs/events.html rename to src/AdminUI/public/events.html diff --git a/src/htdocs/fan.js b/src/AdminUI/public/fan.js similarity index 100% rename from src/htdocs/fan.js rename to src/AdminUI/public/fan.js diff --git a/src/htdocs-admin/src/assets/favicon.ico b/src/AdminUI/public/favicon.ico similarity index 100% rename from src/htdocs-admin/src/assets/favicon.ico rename to src/AdminUI/public/favicon.ico diff --git a/src/htdocs/i18n/messages_i18n-en_us.js b/src/AdminUI/public/i18n/messages_i18n-en_us.js similarity index 99% rename from src/htdocs/i18n/messages_i18n-en_us.js rename to src/AdminUI/public/i18n/messages_i18n-en_us.js index 3f497ca9..60439ebf 100644 --- a/src/htdocs/i18n/messages_i18n-en_us.js +++ b/src/AdminUI/public/i18n/messages_i18n-en_us.js @@ -4,7 +4,7 @@ var Msg = { NomeProduto: '{json:scada}', -VersaoProduto: '0.38', +VersaoProduto: '0.39', NomeVisorTelas: 'Display Viewer', NomeVisorEventos: 'Events Viewer', diff --git a/src/htdocs/i18n/messages_i18n-pt_br.js b/src/AdminUI/public/i18n/messages_i18n-pt_br.js similarity index 99% rename from src/htdocs/i18n/messages_i18n-pt_br.js rename to src/AdminUI/public/i18n/messages_i18n-pt_br.js index dd330baf..7f2e22f0 100644 --- a/src/htdocs/i18n/messages_i18n-pt_br.js +++ b/src/AdminUI/public/i18n/messages_i18n-pt_br.js @@ -4,7 +4,7 @@ var Msg = { NomeProduto: '{json:scada}', -VersaoProduto: '0.38', +VersaoProduto: '0.39', NomeVisorTelas: 'Visor de Telas', NomeVisorEventos: 'Visor de Eventos', diff --git a/src/htdocs/i18n/messages_i18n-uk_ua.js b/src/AdminUI/public/i18n/messages_i18n-uk_ua.js similarity index 99% rename from src/htdocs/i18n/messages_i18n-uk_ua.js rename to src/AdminUI/public/i18n/messages_i18n-uk_ua.js index a45698f0..be9206d4 100644 --- a/src/htdocs/i18n/messages_i18n-uk_ua.js +++ b/src/AdminUI/public/i18n/messages_i18n-uk_ua.js @@ -4,7 +4,7 @@ var Msg = { NomeProduto: '{json:scada}', -VersaoProduto: '0.38', +VersaoProduto: '0.39', NomeVisorTelas: 'Перегляд ', NomeVisorEventos: 'Події', diff --git a/src/htdocs/i18n/messages_i18n.js b/src/AdminUI/public/i18n/messages_i18n.js similarity index 99% rename from src/htdocs/i18n/messages_i18n.js rename to src/AdminUI/public/i18n/messages_i18n.js index 3f497ca9..60439ebf 100644 --- a/src/htdocs/i18n/messages_i18n.js +++ b/src/AdminUI/public/i18n/messages_i18n.js @@ -4,7 +4,7 @@ var Msg = { NomeProduto: '{json:scada}', -VersaoProduto: '0.38', +VersaoProduto: '0.39', NomeVisorTelas: 'Display Viewer', NomeVisorEventos: 'Events Viewer', diff --git a/src/htdocs/images.js b/src/AdminUI/public/images.js similarity index 100% rename from src/htdocs/images.js rename to src/AdminUI/public/images.js diff --git a/src/htdocs/images/arrow-left.svg b/src/AdminUI/public/images/arrow-left.svg similarity index 100% rename from src/htdocs/images/arrow-left.svg rename to src/AdminUI/public/images/arrow-left.svg diff --git a/src/htdocs/images/arrow-right.svg b/src/AdminUI/public/images/arrow-right.svg similarity index 100% rename from src/htdocs/images/arrow-right.svg rename to src/AdminUI/public/images/arrow-right.svg diff --git a/src/htdocs/images/arrow-up-left.svg b/src/AdminUI/public/images/arrow-up-left.svg similarity index 100% rename from src/htdocs/images/arrow-up-left.svg rename to src/AdminUI/public/images/arrow-up-left.svg diff --git a/src/htdocs/images/bell-off.svg b/src/AdminUI/public/images/bell-off.svg similarity index 100% rename from src/htdocs/images/bell-off.svg rename to src/AdminUI/public/images/bell-off.svg diff --git a/src/htdocs/images/bell-on.svg b/src/AdminUI/public/images/bell-on.svg similarity index 100% rename from src/htdocs/images/bell-on.svg rename to src/AdminUI/public/images/bell-on.svg diff --git a/src/htdocs/images/calendar.ico b/src/AdminUI/public/images/calendar.ico similarity index 100% rename from src/htdocs/images/calendar.ico rename to src/AdminUI/public/images/calendar.ico diff --git a/src/htdocs/images/calendar.svg b/src/AdminUI/public/images/calendar.svg similarity index 100% rename from src/htdocs/images/calendar.svg rename to src/AdminUI/public/images/calendar.svg diff --git a/src/htdocs/images/cancel.svg b/src/AdminUI/public/images/cancel.svg similarity index 100% rename from src/htdocs/images/cancel.svg rename to src/AdminUI/public/images/cancel.svg diff --git a/src/htdocs/images/check-alt.svg b/src/AdminUI/public/images/check-alt.svg similarity index 100% rename from src/htdocs/images/check-alt.svg rename to src/AdminUI/public/images/check-alt.svg diff --git a/src/htdocs/images/chrono-blink.svg b/src/AdminUI/public/images/chrono-blink.svg similarity index 100% rename from src/htdocs/images/chrono-blink.svg rename to src/AdminUI/public/images/chrono-blink.svg diff --git a/src/htdocs/images/chrono.ico b/src/AdminUI/public/images/chrono.ico similarity index 100% rename from src/htdocs/images/chrono.ico rename to src/AdminUI/public/images/chrono.ico diff --git a/src/htdocs/images/chrono.png b/src/AdminUI/public/images/chrono.png similarity index 100% rename from src/htdocs/images/chrono.png rename to src/AdminUI/public/images/chrono.png diff --git a/src/htdocs-admin/src/assets/chrono.svg b/src/AdminUI/public/images/chrono.svg similarity index 100% rename from src/htdocs-admin/src/assets/chrono.svg rename to src/AdminUI/public/images/chrono.svg diff --git a/src/htdocs/images/clipboard.svg b/src/AdminUI/public/images/clipboard.svg similarity index 100% rename from src/htdocs/images/clipboard.svg rename to src/AdminUI/public/images/clipboard.svg diff --git a/src/htdocs/images/dot.png b/src/AdminUI/public/images/dot.png similarity index 100% rename from src/htdocs/images/dot.png rename to src/AdminUI/public/images/dot.png diff --git a/src/htdocs-login/images/favicon.ico b/src/AdminUI/public/images/favicon.ico similarity index 100% rename from src/htdocs-login/images/favicon.ico rename to src/AdminUI/public/images/favicon.ico diff --git a/src/htdocs/images/filter.svg b/src/AdminUI/public/images/filter.svg similarity index 100% rename from src/htdocs/images/filter.svg rename to src/AdminUI/public/images/filter.svg diff --git a/src/htdocs/images/fire2.svg b/src/AdminUI/public/images/fire2.svg similarity index 100% rename from src/htdocs/images/fire2.svg rename to src/AdminUI/public/images/fire2.svg diff --git a/src/htdocs/images/firstaid.ico b/src/AdminUI/public/images/firstaid.ico similarity index 100% rename from src/htdocs/images/firstaid.ico rename to src/AdminUI/public/images/firstaid.ico diff --git a/src/htdocs-admin/src/assets/firstaid.svg b/src/AdminUI/public/images/firstaid.svg similarity index 100% rename from src/htdocs-admin/src/assets/firstaid.svg rename to src/AdminUI/public/images/firstaid.svg diff --git a/src/htdocs/images/gps-off.svg b/src/AdminUI/public/images/gps-off.svg similarity index 100% rename from src/htdocs/images/gps-off.svg rename to src/AdminUI/public/images/gps-off.svg diff --git a/src/htdocs/images/gps-on.svg b/src/AdminUI/public/images/gps-on.svg similarity index 100% rename from src/htdocs/images/gps-on.svg rename to src/AdminUI/public/images/gps-on.svg diff --git a/src/htdocs-admin/src/assets/grafana.ico b/src/AdminUI/public/images/grafana.ico similarity index 100% rename from src/htdocs-admin/src/assets/grafana.ico rename to src/AdminUI/public/images/grafana.ico diff --git a/src/htdocs/images/grafana.png b/src/AdminUI/public/images/grafana.png similarity index 100% rename from src/htdocs/images/grafana.png rename to src/AdminUI/public/images/grafana.png diff --git a/src/htdocs/images/happy.svg b/src/AdminUI/public/images/happy.svg similarity index 100% rename from src/htdocs/images/happy.svg rename to src/AdminUI/public/images/happy.svg diff --git a/src/htdocs/images/help2.ico b/src/AdminUI/public/images/help2.ico similarity index 100% rename from src/htdocs/images/help2.ico rename to src/AdminUI/public/images/help2.ico diff --git a/src/htdocs/images/help2.svg b/src/AdminUI/public/images/help2.svg similarity index 100% rename from src/htdocs/images/help2.svg rename to src/AdminUI/public/images/help2.svg diff --git a/src/htdocs/images/history.svg b/src/AdminUI/public/images/history.svg similarity index 100% rename from src/htdocs/images/history.svg rename to src/AdminUI/public/images/history.svg diff --git a/src/htdocs/images/info.ico b/src/AdminUI/public/images/info.ico similarity index 100% rename from src/htdocs/images/info.ico rename to src/AdminUI/public/images/info.ico diff --git a/src/htdocs/images/info.svg b/src/AdminUI/public/images/info.svg similarity index 100% rename from src/htdocs/images/info.svg rename to src/AdminUI/public/images/info.svg diff --git a/src/htdocs/images/infobg.jpg b/src/AdminUI/public/images/infobg.jpg similarity index 100% rename from src/htdocs/images/infobg.jpg rename to src/AdminUI/public/images/infobg.jpg diff --git a/src/htdocs/images/j-s-256.ico b/src/AdminUI/public/images/j-s-256.ico similarity index 100% rename from src/htdocs/images/j-s-256.ico rename to src/AdminUI/public/images/j-s-256.ico diff --git a/src/htdocs/images/j-s.ico b/src/AdminUI/public/images/j-s.ico similarity index 100% rename from src/htdocs/images/j-s.ico rename to src/AdminUI/public/images/j-s.ico diff --git a/src/htdocs/images/j-s.png b/src/AdminUI/public/images/j-s.png similarity index 100% rename from src/htdocs/images/j-s.png rename to src/AdminUI/public/images/j-s.png diff --git a/src/htdocs/images/j-s.svg b/src/AdminUI/public/images/j-s.svg similarity index 100% rename from src/htdocs/images/j-s.svg rename to src/AdminUI/public/images/j-s.svg diff --git a/src/htdocs-admin/src/assets/json-scada.svg b/src/AdminUI/public/images/json-scada.svg similarity index 100% rename from src/htdocs-admin/src/assets/json-scada.svg rename to src/AdminUI/public/images/json-scada.svg diff --git a/src/htdocs/images/magnet-off.svg b/src/AdminUI/public/images/magnet-off.svg similarity index 100% rename from src/htdocs/images/magnet-off.svg rename to src/AdminUI/public/images/magnet-off.svg diff --git a/src/htdocs/images/magnet.svg b/src/AdminUI/public/images/magnet.svg similarity index 100% rename from src/htdocs/images/magnet.svg rename to src/AdminUI/public/images/magnet.svg diff --git a/src/htdocs/images/metabase.ico b/src/AdminUI/public/images/metabase.ico similarity index 100% rename from src/htdocs/images/metabase.ico rename to src/AdminUI/public/images/metabase.ico diff --git a/src/htdocs-login/images/metabase.svg b/src/AdminUI/public/images/metabase.svg similarity index 100% rename from src/htdocs-login/images/metabase.svg rename to src/AdminUI/public/images/metabase.svg diff --git a/src/htdocs/images/move.svg b/src/AdminUI/public/images/move.svg similarity index 100% rename from src/htdocs/images/move.svg rename to src/AdminUI/public/images/move.svg diff --git a/src/htdocs/images/panic.svg b/src/AdminUI/public/images/panic.svg similarity index 100% rename from src/htdocs/images/panic.svg rename to src/AdminUI/public/images/panic.svg diff --git a/src/htdocs/images/pause.svg b/src/AdminUI/public/images/pause.svg similarity index 100% rename from src/htdocs/images/pause.svg rename to src/AdminUI/public/images/pause.svg diff --git a/src/htdocs/images/play.svg b/src/AdminUI/public/images/play.svg similarity index 100% rename from src/htdocs/images/play.svg rename to src/AdminUI/public/images/play.svg diff --git a/src/htdocs/images/plot.ico b/src/AdminUI/public/images/plot.ico similarity index 100% rename from src/htdocs/images/plot.ico rename to src/AdminUI/public/images/plot.ico diff --git a/src/htdocs/images/plot.svg b/src/AdminUI/public/images/plot.svg similarity index 100% rename from src/htdocs/images/plot.svg rename to src/AdminUI/public/images/plot.svg diff --git a/src/htdocs/images/screen2.svg b/src/AdminUI/public/images/screen2.svg similarity index 100% rename from src/htdocs/images/screen2.svg rename to src/AdminUI/public/images/screen2.svg diff --git a/src/htdocs/images/seta.jpg b/src/AdminUI/public/images/seta.jpg similarity index 100% rename from src/htdocs/images/seta.jpg rename to src/AdminUI/public/images/seta.jpg diff --git a/src/htdocs/images/showfiltered.svg b/src/AdminUI/public/images/showfiltered.svg similarity index 100% rename from src/htdocs/images/showfiltered.svg rename to src/AdminUI/public/images/showfiltered.svg diff --git a/src/htdocs/images/showless.svg b/src/AdminUI/public/images/showless.svg similarity index 100% rename from src/htdocs/images/showless.svg rename to src/AdminUI/public/images/showless.svg diff --git a/src/htdocs/images/showmore.svg b/src/AdminUI/public/images/showmore.svg similarity index 100% rename from src/htdocs/images/showmore.svg rename to src/AdminUI/public/images/showmore.svg diff --git a/src/htdocs/images/snowflake.svg b/src/AdminUI/public/images/snowflake.svg similarity index 100% rename from src/htdocs/images/snowflake.svg rename to src/AdminUI/public/images/snowflake.svg diff --git a/src/htdocs/images/tabular.ico b/src/AdminUI/public/images/tabular.ico similarity index 100% rename from src/htdocs/images/tabular.ico rename to src/AdminUI/public/images/tabular.ico diff --git a/src/htdocs/images/tabular.png b/src/AdminUI/public/images/tabular.png similarity index 100% rename from src/htdocs/images/tabular.png rename to src/AdminUI/public/images/tabular.png diff --git a/src/htdocs-admin/src/assets/tabular.svg b/src/AdminUI/public/images/tabular.svg similarity index 100% rename from src/htdocs-admin/src/assets/tabular.svg rename to src/AdminUI/public/images/tabular.svg diff --git a/src/htdocs/images/tag.svg b/src/AdminUI/public/images/tag.svg similarity index 100% rename from src/htdocs/images/tag.svg rename to src/AdminUI/public/images/tag.svg diff --git a/src/htdocs/images/tela.ico b/src/AdminUI/public/images/tela.ico similarity index 100% rename from src/htdocs/images/tela.ico rename to src/AdminUI/public/images/tela.ico diff --git a/src/htdocs-admin/src/assets/tela.png b/src/AdminUI/public/images/tela.png similarity index 100% rename from src/htdocs-admin/src/assets/tela.png rename to src/AdminUI/public/images/tela.png diff --git a/src/htdocs/images/vsepar.png b/src/AdminUI/public/images/vsepar.png similarity index 100% rename from src/htdocs/images/vsepar.png rename to src/AdminUI/public/images/vsepar.png diff --git a/src/htdocs/images/zoom-in.svg b/src/AdminUI/public/images/zoom-in.svg similarity index 100% rename from src/htdocs/images/zoom-in.svg rename to src/AdminUI/public/images/zoom-in.svg diff --git a/src/htdocs/images/zoom-in1.svg b/src/AdminUI/public/images/zoom-in1.svg similarity index 100% rename from src/htdocs/images/zoom-in1.svg rename to src/AdminUI/public/images/zoom-in1.svg diff --git a/src/htdocs/images/zoom-out.svg b/src/AdminUI/public/images/zoom-out.svg similarity index 100% rename from src/htdocs/images/zoom-out.svg rename to src/AdminUI/public/images/zoom-out.svg diff --git a/src/htdocs/images/zoom-out1.svg b/src/AdminUI/public/images/zoom-out1.svg similarity index 100% rename from src/htdocs/images/zoom-out1.svg rename to src/AdminUI/public/images/zoom-out1.svg diff --git a/src/htdocs/images/zoompan.png b/src/AdminUI/public/images/zoompan.png similarity index 100% rename from src/htdocs/images/zoompan.png rename to src/AdminUI/public/images/zoompan.png diff --git a/src/htdocs/legacy_options.js b/src/AdminUI/public/legacy_options.js similarity index 100% rename from src/htdocs/legacy_options.js rename to src/AdminUI/public/legacy_options.js diff --git a/src/htdocs/lib/SourceSansPro-Regular.woff2 b/src/AdminUI/public/lib/SourceSansPro-Regular.woff2 similarity index 100% rename from src/htdocs/lib/SourceSansPro-Regular.woff2 rename to src/AdminUI/public/lib/SourceSansPro-Regular.woff2 diff --git a/src/htdocs/lib/animations.css b/src/AdminUI/public/lib/animations.css similarity index 100% rename from src/htdocs/lib/animations.css rename to src/AdminUI/public/lib/animations.css diff --git a/src/htdocs/lib/bootstrap.min.css b/src/AdminUI/public/lib/bootstrap.min.css similarity index 100% rename from src/htdocs/lib/bootstrap.min.css rename to src/AdminUI/public/lib/bootstrap.min.css diff --git a/src/htdocs/lib/bootstrap.min.js b/src/AdminUI/public/lib/bootstrap.min.js similarity index 100% rename from src/htdocs/lib/bootstrap.min.js rename to src/AdminUI/public/lib/bootstrap.min.js diff --git a/src/htdocs/lib/chroma.js b/src/AdminUI/public/lib/chroma.js similarity index 100% rename from src/htdocs/lib/chroma.js rename to src/AdminUI/public/lib/chroma.js diff --git a/src/htdocs/lib/core-1.0.js b/src/AdminUI/public/lib/core-1.0.js similarity index 100% rename from src/htdocs/lib/core-1.0.js rename to src/AdminUI/public/lib/core-1.0.js diff --git a/src/htdocs/lib/d3.LICENSE b/src/AdminUI/public/lib/d3.LICENSE similarity index 100% rename from src/htdocs/lib/d3.LICENSE rename to src/AdminUI/public/lib/d3.LICENSE diff --git a/src/htdocs/lib/d3.js b/src/AdminUI/public/lib/d3.js similarity index 100% rename from src/htdocs/lib/d3.js rename to src/AdminUI/public/lib/d3.js diff --git a/src/htdocs/lib/d3.min.js b/src/AdminUI/public/lib/d3.min.js similarity index 100% rename from src/htdocs/lib/d3.min.js rename to src/AdminUI/public/lib/d3.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.crosshair.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.crosshair.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.crosshair.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.crosshair.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.crosshair.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.crosshair.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.crosshair.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.crosshair.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.fillbetween.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.fillbetween.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.fillbetween.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.fillbetween.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.fillbetween.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.fillbetween.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.fillbetween.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.fillbetween.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.image.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.image.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.image.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.image.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.image.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.image.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.image.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.image.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.navigate.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.navigate.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.navigate.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.navigate.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.navigate.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.navigate.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.navigate.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.navigate.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.pie.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.pie.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.pie.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.pie.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.pie.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.pie.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.pie.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.pie.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.resize.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.resize.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.resize.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.resize.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.resize.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.resize.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.resize.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.resize.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.selection.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.selection.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.selection.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.selection.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.selection.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.selection.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.selection.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.selection.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.stack.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.stack.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.stack.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.stack.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.stack.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.stack.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.stack.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.stack.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.symbol.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.symbol.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.symbol.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.symbol.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.symbol.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.symbol.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.symbol.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.symbol.min.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.threshold.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.threshold.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.threshold.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.threshold.js diff --git a/src/htdocs/lib/flot-0.7/jquery.flot.threshold.min.js b/src/AdminUI/public/lib/flot-0.7/jquery.flot.threshold.min.js similarity index 100% rename from src/htdocs/lib/flot-0.7/jquery.flot.threshold.min.js rename to src/AdminUI/public/lib/flot-0.7/jquery.flot.threshold.min.js diff --git a/src/htdocs/lib/jquery-1.5.1.js b/src/AdminUI/public/lib/jquery-1.5.1.js similarity index 100% rename from src/htdocs/lib/jquery-1.5.1.js rename to src/AdminUI/public/lib/jquery-1.5.1.js diff --git a/src/htdocs/lib/jquery-1.7.2.js b/src/AdminUI/public/lib/jquery-1.7.2.js similarity index 100% rename from src/htdocs/lib/jquery-1.7.2.js rename to src/AdminUI/public/lib/jquery-1.7.2.js diff --git a/src/htdocs/lib/jquery-1.7.2.min.js b/src/AdminUI/public/lib/jquery-1.7.2.min.js similarity index 100% rename from src/htdocs/lib/jquery-1.7.2.min.js rename to src/AdminUI/public/lib/jquery-1.7.2.min.js diff --git a/src/htdocs/lib/jquery-1.8.3.js b/src/AdminUI/public/lib/jquery-1.8.3.js similarity index 100% rename from src/htdocs/lib/jquery-1.8.3.js rename to src/AdminUI/public/lib/jquery-1.8.3.js diff --git a/src/htdocs/lib/jquery-2.1.1.js b/src/AdminUI/public/lib/jquery-2.1.1.js similarity index 100% rename from src/htdocs/lib/jquery-2.1.1.js rename to src/AdminUI/public/lib/jquery-2.1.1.js diff --git a/src/htdocs/lib/jquery.event.drag-2.2.js b/src/AdminUI/public/lib/jquery.event.drag-2.2.js similarity index 100% rename from src/htdocs/lib/jquery.event.drag-2.2.js rename to src/AdminUI/public/lib/jquery.event.drag-2.2.js diff --git a/src/htdocs/lib/modernizr-2.0.6.js b/src/AdminUI/public/lib/modernizr-2.0.6.js similarity index 100% rename from src/htdocs/lib/modernizr-2.0.6.js rename to src/AdminUI/public/lib/modernizr-2.0.6.js diff --git a/src/htdocs/lib/normalize.css b/src/AdminUI/public/lib/normalize.css similarity index 100% rename from src/htdocs/lib/normalize.css rename to src/AdminUI/public/lib/normalize.css diff --git a/src/htdocs/lib/pergola/Documentation/API-reference.html b/src/AdminUI/public/lib/pergola/Documentation/API-reference.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/API-reference.html rename to src/AdminUI/public/lib/pergola/Documentation/API-reference.html diff --git a/src/htdocs/lib/pergola/Documentation/Tutorial.html b/src/AdminUI/public/lib/pergola/Documentation/Tutorial.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/Tutorial.html rename to src/AdminUI/public/lib/pergola/Documentation/Tutorial.html diff --git a/src/htdocs/lib/pergola/Documentation/api.css b/src/AdminUI/public/lib/pergola/Documentation/api.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/api.css rename to src/AdminUI/public/lib/pergola/Documentation/api.css diff --git a/src/htdocs/lib/pergola/Documentation/doc.css b/src/AdminUI/public/lib/pergola/Documentation/doc.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/doc.css rename to src/AdminUI/public/lib/pergola/Documentation/doc.css diff --git a/src/htdocs/lib/pergola/Documentation/files/Background.html b/src/AdminUI/public/lib/pergola/Documentation/files/Background.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Background.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Background.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Button.html b/src/AdminUI/public/lib/pergola/Documentation/files/Button.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Button.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Button.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Caption.html b/src/AdminUI/public/lib/pergola/Documentation/files/Caption.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Caption.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Caption.html diff --git a/src/htdocs/lib/pergola/Documentation/files/CheckBox.html b/src/AdminUI/public/lib/pergola/Documentation/files/CheckBox.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/CheckBox.html rename to src/AdminUI/public/lib/pergola/Documentation/files/CheckBox.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Class.html b/src/AdminUI/public/lib/pergola/Documentation/files/Class.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Class.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Class.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ColorBoxSelector.html b/src/AdminUI/public/lib/pergola/Documentation/files/ColorBoxSelector.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ColorBoxSelector.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ColorBoxSelector.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ColorPicker.html b/src/AdminUI/public/lib/pergola/Documentation/files/ColorPicker.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ColorPicker.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ColorPicker.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ComboBox.html b/src/AdminUI/public/lib/pergola/Documentation/files/ComboBox.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ComboBox.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ComboBox.html diff --git a/src/htdocs/lib/pergola/Documentation/files/CommandButton.html b/src/AdminUI/public/lib/pergola/Documentation/files/CommandButton.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/CommandButton.html rename to src/AdminUI/public/lib/pergola/Documentation/files/CommandButton.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ContextMenu.html b/src/AdminUI/public/lib/pergola/Documentation/files/ContextMenu.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ContextMenu.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ContextMenu.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ContextMenuItem.html b/src/AdminUI/public/lib/pergola/Documentation/files/ContextMenuItem.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ContextMenuItem.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ContextMenuItem.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Coordinates.html b/src/AdminUI/public/lib/pergola/Documentation/files/Coordinates.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Coordinates.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Coordinates.html diff --git a/src/htdocs/lib/pergola/Documentation/files/DataGrid.html b/src/AdminUI/public/lib/pergola/Documentation/files/DataGrid.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/DataGrid.html rename to src/AdminUI/public/lib/pergola/Documentation/files/DataGrid.html diff --git a/src/htdocs/lib/pergola/Documentation/files/DataGridHeader.html b/src/AdminUI/public/lib/pergola/Documentation/files/DataGridHeader.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/DataGridHeader.html rename to src/AdminUI/public/lib/pergola/Documentation/files/DataGridHeader.html diff --git a/src/htdocs/lib/pergola/Documentation/files/DataGridLine.html b/src/AdminUI/public/lib/pergola/Documentation/files/DataGridLine.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/DataGridLine.html rename to src/AdminUI/public/lib/pergola/Documentation/files/DataGridLine.html diff --git a/src/htdocs/lib/pergola/Documentation/files/DialogButton.html b/src/AdminUI/public/lib/pergola/Documentation/files/DialogButton.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/DialogButton.html rename to src/AdminUI/public/lib/pergola/Documentation/files/DialogButton.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Doc.html b/src/AdminUI/public/lib/pergola/Documentation/files/Doc.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Doc.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Doc.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Dragarea.html b/src/AdminUI/public/lib/pergola/Documentation/files/Dragarea.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Dragarea.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Dragarea.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Frame.html b/src/AdminUI/public/lib/pergola/Documentation/files/Frame.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Frame.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Frame.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Input.html b/src/AdminUI/public/lib/pergola/Documentation/files/Input.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Input.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Input.html diff --git a/src/htdocs/lib/pergola/Documentation/files/InputCursor.html b/src/AdminUI/public/lib/pergola/Documentation/files/InputCursor.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/InputCursor.html rename to src/AdminUI/public/lib/pergola/Documentation/files/InputCursor.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Layout.html b/src/AdminUI/public/lib/pergola/Documentation/files/Layout.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Layout.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Layout.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Legend.html b/src/AdminUI/public/lib/pergola/Documentation/files/Legend.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Legend.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Legend.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ListItem.html b/src/AdminUI/public/lib/pergola/Documentation/files/ListItem.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ListItem.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ListItem.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Menu.html b/src/AdminUI/public/lib/pergola/Documentation/files/Menu.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Menu.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Menu.html diff --git a/src/htdocs/lib/pergola/Documentation/files/MenuItem.html b/src/AdminUI/public/lib/pergola/Documentation/files/MenuItem.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/MenuItem.html rename to src/AdminUI/public/lib/pergola/Documentation/files/MenuItem.html diff --git a/src/htdocs/lib/pergola/Documentation/files/MenuList.html b/src/AdminUI/public/lib/pergola/Documentation/files/MenuList.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/MenuList.html rename to src/AdminUI/public/lib/pergola/Documentation/files/MenuList.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Menubar.html b/src/AdminUI/public/lib/pergola/Documentation/files/Menubar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Menubar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Menubar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Number.html b/src/AdminUI/public/lib/pergola/Documentation/files/Number.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Number.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Number.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Panel.html b/src/AdminUI/public/lib/pergola/Documentation/files/Panel.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Panel.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Panel.html diff --git a/src/htdocs/lib/pergola/Documentation/files/PopupList.html b/src/AdminUI/public/lib/pergola/Documentation/files/PopupList.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/PopupList.html rename to src/AdminUI/public/lib/pergola/Documentation/files/PopupList.html diff --git a/src/htdocs/lib/pergola/Documentation/files/PopupListItem.html b/src/AdminUI/public/lib/pergola/Documentation/files/PopupListItem.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/PopupListItem.html rename to src/AdminUI/public/lib/pergola/Documentation/files/PopupListItem.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Preview.html b/src/AdminUI/public/lib/pergola/Documentation/files/Preview.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Preview.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Preview.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Progress.html b/src/AdminUI/public/lib/pergola/Documentation/files/Progress.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Progress.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Progress.html diff --git a/src/htdocs/lib/pergola/Documentation/files/QuickTip.html b/src/AdminUI/public/lib/pergola/Documentation/files/QuickTip.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/QuickTip.html rename to src/AdminUI/public/lib/pergola/Documentation/files/QuickTip.html diff --git a/src/htdocs/lib/pergola/Documentation/files/RadioButton.html b/src/AdminUI/public/lib/pergola/Documentation/files/RadioButton.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/RadioButton.html rename to src/AdminUI/public/lib/pergola/Documentation/files/RadioButton.html diff --git a/src/htdocs/lib/pergola/Documentation/files/RubberBox.html b/src/AdminUI/public/lib/pergola/Documentation/files/RubberBox.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/RubberBox.html rename to src/AdminUI/public/lib/pergola/Documentation/files/RubberBox.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ScrollButton.html b/src/AdminUI/public/lib/pergola/Documentation/files/ScrollButton.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ScrollButton.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ScrollButton.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ScrollSlider.html b/src/AdminUI/public/lib/pergola/Documentation/files/ScrollSlider.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ScrollSlider.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ScrollSlider.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Scrollbar.html b/src/AdminUI/public/lib/pergola/Documentation/files/Scrollbar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Scrollbar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Scrollbar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Selector.html b/src/AdminUI/public/lib/pergola/Documentation/files/Selector.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Selector.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Selector.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Separator.html b/src/AdminUI/public/lib/pergola/Documentation/files/Separator.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Separator.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Separator.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Slider.html b/src/AdminUI/public/lib/pergola/Documentation/files/Slider.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Slider.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Slider.html diff --git a/src/htdocs/lib/pergola/Documentation/files/StatusBar.html b/src/AdminUI/public/lib/pergola/Documentation/files/StatusBar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/StatusBar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/StatusBar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/String.html b/src/AdminUI/public/lib/pergola/Documentation/files/String.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/String.html rename to src/AdminUI/public/lib/pergola/Documentation/files/String.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Suffix.html b/src/AdminUI/public/lib/pergola/Documentation/files/Suffix.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Suffix.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Suffix.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Tab.html b/src/AdminUI/public/lib/pergola/Documentation/files/Tab.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Tab.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Tab.html diff --git a/src/htdocs/lib/pergola/Documentation/files/TabsDock.html b/src/AdminUI/public/lib/pergola/Documentation/files/TabsDock.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/TabsDock.html rename to src/AdminUI/public/lib/pergola/Documentation/files/TabsDock.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Taskbar.html b/src/AdminUI/public/lib/pergola/Documentation/files/Taskbar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Taskbar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Taskbar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ToolBar.html b/src/AdminUI/public/lib/pergola/Documentation/files/ToolBar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ToolBar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ToolBar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/ToolButton.html b/src/AdminUI/public/lib/pergola/Documentation/files/ToolButton.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/ToolButton.html rename to src/AdminUI/public/lib/pergola/Documentation/files/ToolButton.html diff --git a/src/htdocs/lib/pergola/Documentation/files/TopBar.html b/src/AdminUI/public/lib/pergola/Documentation/files/TopBar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/TopBar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/TopBar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Undo.html b/src/AdminUI/public/lib/pergola/Documentation/files/Undo.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Undo.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Undo.html diff --git a/src/htdocs/lib/pergola/Documentation/files/UpDownButton.html b/src/AdminUI/public/lib/pergola/Documentation/files/UpDownButton.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/UpDownButton.html rename to src/AdminUI/public/lib/pergola/Documentation/files/UpDownButton.html diff --git a/src/htdocs/lib/pergola/Documentation/files/Window.html b/src/AdminUI/public/lib/pergola/Documentation/files/Window.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/Window.html rename to src/AdminUI/public/lib/pergola/Documentation/files/Window.html diff --git a/src/htdocs/lib/pergola/Documentation/files/WindowTab.html b/src/AdminUI/public/lib/pergola/Documentation/files/WindowTab.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/WindowTab.html rename to src/AdminUI/public/lib/pergola/Documentation/files/WindowTab.html diff --git a/src/htdocs/lib/pergola/Documentation/files/WindowTopBar.html b/src/AdminUI/public/lib/pergola/Documentation/files/WindowTopBar.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/WindowTopBar.html rename to src/AdminUI/public/lib/pergola/Documentation/files/WindowTopBar.html diff --git a/src/htdocs/lib/pergola/Documentation/files/classOps.html b/src/AdminUI/public/lib/pergola/Documentation/files/classOps.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/classOps.html rename to src/AdminUI/public/lib/pergola/Documentation/files/classOps.html diff --git a/src/htdocs/lib/pergola/Documentation/files/classes.html b/src/AdminUI/public/lib/pergola/Documentation/files/classes.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/classes.html rename to src/AdminUI/public/lib/pergola/Documentation/files/classes.html diff --git a/src/htdocs/lib/pergola/Documentation/files/color.html b/src/AdminUI/public/lib/pergola/Documentation/files/color.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/color.html rename to src/AdminUI/public/lib/pergola/Documentation/files/color.html diff --git a/src/htdocs/lib/pergola/Documentation/files/constants.html b/src/AdminUI/public/lib/pergola/Documentation/files/constants.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/constants.html rename to src/AdminUI/public/lib/pergola/Documentation/files/constants.html diff --git a/src/htdocs/lib/pergola/Documentation/files/contextmenuManager.html b/src/AdminUI/public/lib/pergola/Documentation/files/contextmenuManager.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/contextmenuManager.html rename to src/AdminUI/public/lib/pergola/Documentation/files/contextmenuManager.html diff --git a/src/htdocs/lib/pergola/Documentation/files/core.html b/src/AdminUI/public/lib/pergola/Documentation/files/core.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/core.html rename to src/AdminUI/public/lib/pergola/Documentation/files/core.html diff --git a/src/htdocs/lib/pergola/Documentation/files/cursors.html b/src/AdminUI/public/lib/pergola/Documentation/files/cursors.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/cursors.html rename to src/AdminUI/public/lib/pergola/Documentation/files/cursors.html diff --git a/src/htdocs/lib/pergola/Documentation/files/debugger.html b/src/AdminUI/public/lib/pergola/Documentation/files/debugger.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/debugger.html rename to src/AdminUI/public/lib/pergola/Documentation/files/debugger.html diff --git a/src/htdocs/lib/pergola/Documentation/files/dom.html b/src/AdminUI/public/lib/pergola/Documentation/files/dom.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/dom.html rename to src/AdminUI/public/lib/pergola/Documentation/files/dom.html diff --git a/src/htdocs/lib/pergola/Documentation/files/filters.html b/src/AdminUI/public/lib/pergola/Documentation/files/filters.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/filters.html rename to src/AdminUI/public/lib/pergola/Documentation/files/filters.html diff --git a/src/htdocs/lib/pergola/Documentation/files/geo.html b/src/AdminUI/public/lib/pergola/Documentation/files/geo.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/geo.html rename to src/AdminUI/public/lib/pergola/Documentation/files/geo.html diff --git a/src/htdocs/lib/pergola/Documentation/files/geom.html b/src/AdminUI/public/lib/pergola/Documentation/files/geom.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/geom.html rename to src/AdminUI/public/lib/pergola/Documentation/files/geom.html diff --git a/src/htdocs/lib/pergola/Documentation/files/key.html b/src/AdminUI/public/lib/pergola/Documentation/files/key.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/key.html rename to src/AdminUI/public/lib/pergola/Documentation/files/key.html diff --git a/src/htdocs/lib/pergola/Documentation/files/lazyLoad.html b/src/AdminUI/public/lib/pergola/Documentation/files/lazyLoad.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/lazyLoad.html rename to src/AdminUI/public/lib/pergola/Documentation/files/lazyLoad.html diff --git a/src/htdocs/lib/pergola/Documentation/files/lib.html b/src/AdminUI/public/lib/pergola/Documentation/files/lib.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/lib.html rename to src/AdminUI/public/lib/pergola/Documentation/files/lib.html diff --git a/src/htdocs/lib/pergola/Documentation/files/markers.html b/src/AdminUI/public/lib/pergola/Documentation/files/markers.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/markers.html rename to src/AdminUI/public/lib/pergola/Documentation/files/markers.html diff --git a/src/htdocs/lib/pergola/Documentation/files/messages.html b/src/AdminUI/public/lib/pergola/Documentation/files/messages.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/messages.html rename to src/AdminUI/public/lib/pergola/Documentation/files/messages.html diff --git a/src/htdocs/lib/pergola/Documentation/files/misc.html b/src/AdminUI/public/lib/pergola/Documentation/files/misc.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/misc.html rename to src/AdminUI/public/lib/pergola/Documentation/files/misc.html diff --git a/src/htdocs/lib/pergola/Documentation/files/nodeManip.html b/src/AdminUI/public/lib/pergola/Documentation/files/nodeManip.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/nodeManip.html rename to src/AdminUI/public/lib/pergola/Documentation/files/nodeManip.html diff --git a/src/htdocs/lib/pergola/Documentation/files/obExt.html b/src/AdminUI/public/lib/pergola/Documentation/files/obExt.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/obExt.html rename to src/AdminUI/public/lib/pergola/Documentation/files/obExt.html diff --git a/src/htdocs/lib/pergola/Documentation/files/patterns.html b/src/AdminUI/public/lib/pergola/Documentation/files/patterns.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/patterns.html rename to src/AdminUI/public/lib/pergola/Documentation/files/patterns.html diff --git a/src/htdocs/lib/pergola/Documentation/files/qtips.html b/src/AdminUI/public/lib/pergola/Documentation/files/qtips.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/qtips.html rename to src/AdminUI/public/lib/pergola/Documentation/files/qtips.html diff --git a/src/htdocs/lib/pergola/Documentation/files/references.html b/src/AdminUI/public/lib/pergola/Documentation/files/references.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/references.html rename to src/AdminUI/public/lib/pergola/Documentation/files/references.html diff --git a/src/htdocs/lib/pergola/Documentation/files/requests.html b/src/AdminUI/public/lib/pergola/Documentation/files/requests.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/requests.html rename to src/AdminUI/public/lib/pergola/Documentation/files/requests.html diff --git a/src/htdocs/lib/pergola/Documentation/files/shapes.html b/src/AdminUI/public/lib/pergola/Documentation/files/shapes.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/shapes.html rename to src/AdminUI/public/lib/pergola/Documentation/files/shapes.html diff --git a/src/htdocs/lib/pergola/Documentation/files/skins.html b/src/AdminUI/public/lib/pergola/Documentation/files/skins.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/skins.html rename to src/AdminUI/public/lib/pergola/Documentation/files/skins.html diff --git a/src/htdocs/lib/pergola/Documentation/files/symbols.html b/src/AdminUI/public/lib/pergola/Documentation/files/symbols.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/symbols.html rename to src/AdminUI/public/lib/pergola/Documentation/files/symbols.html diff --git a/src/htdocs/lib/pergola/Documentation/files/timer.html b/src/AdminUI/public/lib/pergola/Documentation/files/timer.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/timer.html rename to src/AdminUI/public/lib/pergola/Documentation/files/timer.html diff --git a/src/htdocs/lib/pergola/Documentation/files/variables.html b/src/AdminUI/public/lib/pergola/Documentation/files/variables.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/variables.html rename to src/AdminUI/public/lib/pergola/Documentation/files/variables.html diff --git a/src/htdocs/lib/pergola/Documentation/files/xmlName.html b/src/AdminUI/public/lib/pergola/Documentation/files/xmlName.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/files/xmlName.html rename to src/AdminUI/public/lib/pergola/Documentation/files/xmlName.html diff --git a/src/htdocs/lib/pergola/Documentation/graphics/banana.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/banana.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/banana.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/banana.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/basicButton.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/basicButton.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/basicButton.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/basicButton.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/button.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/button.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/button.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/button.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/contextmenu.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/contextmenu.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/contextmenu.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/contextmenu.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/file.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/file.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/file.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/file.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/filter1.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/filter1.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/filter1.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/filter1.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/find.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/find.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/find.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/find.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/listDot.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/listDot.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/listDot.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/listDot.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/logo.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/logo.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/logo.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/logo.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/marker1.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/marker1.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/marker1.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/marker1.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/marker2.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/marker2.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/marker2.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/marker2.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/marker3.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/marker3.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/marker3.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/marker3.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/monalisa-hover.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/monalisa-hover.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/monalisa-hover.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/monalisa-hover.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/monalisa.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/monalisa.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/monalisa.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/monalisa.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/pattern1.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/pattern1.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/pattern1.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/pattern1.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/penTool.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/penTool.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/penTool.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/penTool.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/pergola_small.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/pergola_small.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/pergola_small.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/pergola_small.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/quicktip.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/quicktip.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/quicktip.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/quicktip.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/rotation.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/rotation.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/rotation.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/rotation.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/shape1.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/shape1.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/shape1.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/shape1.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/shape2.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/shape2.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/shape2.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/shape2.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/spectrum.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/spectrum.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/spectrum.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/spectrum.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/symbol1.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/symbol1.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/symbol1.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/symbol1.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/sysMenu.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/sysMenu.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/sysMenu.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/sysMenu.png diff --git a/src/htdocs/lib/pergola/Documentation/graphics/tools.png b/src/AdminUI/public/lib/pergola/Documentation/graphics/tools.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/graphics/tools.png rename to src/AdminUI/public/lib/pergola/Documentation/graphics/tools.png diff --git a/src/htdocs/lib/pergola/Documentation/pergola_small.png b/src/AdminUI/public/lib/pergola/Documentation/pergola_small.png similarity index 100% rename from src/htdocs/lib/pergola/Documentation/pergola_small.png rename to src/AdminUI/public/lib/pergola/Documentation/pergola_small.png diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/LGPL-LICENSE b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/LGPL-LICENSE similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/LGPL-LICENSE rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/LGPL-LICENSE diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/MIT-LICENSE b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/MIT-LICENSE similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/MIT-LICENSE rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/MIT-LICENSE diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/_theme_template.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/_theme_template.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/_theme_template.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/_theme_template.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/config.rb b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/config.rb similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/config.rb rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/config.rb diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCore.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCore.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCore.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCore.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/index.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/index.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/index.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/index.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shAutoloader.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shAutoloader.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shAutoloader.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shAutoloader.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushBash.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushBash.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushBash.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushBash.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCss.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCss.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCss.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushCss.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJava.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJava.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJava.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJava.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPython.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPython.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPython.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushPython.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSass.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSass.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSass.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSass.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushScala.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushScala.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushScala.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushScala.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSql.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSql.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSql.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushSql.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushVb.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushVb.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushVb.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushVb.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushXml.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushXml.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushXml.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shBrushXml.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shCore.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shCore.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shCore.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shCore.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shLegacy.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shLegacy.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shLegacy.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/scripts/shLegacy.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shAutoloader.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shAutoloader.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shAutoloader.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shAutoloader.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shCore.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shCore.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shCore.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shCore.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shLegacy.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shLegacy.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shLegacy.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/src/shLegacy.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCore.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCore.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCore.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCore.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDefault.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDefault.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDefault.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDefault.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDjango.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDjango.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDjango.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreDjango.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreRDark.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreRDark.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreRDark.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreRDark.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDefault.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDefault.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDefault.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDefault.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDjango.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDjango.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDjango.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeDjango.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeRDark.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeRDark.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeRDark.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/styles/shThemeRDark.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/.rvmrc b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/.rvmrc similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/.rvmrc rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/.rvmrc diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes/sass.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes/sass.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes/sass.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes/sass.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes_tests.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes_tests.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes_tests.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/brushes_tests.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/001_basic.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/001_basic.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/001_basic.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/001_basic.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/commonjs_tests.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/commonjs_tests.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/commonjs_tests.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/commonjs_tests.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.css b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.css rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.css diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.js b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.js similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.js rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/js/qunit.js diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/theme_tests.html b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/theme_tests.html similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/theme_tests.html rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/theme_tests.html diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.rb b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.rb similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.rb rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.rb diff --git a/src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.sh b/src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.sh similarity index 100% rename from src/htdocs/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.sh rename to src/AdminUI/public/lib/pergola/Documentation/syntaxhighlighter_3.0.83/tests/webrick.sh diff --git a/src/htdocs/lib/pergola/Documentation/tutorial.css b/src/AdminUI/public/lib/pergola/Documentation/tutorial.css similarity index 100% rename from src/htdocs/lib/pergola/Documentation/tutorial.css rename to src/AdminUI/public/lib/pergola/Documentation/tutorial.css diff --git a/src/htdocs/lib/pergola/Examples/BingMaps/BingWindow.svg b/src/AdminUI/public/lib/pergola/Examples/BingMaps/BingWindow.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/BingMaps/BingWindow.svg rename to src/AdminUI/public/lib/pergola/Examples/BingMaps/BingWindow.svg diff --git a/src/htdocs/lib/pergola/Examples/BingMaps/bing_window.js b/src/AdminUI/public/lib/pergola/Examples/BingMaps/bing_window.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/BingMaps/bing_window.js rename to src/AdminUI/public/lib/pergola/Examples/BingMaps/bing_window.js diff --git a/src/htdocs/lib/pergola/Examples/BingMaps/config.js b/src/AdminUI/public/lib/pergola/Examples/BingMaps/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/BingMaps/config.js rename to src/AdminUI/public/lib/pergola/Examples/BingMaps/config.js diff --git a/src/htdocs/lib/pergola/Examples/Buttons/buttons.js b/src/AdminUI/public/lib/pergola/Examples/Buttons/buttons.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Buttons/buttons.js rename to src/AdminUI/public/lib/pergola/Examples/Buttons/buttons.js diff --git a/src/htdocs/lib/pergola/Examples/Buttons/buttons.svg b/src/AdminUI/public/lib/pergola/Examples/Buttons/buttons.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Buttons/buttons.svg rename to src/AdminUI/public/lib/pergola/Examples/Buttons/buttons.svg diff --git a/src/htdocs/lib/pergola/Examples/Buttons/config.js b/src/AdminUI/public/lib/pergola/Examples/Buttons/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Buttons/config.js rename to src/AdminUI/public/lib/pergola/Examples/Buttons/config.js diff --git a/src/htdocs/lib/pergola/Examples/Buttons/legend.js b/src/AdminUI/public/lib/pergola/Examples/Buttons/legend.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Buttons/legend.js rename to src/AdminUI/public/lib/pergola/Examples/Buttons/legend.js diff --git a/src/htdocs/lib/pergola/Examples/Colorpicker/colorBoxSelector_and_colorpicker.js b/src/AdminUI/public/lib/pergola/Examples/Colorpicker/colorBoxSelector_and_colorpicker.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Colorpicker/colorBoxSelector_and_colorpicker.js rename to src/AdminUI/public/lib/pergola/Examples/Colorpicker/colorBoxSelector_and_colorpicker.js diff --git a/src/htdocs/lib/pergola/Examples/Colorpicker/colorpicker.svg b/src/AdminUI/public/lib/pergola/Examples/Colorpicker/colorpicker.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Colorpicker/colorpicker.svg rename to src/AdminUI/public/lib/pergola/Examples/Colorpicker/colorpicker.svg diff --git a/src/htdocs/lib/pergola/Examples/Colorpicker/config.js b/src/AdminUI/public/lib/pergola/Examples/Colorpicker/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Colorpicker/config.js rename to src/AdminUI/public/lib/pergola/Examples/Colorpicker/config.js diff --git a/src/htdocs/lib/pergola/Examples/ComboBox/combobox-orphan.js b/src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox-orphan.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/ComboBox/combobox-orphan.js rename to src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox-orphan.js diff --git a/src/htdocs/lib/pergola/Examples/ComboBox/combobox-orphan.svg b/src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox-orphan.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/ComboBox/combobox-orphan.svg rename to src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox-orphan.svg diff --git a/src/htdocs/lib/pergola/Examples/ComboBox/combobox.js b/src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/ComboBox/combobox.js rename to src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox.js diff --git a/src/htdocs/lib/pergola/Examples/ComboBox/combobox.svg b/src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/ComboBox/combobox.svg rename to src/AdminUI/public/lib/pergola/Examples/ComboBox/combobox.svg diff --git a/src/htdocs/lib/pergola/Examples/ComboBox/config.js b/src/AdminUI/public/lib/pergola/Examples/ComboBox/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/ComboBox/config.js rename to src/AdminUI/public/lib/pergola/Examples/ComboBox/config.js diff --git a/src/htdocs/lib/pergola/Examples/ComboBox/list.js b/src/AdminUI/public/lib/pergola/Examples/ComboBox/list.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/ComboBox/list.js rename to src/AdminUI/public/lib/pergola/Examples/ComboBox/list.js diff --git a/src/htdocs/lib/pergola/Examples/Contextmenu/config.js b/src/AdminUI/public/lib/pergola/Examples/Contextmenu/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Contextmenu/config.js rename to src/AdminUI/public/lib/pergola/Examples/Contextmenu/config.js diff --git a/src/htdocs/lib/pergola/Examples/Contextmenu/contextmenu.js b/src/AdminUI/public/lib/pergola/Examples/Contextmenu/contextmenu.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Contextmenu/contextmenu.js rename to src/AdminUI/public/lib/pergola/Examples/Contextmenu/contextmenu.js diff --git a/src/htdocs/lib/pergola/Examples/Contextmenu/contextmenu.svg b/src/AdminUI/public/lib/pergola/Examples/Contextmenu/contextmenu.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Contextmenu/contextmenu.svg rename to src/AdminUI/public/lib/pergola/Examples/Contextmenu/contextmenu.svg diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/clock.html b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/clock.html similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/clock.html rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/clock.html diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/clock.js b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/clock.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/clock.js rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/clock.js diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/force.css b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/force.css similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/force.css rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/force.css diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/force.html b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/force.html similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/force.html rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/force.html diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/force.js b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/force.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/force.js rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/force.js diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/miserables.json b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/miserables.json similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/miserables.json rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/miserables.json diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream.css b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream.css similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream.css rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream.css diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream.html b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream.html similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream.html rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream.html diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream.js b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream.js rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream.js diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream_layers.js b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream_layers.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/stream_layers.js rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/stream_layers.js diff --git a/src/htdocs/lib/pergola/Examples/D3/Original D3 examples/worm.js b/src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/worm.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/Original D3 examples/worm.js rename to src/AdminUI/public/lib/pergola/Examples/D3/Original D3 examples/worm.js diff --git a/src/htdocs/lib/pergola/Examples/D3/area.js b/src/AdminUI/public/lib/pergola/Examples/D3/area.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/area.js rename to src/AdminUI/public/lib/pergola/Examples/D3/area.js diff --git a/src/htdocs/lib/pergola/Examples/D3/clock.js b/src/AdminUI/public/lib/pergola/Examples/D3/clock.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/clock.js rename to src/AdminUI/public/lib/pergola/Examples/D3/clock.js diff --git a/src/htdocs/lib/pergola/Examples/D3/config.js b/src/AdminUI/public/lib/pergola/Examples/D3/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/config.js rename to src/AdminUI/public/lib/pergola/Examples/D3/config.js diff --git a/src/htdocs/lib/pergola/Examples/D3/dragon-firefly.js b/src/AdminUI/public/lib/pergola/Examples/D3/dragon-firefly.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/dragon-firefly.js rename to src/AdminUI/public/lib/pergola/Examples/D3/dragon-firefly.js diff --git a/src/htdocs/lib/pergola/Examples/D3/dragon-firefly.svg b/src/AdminUI/public/lib/pergola/Examples/D3/dragon-firefly.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/dragon-firefly.svg rename to src/AdminUI/public/lib/pergola/Examples/D3/dragon-firefly.svg diff --git a/src/htdocs/lib/pergola/Examples/D3/force.js b/src/AdminUI/public/lib/pergola/Examples/D3/force.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/force.js rename to src/AdminUI/public/lib/pergola/Examples/D3/force.js diff --git a/src/htdocs/lib/pergola/Examples/D3/miserables.json b/src/AdminUI/public/lib/pergola/Examples/D3/miserables.json similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/miserables.json rename to src/AdminUI/public/lib/pergola/Examples/D3/miserables.json diff --git a/src/htdocs/lib/pergola/Examples/D3/multiD3.svg b/src/AdminUI/public/lib/pergola/Examples/D3/multiD3.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/multiD3.svg rename to src/AdminUI/public/lib/pergola/Examples/D3/multiD3.svg diff --git a/src/htdocs/lib/pergola/Examples/D3/phoenix.js b/src/AdminUI/public/lib/pergola/Examples/D3/phoenix.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/phoenix.js rename to src/AdminUI/public/lib/pergola/Examples/D3/phoenix.js diff --git a/src/htdocs/lib/pergola/Examples/D3/phoenix.svg b/src/AdminUI/public/lib/pergola/Examples/D3/phoenix.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/phoenix.svg rename to src/AdminUI/public/lib/pergola/Examples/D3/phoenix.svg diff --git a/src/htdocs/lib/pergola/Examples/D3/ray.js b/src/AdminUI/public/lib/pergola/Examples/D3/ray.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/ray.js rename to src/AdminUI/public/lib/pergola/Examples/D3/ray.js diff --git a/src/htdocs/lib/pergola/Examples/D3/ray.svg b/src/AdminUI/public/lib/pergola/Examples/D3/ray.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/ray.svg rename to src/AdminUI/public/lib/pergola/Examples/D3/ray.svg diff --git a/src/htdocs/lib/pergola/Examples/D3/stream.js b/src/AdminUI/public/lib/pergola/Examples/D3/stream.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/stream.js rename to src/AdminUI/public/lib/pergola/Examples/D3/stream.js diff --git a/src/htdocs/lib/pergola/Examples/D3/stream_layers.js b/src/AdminUI/public/lib/pergola/Examples/D3/stream_layers.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/stream_layers.js rename to src/AdminUI/public/lib/pergola/Examples/D3/stream_layers.js diff --git a/src/htdocs/lib/pergola/Examples/D3/style.css b/src/AdminUI/public/lib/pergola/Examples/D3/style.css similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/style.css rename to src/AdminUI/public/lib/pergola/Examples/D3/style.css diff --git a/src/htdocs/lib/pergola/Examples/D3/worm.js b/src/AdminUI/public/lib/pergola/Examples/D3/worm.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/worm.js rename to src/AdminUI/public/lib/pergola/Examples/D3/worm.js diff --git a/src/htdocs/lib/pergola/Examples/D3/worms.js b/src/AdminUI/public/lib/pergola/Examples/D3/worms.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/worms.js rename to src/AdminUI/public/lib/pergola/Examples/D3/worms.js diff --git a/src/htdocs/lib/pergola/Examples/D3/worms.svg b/src/AdminUI/public/lib/pergola/Examples/D3/worms.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/D3/worms.svg rename to src/AdminUI/public/lib/pergola/Examples/D3/worms.svg diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/Files/employees.json b/src/AdminUI/public/lib/pergola/Examples/DataGrid/Files/employees.json similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/Files/employees.json rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/Files/employees.json diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/Files/employees_local.js b/src/AdminUI/public/lib/pergola/Examples/DataGrid/Files/employees_local.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/Files/employees_local.js rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/Files/employees_local.js diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/config.js b/src/AdminUI/public/lib/pergola/Examples/DataGrid/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/config.js rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/config.js diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/datagrid.js b/src/AdminUI/public/lib/pergola/Examples/DataGrid/datagrid.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/datagrid.js rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/datagrid.js diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/datagrid.svg b/src/AdminUI/public/lib/pergola/Examples/DataGrid/datagrid.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/datagrid.svg rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/datagrid.svg diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/datagridLocal.js b/src/AdminUI/public/lib/pergola/Examples/DataGrid/datagridLocal.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/datagridLocal.js rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/datagridLocal.js diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/datagridLocal.svg b/src/AdminUI/public/lib/pergola/Examples/DataGrid/datagridLocal.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/datagridLocal.svg rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/datagridLocal.svg diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/getDir.php b/src/AdminUI/public/lib/pergola/Examples/DataGrid/getDir.php similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/getDir.php rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/getDir.php diff --git a/src/htdocs/lib/pergola/Examples/DataGrid/writeFile.php b/src/AdminUI/public/lib/pergola/Examples/DataGrid/writeFile.php similarity index 100% rename from src/htdocs/lib/pergola/Examples/DataGrid/writeFile.php rename to src/AdminUI/public/lib/pergola/Examples/DataGrid/writeFile.php diff --git a/src/htdocs/lib/pergola/Examples/Filters/config.js b/src/AdminUI/public/lib/pergola/Examples/Filters/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Filters/config.js rename to src/AdminUI/public/lib/pergola/Examples/Filters/config.js diff --git a/src/htdocs/lib/pergola/Examples/Filters/f.js b/src/AdminUI/public/lib/pergola/Examples/Filters/f.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Filters/f.js rename to src/AdminUI/public/lib/pergola/Examples/Filters/f.js diff --git a/src/htdocs/lib/pergola/Examples/Filters/filters.svg b/src/AdminUI/public/lib/pergola/Examples/Filters/filters.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Filters/filters.svg rename to src/AdminUI/public/lib/pergola/Examples/Filters/filters.svg diff --git a/src/htdocs/lib/pergola/Examples/Find/config.js b/src/AdminUI/public/lib/pergola/Examples/Find/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Find/config.js rename to src/AdminUI/public/lib/pergola/Examples/Find/config.js diff --git a/src/htdocs/lib/pergola/Examples/Find/find.js b/src/AdminUI/public/lib/pergola/Examples/Find/find.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Find/find.js rename to src/AdminUI/public/lib/pergola/Examples/Find/find.js diff --git a/src/htdocs/lib/pergola/Examples/Find/find.svg b/src/AdminUI/public/lib/pergola/Examples/Find/find.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Find/find.svg rename to src/AdminUI/public/lib/pergola/Examples/Find/find.svg diff --git a/src/htdocs/lib/pergola/Examples/Input/Input.svg b/src/AdminUI/public/lib/pergola/Examples/Input/Input.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Input/Input.svg rename to src/AdminUI/public/lib/pergola/Examples/Input/Input.svg diff --git a/src/htdocs/lib/pergola/Examples/Input/config.js b/src/AdminUI/public/lib/pergola/Examples/Input/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Input/config.js rename to src/AdminUI/public/lib/pergola/Examples/Input/config.js diff --git a/src/htdocs/lib/pergola/Examples/Input/input.js b/src/AdminUI/public/lib/pergola/Examples/Input/input.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Input/input.js rename to src/AdminUI/public/lib/pergola/Examples/Input/input.js diff --git a/src/htdocs/lib/pergola/Examples/Legend/config.js b/src/AdminUI/public/lib/pergola/Examples/Legend/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Legend/config.js rename to src/AdminUI/public/lib/pergola/Examples/Legend/config.js diff --git a/src/htdocs/lib/pergola/Examples/Legend/legend.js b/src/AdminUI/public/lib/pergola/Examples/Legend/legend.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Legend/legend.js rename to src/AdminUI/public/lib/pergola/Examples/Legend/legend.js diff --git a/src/htdocs/lib/pergola/Examples/Legend/legend.svg b/src/AdminUI/public/lib/pergola/Examples/Legend/legend.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Legend/legend.svg rename to src/AdminUI/public/lib/pergola/Examples/Legend/legend.svg diff --git a/src/htdocs/lib/pergola/Examples/Load/config.js b/src/AdminUI/public/lib/pergola/Examples/Load/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Load/config.js rename to src/AdminUI/public/lib/pergola/Examples/Load/config.js diff --git a/src/htdocs/lib/pergola/Examples/Load/docs/birds.svg b/src/AdminUI/public/lib/pergola/Examples/Load/docs/birds.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Load/docs/birds.svg rename to src/AdminUI/public/lib/pergola/Examples/Load/docs/birds.svg diff --git a/src/htdocs/lib/pergola/Examples/Load/load.js b/src/AdminUI/public/lib/pergola/Examples/Load/load.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Load/load.js rename to src/AdminUI/public/lib/pergola/Examples/Load/load.js diff --git a/src/htdocs/lib/pergola/Examples/Load/loadSVG.svg b/src/AdminUI/public/lib/pergola/Examples/Load/loadSVG.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Load/loadSVG.svg rename to src/AdminUI/public/lib/pergola/Examples/Load/loadSVG.svg diff --git a/src/htdocs/lib/pergola/Examples/Markers/config.js b/src/AdminUI/public/lib/pergola/Examples/Markers/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Markers/config.js rename to src/AdminUI/public/lib/pergola/Examples/Markers/config.js diff --git a/src/htdocs/lib/pergola/Examples/Markers/markers.js b/src/AdminUI/public/lib/pergola/Examples/Markers/markers.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Markers/markers.js rename to src/AdminUI/public/lib/pergola/Examples/Markers/markers.js diff --git a/src/htdocs/lib/pergola/Examples/Markers/markers.svg b/src/AdminUI/public/lib/pergola/Examples/Markers/markers.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Markers/markers.svg rename to src/AdminUI/public/lib/pergola/Examples/Markers/markers.svg diff --git a/src/htdocs/lib/pergola/Examples/Menu/config.js b/src/AdminUI/public/lib/pergola/Examples/Menu/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Menu/config.js rename to src/AdminUI/public/lib/pergola/Examples/Menu/config.js diff --git a/src/htdocs/lib/pergola/Examples/Menu/menu.js b/src/AdminUI/public/lib/pergola/Examples/Menu/menu.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Menu/menu.js rename to src/AdminUI/public/lib/pergola/Examples/Menu/menu.js diff --git a/src/htdocs/lib/pergola/Examples/Menu/menu.svg b/src/AdminUI/public/lib/pergola/Examples/Menu/menu.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Menu/menu.svg rename to src/AdminUI/public/lib/pergola/Examples/Menu/menu.svg diff --git a/src/htdocs/lib/pergola/Examples/Notification/config.js b/src/AdminUI/public/lib/pergola/Examples/Notification/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Notification/config.js rename to src/AdminUI/public/lib/pergola/Examples/Notification/config.js diff --git a/src/htdocs/lib/pergola/Examples/Notification/systemNotification.js b/src/AdminUI/public/lib/pergola/Examples/Notification/systemNotification.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Notification/systemNotification.js rename to src/AdminUI/public/lib/pergola/Examples/Notification/systemNotification.js diff --git a/src/htdocs/lib/pergola/Examples/Notification/systemNotification.svg b/src/AdminUI/public/lib/pergola/Examples/Notification/systemNotification.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Notification/systemNotification.svg rename to src/AdminUI/public/lib/pergola/Examples/Notification/systemNotification.svg diff --git a/src/htdocs/lib/pergola/Examples/Nut/config.js b/src/AdminUI/public/lib/pergola/Examples/Nut/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/config.js rename to src/AdminUI/public/lib/pergola/Examples/Nut/config.js diff --git a/src/htdocs/lib/pergola/Examples/Nut/nut.js b/src/AdminUI/public/lib/pergola/Examples/Nut/nut.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/nut.js rename to src/AdminUI/public/lib/pergola/Examples/Nut/nut.js diff --git a/src/htdocs/lib/pergola/Examples/Nut/nut.svg b/src/AdminUI/public/lib/pergola/Examples/Nut/nut.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/nut.svg rename to src/AdminUI/public/lib/pergola/Examples/Nut/nut.svg diff --git a/src/htdocs/lib/pergola/Examples/Nut/nut1.js b/src/AdminUI/public/lib/pergola/Examples/Nut/nut1.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/nut1.js rename to src/AdminUI/public/lib/pergola/Examples/Nut/nut1.js diff --git a/src/htdocs/lib/pergola/Examples/Nut/nut1.svg b/src/AdminUI/public/lib/pergola/Examples/Nut/nut1.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/nut1.svg rename to src/AdminUI/public/lib/pergola/Examples/Nut/nut1.svg diff --git a/src/htdocs/lib/pergola/Examples/Nut/nut2.js b/src/AdminUI/public/lib/pergola/Examples/Nut/nut2.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/nut2.js rename to src/AdminUI/public/lib/pergola/Examples/Nut/nut2.js diff --git a/src/htdocs/lib/pergola/Examples/Nut/nut2.svg b/src/AdminUI/public/lib/pergola/Examples/Nut/nut2.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Nut/nut2.svg rename to src/AdminUI/public/lib/pergola/Examples/Nut/nut2.svg diff --git a/src/htdocs/lib/pergola/Examples/Panel/basicPanel.js b/src/AdminUI/public/lib/pergola/Examples/Panel/basicPanel.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/basicPanel.js rename to src/AdminUI/public/lib/pergola/Examples/Panel/basicPanel.js diff --git a/src/htdocs/lib/pergola/Examples/Panel/basicPanel.svg b/src/AdminUI/public/lib/pergola/Examples/Panel/basicPanel.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/basicPanel.svg rename to src/AdminUI/public/lib/pergola/Examples/Panel/basicPanel.svg diff --git a/src/htdocs/lib/pergola/Examples/Panel/config.js b/src/AdminUI/public/lib/pergola/Examples/Panel/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/config.js rename to src/AdminUI/public/lib/pergola/Examples/Panel/config.js diff --git a/src/htdocs/lib/pergola/Examples/Panel/dialogPanel.js b/src/AdminUI/public/lib/pergola/Examples/Panel/dialogPanel.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/dialogPanel.js rename to src/AdminUI/public/lib/pergola/Examples/Panel/dialogPanel.js diff --git a/src/htdocs/lib/pergola/Examples/Panel/dialogPanel.svg b/src/AdminUI/public/lib/pergola/Examples/Panel/dialogPanel.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/dialogPanel.svg rename to src/AdminUI/public/lib/pergola/Examples/Panel/dialogPanel.svg diff --git a/src/htdocs/lib/pergola/Examples/Panel/panelWithTableLayout.js b/src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTableLayout.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/panelWithTableLayout.js rename to src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTableLayout.js diff --git a/src/htdocs/lib/pergola/Examples/Panel/panelWithTableLayout.svg b/src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTableLayout.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/panelWithTableLayout.svg rename to src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTableLayout.svg diff --git a/src/htdocs/lib/pergola/Examples/Panel/panelWithTabs.js b/src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTabs.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/panelWithTabs.js rename to src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTabs.js diff --git a/src/htdocs/lib/pergola/Examples/Panel/panelWithTabs.svg b/src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTabs.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/panelWithTabs.svg rename to src/AdminUI/public/lib/pergola/Examples/Panel/panelWithTabs.svg diff --git a/src/htdocs/lib/pergola/Examples/Panel/simplePanel.js b/src/AdminUI/public/lib/pergola/Examples/Panel/simplePanel.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/simplePanel.js rename to src/AdminUI/public/lib/pergola/Examples/Panel/simplePanel.js diff --git a/src/htdocs/lib/pergola/Examples/Panel/simplePanel.svg b/src/AdminUI/public/lib/pergola/Examples/Panel/simplePanel.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Panel/simplePanel.svg rename to src/AdminUI/public/lib/pergola/Examples/Panel/simplePanel.svg diff --git a/src/htdocs/lib/pergola/Examples/Patterns/config.js b/src/AdminUI/public/lib/pergola/Examples/Patterns/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Patterns/config.js rename to src/AdminUI/public/lib/pergola/Examples/Patterns/config.js diff --git a/src/htdocs/lib/pergola/Examples/Patterns/patterns.js b/src/AdminUI/public/lib/pergola/Examples/Patterns/patterns.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Patterns/patterns.js rename to src/AdminUI/public/lib/pergola/Examples/Patterns/patterns.js diff --git a/src/htdocs/lib/pergola/Examples/Patterns/patterns.svg b/src/AdminUI/public/lib/pergola/Examples/Patterns/patterns.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Patterns/patterns.svg rename to src/AdminUI/public/lib/pergola/Examples/Patterns/patterns.svg diff --git a/src/htdocs/lib/pergola/Examples/Progress/config.js b/src/AdminUI/public/lib/pergola/Examples/Progress/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Progress/config.js rename to src/AdminUI/public/lib/pergola/Examples/Progress/config.js diff --git a/src/htdocs/lib/pergola/Examples/Progress/progress.js b/src/AdminUI/public/lib/pergola/Examples/Progress/progress.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Progress/progress.js rename to src/AdminUI/public/lib/pergola/Examples/Progress/progress.js diff --git a/src/htdocs/lib/pergola/Examples/Progress/progress.svg b/src/AdminUI/public/lib/pergola/Examples/Progress/progress.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Progress/progress.svg rename to src/AdminUI/public/lib/pergola/Examples/Progress/progress.svg diff --git a/src/htdocs/lib/pergola/Examples/Quicktip/config.js b/src/AdminUI/public/lib/pergola/Examples/Quicktip/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Quicktip/config.js rename to src/AdminUI/public/lib/pergola/Examples/Quicktip/config.js diff --git a/src/htdocs/lib/pergola/Examples/Quicktip/quicktip.js b/src/AdminUI/public/lib/pergola/Examples/Quicktip/quicktip.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Quicktip/quicktip.js rename to src/AdminUI/public/lib/pergola/Examples/Quicktip/quicktip.js diff --git a/src/htdocs/lib/pergola/Examples/Quicktip/quicktip.svg b/src/AdminUI/public/lib/pergola/Examples/Quicktip/quicktip.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Quicktip/quicktip.svg rename to src/AdminUI/public/lib/pergola/Examples/Quicktip/quicktip.svg diff --git a/src/htdocs/lib/pergola/Examples/RadioAndCheckButtons/Radio-CheckButtons.svg b/src/AdminUI/public/lib/pergola/Examples/RadioAndCheckButtons/Radio-CheckButtons.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/RadioAndCheckButtons/Radio-CheckButtons.svg rename to src/AdminUI/public/lib/pergola/Examples/RadioAndCheckButtons/Radio-CheckButtons.svg diff --git a/src/htdocs/lib/pergola/Examples/RadioAndCheckButtons/config.js b/src/AdminUI/public/lib/pergola/Examples/RadioAndCheckButtons/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/RadioAndCheckButtons/config.js rename to src/AdminUI/public/lib/pergola/Examples/RadioAndCheckButtons/config.js diff --git a/src/htdocs/lib/pergola/Examples/RadioAndCheckButtons/radio-check.js b/src/AdminUI/public/lib/pergola/Examples/RadioAndCheckButtons/radio-check.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/RadioAndCheckButtons/radio-check.js rename to src/AdminUI/public/lib/pergola/Examples/RadioAndCheckButtons/radio-check.js diff --git a/src/htdocs/lib/pergola/Examples/Selector/config.js b/src/AdminUI/public/lib/pergola/Examples/Selector/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Selector/config.js rename to src/AdminUI/public/lib/pergola/Examples/Selector/config.js diff --git a/src/htdocs/lib/pergola/Examples/Selector/selector.js b/src/AdminUI/public/lib/pergola/Examples/Selector/selector.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Selector/selector.js rename to src/AdminUI/public/lib/pergola/Examples/Selector/selector.js diff --git a/src/htdocs/lib/pergola/Examples/Selector/selector.svg b/src/AdminUI/public/lib/pergola/Examples/Selector/selector.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Selector/selector.svg rename to src/AdminUI/public/lib/pergola/Examples/Selector/selector.svg diff --git a/src/htdocs/lib/pergola/Examples/Selector/selectors-inPanel.js b/src/AdminUI/public/lib/pergola/Examples/Selector/selectors-inPanel.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Selector/selectors-inPanel.js rename to src/AdminUI/public/lib/pergola/Examples/Selector/selectors-inPanel.js diff --git a/src/htdocs/lib/pergola/Examples/Selector/selectors-inPanel.svg b/src/AdminUI/public/lib/pergola/Examples/Selector/selectors-inPanel.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Selector/selectors-inPanel.svg rename to src/AdminUI/public/lib/pergola/Examples/Selector/selectors-inPanel.svg diff --git a/src/htdocs/lib/pergola/Examples/Shapes/config.js b/src/AdminUI/public/lib/pergola/Examples/Shapes/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Shapes/config.js rename to src/AdminUI/public/lib/pergola/Examples/Shapes/config.js diff --git a/src/htdocs/lib/pergola/Examples/Shapes/shapes.js b/src/AdminUI/public/lib/pergola/Examples/Shapes/shapes.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Shapes/shapes.js rename to src/AdminUI/public/lib/pergola/Examples/Shapes/shapes.js diff --git a/src/htdocs/lib/pergola/Examples/Shapes/shapes.svg b/src/AdminUI/public/lib/pergola/Examples/Shapes/shapes.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Shapes/shapes.svg rename to src/AdminUI/public/lib/pergola/Examples/Shapes/shapes.svg diff --git a/src/htdocs/lib/pergola/Examples/Sliders/config.js b/src/AdminUI/public/lib/pergola/Examples/Sliders/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Sliders/config.js rename to src/AdminUI/public/lib/pergola/Examples/Sliders/config.js diff --git a/src/htdocs/lib/pergola/Examples/Sliders/legend.js b/src/AdminUI/public/lib/pergola/Examples/Sliders/legend.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Sliders/legend.js rename to src/AdminUI/public/lib/pergola/Examples/Sliders/legend.js diff --git a/src/htdocs/lib/pergola/Examples/Sliders/sliders.js b/src/AdminUI/public/lib/pergola/Examples/Sliders/sliders.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Sliders/sliders.js rename to src/AdminUI/public/lib/pergola/Examples/Sliders/sliders.js diff --git a/src/htdocs/lib/pergola/Examples/Sliders/sliders.svg b/src/AdminUI/public/lib/pergola/Examples/Sliders/sliders.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Sliders/sliders.svg rename to src/AdminUI/public/lib/pergola/Examples/Sliders/sliders.svg diff --git a/src/htdocs/lib/pergola/Examples/Symbols/config.js b/src/AdminUI/public/lib/pergola/Examples/Symbols/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Symbols/config.js rename to src/AdminUI/public/lib/pergola/Examples/Symbols/config.js diff --git a/src/htdocs/lib/pergola/Examples/Symbols/symbols.js b/src/AdminUI/public/lib/pergola/Examples/Symbols/symbols.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Symbols/symbols.js rename to src/AdminUI/public/lib/pergola/Examples/Symbols/symbols.js diff --git a/src/htdocs/lib/pergola/Examples/Symbols/symbols.svg b/src/AdminUI/public/lib/pergola/Examples/Symbols/symbols.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Symbols/symbols.svg rename to src/AdminUI/public/lib/pergola/Examples/Symbols/symbols.svg diff --git a/src/htdocs/lib/pergola/Examples/Taskbar/config.js b/src/AdminUI/public/lib/pergola/Examples/Taskbar/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Taskbar/config.js rename to src/AdminUI/public/lib/pergola/Examples/Taskbar/config.js diff --git a/src/htdocs/lib/pergola/Examples/Taskbar/taskbar.js b/src/AdminUI/public/lib/pergola/Examples/Taskbar/taskbar.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Taskbar/taskbar.js rename to src/AdminUI/public/lib/pergola/Examples/Taskbar/taskbar.js diff --git a/src/htdocs/lib/pergola/Examples/Taskbar/taskbar.svg b/src/AdminUI/public/lib/pergola/Examples/Taskbar/taskbar.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Taskbar/taskbar.svg rename to src/AdminUI/public/lib/pergola/Examples/Taskbar/taskbar.svg diff --git a/src/htdocs/lib/pergola/Examples/Tool buttons/config.js b/src/AdminUI/public/lib/pergola/Examples/Tool buttons/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Tool buttons/config.js rename to src/AdminUI/public/lib/pergola/Examples/Tool buttons/config.js diff --git a/src/htdocs/lib/pergola/Examples/Tool buttons/toolbuttons.js b/src/AdminUI/public/lib/pergola/Examples/Tool buttons/toolbuttons.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Tool buttons/toolbuttons.js rename to src/AdminUI/public/lib/pergola/Examples/Tool buttons/toolbuttons.js diff --git a/src/htdocs/lib/pergola/Examples/Tool buttons/toolbuttons.svg b/src/AdminUI/public/lib/pergola/Examples/Tool buttons/toolbuttons.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Tool buttons/toolbuttons.svg rename to src/AdminUI/public/lib/pergola/Examples/Tool buttons/toolbuttons.svg diff --git a/src/htdocs/lib/pergola/Examples/Window/basicWindow.js b/src/AdminUI/public/lib/pergola/Examples/Window/basicWindow.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Window/basicWindow.js rename to src/AdminUI/public/lib/pergola/Examples/Window/basicWindow.js diff --git a/src/htdocs/lib/pergola/Examples/Window/basicWindow.svg b/src/AdminUI/public/lib/pergola/Examples/Window/basicWindow.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Window/basicWindow.svg rename to src/AdminUI/public/lib/pergola/Examples/Window/basicWindow.svg diff --git a/src/htdocs/lib/pergola/Examples/Window/config.js b/src/AdminUI/public/lib/pergola/Examples/Window/config.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Window/config.js rename to src/AdminUI/public/lib/pergola/Examples/Window/config.js diff --git a/src/htdocs/lib/pergola/Examples/Window/window_art.js b/src/AdminUI/public/lib/pergola/Examples/Window/window_art.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Window/window_art.js rename to src/AdminUI/public/lib/pergola/Examples/Window/window_art.js diff --git a/src/htdocs/lib/pergola/Examples/Window/window_art.svg b/src/AdminUI/public/lib/pergola/Examples/Window/window_art.svg similarity index 100% rename from src/htdocs/lib/pergola/Examples/Window/window_art.svg rename to src/AdminUI/public/lib/pergola/Examples/Window/window_art.svg diff --git a/src/htdocs/lib/pergola/Examples/Window/works/artwork.js b/src/AdminUI/public/lib/pergola/Examples/Window/works/artwork.js similarity index 100% rename from src/htdocs/lib/pergola/Examples/Window/works/artwork.js rename to src/AdminUI/public/lib/pergola/Examples/Window/works/artwork.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/BingMaps/bing_window.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/BingMaps/bing_window.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/BingMaps/bing_window.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/BingMaps/bing_window.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/BingMaps/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/BingMaps/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/BingMaps/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/BingMaps/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/BingMaps/index.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/BingMaps/index.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/BingMaps/index.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/BingMaps/index.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Buttons/buttons.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/buttons.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Buttons/buttons.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/buttons.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Buttons/buttons.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/buttons.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Buttons/buttons.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/buttons.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Buttons/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Buttons/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Buttons/legend.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/legend.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Buttons/legend.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Buttons/legend.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Colorpicker/colorBoxSelector_and_colorpicker.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Colorpicker/colorBoxSelector_and_colorpicker.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Colorpicker/colorBoxSelector_and_colorpicker.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Colorpicker/colorBoxSelector_and_colorpicker.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Colorpicker/colorpicker.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Colorpicker/colorpicker.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Colorpicker/colorpicker.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Colorpicker/colorpicker.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Colorpicker/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Colorpicker/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Colorpicker/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Colorpicker/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox-orphan.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/ComboBox/combobox.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/combobox.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/ComboBox/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/ComboBox/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/ComboBox/list b/src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/list similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/ComboBox/list rename to src/AdminUI/public/lib/pergola/ExamplesHTML/ComboBox/list diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Contextmenu/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Contextmenu/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Contextmenu/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Contextmenu/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Contextmenu/contextmenu.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/clock.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/force.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/miserables.json b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/miserables.json similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/miserables.json rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/miserables.json diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream_layers.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream_layers.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream_layers.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/stream_layers.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/worm.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/worm.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/Original D3 examples/worm.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/Original D3 examples/worm.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/clock.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/clock.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/clock.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/clock.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/force.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/force.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/force.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/force.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/miserables.json b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/miserables.json similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/miserables.json rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/miserables.json diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/multiD3.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/multiD3.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/multiD3.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/multiD3.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/phoenix.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/phoenix.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/phoenix.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/phoenix.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/phoenix.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/phoenix.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/phoenix.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/phoenix.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/stream.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/stream.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/stream.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/stream.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/stream_layers.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/stream_layers.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/stream_layers.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/stream_layers.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/style.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/style.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/style.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/style.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/worm.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/worm.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/worm.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/worm.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/worms.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/worms.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/worms.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/worms.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/D3/worms.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/D3/worms.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/D3/worms.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/D3/worms.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/Files/employees.json b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/Files/employees.json similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/Files/employees.json rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/Files/employees.json diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/Files/employees_local.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/Files/employees_local.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/Files/employees_local.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/Files/employees_local.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagrid.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagrid.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagrid.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagrid.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagrid.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagrid.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagrid.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagrid.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/datagridLocal.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/getDir.php b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/getDir.php similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/getDir.php rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/getDir.php diff --git a/src/htdocs/lib/pergola/ExamplesHTML/DataGrid/writeFile.php b/src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/writeFile.php similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/DataGrid/writeFile.php rename to src/AdminUI/public/lib/pergola/ExamplesHTML/DataGrid/writeFile.php diff --git a/src/htdocs/lib/pergola/ExamplesHTML/File/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/File/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/File/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/File/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/File/file.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/File/file.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/File/file.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/File/file.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/File/file.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/File/file.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/File/file.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/File/file.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Filters/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Filters/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Filters/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Filters/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Filters/f.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Filters/f.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Filters/f.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Filters/f.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Filters/filters.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Filters/filters.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Filters/filters.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Filters/filters.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Find/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Find/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Find/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Find/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Find/find.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Find/find.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Find/find.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Find/find.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Find/find.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Find/find.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Find/find.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Find/find.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Input/Input.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Input/Input.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Input/Input.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Input/Input.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Input/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Input/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Input/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Input/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Input/input.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Input/input.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Input/input.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Input/input.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Legend/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Legend/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Legend/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Legend/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Legend/legend.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Legend/legend.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Legend/legend.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Legend/legend.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Legend/legend.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Legend/legend.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Legend/legend.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Legend/legend.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Load/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Load/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Load/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Load/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Load/docs/birds.svg b/src/AdminUI/public/lib/pergola/ExamplesHTML/Load/docs/birds.svg similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Load/docs/birds.svg rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Load/docs/birds.svg diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Load/load.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Load/load.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Load/load.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Load/load.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Load/loadSVG.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Load/loadSVG.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Load/loadSVG.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Load/loadSVG.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Markers/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Markers/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Markers/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Markers/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Markers/markers.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Markers/markers.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Markers/markers.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Markers/markers.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Markers/markers.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Markers/markers.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Markers/markers.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Markers/markers.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Menu/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Menu/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Menu/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Menu/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Menu/menu.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Menu/menu.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Menu/menu.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Menu/menu.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Menu/menu.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Menu/menu.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Menu/menu.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Menu/menu.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Notification/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Notification/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Notification/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Notification/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Notification/systemNotification.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Notification/systemNotification.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Notification/systemNotification.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Notification/systemNotification.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Notification/systemNotification.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Notification/systemNotification.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Notification/systemNotification.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Notification/systemNotification.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/basicPanel.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/basicPanel.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/basicPanel.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/basicPanel.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/basicPanel.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/basicPanel.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/basicPanel.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/basicPanel.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/dialogPanel.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/dialogPanel.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/dialogPanel.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/dialogPanel.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/dialogPanel.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/dialogPanel.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/dialogPanel.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/dialogPanel.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTableLayout.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTabs.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTabs.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTabs.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTabs.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTabs.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTabs.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/panelWithTabs.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/panelWithTabs.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/simplePanel.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/simplePanel.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/simplePanel.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/simplePanel.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Panel/simplePanel.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/simplePanel.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Panel/simplePanel.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Panel/simplePanel.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Patterns/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Patterns/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Patterns/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Patterns/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Patterns/patterns.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Patterns/patterns.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Patterns/patterns.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Patterns/patterns.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Patterns/patterns.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Patterns/patterns.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Patterns/patterns.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Patterns/patterns.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Progress/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Progress/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Progress/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Progress/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Progress/progress.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Progress/progress.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Progress/progress.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Progress/progress.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Progress/progress.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Progress/progress.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Progress/progress.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Progress/progress.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Quicktip/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Quicktip/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Quicktip/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Quicktip/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Quicktip/quicktip.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Quicktip/quicktip.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Quicktip/quicktip.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Quicktip/quicktip.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Quicktip/quicktip.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Quicktip/quicktip.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Quicktip/quicktip.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Quicktip/quicktip.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/RadioAndCheckButtons/Radio-CheckButtons.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/RadioAndCheckButtons/Radio-CheckButtons.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/RadioAndCheckButtons/Radio-CheckButtons.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/RadioAndCheckButtons/Radio-CheckButtons.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/RadioAndCheckButtons/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/RadioAndCheckButtons/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/RadioAndCheckButtons/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/RadioAndCheckButtons/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/RadioAndCheckButtons/radio-check.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/RadioAndCheckButtons/radio-check.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/RadioAndCheckButtons/radio-check.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/RadioAndCheckButtons/radio-check.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Selector/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Selector/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Selector/selector.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selector.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Selector/selector.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selector.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Selector/selector.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selector.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Selector/selector.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selector.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Selector/selectors-inPanel.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Shapes/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Shapes/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Shapes/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Shapes/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Shapes/shapes.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Shapes/shapes.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Shapes/shapes.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Shapes/shapes.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Shapes/shapes.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Shapes/shapes.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Shapes/shapes.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Shapes/shapes.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Sliders/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Sliders/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Sliders/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Sliders/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Sliders/sliders.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Sliders/sliders.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Sliders/sliders.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Sliders/sliders.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Sliders/sliders.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Sliders/sliders.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Sliders/sliders.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Sliders/sliders.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Symbols/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Symbols/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Symbols/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Symbols/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Symbols/symbols.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Symbols/symbols.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Symbols/symbols.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Symbols/symbols.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Symbols/symbols.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Symbols/symbols.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Symbols/symbols.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Symbols/symbols.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Taskbar/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Taskbar/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Taskbar/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Taskbar/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Taskbar/taskbar.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Taskbar/taskbar.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Taskbar/taskbar.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Taskbar/taskbar.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Taskbar/taskbar.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Taskbar/taskbar.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Taskbar/taskbar.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Taskbar/taskbar.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Tool buttons/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Tool buttons/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Tool buttons/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Tool buttons/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Tool buttons/toolbuttons.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Window/basicWindow.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Window/basicWindow.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Window/basicWindow.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Window/basicWindow.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Window/basicWindow.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Window/basicWindow.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Window/basicWindow.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Window/basicWindow.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Window/config.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Window/config.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Window/config.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Window/config.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Window/window_art.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/Window/window_art.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Window/window_art.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Window/window_art.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Window/window_art.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Window/window_art.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Window/window_art.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Window/window_art.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/Window/works/artwork.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/Window/works/artwork.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/Window/works/artwork.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/Window/works/artwork.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/example.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/example.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/example.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/example.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/listDot.png b/src/AdminUI/public/lib/pergola/ExamplesHTML/listDot.png similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/listDot.png rename to src/AdminUI/public/lib/pergola/ExamplesHTML/listDot.png diff --git a/src/htdocs/lib/pergola/ExamplesHTML/pergola_small.png b/src/AdminUI/public/lib/pergola/ExamplesHTML/pergola_small.png similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/pergola_small.png rename to src/AdminUI/public/lib/pergola/ExamplesHTML/pergola_small.png diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/LGPL-LICENSE b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/LGPL-LICENSE similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/LGPL-LICENSE rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/LGPL-LICENSE diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/MIT-LICENSE b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/MIT-LICENSE similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/MIT-LICENSE rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/MIT-LICENSE diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/_theme_template.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/_theme_template.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/_theme_template.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/_theme_template.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/config.rb b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/config.rb similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/config.rb rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/config.rb diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCore.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCore.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCore.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCore.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDefault.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreDjango.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEclipse.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreEmacs.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreFadeToGrey.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMDUltra.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreMidnight.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shCoreRDark.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDefault.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeDjango.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEclipse.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeEmacs.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeFadeToGrey.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMDUltra.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeMidnight.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/compass/shThemeRDark.scss diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/index.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/index.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/index.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/index.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shAutoloader.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shAutoloader.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shAutoloader.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shAutoloader.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAS3.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushAppleScript.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushBash.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushBash.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushBash.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushBash.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCSharp.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushColdFusion.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCpp.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCss.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCss.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCss.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushCss.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDelphi.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushDiff.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushErlang.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushGroovy.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJScript.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJava.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJava.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJava.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJava.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushJavaFX.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPerl.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPhp.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPlain.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPowerShell.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPython.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPython.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPython.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushPython.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushRuby.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSass.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSass.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSass.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSass.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushScala.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushScala.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushScala.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushScala.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSql.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSql.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSql.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushSql.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushVb.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushVb.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushVb.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushVb.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushXml.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushXml.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushXml.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shBrushXml.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shCore.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shCore.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shCore.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shCore.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shLegacy.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shLegacy.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shLegacy.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/scripts/shLegacy.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shAutoloader.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shAutoloader.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shAutoloader.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shAutoloader.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shCore.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shCore.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shCore.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shCore.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shLegacy.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shLegacy.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shLegacy.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/src/shLegacy.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCore.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCore.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCore.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCore.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDefault.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDefault.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDefault.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDefault.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDjango.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDjango.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDjango.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreDjango.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEclipse.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreEmacs.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreFadeToGrey.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMDUltra.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreMidnight.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreRDark.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreRDark.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreRDark.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreRDark.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shCoreSVGmagazine.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDefault.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDefault.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDefault.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDefault.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDjango.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDjango.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDjango.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeDjango.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEclipse.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeEmacs.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeFadeToGrey.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMDUltra.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeMidnight.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeRDark.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeRDark.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeRDark.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/styles/shThemeRDark.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/.rvmrc b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/.rvmrc similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/.rvmrc rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/.rvmrc diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes/sass.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes/sass.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes/sass.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes/sass.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes_tests.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes_tests.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes_tests.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/brushes_tests.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/001_basic.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/001_basic.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/001_basic.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/001_basic.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/002_brushes.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/003_script_tag.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/004_url_parsing.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/005_no_gutter.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/006_pad_line_numbers.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/007_collapse_interaction.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/008_first_line.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/009_class_name.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/010_highlight.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/011_smart_tabs.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/012_server_side.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/013_html_script.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/cases/014_legacy.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/commonjs_tests.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/commonjs_tests.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/commonjs_tests.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/commonjs_tests.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/jquery-1.4.2.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.css b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.css similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.css rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.css diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.js b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.js similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.js rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/js/qunit.js diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/syntaxhighlighter_tests.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/theme_tests.html b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/theme_tests.html similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/theme_tests.html rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/theme_tests.html diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.rb b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.rb similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.rb rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.rb diff --git a/src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.sh b/src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.sh similarity index 100% rename from src/htdocs/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.sh rename to src/AdminUI/public/lib/pergola/ExamplesHTML/syntaxhighlighter_3.0.83/tests/webrick.sh diff --git a/src/htdocs/lib/pergola/pergola/PHP/README.txt b/src/AdminUI/public/lib/pergola/pergola/PHP/README.txt similarity index 100% rename from src/htdocs/lib/pergola/pergola/PHP/README.txt rename to src/AdminUI/public/lib/pergola/pergola/PHP/README.txt diff --git a/src/htdocs/lib/pergola/pergola/PHP/getDir.php b/src/AdminUI/public/lib/pergola/pergola/PHP/getDir.php similarity index 100% rename from src/htdocs/lib/pergola/pergola/PHP/getDir.php rename to src/AdminUI/public/lib/pergola/pergola/PHP/getDir.php diff --git a/src/htdocs/lib/pergola/pergola/PHP/writeFile.php b/src/AdminUI/public/lib/pergola/pergola/PHP/writeFile.php similarity index 100% rename from src/htdocs/lib/pergola/pergola/PHP/writeFile.php rename to src/AdminUI/public/lib/pergola/pergola/PHP/writeFile.php diff --git a/src/htdocs/lib/pergola/pergola/config.js b/src/AdminUI/public/lib/pergola/pergola/config.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/config.js rename to src/AdminUI/public/lib/pergola/pergola/config.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/.gitignore b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/.gitignore similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/.gitignore rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/.gitignore diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/LICENSE b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/LICENSE similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/LICENSE rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/LICENSE diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/Makefile b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/Makefile similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/Makefile rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/Makefile diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/README.md b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/README.md similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/README.md rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/README.md diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.behavior.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.chart.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.csv.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geo.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.geom.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.layout.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.min.js b/src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.min.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.min.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/d3-28b0e22/d3.time.min.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/bingCallback.js b/src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/bingCallback.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/bingCallback.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/bingCallback.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/crimespotting/crimespotting.js b/src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/crimespotting/crimespotting.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/crimespotting/crimespotting.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/crimespotting/crimespotting.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/kmeans.js b/src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/kmeans.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/kmeans.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/lib/kmeans.js diff --git a/src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/polymaps.js b/src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/polymaps.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/extlib/polymaps-g42b145f/polymaps.js rename to src/AdminUI/public/lib/pergola/pergola/extlib/polymaps-g42b145f/polymaps.js diff --git a/src/htdocs/lib/pergola/pergola/lib/cursors/cursor_lens_empty.png b/src/AdminUI/public/lib/pergola/pergola/lib/cursors/cursor_lens_empty.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/cursors/cursor_lens_empty.png rename to src/AdminUI/public/lib/pergola/pergola/lib/cursors/cursor_lens_empty.png diff --git a/src/htdocs/lib/pergola/pergola/lib/cursors/cursor_lens_minus.png b/src/AdminUI/public/lib/pergola/pergola/lib/cursors/cursor_lens_minus.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/cursors/cursor_lens_minus.png rename to src/AdminUI/public/lib/pergola/pergola/lib/cursors/cursor_lens_minus.png diff --git a/src/htdocs/lib/pergola/pergola/lib/cursors/cursor_lens_plus.png b/src/AdminUI/public/lib/pergola/pergola/lib/cursors/cursor_lens_plus.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/cursors/cursor_lens_plus.png rename to src/AdminUI/public/lib/pergola/pergola/lib/cursors/cursor_lens_plus.png diff --git a/src/htdocs/lib/pergola/pergola/lib/cursors/pointerBlack.png b/src/AdminUI/public/lib/pergola/pergola/lib/cursors/pointerBlack.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/cursors/pointerBlack.png rename to src/AdminUI/public/lib/pergola/pergola/lib/cursors/pointerBlack.png diff --git a/src/htdocs/lib/pergola/pergola/lib/cursors/rotation.png b/src/AdminUI/public/lib/pergola/pergola/lib/cursors/rotation.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/cursors/rotation.png rename to src/AdminUI/public/lib/pergola/pergola/lib/cursors/rotation.png diff --git a/src/htdocs/lib/pergola/pergola/lib/palettes/legendSpectrum.png b/src/AdminUI/public/lib/pergola/pergola/lib/palettes/legendSpectrum.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/palettes/legendSpectrum.png rename to src/AdminUI/public/lib/pergola/pergola/lib/palettes/legendSpectrum.png diff --git a/src/htdocs/lib/pergola/pergola/lib/palettes/spectrum.png b/src/AdminUI/public/lib/pergola/pergola/lib/palettes/spectrum.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/palettes/spectrum.png rename to src/AdminUI/public/lib/pergola/pergola/lib/palettes/spectrum.png diff --git a/src/htdocs/lib/pergola/pergola/lib/palettes/spectrumExtended.png b/src/AdminUI/public/lib/pergola/pergola/lib/palettes/spectrumExtended.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/palettes/spectrumExtended.png rename to src/AdminUI/public/lib/pergola/pergola/lib/palettes/spectrumExtended.png diff --git a/src/htdocs/lib/pergola/pergola/lib/symbols/MonaLisa.jpg b/src/AdminUI/public/lib/pergola/pergola/lib/symbols/MonaLisa.jpg similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/symbols/MonaLisa.jpg rename to src/AdminUI/public/lib/pergola/pergola/lib/symbols/MonaLisa.jpg diff --git a/src/htdocs/lib/pergola/pergola/lib/symbols/MonaLisa_negative.jpg b/src/AdminUI/public/lib/pergola/pergola/lib/symbols/MonaLisa_negative.jpg similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/symbols/MonaLisa_negative.jpg rename to src/AdminUI/public/lib/pergola/pergola/lib/symbols/MonaLisa_negative.jpg diff --git a/src/htdocs/lib/pergola/pergola/lib/symbols/spectrum.png b/src/AdminUI/public/lib/pergola/pergola/lib/symbols/spectrum.png similarity index 100% rename from src/htdocs/lib/pergola/pergola/lib/symbols/spectrum.png rename to src/AdminUI/public/lib/pergola/pergola/lib/symbols/spectrum.png diff --git a/src/htdocs/lib/pergola/pergola/pergola.js b/src/AdminUI/public/lib/pergola/pergola/pergola.js similarity index 100% rename from src/htdocs/lib/pergola/pergola/pergola.js rename to src/AdminUI/public/lib/pergola/pergola/pergola.js diff --git a/src/htdocs/lib/radar-chart.css b/src/AdminUI/public/lib/radar-chart.css similarity index 100% rename from src/htdocs/lib/radar-chart.css rename to src/AdminUI/public/lib/radar-chart.css diff --git a/src/htdocs/lib/radar-chart.js b/src/AdminUI/public/lib/radar-chart.js similarity index 100% rename from src/htdocs/lib/radar-chart.js rename to src/AdminUI/public/lib/radar-chart.js diff --git a/src/htdocs/lib/shortcut-2.01b.js b/src/AdminUI/public/lib/shortcut-2.01b.js similarity index 100% rename from src/htdocs/lib/shortcut-2.01b.js rename to src/AdminUI/public/lib/shortcut-2.01b.js diff --git a/src/htdocs/lib/snap.svg-min.js b/src/AdminUI/public/lib/snap.svg-min.js similarity index 100% rename from src/htdocs/lib/snap.svg-min.js rename to src/AdminUI/public/lib/snap.svg-min.js diff --git a/src/htdocs/lib/snap.svg.js b/src/AdminUI/public/lib/snap.svg.js similarity index 100% rename from src/htdocs/lib/snap.svg.js rename to src/AdminUI/public/lib/snap.svg.js diff --git a/src/htdocs/lib/tableauwdc-2.2.latest.js b/src/AdminUI/public/lib/tableauwdc-2.2.latest.js similarity index 100% rename from src/htdocs/lib/tableauwdc-2.2.latest.js rename to src/AdminUI/public/lib/tableauwdc-2.2.latest.js diff --git a/src/htdocs/lib/tableauwdc-2.3.js b/src/AdminUI/public/lib/tableauwdc-2.3.js similarity index 100% rename from src/htdocs/lib/tableauwdc-2.3.js rename to src/AdminUI/public/lib/tableauwdc-2.3.js diff --git a/src/htdocs/lib/toastr.min.css b/src/AdminUI/public/lib/toastr.min.css similarity index 100% rename from src/htdocs/lib/toastr.min.css rename to src/AdminUI/public/lib/toastr.min.css diff --git a/src/htdocs/lib/toastr.min.js b/src/AdminUI/public/lib/toastr.min.js similarity index 100% rename from src/htdocs/lib/toastr.min.js rename to src/AdminUI/public/lib/toastr.min.js diff --git a/src/htdocs/lib/vega-3.0.4.js b/src/AdminUI/public/lib/vega-3.0.4.js similarity index 100% rename from src/htdocs/lib/vega-3.0.4.js rename to src/AdminUI/public/lib/vega-3.0.4.js diff --git a/src/htdocs/lib/vega-3.0.4.min.js b/src/AdminUI/public/lib/vega-3.0.4.min.js similarity index 100% rename from src/htdocs/lib/vega-3.0.4.min.js rename to src/AdminUI/public/lib/vega-3.0.4.min.js diff --git a/src/htdocs/lib/vega-3.0.8.min.js b/src/AdminUI/public/lib/vega-3.0.8.min.js similarity index 100% rename from src/htdocs/lib/vega-3.0.8.min.js rename to src/AdminUI/public/lib/vega-3.0.8.min.js diff --git a/src/htdocs/lib/vega-3.3.1.min.js b/src/AdminUI/public/lib/vega-3.3.1.min.js similarity index 100% rename from src/htdocs/lib/vega-3.3.1.min.js rename to src/AdminUI/public/lib/vega-3.3.1.min.js diff --git a/src/htdocs/lib/vega-4.4.0.min.js b/src/AdminUI/public/lib/vega-4.4.0.min.js similarity index 100% rename from src/htdocs/lib/vega-4.4.0.min.js rename to src/AdminUI/public/lib/vega-4.4.0.min.js diff --git a/src/htdocs/lib/vega-5.3.5.min.js b/src/AdminUI/public/lib/vega-5.3.5.min.js similarity index 100% rename from src/htdocs/lib/vega-5.3.5.min.js rename to src/AdminUI/public/lib/vega-5.3.5.min.js diff --git a/src/htdocs/lib/vega-lite-2.0.0-rc3.js b/src/AdminUI/public/lib/vega-lite-2.0.0-rc3.js similarity index 100% rename from src/htdocs/lib/vega-lite-2.0.0-rc3.js rename to src/AdminUI/public/lib/vega-lite-2.0.0-rc3.js diff --git a/src/htdocs/lib/vega-lite-2.0.0-rc3.min.js b/src/AdminUI/public/lib/vega-lite-2.0.0-rc3.min.js similarity index 100% rename from src/htdocs/lib/vega-lite-2.0.0-rc3.min.js rename to src/AdminUI/public/lib/vega-lite-2.0.0-rc3.min.js diff --git a/src/htdocs/lib/vega-lite-2.0.3.min.js b/src/AdminUI/public/lib/vega-lite-2.0.3.min.js similarity index 100% rename from src/htdocs/lib/vega-lite-2.0.3.min.js rename to src/AdminUI/public/lib/vega-lite-2.0.3.min.js diff --git a/src/htdocs/lib/vega-lite-2.4.3.min.js b/src/AdminUI/public/lib/vega-lite-2.4.3.min.js similarity index 100% rename from src/htdocs/lib/vega-lite-2.4.3.min.js rename to src/AdminUI/public/lib/vega-lite-2.4.3.min.js diff --git a/src/htdocs/lib/vega-lite-2.6.0.min.js b/src/AdminUI/public/lib/vega-lite-2.6.0.min.js similarity index 100% rename from src/htdocs/lib/vega-lite-2.6.0.min.js rename to src/AdminUI/public/lib/vega-lite-2.6.0.min.js diff --git a/src/htdocs/lib/vega-lite-3.1.0.min.js b/src/AdminUI/public/lib/vega-lite-3.1.0.min.js similarity index 100% rename from src/htdocs/lib/vega-lite-3.1.0.min.js rename to src/AdminUI/public/lib/vega-lite-3.1.0.min.js diff --git a/src/htdocs/lib/vega-lite.js b/src/AdminUI/public/lib/vega-lite.js similarity index 100% rename from src/htdocs/lib/vega-lite.js rename to src/AdminUI/public/lib/vega-lite.js diff --git a/src/htdocs/lib/vega-lite.min.js b/src/AdminUI/public/lib/vega-lite.min.js similarity index 100% rename from src/htdocs/lib/vega-lite.min.js rename to src/AdminUI/public/lib/vega-lite.min.js diff --git a/src/htdocs/lib/vega.js b/src/AdminUI/public/lib/vega.js similarity index 100% rename from src/htdocs/lib/vega.js rename to src/AdminUI/public/lib/vega.js diff --git a/src/htdocs/lib/vega.min.js b/src/AdminUI/public/lib/vega.min.js similarity index 100% rename from src/htdocs/lib/vega.min.js rename to src/AdminUI/public/lib/vega.min.js diff --git a/src/htdocs/opc-codes.js b/src/AdminUI/public/opc-codes.js similarity index 100% rename from src/htdocs/opc-codes.js rename to src/AdminUI/public/opc-codes.js diff --git a/src/htdocs/overview.html b/src/AdminUI/public/overview.html similarity index 100% rename from src/htdocs/overview.html rename to src/AdminUI/public/overview.html diff --git a/src/htdocs/pntserver.js b/src/AdminUI/public/pntserver.js similarity index 100% rename from src/htdocs/pntserver.js rename to src/AdminUI/public/pntserver.js diff --git a/src/htdocs/pntserver_gateway.js b/src/AdminUI/public/pntserver_gateway.js similarity index 100% rename from src/htdocs/pntserver_gateway.js rename to src/AdminUI/public/pntserver_gateway.js diff --git a/src/htdocs/release_notes.txt b/src/AdminUI/public/release_notes.txt similarity index 95% rename from src/htdocs/release_notes.txt rename to src/AdminUI/public/release_notes.txt index 6d2862f9..ca119b0e 100644 --- a/src/htdocs/release_notes.txt +++ b/src/AdminUI/public/release_notes.txt @@ -57,6 +57,7 @@ Acknowledgements: D3JS - http://d3js.org Radar-chart-d3 - https://github.com/alangrafu/radar-chart-d3 Vega A Visualization Grammar - https://vega.github.io/vega + Pergola SVG - https://web.archive.org/web/20210211163020/http://www.dotuscomus.com/pergola/licenses.html NSSM - The Non-Sucking Service Manager: http://nssm.cc Some icons from - http://keyamoon.com/icomoon and http://raphaeljs.com/icons CSS Loaders from Luke Haas - https://projects.lukehaas.me/css-loaders/ @@ -134,6 +135,38 @@ Inkscape+SAGE: ------------------------------------------------------------------- +Notes for version 0.39: + +* Default login credentials: username=admin password=jsonscada. +* Metabase credentials: username=json@scada.com password=jsonscada123. +* New reconstructed and improved web UI based on Vuetify 3. +* New option to export and import project files. +* Improved MQTT/Sparkplug-B Client driver. +* Demo simulator now works with recent versions of MongoDB. +* SVG displays can now use the Pergola library. +* Added GraphQL server. +* Avoid deadlocks on PostgreSQL updates/inserts. +* IEC 104 Server allows for TLS 1.2 and 1.3 connections. +* NPM packages updated. +* Dotnet runtime updated to 8.0.10. +* MongoDB Community Server updated to 8.0.1. +* MongoDB Compass updated to 1.44.4. +* Grafana updated to 11.2.2. +* Nodejs runtime updated to 20.18.0. +* Telegraf runtime updated to 1.32.1. + +Requirements and recommendations: + +* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 20GB of free space in the "C:" drive. +* Administrative rights. corporate Windows policies may cause problems with the creation of services and the opening of TCP ports. +* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000. Other ports may be required for optional services and protocols. +* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts. +* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version. +* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur. +* MongoDB requires AVX instructions on x86 CPU. + +------------------------------------------------------------------- + Notes for version 0.38: * Default login credentials: username=admin password=jsonscada. diff --git a/src/htdocs/sage-cepel-displays/README.md b/src/AdminUI/public/sage-cepel-displays/README.md similarity index 100% rename from src/htdocs/sage-cepel-displays/README.md rename to src/AdminUI/public/sage-cepel-displays/README.md diff --git a/src/htdocs/scripts/main.js b/src/AdminUI/public/scripts/main.js similarity index 100% rename from src/htdocs/scripts/main.js rename to src/AdminUI/public/scripts/main.js diff --git a/src/htdocs/sounds/critical.wav b/src/AdminUI/public/sounds/critical.wav similarity index 100% rename from src/htdocs/sounds/critical.wav rename to src/AdminUI/public/sounds/critical.wav diff --git a/src/htdocs/sounds/noncritical.wav b/src/AdminUI/public/sounds/noncritical.wav similarity index 100% rename from src/htdocs/sounds/noncritical.wav rename to src/AdminUI/public/sounds/noncritical.wav diff --git a/src/htdocs/symbol_webreflection.js b/src/AdminUI/public/symbol_webreflection.js similarity index 100% rename from src/htdocs/symbol_webreflection.js rename to src/AdminUI/public/symbol_webreflection.js diff --git a/src/htdocs/tableau_wdc.js b/src/AdminUI/public/tableau_wdc.js similarity index 100% rename from src/htdocs/tableau_wdc.js rename to src/AdminUI/public/tableau_wdc.js diff --git a/src/htdocs/tabular.html b/src/AdminUI/public/tabular.html similarity index 99% rename from src/htdocs/tabular.html rename to src/AdminUI/public/tabular.html index 21c57b32..40718c29 100644 --- a/src/htdocs/tabular.html +++ b/src/AdminUI/public/tabular.html @@ -2925,7 +2925,7 @@ gridstyle = gridstyle + 'color:' + TabularViewer_AckTxtColor + ';'; gridstyle = gridstyle + 'font-family:' + TabularViewer_Font + ';'; WebSAGE.g_tbl.setStyle(';', 'height:auto;font-size:' + WebSAGE.g_fontsize + 'px;' + gridstyle,';',';'); - WebSAGE.g_tbl.setInitWidths("0,0,70,400,180,0,0,55,0,170,170"); + WebSAGE.g_tbl.setInitWidths("0,0,70,400,180,0,0,55,0,170,200"); WebSAGE.g_tbl.setHeader(Msg.TabNomesColunas); $('#gridbox').css('background-color', TabularViewer_TableColor); diff --git a/src/htdocs/trend.html b/src/AdminUI/public/trend.html similarity index 100% rename from src/htdocs/trend.html rename to src/AdminUI/public/trend.html diff --git a/src/htdocs/util.js b/src/AdminUI/public/util.js similarity index 100% rename from src/htdocs/util.js rename to src/AdminUI/public/util.js diff --git a/src/htdocs/vega_websage.js b/src/AdminUI/public/vega_websage.js similarity index 100% rename from src/htdocs/vega_websage.js rename to src/AdminUI/public/vega_websage.js diff --git a/src/htdocs/websage.js b/src/AdminUI/public/websage.js similarity index 100% rename from src/htdocs/websage.js rename to src/AdminUI/public/websage.js diff --git a/src/AdminUI/src/App.vue b/src/AdminUI/src/App.vue index 0c5253eb..66663ce7 100644 --- a/src/AdminUI/src/App.vue +++ b/src/AdminUI/src/App.vue @@ -11,10 +11,19 @@ - + - {{ theme === 'light' ? 'mdi-weather-night' : 'mdi-weather-sunny' }} + {{ + theme === 'light' ? 'mdi-weather-night' : 'mdi-weather-sunny' + }} - {{ $t('app.logout') }} mdi-logout + {{ $t('app.logout') }} mdi-logout + - {{ $t('login.changePassword') }} mdi-lock-reset + {{ $t('login.changePassword') }} + mdi-lock-reset @@ -36,24 +49,51 @@ - + {{ $t('login.changePassword') }} - + - + - - + + {{ errorMessage }} - + {{ $t('common.cancel') }} @@ -63,205 +103,211 @@ - + \ No newline at end of file + .text-decoration-none { + text-decoration: none; + color: inherit; + } + diff --git a/src/AdminUI/src/components/AboutPage.vue b/src/AdminUI/src/components/AboutPage.vue index 6be53fba..df66b406 100644 --- a/src/AdminUI/src/components/AboutPage.vue +++ b/src/AdminUI/src/components/AboutPage.vue @@ -7,7 +7,13 @@ width="100%" height="100%" frameborder="0" - style="position: absolute; top: 120; left: 0; width: 100%; height: 100%;" + style=" + position: absolute; + top: 120; + left: 0; + width: 100%; + height: 100%; + " > @@ -15,17 +21,17 @@ \ No newline at end of file + html { + overflow-y: hidden; + } + diff --git a/src/AdminUI/src/components/AdminPage.vue b/src/AdminUI/src/components/AdminPage.vue index c7a72b14..6f8e485c 100644 --- a/src/AdminUI/src/components/AdminPage.vue +++ b/src/AdminUI/src/components/AdminPage.vue @@ -2,18 +2,32 @@ - mdi-account-multiple {{ - $t('admin.tabs.userManagement') }} - mdi-shield-account {{ $t('admin.tabs.rolesManagement') - }} - mdi-cogs {{ - $t('admin.tabs.protocolDriverInstances') }} - mdi-lan-connect {{ - $t('admin.tabs.protocolConnections') }} - mdi-tag-multiple {{ $t('admin.tabs.tags') }} - mdi-account-clock {{ $t('admin.tabs.userActions') - }} - mdi-cog {{ $t('admin.tabs.systemSettings') }} + mdi-account-multiple + {{ $t('admin.tabs.userManagement') }} + mdi-shield-account + {{ $t('admin.tabs.rolesManagement') }} + mdi-cogs + {{ $t('admin.tabs.protocolDriverInstances') }} + mdi-lan-connect + {{ $t('admin.tabs.protocolConnections') }} + mdi-tag-multiple {{ $t('admin.tabs.tags') }} + mdi-account-clock + {{ $t('admin.tabs.userActions') }} + mdi-cog {{ $t('admin.tabs.systemSettings') }} @@ -27,7 +41,9 @@ - + @@ -52,60 +68,59 @@ diff --git a/src/AdminUI/src/components/AlarmsViewerPage.vue b/src/AdminUI/src/components/AlarmsViewerPage.vue index f290dd90..f357be8b 100644 --- a/src/AdminUI/src/components/AlarmsViewerPage.vue +++ b/src/AdminUI/src/components/AlarmsViewerPage.vue @@ -1,31 +1,37 @@ - - - - - - + + \ No newline at end of file + diff --git a/src/AdminUI/src/components/DashboardPage.vue b/src/AdminUI/src/components/DashboardPage.vue index ace1b2d9..1878bd40 100644 --- a/src/AdminUI/src/components/DashboardPage.vue +++ b/src/AdminUI/src/components/DashboardPage.vue @@ -1,8 +1,20 @@ \ No newline at end of file + import { ref, onMounted, onUnmounted } from 'vue' + import { useRouter } from 'vue-router' + import { + Monitor, + Bell, + Table, + Calendar, + FileText, + UserCog, + HelpCircle, + BarChart, + Database, + } from 'lucide-vue-next' + + // Lifecycle hooks + onMounted(async () => { + document.documentElement.style.overflowY = 'scroll' + }) + + onUnmounted(async () => { + document.documentElement.style.overflowY = 'hidden' + }) + + const router = useRouter() + + const shortcuts = ref([ + { + titleKey: 'dashboard.displayViewer', + icon: Monitor, + color: 'primary', + route: '/display-viewer', + page: '/display.html', + target: '_blank', + }, + { + titleKey: 'dashboard.alarmsViewer', + icon: Bell, + color: 'primary', + route: '/alarms-viewer', + page: '/tabular.html?SELMODULO=ALARMS_VIEWER', + target: '_blank', + }, + { + titleKey: 'dashboard.tabularViewer', + icon: Table, + color: 'primary', + route: '/tabular-viewer', + page: '/tabular.html', + target: '_blank', + }, + { + titleKey: 'dashboard.eventsViewer', + icon: Calendar, + color: 'primary', + route: '/events-viewer', + page: '/events.html', + target: '_blank', + }, + { + titleKey: 'dashboard.grafana', + icon: BarChart, + color: 'secondary', + route: '/grafana', + page: '/grafana', + target: '_blank', + }, + { + titleKey: 'dashboard.metabase', + icon: Database, + color: 'secondary', + route: '', // metabase (is not working iframed) + page: '/metabase', + target: '_blank', + }, + { + titleKey: 'dashboard.admin', + icon: UserCog, + color: 'warning', + route: '/admin', + page: '/#/admin', + target: '_blank', + }, + { + titleKey: 'dashboard.logViewer', + icon: FileText, + color: 'warning', + route: '/log-viewer', + page: '/log-io', + target: '_blank', + }, + { + titleKey: 'dashboard.about', + icon: HelpCircle, + color: 'green', + route: '/about', + page: '/#/about', + target: '_blank', + }, + ]) + + const handleCardClick = (shortcut) => { + if (shortcut.route) { + navigateTo(shortcut.route) + } else if (shortcut.page) { + window.open(shortcut.page, shortcut.target || '_blank') + } + } + + const navigateTo = (route) => { + if (route.startsWith('http://') || route.startsWith('https://')) { + window.open(route, '_blank') + } else { + router.push(route) + } + } + + const parseCookie = (str) => { + if (str === '') return {} + return str + .split(';') + .map((v) => v.split('=')) + .reduce((acc, v) => { + acc[decodeURIComponent(v[0].trim())] = decodeURIComponent(v[1].trim()) + return acc + }, {}) + } + + const isAdmin = () => { + let ck = parseCookie(document.cookie) + if ('json-scada-user' in ck) { + ck = JSON.parse(ck['json-scada-user']) + if (ck?.rights?.isAdmin) return true + } + return false + } + diff --git a/src/AdminUI/src/components/DisplayViewerPage.vue b/src/AdminUI/src/components/DisplayViewerPage.vue index 0845a2a4..63aac7c7 100644 --- a/src/AdminUI/src/components/DisplayViewerPage.vue +++ b/src/AdminUI/src/components/DisplayViewerPage.vue @@ -7,7 +7,13 @@ width="100%" height="100%" frameborder="0" - style="position: absolute; top: 120; left: 0; width: 100%; height: 100%;" + style=" + position: absolute; + top: 120; + left: 0; + width: 100%; + height: 100%; + " > @@ -15,17 +21,17 @@ \ No newline at end of file + html { + overflow-y: hidden; + } + diff --git a/src/AdminUI/src/components/EventsViewerPage.vue b/src/AdminUI/src/components/EventsViewerPage.vue index e8296d93..3d122a14 100644 --- a/src/AdminUI/src/components/EventsViewerPage.vue +++ b/src/AdminUI/src/components/EventsViewerPage.vue @@ -1,31 +1,37 @@ - - - - - - + + \ No newline at end of file + diff --git a/src/AdminUI/src/components/GrafanaPage.vue b/src/AdminUI/src/components/GrafanaPage.vue index 4e512ffe..d31d17f4 100644 --- a/src/AdminUI/src/components/GrafanaPage.vue +++ b/src/AdminUI/src/components/GrafanaPage.vue @@ -1,31 +1,37 @@ - - - - - - + + \ No newline at end of file + diff --git a/src/AdminUI/src/components/LogViewerPage.vue b/src/AdminUI/src/components/LogViewerPage.vue index 21fd8016..4813e220 100644 --- a/src/AdminUI/src/components/LogViewerPage.vue +++ b/src/AdminUI/src/components/LogViewerPage.vue @@ -1,31 +1,37 @@ - - - - - - + + \ No newline at end of file + diff --git a/src/AdminUI/src/components/LoginPage.vue b/src/AdminUI/src/components/LoginPage.vue index 4d04b88c..b3d040a7 100644 --- a/src/AdminUI/src/components/LoginPage.vue +++ b/src/AdminUI/src/components/LoginPage.vue @@ -1,6 +1,6 @@ diff --git a/src/AdminUI/src/components/MetabasePage.vue b/src/AdminUI/src/components/MetabasePage.vue index 743cc32d..741b802d 100644 --- a/src/AdminUI/src/components/MetabasePage.vue +++ b/src/AdminUI/src/components/MetabasePage.vue @@ -1,31 +1,37 @@ - - - - - - + + \ No newline at end of file + diff --git a/src/AdminUI/src/components/ProtocolConnectionsTab.vue b/src/AdminUI/src/components/ProtocolConnectionsTab.vue index 5241d4f7..df2673d3 100644 --- a/src/AdminUI/src/components/ProtocolConnectionsTab.vue +++ b/src/AdminUI/src/components/ProtocolConnectionsTab.vue @@ -1,23 +1,41 @@ diff --git a/src/AdminUI/src/components/RolesManagementTab.vue b/src/AdminUI/src/components/RolesManagementTab.vue index d2fc5d97..8a125473 100644 --- a/src/AdminUI/src/components/RolesManagementTab.vue +++ b/src/AdminUI/src/components/RolesManagementTab.vue @@ -1,161 +1,337 @@ \ No newline at end of file + .v-checkbox :deep(.v-label) { + font-size: 0.8em; + } + diff --git a/src/AdminUI/src/components/SystemSettingsTab.vue b/src/AdminUI/src/components/SystemSettingsTab.vue index 5610dcab..68e7056c 100644 --- a/src/AdminUI/src/components/SystemSettingsTab.vue +++ b/src/AdminUI/src/components/SystemSettingsTab.vue @@ -1,65 +1,378 @@ \ No newline at end of file + const confirmRestartProcesses = async () => { + restartProcessesDialog.value = false + await restartProcesses() + } + + const restartProcesses = async () => { + try { + const response = await fetch('/Invoke/auth/restartProcesses', { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }) + const json = await response.json() + if (json.error) { + setError(json) + return + } + console.log('System restart initiated') + } catch (err) { + setError(err) + } + } + + const sanitizeDatabase = async () => { + try { + const response = await fetch('/Invoke/auth/sanitizeDatabase', { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + }, + }) + const json = await response.json() + if (json.error) { + setError(json) + return + } + console.log('Sanitization initiated') + } catch (err) { + setError(err) + } + } + + const setError = (err) => { + error.value = true + console.warn(err) + setTimeout(() => { + error.value = false + }, 2000) + } + + + diff --git a/src/AdminUI/src/components/TabularViewerPage.vue b/src/AdminUI/src/components/TabularViewerPage.vue index 9c85d6fc..4c2f7ec8 100644 --- a/src/AdminUI/src/components/TabularViewerPage.vue +++ b/src/AdminUI/src/components/TabularViewerPage.vue @@ -1,31 +1,37 @@ - - - - - - + + \ No newline at end of file + diff --git a/src/AdminUI/src/components/TagsTab.vue b/src/AdminUI/src/components/TagsTab.vue index c971a6ab..0bce4006 100644 --- a/src/AdminUI/src/components/TagsTab.vue +++ b/src/AdminUI/src/components/TagsTab.vue @@ -1,330 +1,685 @@ diff --git a/src/AdminUI/src/components/UserActions.vue b/src/AdminUI/src/components/UserActions.vue index 926831a6..7fc41845 100644 --- a/src/AdminUI/src/components/UserActions.vue +++ b/src/AdminUI/src/components/UserActions.vue @@ -1,26 +1,69 @@