Merge pull request #8781 from fossasia/development

Merge dev to master

Author: mariobehling

.github/dependabot.yml

@@ -101,4 +101,4 @@ updates:
   - dependency-name: "@babel/core"
     versions:
     - 7.13.0
-    - 7.13.1
+    - 7.13.1

.github/workflows/ci.yml

@@ -54,9 +54,9 @@ jobs:
     needs: install
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v3
+      - name: Copy .env
+        run:  cp '.env.example' '.env'
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
@@ -69,8 +69,6 @@ jobs:
           # no restore-keys here, so we only accept this exact version
       - run: yarn l10n:generate
       - run: COVERAGE=true yarn test
-        env:
-          API_HOST: https://open-event.dokku.fossasia.org
       - name: Code Coverage
         uses: codecov/codecov-action@v1
 

.github/workflows/docker-hub.yml

@@ -13,29 +13,37 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       -
-        name: Login to DockerHub
-        # The job will terminate early if Docker Hub credentials is not set.
-        uses: docker/login-action@v1
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Docker meta
+        uses: docker/metadata-action@v4
+        id: meta
+        with:
+          images: |
+             eventyay/open-event-frontend
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
       -
-        name: Docker meta
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: eventyay/open-event-frontend
+        name: Set up Buildx
+        uses: docker/setup-buildx-action@v2
       -
-        name: Build
-        id: docker_build
-        uses: docker/build-push-action@v2
+        name: Build and push
+        uses: docker/build-push-action@v4
         with:
-          push: true
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.gitpod.yml

@@ -4,6 +4,8 @@ image:
 tasks:
   - name: setup
     init: |
+      nvm install 14
+      nvm use 14
       yarn
       cp .env.example .env
       yarn l10n:generate

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:14-alpine3.11 as builder
+FROM node:14-alpine as builder
 
 WORKDIR /app
 
-RUN apk add git python2-dev make g++ gettext
+RUN apk add git python3-dev make g++ gettext
 
 COPY package.json yarn.lock ./
 
@@ -18,9 +18,9 @@ RUN yarn l10n:generate && \
     JOBS=1 yarn build -prod
 
 ##
-##
 
-FROM node:14-alpine3.11
+FROM node:14-alpine
+
 
 WORKDIR /fastboot
 
