diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65ffc8a58bac592a7bc89044b6f437627ae36851..7a9ff0940d645079fea4bad880c964270325075d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + BUILD_DIR: dist + stages: - test - build @@ -19,3 +22,32 @@ tslint: - npm install rxjs - node_modules/tslint/bin/tslint -p ./tsconfig.json -c ./tslint.json ./src/**/*.ts +ngbuild: + stage: build + tags: + - angular + allow_failure: false + dependencies: [] + script: + - npm install -g @angular/cli + - npm install + - ng build --prod + artifacts: + paths: + - "$BUILD_DIR" + +deploy: + stage: deploy + only: + - master + tags: + - ssh + dependencies: + - tslint + - ngbuild + script: + - eval $(ssh-agent -s) + - mkdir ~/.ssh #&& echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - ssh-keyscan "$SERVER_URL" >> ~/.ssh/known_hosts + - ssh-add <(echo "$SSH_PRIVATE_KEY") + - scp -r "$BUILD_DIR"* "$SSH_URL" diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html index ed5cd73558a75b0686d35f9a5601bf974f7215b5..176f16f1f563d1605ee8038a22ce6754f8bedfe2 100644 --- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html +++ b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.html @@ -6,7 +6,7 @@ <textarea matInput #body [(ngModel)]="content.body" placeholder="Body" name="body"></textarea> </mat-form-field> <mat-divider></mat-divider> -<form (ngSubmit)="submitContent()"> +<form (ngSubmit)="submitContent(subject.value, body.value)"> <section class="choice-seformn" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px"> <mat-checkbox (click)="singleChoice = true; multipleChoice = false;" color="primary" [(ngModel)]="singleChoice" name="singleChoice">Single choice