Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/OpenTOSCA/winery into pro…
…ject/radon
- Loading branch information
Showing
19 changed files
with
2,144 additions
and
1,246 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| FROM maven:3-jdk-8 as builder | ||
| WORKDIR /tmp/winery | ||
| COPY . /tmp/winery | ||
| RUN mvn package -pl org.eclipse.winery.cli -am -DskipTests | ||
| RUN chmod u+x /tmp/winery/org.eclipse.winery.cli/target/winery.jar | ||
|
|
||
| FROM openjdk:8-jre | ||
| LABEL maintainer "Oliver Kopp <kopp.dev@gmail.com>" | ||
| RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash | ||
| RUN apt-get update && apt-get install -y git git-lfs | ||
| COPY --from=builder /tmp/winery/org.eclipse.winery.cli/target/winery.jar /usr/local/bin | ||
| COPY docker/winery /usr/local/bin | ||
| RUN chmod +x /usr/local/bin/winery | ||
|
|
||
| CMD winery |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/bash | ||
| java -jar /usr/local/bin/winery.jar "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
...ontends/app/tosca-management/src/app/wineryMarkdownComponent/wineryMarkdown.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /** | ||
| * SPDX-License-Identifier: MIT | ||
| * | ||
| * Taken from: https://github.com/dimpu/angular2-markdown/blob/1c36831d2c9f48ddd7183db33e886ed9ab0a3345/demo/src/app/home/home.component.ts#L11 | ||
| */ | ||
|
|
||
| #textbox { | ||
| width: 100%; | ||
| height: 100vh; | ||
| } | ||
|
|
||
| table.table2 { | ||
| font-size: 14px; | ||
| color: #212121; | ||
| margin: 0 auto; | ||
| border-collapse: collapse; | ||
| } | ||
|
|
||
| table.table2 thead th { | ||
| font-size: 20px; | ||
| color: #212121; | ||
| height: 40px; | ||
| border: 1px solid #e6e6e6; | ||
| border-top: 0; | ||
| border-right: 0; | ||
| border-left: 0; | ||
| } | ||
|
|
||
| table.table2 tbody tr:nth-child(odd) { | ||
| background-color: #f6f6f6; | ||
| } | ||
|
|
||
| table.table2 td { | ||
| height: 40px; | ||
| width: 230px; | ||
| border-bottom: 1px solid #e6e6e6; | ||
| border-right: 1px solid #e6e6e6; | ||
| } | ||
|
|
||
| table.table2 td:last-of-type { | ||
| border-right: 0; | ||
| } | ||
|
|
||
| /* From https://codepen.io/maxds/pen/DcveB */ | ||
| blockquote.king-quote { | ||
| display: block; | ||
| background: #fff; | ||
| padding: 15px 20px 15px 45px; | ||
| margin: 0 0 20px; | ||
| position: relative; | ||
|
|
||
| /*Font*/ | ||
| font-family: Georgia, serif; | ||
| font-size: 16px; | ||
| line-height: 1.2; | ||
| color: #666; | ||
| text-align: justify; | ||
|
|
||
| /*Borders - (Optional)*/ | ||
| border-left: 15px solid #c76c0c; | ||
| border-right: 2px solid #c76c0c; | ||
|
|
||
| /*Box Shadow - (Optional)*/ | ||
| -moz-box-shadow: 2px 2px 15px #ccc; | ||
| -webkit-box-shadow: 2px 2px 15px #ccc; | ||
| box-shadow: 2px 2px 15px #ccc; | ||
| } | ||
|
|
||
| blockquote.king-quote::before { | ||
| content: "\201C"; /*Unicode for Left Double Quote*/ | ||
|
|
||
| /*Font*/ | ||
| font-family: Georgia, serif; | ||
| font-size: 60px; | ||
| font-weight: bold; | ||
| color: #999; | ||
|
|
||
| /*Positioning*/ | ||
| position: absolute; | ||
| left: 10px; | ||
| top: 5px; | ||
| } | ||
|
|
||
| blockquote.king-quote::after { | ||
| /*Reset to make sure*/ | ||
| content: ""; | ||
| } | ||
|
|
||
| blockquote.king-quote a { | ||
| text-decoration: none; | ||
| background: #eee; | ||
| cursor: pointer; | ||
| padding: 0 3px; | ||
| color: #c76c0c; | ||
| } | ||
|
|
||
| blockquote.king-quote a:hover { | ||
| color: #666; | ||
| } | ||
|
|
||
| blockquote.king-quote em { | ||
| font-style: italic; | ||
| } |
12 changes: 12 additions & 0 deletions
12
...ntends/app/tosca-management/src/app/wineryMarkdownComponent/wineryMarkdown.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <!-- | ||
| /** | ||
| * Copyright (c) 2017 University of Stuttgart. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * and the Apache License 2.0 which both accompany this distribution, | ||
| * and are available at http://www.eclipse.org/legal/epl-v20.html | ||
| * and http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| --> | ||
|
|
||
| <markdown [data]='markdownContent'></markdown> |
57 changes: 57 additions & 0 deletions
57
...rontends/app/tosca-management/src/app/wineryMarkdownComponent/wineryMarkdown.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /** | ||
| * Copyright (c) 2017 University of Stuttgart. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * and the Apache License 2.0 which both accompany this distribution, | ||
| * and are available at http://www.eclipse.org/legal/epl-v20.html | ||
| * and http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
|
|
||
| import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; | ||
| import { MarkdownService } from 'angular2-markdown'; | ||
|
|
||
| @Component({ | ||
| selector: 'winery-markdown', | ||
| encapsulation: ViewEncapsulation.None, | ||
| templateUrl: './wineryMarkdown.component.html', | ||
| providers: [], | ||
| styleUrls: ['wineryMarkdown.component.css'], | ||
|
|
||
| }) | ||
| export class WineryMarkdownComponent implements OnInit { | ||
|
|
||
| @Input() markdownContent = ''; | ||
|
|
||
| constructor(private _markdown: MarkdownService) { | ||
| } | ||
|
|
||
| ngOnInit() { | ||
| this._markdown.setMarkedOptions({}); | ||
| this._markdown.setMarkedOptions({ | ||
| gfm: true, | ||
| tables: true, | ||
| breaks: false, | ||
| pedantic: false, | ||
| sanitize: false, | ||
| smartLists: true, | ||
| smartypants: false | ||
| }); | ||
|
|
||
| this._markdown.renderer.table = (header: string, body: string) => { | ||
| return ` | ||
| <table class="table2"> | ||
| <thead> | ||
| ${header} | ||
| </thead> | ||
| <tbody> | ||
| ${body} | ||
| </tbody> | ||
| </table> | ||
| `; | ||
| }; | ||
| this._markdown.renderer.blockquote = (quote: string) => { | ||
| return `<blockquote class="king-quote">${quote}</blockquote>`; | ||
| }; | ||
| } | ||
|
|
||
| } |
28 changes: 28 additions & 0 deletions
28
...y.frontends/app/tosca-management/src/app/wineryMarkdownComponent/wineryMarkdown.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /** | ||
| * Copyright (c) 2017 University of Stuttgart. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * and the Apache License 2.0 which both accompany this distribution, | ||
| * and are available at http://www.eclipse.org/legal/epl-v20.html | ||
| * and http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
| import { NgModule } from '@angular/core'; | ||
|
|
||
| import { FormsModule } from '@angular/forms'; | ||
| import { BrowserModule } from '@angular/platform-browser'; | ||
| import { WineryMarkdownComponent } from './wineryMarkdown.component'; | ||
| import { MarkdownModule } from 'angular2-markdown'; | ||
|
|
||
| @NgModule({ | ||
| imports: [ | ||
| FormsModule, | ||
| BrowserModule, | ||
| MarkdownModule.forRoot(), | ||
|
|
||
| ], | ||
| exports: [WineryMarkdownComponent], | ||
| declarations: [WineryMarkdownComponent], | ||
| providers: [], | ||
| }) | ||
| export class WineryMarkdownModule { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,3 +25,7 @@ | |
| background-image: linear-gradient(#79d858, #569e3d); | ||
| border-color: #569e3d; | ||
| } | ||
|
|
||
| .pad-6px { | ||
| padding: 6px; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.