@@ -36,8 +36,8 @@ RUN apk add --no-cache ca-certificates nginx && \
 COPY scripts/* ./scripts/
 COPY config/environment.js ./config/
 
-RUN mkdir -p /etc/nginx/conf.d/
-COPY config/nginx.conf /etc/nginx/conf.d
+RUN mkdir -p /etc/nginx/http.d/
+COPY config/nginx.conf /etc/nginx/http.d/
 RUN mkdir -p /run/nginx
 
 EXPOSE 4000

README.md

@@ -14,11 +14,9 @@
 
 The front end for the **Open Event Server**
 
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
-
 **API Documentation:**
 
-- Every installation of the **Open Event Server** project includes API docs, (e.g. here on the test install [https://open-event.dokku.fossasia.org](https://open-event.dokku.fossasia.org)).
+- Every installation of the **Open Event Server** project includes API docs
 - A hosted version of the API docs is available in the `gh-pages` branch of the **Open Event Server** repository at [http://api.eventyay.com](http://api.eventyay.com)
 
 ## Communication
@@ -78,7 +76,7 @@ It consumes the API exposed by master branch deployment of open event server, ho
 #### Development branch
 
 The **development** branch of open-event-frontend gets deployed at [https://open-event-frontend.now.sh/](https://open-event-frontend.now.sh/)
-It consumes the API exposed by development branch of open event server, hosted at [https://open-event.dokku.fossasia.org](https://open-event.dokku.fossasia.org)
+It consumes the API exposed by development branch of open event server, hosted at [https://test.eventyay.com](https://test.eventyay.com)
 
 ### Release Cycle
 

app/components/forms/events/view/videoroom-form.hbs

@@ -95,16 +95,14 @@
   {{#if (or (eq this.data.stream.videoChannel.provider 'youtube') (eq this.data.stream.videoChannel.provider 'vimeo'))}}
     <div class="field">
       <label for="public_name">
-          {{t 'Autoplay'}}
+        {{t 'Autoplay'}}
       </label>
       <UiCheckbox
         class="toggle"
         @checked={{this.data.stream.extra.autoplay}}
         @onChange={{action (mut this.data.stream.extra.autoplay)}} />
-    </div>
-    <div class="field">
       <label for="public_name">
-          {{t 'Loop'}}
+        {{t 'Loop'}}
       </label>
       <UiCheckbox
         class="toggle"
@@ -159,6 +157,27 @@
     </div>
   {{/if}}
 
+  {{#if (eq this.data.stream.videoChannel.provider 'jitsi')}}
+    <div class="field">
+      <label>
+          {{t 'Mute On Start'}}
+      </label>
+      <UiCheckbox
+        class="toggle"
+        @checked={{this.data.stream.extra.jitsi_options.muteOnStart}}
+        @onChange={{action this.toggleJitsiMuteOnStart}} />
+    </div>
+    <div class="field">
+      <label>
+          {{t 'Hide Cam On Start'}}
+      </label>
+      <UiCheckbox
+        class="toggle"
+        @checked={{this.data.stream.extra.jitsi_options.hideCamOnStart}}
+        @onChange={{action this.toggleHideCamOnStart}} />
+    </div>
+  {{/if}}
+
   {{#if (and showUpdateOptions (and this.data.stream.id this.actualBBBExtra))}}
     <div class="ui divider"></div>
     <div class="grouped fields">

app/components/forms/events/view/videoroom-form.js

@@ -15,6 +15,11 @@ const bbb_options = {
   endCurrentMeeting  : false
 };
 
+const jitsi_options = {
+  muteOnStart    : false,
+  hideCamOnStart : false
+};
+
 @classic
 export default class VideoroomForm extends Component.extend(FormMixin) {
   @service confirm;
@@ -155,6 +160,7 @@ export default class VideoroomForm extends Component.extend(FormMixin) {
     const identifier = this.streamIdentifier;
 
     this.data.stream.set('url', channel.get('url') + '/eventyay/' + identifier);
+    this.data.stream.set('extra', { jitsi_options });
 
     this.integrationLoading = true;
 
@@ -200,10 +206,7 @@ export default class VideoroomForm extends Component.extend(FormMixin) {
   }
 
   addLibre(channel) {
-    this.data.stream.set(
-      'url',
-      channel.get('url')
-    );
+    this.data.stream.set('url', channel.get('url'));
   }
 
   add3cx() {
@@ -288,6 +291,18 @@ export default class VideoroomForm extends Component.extend(FormMixin) {
     }
   }
 
+  @action
+  async toggleJitsiMuteOnStart() {
+    this.data.stream.extra.jitsi_options.muteOnStart
+      = !this.data.stream.extra.jitsi_options.muteOnStart;
+  }
+
+  @action
+  async toggleHideCamOnStart() {
+    this.data.stream.extra.jitsi_options.hideCamOnStart
+      = !this.data.stream.extra.jitsi_options.hideCamOnStart;
+  }
+
   @action
   async toggleMuteOnStart() {
     this.data.stream.extra.bbb_options.muteOnStart
@@ -416,6 +431,11 @@ export default class VideoroomForm extends Component.extend(FormMixin) {
       }
       this.loadRecordings();
     }
+    if (this.data.stream.videoChannel.get('provider') === 'jitsi') {
+      if (!this.data.stream.extra?.jitsi_options) {
+        this.set('extra', { jitsi_options });
+      }
+    }
     if (
       this.data.stream.extra === null
       && ['vimeo', 'youtube'].includes(

app/components/forms/orders/order-form.js

@@ -493,12 +493,7 @@ export default Component.extend(FormMixin, {
         },
         taxBusinessInfo: {
           identifier : 'taxBusinessInfo',
-          rules      : [
-            {
-              type   : 'empty',
-              prompt : this.l10n.t('Please enter your Tax ID or Business ID.')
-            }
-          ]
+          optional   : true
         },
         address: {
           identifier : 'address',

app/components/public/add-to-calender.ts

@@ -98,12 +98,16 @@ export default class AddToCalender extends Component<Args> {
 
   get sessionGoogleUrl(): string {
     const { event } = this.args;
-    return 'https://calendar.google.com/calendar/render?cid=webcal://api.eventyay.com/v1/events/' + event.identifier + '.ics?include_sessions';
+    let host = this.loader.host();
+    host = host.replace('https://', '')
+    return 'https://calendar.google.com/calendar/render?cid=webcal://' + host + '/v1/events/' + event.identifier + '.ics?include_sessions';
   }
 
   get mySessionGoogleUrl(): string {
     const { event } = this.args;
-    return 'https://calendar.google.com/calendar/render?cid=webcal://api.eventyay.com/v1/events/' + event.identifier + encodeURIComponent('.ics?include_sessions&my_schedule&user_id=') + this.authManager.currentUser.id;
+    let host = this.loader.host();
+    host = host.replace('https://', '');
+    return 'https://calendar.google.com/calendar/render?cid=webcal://' + host + '/v1/events/' + event.identifier + encodeURIComponent('.ics?include_sessions&my_schedule&user_id=') + this.authManager.currentUser.id;
   }
 
   get mySessioniCalUrl(): string {