Skip to content

Commit

Permalink
Merge pull request #8 from Nano-Vaadin-Demos/release/01.00.00-RPM
Browse files Browse the repository at this point in the history
Release/01.00.00 rpm
  • Loading branch information
svenruppert committed Oct 4, 2019
2 parents 8222ac7 + cf9414c commit 70f4a79
Show file tree
Hide file tree
Showing 27 changed files with 908 additions and 35 deletions.
53 changes: 50 additions & 3 deletions 01_impl/pom.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2017 Sven Ruppert ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<groupId>org.rapidpm.vaadin</groupId>
<version>00.07.05-RPM-SNAPSHOT</version>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<version>01.00.00-RPM</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>nano-vaadin-jetty</artifactId>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<!-- <finalName>vaadin-app</finalName>-->
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.rapidpm.vaadin.nano.CoreUIServiceJava</Main-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**
* Copyright © 2017 Sven Ruppert ([email protected])
* <p>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -52,10 +52,10 @@ public class CoreUIServiceJava
public static final String CLI_PORT = "port";

public static void main(String[] args) throws ParseException {
new CoreUIServiceJava().executeCLIOLDY(args).startup();
new CoreUIServiceJava().executeCLI(args).startup();
}

public CoreUIServiceJava executeCLIOLDY(String[] args) throws ParseException {
public CoreUIServiceJava executeCLI(String[] args) throws ParseException {
final Options options = new Options();
options.addOption(CLI_HOST, true, "host to use");
options.addOption(CLI_PORT, true, "port to use");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
/**
* Copyright © 2017 Sven Ruppert ([email protected])
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
22 changes: 20 additions & 2 deletions 02_test/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2017 Sven Ruppert ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<groupId>org.rapidpm.vaadin</groupId>
<version>00.07.05-RPM-SNAPSHOT</version>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<version>01.00.00-RPM</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -23,4 +40,5 @@
</snapshotRepository>
</distributionManagement>


</project>
1 change: 1 addition & 0 deletions 03_demo/frontend/src/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Place your Vaadin Designer or hand written templates in this folder.
3 changes: 3 additions & 0 deletions 03_demo/frontend/styles/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Place your optional styles in this folder.

See https://vaadin.com/docs/flow/theme/theming-overview.html for getting started on theming Vaadin applications.
133 changes: 133 additions & 0 deletions 03_demo/frontend/styles/shared-styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/*
* Copyright © 2013 Sven Ruppert ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// import "@vaadin/vaadin-charts/theme/vaadin-chart-default-theme";

const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `
<custom-style>
<style>
html {
--lumo-font-size: 1rem;
--lumo-font-size-xxxl: 1.75rem;
--lumo-font-size-xxl: 1.375rem;
--lumo-font-size-xl: 1.125rem;
--lumo-font-size-l: 1rem;
--lumo-font-size-m: 0.875rem;
--lumo-font-size-s: 0.8125rem;
--lumo-font-size-xs: 0.75rem;
--lumo-font-size-xxs: 0.6875rem;
--lumo-line-height-m: 1.4;
--lumo-line-height-s: 1.2;
--lumo-line-height-xs: 1.1;
--lumo-border-radius: calc(var(--lumo-size-m) / 2);
--lumo-size-xl: 3rem;
--lumo-size-l: 2.5rem;
--lumo-size-m: 2rem;
--lumo-size-s: 1.75rem;
--lumo-size-xs: 1.5rem;
--lumo-space-xl: 1.875rem;
--lumo-space-l: 1.25rem;
--lumo-space-m: 0.625rem;
--lumo-space-s: 0.3125rem;
--lumo-space-xs: 0.1875rem;
}
</style>
</custom-style>
<dom-module id="button-style" theme-for="vaadin-button">
<template>
<style>
:host(:not([theme~="tertiary"])) {
background-image: linear-gradient(var(--lumo-tint-5pct), var(--lumo-shade-5pct));
box-shadow: inset 0 0 0 1px var(--lumo-contrast-20pct);
}
:host(:not([theme~="tertiary"]):not([theme~="primary"]):not([theme~="error"]):not([theme~="success"])) {
color: var(--lumo-body-text-color);
}
:host([theme~="primary"]) {
text-shadow: 0 -1px 0 var(--lumo-shade-20pct);
}
</style>
</template>
</dom-module>
<custom-style>
<style>
html {
overflow:hidden;
}
vaadin-app-layout vaadin-tab a:hover {
text-decoration: none;
}
</style>
</custom-style>
<dom-module id="app-layout-theme" theme-for="vaadin-app-layout">
<template>
<style>
[part="navbar"] {
align-items: center;
justify-content: center;
}
</style>
</template>
</dom-module>
<!--<dom-module id="chart" theme-for="vaadin-chart">-->
<!-- <template>-->
<!-- <style include="vaadin-chart-default-theme">-->
<!-- :host {-->
<!-- &#45;&#45;vaadin-charts-color-0: var(&#45;&#45;lumo-primary-color);-->
<!-- &#45;&#45;vaadin-charts-color-1: var(&#45;&#45;lumo-error-color);-->
<!-- &#45;&#45;vaadin-charts-color-2: var(&#45;&#45;lumo-success-color);-->
<!-- &#45;&#45;vaadin-charts-color-3: var(&#45;&#45;lumo-contrast);-->
<!-- }-->
<!-- .highcharts-container {-->
<!-- font-family: var(&#45;&#45;lumo-font-family);-->
<!-- }-->
<!-- .highcharts-background {-->
<!-- fill: var(&#45;&#45;lumo-base-color);-->
<!-- }-->
<!-- .highcharts-title {-->
<!-- fill: var(&#45;&#45;lumo-header-text-color);-->
<!-- font-size: var(&#45;&#45;lumo-font-size-xl);-->
<!-- font-weight: 600;-->
<!-- line-height: var(&#45;&#45;lumo-line-height-xs);-->
<!-- }-->
<!-- .highcharts-legend-item text {-->
<!-- fill: var(&#45;&#45;lumo-body-text-color);-->
<!-- }-->
<!-- .highcharts-axis-title,-->
<!-- .highcharts-axis-labels {-->
<!-- fill: var(&#45;&#45;lumo-secondary-text-color);-->
<!-- }-->
<!-- .highcharts-axis-line,-->
<!-- .highcharts-grid-line,-->
<!-- .highcharts-tick {-->
<!-- stroke: var(&#45;&#45;lumo-contrast-10pct);-->
<!-- }-->
<!-- .highcharts-column-series rect.highcharts-point {-->
<!-- stroke: var(&#45;&#45;lumo-base-color);-->
<!-- }-->
<!-- </style>-->
<!-- </template>-->
<!--</dom-module>-->`;

document.head.appendChild($_documentContainer.content);
91 changes: 91 additions & 0 deletions 03_demo/frontend/styles/views/dashboard/dashboard-view.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/**
* Copyright © 2013 Sven Ruppert ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#dashboard-view {
background-color: var(--lumo-contrast-10pct);
box-sizing: border-box;
display: block;
font-size: var(--lumo-font-size-m);
height: 100%;
overflow: auto;
padding: var(--lumo-space-m) var(--lumo-space-l);
}


/*vaadin-board {*/
/* margin: 0 auto;*/
/* max-width: 1024px;*/
/*}*/

/* Wrapper */
.wrapper {
display: flex;
padding: var(--lumo-space-s);
}

/* Card */
.card {
align-items: baseline;
background-color: var(--lumo-base-color);
border-radius: var(--lumo-border-radius);
box-shadow: var(--lumo-box-shadow-xs);
display: flex;
flex-direction: column;
overflow: hidden;
width: 100%;
}

.card h2 {
margin-bottom: 0;
margin-top: var(--lumo-space-m);
}

.card h3 {
margin-bottom: var(--lumo-space-xs);
margin-left: var(--lumo-space-m);
margin-top: var(--lumo-space-m);
}

/* Spacing */
.space-m {
padding: var(--lumo-space-m);
}

/* Text colors */
.error-text {
color: var(--lumo-error-text-color);
}

.primary-text {
color: var(--lumo-primary-text-color);
}

.secondary-text {
color: var(--lumo-secondary-text-color);
}

.success-text {
color: var(--lumo-success-text-color);
}

/* Charts */
vaadin-chart {
padding-top: var(--lumo-space-s);
}

/* Grid */
vaadin-grid {
height: 300px;
}
Loading

0 comments on commit 70f4a79

Please sign in to comment.