Merge pull request #59 from rwth-acis/release/v1.0.3

Release/v1.0.3

Author: AlexanderNeumann

.github/workflows/docker-CI.yml

@@ -2,7 +2,7 @@ name: Docker Build and Push
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop]
 
 jobs:
   build:

.gitignore

@@ -0,0 +1,2 @@
+Utilities Frontend/app/config.json
+Utilities Frontend/syncmeta/node_modules

Dockerfile

@@ -1,29 +1,45 @@
 FROM node:10
 
-ENV YJS_RESOURCE_PATH "/socket.io"
+ENV YJS_RESOURCE_PATH "/yjs/socket.io"
 ENV PORT 8070
+ENV SYNC_META_HOST http://127.0.0.1:8070
+ENV YJS https://sbf.tech4comp.dbis.rwth-aachen.de
+ENV OIDC_CLIENT_ID a7ece4a9-0a43-4fda-a33b-9c24a5a0d8f2
 
 WORKDIR /usr/src/app
 
 RUN apt-get update
 RUN apt-get install -y --allow-unauthenticated --no-install-recommends supervisor git nginx dos2unix
-RUN npm_config_user=root npm install -g grunt-cli grunt polymer-cli gulp
+RUN npm_config_user=root npm install -g grunt-cli grunt gulp
 
 ARG src="Utilities Frontend/docker/supervisorConfigs"
 ARG srx="Utilities Frontend"
 COPY ${src} /etc/supervisor/conf.d
 
-
 WORKDIR /usr/src/app
 COPY ${srx}/syncmeta syncmeta
 
-
 WORKDIR /usr/src/app/syncmeta
 RUN npm install
 RUN cp -a node_modules/@rwth-acis/syncmeta-widgets/. widgets/
 RUN cp -a node_modules/. widgets/node_modules/
-COPY ${srx}/docker/_bot_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
-COPY ${srx}/docker/bot_widget.js /usr/src/app/syncmeta/widgets/src/js/
+# copy widgets
+COPY ${srx}/docker/widgets/_bot_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
+COPY ${srx}/docker/widgets/bot_widget.js /usr/src/app/syncmeta/widgets/src/js/
+# overwrite debug widget template to use slim version (js stays the same)
+COPY ${srx}/docker/widgets/_debug_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
+# overwrite attribute widget
+COPY ${srx}/docker/widgets/attribute_widget /usr/src/app/syncmeta/widgets/src/templates/attribute_widget
+# overwrite activity widget
+COPY ${srx}/docker/widgets/activity_widget /usr/src/app/syncmeta/widgets/src/templates/activity_widget
+COPY ${srx}/docker/widgets/_activity_widget.tpl /usr/src/app/syncmeta/widgets/src/widgets/partials/
+# overwrite js
+COPY ${srx}/docker/widgets/js/activity_widget/Activity.js /usr/src/app/syncmeta/widgets/src/js/activity_widget/Activity.js
+# overwrite widget template to use bootstrap. This can be removed as soon as PR for bootstrap is merged in syncmetaf
+COPY ${srx}/docker/widgets/widget.html.tpl /usr/src/app/syncmeta/widgets/src/widgets/
+# overwrite styles
+COPY ${srx}/docker/widgets/css /usr/src/app/syncmeta/widgets/src/css/
+
 COPY ${srx}/docker/Gruntfile.js /usr/src/app/syncmeta/widgets/
 COPY ${srx}/docker/yjs-sync.js /usr/src/app/syncmeta/widgets/src/js/lib/
 WORKDIR /usr/src/app/syncmeta
@@ -40,3 +56,4 @@ ARG srt="Utilities Frontend/docker/docker-entrypoint.sh"
 COPY ${srt} docker-entrypoint.sh
 RUN dos2unix docker-entrypoint.sh
 ENTRYPOINT ["./docker-entrypoint.sh"]
+EXPOSE ${PORT}