diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..cd65e4a --- /dev/null +++ b/.babelrc @@ -0,0 +1,10 @@ +{ + "presets": [ + "@babel/preset-env" + ], + "env": { + "test": { + "plugins": ["transform-imports"] + } + } +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 07ac15d..4dbe038 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,11 @@ +# Ignore +node_modules/ +dist/ + classdiagram_v2.dia.autosave classdiagram_v2.dia~ view/images/Thumbs.db Documentation/Quickstart/pic/Thumbs.db *.iml + +# Allow diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..7428e9a --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,77 @@ + +pipeline { + parameters { + choice(name: 'destination', description: 'Destination folder', choices: ['asterics-web-devlinux/WebACS', 'asterics-web-devwindows/WebACS', 'asterics-web-production/WebACS' ]) + choice(name: 'agent', description: 'Agent', choices: ['Linux', 'Win']) + choice(name: 'image', description: 'Docker Image', choices: ['node:10', 'node:11']) + gitParameter(name: 'BRANCH', branchFilter: 'origin.*?/(.*)', defaultValue: 'master', type: 'PT_BRANCH_TAG', useRepository: 'WebACS') + } + agent none + stages { + stage('Cleanup') { + agent { + label params.agent + } + steps { + deleteDir() + } + } + stage('Build') { + agent { + docker { + image params.image + label params.agent + } + } + steps { + sh ''' + yarn install + yarn build + ''' + } + } + stage('Test') { + agent { + docker { + image params.image + label params.agent + } + } + steps { + sh ''' + yarn global add http-server --prefix deps/ + ./deps/bin/hs dist/ & + yarn test + ''' + } + } + stage('Archive') { + agent { + label params.agent + } + steps { + sh 'cd dist && zip -r ../WebACS.zip *' + archiveArtifacts artifacts: 'WebACS.zip', fingerprint: true + } + } + stage('Deploy') { + environment { + SERVER = credentials('server') + } + agent { + label params.agent + } + steps { + sh ''' + mkdir build + mv dist build/WebACS + ''' + script { + def remote = [ name: 'studyathome', host: 'studyathome.technikum-wien.at', user: env.SERVER_USR, password: env.SERVER_PSW, allowAnyHosts: true ] + sshRemove remote: remote, path: "/var/www/html/${params.destination}", failOnError: false + sshPut remote: remote, from: 'build/WebACS', into: "/var/www/html/${params.destination.replace("/WebACS", "")}" + } + } + } + } +} \ No newline at end of file diff --git a/styles/webACS.css b/assets/css/webACS.css similarity index 100% rename from styles/webACS.css rename to assets/css/webACS.css diff --git a/favicons/android-chrome-256x256.png b/assets/favicon/asterics-logo.png similarity index 100% rename from favicons/android-chrome-256x256.png rename to assets/favicon/asterics-logo.png diff --git a/view/images/AddNew.png b/assets/images/AddNew.png similarity index 100% rename from view/images/AddNew.png rename to assets/images/AddNew.png diff --git a/view/images/AsTeRICS_acs_icon_dg.png b/assets/images/AsTeRICS_acs_icon_dg.png similarity index 100% rename from view/images/AsTeRICS_acs_icon_dg.png rename to assets/images/AsTeRICS_acs_icon_dg.png diff --git a/view/images/AsTeRICS_acs_icon_lg.ico b/assets/images/AsTeRICS_acs_icon_lg.ico similarity index 100% rename from view/images/AsTeRICS_acs_icon_lg.ico rename to assets/images/AsTeRICS_acs_icon_lg.ico diff --git a/view/images/AsTeRICS_acs_icon_lg.png b/assets/images/AsTeRICS_acs_icon_lg.png similarity index 100% rename from view/images/AsTeRICS_acs_icon_lg.png rename to assets/images/AsTeRICS_acs_icon_lg.png diff --git a/view/images/AsTeRICS_acs_icon_lg_tr.ico b/assets/images/AsTeRICS_acs_icon_lg_tr.ico similarity index 100% rename from view/images/AsTeRICS_acs_icon_lg_tr.ico rename to assets/images/AsTeRICS_acs_icon_lg_tr.ico diff --git a/view/images/ConfigureBundle.png b/assets/images/ConfigureBundle.png similarity index 100% rename from view/images/ConfigureBundle.png rename to assets/images/ConfigureBundle.png diff --git a/view/images/Download.png b/assets/images/Download.png similarity index 100% rename from view/images/Download.png rename to assets/images/Download.png diff --git a/view/images/DownloadBundle.png b/assets/images/DownloadBundle.png similarity index 100% rename from view/images/DownloadBundle.png rename to assets/images/DownloadBundle.png diff --git a/view/images/ExtToolActivate.png b/assets/images/ExtToolActivate.png similarity index 100% rename from view/images/ExtToolActivate.png rename to assets/images/ExtToolActivate.png diff --git a/view/images/ExtToolCreate.png b/assets/images/ExtToolCreate.png similarity index 100% rename from view/images/ExtToolCreate.png rename to assets/images/ExtToolCreate.png diff --git a/view/images/ExtToolLangCreate.png b/assets/images/ExtToolLangCreate.png similarity index 100% rename from view/images/ExtToolLangCreate.png rename to assets/images/ExtToolLangCreate.png diff --git a/view/images/ExtToolNote.png b/assets/images/ExtToolNote.png similarity index 100% rename from view/images/ExtToolNote.png rename to assets/images/ExtToolNote.png diff --git a/view/images/Help16.png b/assets/images/Help16.png similarity index 100% rename from view/images/Help16.png rename to assets/images/Help16.png diff --git a/view/images/Options.png b/assets/images/Options.png similarity index 100% rename from view/images/Options.png rename to assets/images/Options.png diff --git a/view/images/PauseModel.png b/assets/images/PauseModel.png similarity index 100% rename from view/images/PauseModel.png rename to assets/images/PauseModel.png diff --git a/view/images/Printer.png b/assets/images/Printer.png similarity index 100% rename from view/images/Printer.png rename to assets/images/Printer.png diff --git a/view/images/Properties_Icon.png b/assets/images/Properties_Icon.png similarity index 100% rename from view/images/Properties_Icon.png rename to assets/images/Properties_Icon.png diff --git a/view/images/Question.png b/assets/images/Question.png similarity index 100% rename from view/images/Question.png rename to assets/images/Question.png diff --git a/view/images/RelationshipsHH.bmp b/assets/images/RelationshipsHH.bmp similarity index 100% rename from view/images/RelationshipsHH.bmp rename to assets/images/RelationshipsHH.bmp diff --git a/view/images/Save16.png b/assets/images/Save16.png similarity index 100% rename from view/images/Save16.png rename to assets/images/Save16.png diff --git a/view/images/StartModel.png b/assets/images/StartModel.png similarity index 100% rename from view/images/StartModel.png rename to assets/images/StartModel.png diff --git a/view/images/StopModel.png b/assets/images/StopModel.png similarity index 100% rename from view/images/StopModel.png rename to assets/images/StopModel.png diff --git a/view/images/StoreModel.png b/assets/images/StoreModel.png similarity index 100% rename from view/images/StoreModel.png rename to assets/images/StoreModel.png diff --git a/view/images/Undo16.png b/assets/images/Undo16.png similarity index 100% rename from view/images/Undo16.png rename to assets/images/Undo16.png diff --git a/view/images/Upload.png b/assets/images/Upload.png similarity index 100% rename from view/images/Upload.png rename to assets/images/Upload.png diff --git a/view/images/Warning.png b/assets/images/Warning.png similarity index 100% rename from view/images/Warning.png rename to assets/images/Warning.png diff --git a/view/images/about.png b/assets/images/about.png similarity index 100% rename from view/images/about.png rename to assets/images/about.png diff --git a/view/images/actuator.png b/assets/images/actuator.png similarity index 100% rename from view/images/actuator.png rename to assets/images/actuator.png diff --git a/view/images/are_deco.png b/assets/images/are_deco.png similarity index 100% rename from view/images/are_deco.png rename to assets/images/are_deco.png diff --git a/view/images/asterics_icon.ico b/assets/images/asterics_icon.ico similarity index 100% rename from view/images/asterics_icon.ico rename to assets/images/asterics_icon.ico diff --git a/view/images/asterics_icon.png b/assets/images/asterics_icon.png similarity index 100% rename from view/images/asterics_icon.png rename to assets/images/asterics_icon.png diff --git a/view/images/asterics_icon_old.png b/assets/images/asterics_icon_old.png similarity index 100% rename from view/images/asterics_icon_old.png rename to assets/images/asterics_icon_old.png diff --git a/view/images/asterics_logo.png b/assets/images/asterics_logo.png similarity index 100% rename from view/images/asterics_logo.png rename to assets/images/asterics_logo.png diff --git a/view/images/asterics_startup.png b/assets/images/asterics_startup.png similarity index 100% rename from view/images/asterics_startup.png rename to assets/images/asterics_startup.png diff --git a/view/images/asterics_startup2.png b/assets/images/asterics_startup2.png similarity index 100% rename from view/images/asterics_startup2.png rename to assets/images/asterics_startup2.png diff --git a/view/images/asterics_startup2_de.png b/assets/images/asterics_startup2_de.png similarity index 100% rename from view/images/asterics_startup2_de.png rename to assets/images/asterics_startup2_de.png diff --git a/view/images/asterics_startup2_pl.png b/assets/images/asterics_startup2_pl.png similarity index 100% rename from view/images/asterics_startup2_pl.png rename to assets/images/asterics_startup2_pl.png diff --git a/view/images/asterics_startup_de.png b/assets/images/asterics_startup_de.png similarity index 100% rename from view/images/asterics_startup_de.png rename to assets/images/asterics_startup_de.png diff --git a/view/images/asterics_startup_es.png b/assets/images/asterics_startup_es.png similarity index 100% rename from view/images/asterics_startup_es.png rename to assets/images/asterics_startup_es.png diff --git a/view/images/asterics_startup_pl.png b/assets/images/asterics_startup_pl.png similarity index 100% rename from view/images/asterics_startup_pl.png rename to assets/images/asterics_startup_pl.png diff --git a/view/images/autorun.png b/assets/images/autorun.png similarity index 100% rename from view/images/autorun.png rename to assets/images/autorun.png diff --git a/view/images/channelModel.png b/assets/images/channelModel.png similarity index 100% rename from view/images/channelModel.png rename to assets/images/channelModel.png diff --git a/view/images/Close.png b/assets/images/close.png similarity index 100% rename from view/images/Close.png rename to assets/images/close.png diff --git a/view/images/connect.png b/assets/images/connect.png similarity index 100% rename from view/images/connect.png rename to assets/images/connect.png diff --git a/view/images/copy.png b/assets/images/copy.png similarity index 100% rename from view/images/copy.png rename to assets/images/copy.png diff --git a/view/images/cut.png b/assets/images/cut.png similarity index 100% rename from view/images/cut.png rename to assets/images/cut.png diff --git a/view/images/delete.png b/assets/images/delete.png similarity index 100% rename from view/images/delete.png rename to assets/images/delete.png diff --git a/view/images/disconnect.png b/assets/images/disconnect.png similarity index 100% rename from view/images/disconnect.png rename to assets/images/disconnect.png diff --git a/view/images/edit.png b/assets/images/edit.png similarity index 100% rename from view/images/edit.png rename to assets/images/edit.png diff --git a/view/images/editModelDescription.png b/assets/images/editModelDescription.png similarity index 100% rename from view/images/editModelDescription.png rename to assets/images/editModelDescription.png diff --git a/view/images/editModelName.png b/assets/images/editModelName.png similarity index 100% rename from view/images/editModelName.png rename to assets/images/editModelName.png diff --git a/view/images/edit_event.png b/assets/images/edit_event.png similarity index 100% rename from view/images/edit_event.png rename to assets/images/edit_event.png diff --git a/view/images/error.png b/assets/images/error.png similarity index 100% rename from view/images/error.png rename to assets/images/error.png diff --git a/view/images/event.png b/assets/images/event.png similarity index 100% rename from view/images/event.png rename to assets/images/event.png diff --git a/view/images/eventChannelModel.png b/assets/images/eventChannelModel.png similarity index 100% rename from view/images/eventChannelModel.png rename to assets/images/eventChannelModel.png diff --git a/view/images/group.png b/assets/images/group.png similarity index 100% rename from view/images/group.png rename to assets/images/group.png diff --git a/view/images/group_elem.png b/assets/images/group_elem.png similarity index 100% rename from view/images/group_elem.png rename to assets/images/group_elem.png diff --git a/view/images/group_save.png b/assets/images/group_save.png similarity index 100% rename from view/images/group_save.png rename to assets/images/group_save.png diff --git a/view/images/help.png b/assets/images/help.png similarity index 100% rename from view/images/help.png rename to assets/images/help.png diff --git a/view/images/info.png b/assets/images/info.png similarity index 100% rename from view/images/info.png rename to assets/images/info.png diff --git a/view/images/logging.png b/assets/images/logging.png similarity index 100% rename from view/images/logging.png rename to assets/images/logging.png diff --git a/view/images/move.png b/assets/images/move.png similarity index 100% rename from view/images/move.png rename to assets/images/move.png diff --git a/view/images/new.png b/assets/images/new.png similarity index 100% rename from view/images/new.png rename to assets/images/new.png diff --git a/view/images/open.png b/assets/images/open.png similarity index 100% rename from view/images/open.png rename to assets/images/open.png diff --git a/view/images/paste.png b/assets/images/paste.png similarity index 100% rename from view/images/paste.png rename to assets/images/paste.png diff --git a/view/images/processor.png b/assets/images/processor.png similarity index 100% rename from view/images/processor.png rename to assets/images/processor.png diff --git a/view/images/properties.png b/assets/images/properties.png similarity index 100% rename from view/images/properties.png rename to assets/images/properties.png diff --git a/view/images/redo.png b/assets/images/redo.png similarity index 100% rename from view/images/redo.png rename to assets/images/redo.png diff --git a/view/images/reset.png b/assets/images/reset.png similarity index 100% rename from view/images/reset.png rename to assets/images/reset.png diff --git a/view/images/save.png b/assets/images/save.png similarity index 100% rename from view/images/save.png rename to assets/images/save.png diff --git a/view/images/saveas.png b/assets/images/saveas.png similarity index 100% rename from view/images/saveas.png rename to assets/images/saveas.png diff --git a/view/images/sensor.png b/assets/images/sensor.png similarity index 100% rename from view/images/sensor.png rename to assets/images/sensor.png diff --git a/view/images/special.png b/assets/images/special.png similarity index 100% rename from view/images/special.png rename to assets/images/special.png diff --git a/view/images/status.png b/assets/images/status.png similarity index 100% rename from view/images/status.png rename to assets/images/status.png diff --git a/view/images/storedelete.png b/assets/images/storedelete.png similarity index 100% rename from view/images/storedelete.png rename to assets/images/storedelete.png diff --git a/view/images/storedown.png b/assets/images/storedown.png similarity index 100% rename from view/images/storedown.png rename to assets/images/storedown.png diff --git a/view/images/storerun.png b/assets/images/storerun.png similarity index 100% rename from view/images/storerun.png rename to assets/images/storerun.png diff --git a/view/images/storeup.png b/assets/images/storeup.png similarity index 100% rename from view/images/storeup.png rename to assets/images/storeup.png diff --git a/view/images/undo.png b/assets/images/undo.png similarity index 100% rename from view/images/undo.png rename to assets/images/undo.png diff --git a/view/images/ungroup.png b/assets/images/ungroup.png similarity index 100% rename from view/images/ungroup.png rename to assets/images/ungroup.png diff --git a/defaultComponentCollection.abd b/assets/resources/defaultComponentCollection.abd similarity index 100% rename from defaultComponentCollection.abd rename to assets/resources/defaultComponentCollection.abd diff --git a/favicons/android-chrome-192x192.png b/favicons/android-chrome-192x192.png deleted file mode 100644 index fc3ad82..0000000 Binary files a/favicons/android-chrome-192x192.png and /dev/null differ diff --git a/favicons/apple-touch-icon.png b/favicons/apple-touch-icon.png deleted file mode 100644 index d8a227e..0000000 Binary files a/favicons/apple-touch-icon.png and /dev/null differ diff --git a/favicons/browserconfig.xml b/favicons/browserconfig.xml deleted file mode 100644 index 02d40fa..0000000 --- a/favicons/browserconfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - #da532c - - - diff --git a/favicons/favicon-16x16.png b/favicons/favicon-16x16.png deleted file mode 100644 index 5cd654a..0000000 Binary files a/favicons/favicon-16x16.png and /dev/null differ diff --git a/favicons/favicon-32x32.png b/favicons/favicon-32x32.png deleted file mode 100644 index 30457fc..0000000 Binary files a/favicons/favicon-32x32.png and /dev/null differ diff --git a/favicons/favicon.ico b/favicons/favicon.ico deleted file mode 100644 index 54f8c23..0000000 Binary files a/favicons/favicon.ico and /dev/null differ diff --git a/favicons/manifest.json b/favicons/manifest.json deleted file mode 100644 index 39513db..0000000 --- a/favicons/manifest.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "", - "icons": [ - { - "src": "favicons/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "favicons/android-chrome-256x256.png", - "sizes": "256x256", - "type": "image/png" - } - ], - "theme_color": "#ffffff", - "background_color": "#ffffff", - "display": "standalone" -} \ No newline at end of file diff --git a/favicons/mstile-150x150.png b/favicons/mstile-150x150.png deleted file mode 100644 index 8d3e1df..0000000 Binary files a/favicons/mstile-150x150.png and /dev/null differ diff --git a/favicons/safari-pinned-tab.svg b/favicons/safari-pinned-tab.svg deleted file mode 100644 index c92b998..0000000 --- a/favicons/safari-pinned-tab.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - - - diff --git a/index.html b/index.html index 802c12d..553e332 100644 --- a/index.html +++ b/index.html @@ -1,86 +1,75 @@ - + - - - - - - - - - - - - - - + + + AsTeRICS Configuration Suite - - - - - - - - - + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + @@ -113,38 +102,38 @@

AsTeRICS Configuration Suite

ARE

ARE Storage

Model

-

Local

+

Local

@@ -153,9 +142,9 @@

Local

Components

@@ -171,19 +160,19 @@

Components

Model Properties

Edit

@@ -192,30 +181,30 @@

Edit

Miscellaneous

- +
- +
- +