Commit eb5b0824 authored by Konstantin Schulz's avatar Konstantin Schulz
Browse files

fixed CHROME_BIN environment variable for Docker

parent f648347b
Pipeline #10756 failed with stage
in 5 minutes and 9 seconds
......@@ -21,8 +21,8 @@ coverage:
# - apt install -y ./google-chrome-stable_current_amd64.deb
# - npm i -g @angular/cli
# - npm install
- sudo docker-compose build
- sudo docker-compose run mc_frontend npm run test
- docker-compose build
- docker-compose run mc_frontend npm run test
# - npm run test
coverage: '/Statements.*?(\d+(?:\.\d+)?)%/'
tags:
......
......@@ -18,7 +18,8 @@ RUN install -Dv /dev/null /run/nginx/nginx.pid
WORKDIR /home/mc/mc_frontend
# to get the version of the local CLI package, run: npm list @angular/cli | sed 's/[^0-9.]*//g' | sed -n 2p
RUN npm i -g cordova && cordova telemetry off && npm i -g @ionic/cli && npm i -g @angular/cli
RUN npm install
# automatically say 'yes' to any occurring prompts during installation, e.g. "participate in Google's telemetry?"
RUN yes | npm install
# workaround to fix the missing binding issue for node-sass
RUN npm rebuild node-sass
# TODO: for some reason, this does not persist?!?!??!
......
......@@ -7,7 +7,7 @@ services:
dockerfile: Dockerfile
command: nginx -g "daemon off;"
environment:
- CHROME_BIN=chromium-browser
- CHROME_BIN=google-chrome
ports:
- "8100:8100"
restart: always
......
{
"name": "mc_frontend",
"version": "1.6.6",
"version": "1.6.7",
"author": "Ionic Framework",
"homepage": "https://ionicframework.com/",
"scripts": {
......
......@@ -119,19 +119,19 @@
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tab-button (click)="HelperService.goToInfoPage(navCtrl)">
<ion-icon name="md-information-circle"></ion-icon>
<ion-icon name="information-circle"></ion-icon>
<ion-label>{{ 'ABOUT' | translate }}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocSoftwarePage(navCtrl)">
<ion-icon name="md-code"></ion-icon>
<ion-icon name="code"></ion-icon>
<ion-label>{{ 'DOC_SOFTWARE' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocVocUnitPage(navCtrl)">
<ion-icon name="md-school"></ion-icon>
<ion-icon name="school"></ion-icon>
<ion-label>{{'DOC_VOC_UNIT' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToImprintPage(navCtrl)">
<ion-icon name="md-today"></ion-icon>
<ion-icon name="today"></ion-icon>
<ion-label>{{ 'IMPRINT' | translate }}</ion-label>
</ion-tab-button>
</ion-tab-bar>
......
......@@ -102,19 +102,19 @@
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tab-button (click)="HelperService.goToInfoPage(navCtrl)">
<ion-icon name="md-information-circle"></ion-icon>
<ion-icon name="information-circle"></ion-icon>
<ion-label>{{ 'ABOUT' | translate }}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocExercisesPage(navCtrl)">
<ion-icon name="md-tablet-landscape"></ion-icon>
<ion-icon name="tablet-landscape"></ion-icon>
<ion-label>{{'DOC_EXERCISES' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocVocUnitPage(navCtrl)">
<ion-icon name="md-school"></ion-icon>
<ion-icon name="school"></ion-icon>
<ion-label>{{'DOC_VOC_UNIT' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToImprintPage(navCtrl)">
<ion-icon name="md-today"></ion-icon>
<ion-icon name="today"></ion-icon>
<ion-label>{{ 'IMPRINT' | translate }}</ion-label>
</ion-tab-button>
</ion-tab-bar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -96,19 +96,19 @@
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tab-button (click)="HelperService.goToInfoPage(navCtrl)">
<ion-icon name="md-information-circle"></ion-icon>
<ion-icon name="information-circle"></ion-icon>
<ion-label>{{ 'ABOUT' | translate }}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocSoftwarePage(navCtrl)">
<ion-icon name="md-code"></ion-icon>
<ion-icon name="code"></ion-icon>
<ion-label>{{ 'DOC_SOFTWARE' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocExercisesPage(navCtrl)">
<ion-icon name="md-tablet-landscape"></ion-icon>
<ion-icon name="tablet-landscape"></ion-icon>
<ion-label>{{'DOC_EXERCISES' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToImprintPage(navCtrl)">
<ion-icon name="md-today"></ion-icon>
<ion-icon name="today"></ion-icon>
<ion-label>{{ 'IMPRINT' | translate }}</ion-label>
</ion-tab-button>
</ion-tab-bar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -44,11 +44,11 @@
<ion-row>
<ion-col class="toggle-menu">
<button *ngIf="showVocabularyCorpus; else dropright" (click)="toggleVocCorpus()">
<ion-icon name="md-arrow-dropdown"></ion-icon>
<ion-icon name="caret-down"></ion-icon>
</button>
<ng-template #dropright>
<button (click)="toggleVocCorpus()">
<ion-icon name="md-arrow-dropright"></ion-icon>
<ion-icon name="caret-forward"></ion-icon>
</button>
</ng-template>
<div>
......
......@@ -17,7 +17,7 @@
<ion-title>{{ 'EXERCISE_PARAMETERS' | translate }}</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -95,11 +95,11 @@
<ion-row>
<ion-col class="toggle-menu" style="padding: 0">
<button *ngIf="showFeedback; else dropright" (click)="showFeedback = !showFeedback">
<ion-icon name="md-arrow-dropdown"></ion-icon>
<ion-icon name="caret-down"></ion-icon>
</button>
<ng-template #dropright>
<button (click)="showFeedback = !showFeedback">
<ion-icon name="md-arrow-dropright"></ion-icon>
<ion-icon name="caret-forward"></ion-icon>
</button>
</ng-template>
<div>
......
......@@ -18,7 +18,7 @@
</ion-select>
</div>
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -114,11 +114,11 @@
<ion-tabs id="tabs">
<ion-tab-bar slot="bottom">
<ion-tab-button (click)="HelperService.goToImprintPage(navCtrl)">
<ion-icon name="md-today"></ion-icon>
<ion-icon name="today"></ion-icon>
<ion-label>{{ 'IMPRINT' | translate }}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="refreshCorpora()">
<ion-icon name="md-refresh"></ion-icon>
<ion-icon name="refresh"></ion-icon>
<ion-label>{{ 'CORPORA_REFRESH' | translate }}</ion-label>
</ion-tab-button>
</ion-tab-bar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -78,19 +78,19 @@
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tab-button (click)="HelperService.goToDocSoftwarePage(navCtrl)">
<ion-icon name="md-code"></ion-icon>
<ion-icon name="code"></ion-icon>
<ion-label>{{ 'DOC_SOFTWARE' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocExercisesPage(navCtrl)">
<ion-icon name="md-tablet-landscape"></ion-icon>
<ion-icon name="tablet-landscape"></ion-icon>
<ion-label>{{'DOC_EXERCISES' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToDocVocUnitPage(navCtrl)">
<ion-icon name="md-school"></ion-icon>
<ion-icon name="school"></ion-icon>
<ion-label>{{'DOC_VOC_UNIT' | translate}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToImprintPage(navCtrl)">
<ion-icon name="md-today"></ion-icon>
<ion-icon name="today"></ion-icon>
<ion-label>{{ 'IMPRINT' | translate }}</ion-label>
</ion-tab-button>
</ion-tab-bar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -85,7 +85,7 @@ beginning that it is going to be a download (instead of an ordinary link or clic
</div>
<div>
<button class="button-icon-only" (click)="copyLink()">
<ion-icon name="md-copy"></ion-icon>
<ion-icon name="copy"></ion-icon>
</button>
</div>
</ion-col>
......@@ -94,11 +94,11 @@ beginning that it is going to be a download (instead of an ordinary link or clic
<ion-col style="text-align: left;">
<h4 (click)="showInstructions = !showInstructions" class="pointer">
<button *ngIf="showInstructions; else dropright">
<ion-icon name="md-arrow-dropdown"></ion-icon>
<ion-icon name="caret-down"></ion-icon>
</button>
<ng-template #dropright>
<button>
<ion-icon name="md-arrow-dropright"></ion-icon>
<ion-icon name="caret-forward"></ion-icon>
</button>
</ng-template>
<span> {{ 'EXERCISE_DOWNLOAD_NEXT_STEPS' | translate }}</span>
......
......@@ -14,7 +14,7 @@
</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -51,11 +51,11 @@
<ion-row>
<button *ngIf="showTextComplexity; else dropright"
(click)="showTextComplexity = !showTextComplexity">
<ion-icon name="md-arrow-dropdown"></ion-icon>
<ion-icon name="caret-down"></ion-icon>
</button>
<ng-template #dropright>
<button (click)="showTextComplexity = !showTextComplexity">
<ion-icon name="md-arrow-dropright"></ion-icon>
<ion-icon name="caret-forward"></ion-icon>
</button>
</ng-template>
<div>
......@@ -64,7 +64,7 @@
{{ 'TEXT_COMPLEXITY' | translate }}</h2>
</div>
<button (click)="showTextComplexityDoc = !showTextComplexityDoc" style="padding:0.2em;">
<ion-icon name="md-help-circle"></ion-icon>
<ion-icon name="help-circle"></ion-icon>
</button>
</ion-row>
<ion-row *ngIf="showTextComplexity" style="text-align:left; padding: 0 0 1em 0">
......
......@@ -137,11 +137,11 @@
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tab-button (click)="goToAuthorPage()">
<ion-icon name="md-walk"></ion-icon>
<ion-icon name="walk"></ion-icon>
<ion-label>Übung erstellen</ion-label>
</ion-tab-button>
<ion-tab-button (click)="HelperService.goToTestPage(navCtrl)">
<ion-icon name="md-school"></ion-icon>
<ion-icon name="school"></ion-icon>
<ion-label>Test beginnen</ion-label>
</ion-tab-button>
</ion-tab-bar>
......
......@@ -7,7 +7,7 @@
<ion-spinner *ngIf="HelperService.isLoading"></ion-spinner>
<span *ngIf="isTestMode" id="timer"></span>
<button (click)="exit($event)">
<ion-icon name="md-close-circle"></ion-icon>
<ion-icon name="close-circle"></ion-icon>
</button>
</div>
</ion-toolbar>
......
......@@ -11,7 +11,7 @@
<ion-title *ngIf="corpusService.currentCorpus | async as cc">{{cc.title}}</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment