Skip to content

Commit

Permalink
update deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
vegegoku committed Sep 14, 2023
1 parent 1a3312e commit 51e1f75
Show file tree
Hide file tree
Showing 12 changed files with 145 additions and 96 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private void sample4() {
.offset4()
.appendChild(Card.create()
.fitContent()
.appendChild(img("/images/login/login-bg-1.jpg")
.appendChild(img("images/login/login-bg-1.jpg")
.css(Styles.img_responsive))
.appendChild(DominoElement.of(div().css(Styles.padding_20))
.appendChild(TextBox.create("User name")
Expand Down Expand Up @@ -170,7 +170,7 @@ private void sample5() {
.css(Styles.align_center)
.css(Styles.padding_30)
.css("avatar-container")
.add(img("/images/login/login-bg-2.png")
.add(img("images/login/login-bg-2.png")
.css(Styles.img_responsive)
.css(Elevation.LEVEL_1.getStyle())
.css("login-avatar")))
Expand Down Expand Up @@ -209,7 +209,7 @@ private void sample6() {
.condense()
.appendChild(div()
.css("avatar-container")
.add(img("/images/greyscale-1.jpg")
.add(img("images/greyscale-1.jpg")
.css(Styles.img_responsive))))
.appendChild(Column.span6()
.condense()
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<vertx.version>3.9.4</vertx.version>
<vertx.version>3.9.16</vertx.version>
<elemento.version>1.0.3</elemento.version>
<elemental2.version>1.1.0</elemental2.version>
<domino.jackson.version>1.0.0</domino.jackson.version>
<domino.history.version>1.0.0</domino.history.version>
<domino.ui.version>2.0.0-RC3</domino.ui.version>
<domino.mvp.version>2.0.0-RC2</domino.mvp.version>
<domino.mvp.version>HEAD-SNAPSHOT</domino.mvp.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected HTMLDivElement init() {
.addCss(dui_text_center)
.appendChild(
Card.create()
.appendChild(img("./images/samples/dominodo.png")
.appendChild(img("images/samples/dominodo.png")
.addCss(dui_image_responsive, dui_elevation_1)
)
.appendChild(h(4).textContent("DominoDo"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,38 +168,38 @@ private void horizontalSpin() {
.appendChild(SpinItem.create("item 1")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/jordan.png")
.appendChild(img("images/flags/jordan.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 2").appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/oman.png")
.appendChild(img("images/flags/oman.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 3")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/palestine.png")
.appendChild(img("images/flags/palestine.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 4")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/brazil.png")
.appendChild(img("images/flags/brazil.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 5")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/european-union.png")
.appendChild(img("images/flags/european-union.png")
.addCss(dui_h_12, dui_w_12)
)
)
Expand Down Expand Up @@ -380,38 +380,38 @@ private void verticalSpin() {
.appendChild(SpinItem.create("item 1")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/jordan.png")
.appendChild(img("images/flags/jordan.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 2").appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/oman.png")
.appendChild(img("images/flags/oman.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 3")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/palestine.png")
.appendChild(img("images/flags/palestine.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 4")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/brazil.png")
.appendChild(img("images/flags/brazil.png")
.addCss(dui_h_12, dui_w_12)
)
)
)
.appendChild(SpinItem.create("item 5")
.appendChild(div()
.addCss(dui_min_h_12, dui_flex, dui_items_center, dui_justify_center)
.appendChild(img("/images/flags/european-union.png")
.appendChild(img("images/flags/european-union.png")
.addCss(dui_h_12, dui_w_12)
)
)
Expand Down
49 changes: 7 additions & 42 deletions ui-demo-backend/src/main/resources/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,21 @@

<html>
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<!-- <script async src="https://www.googletagmanager.com/gtag/js?id=UA-143772295-1"></script>-->
<!-- <script>-->
<!-- window.dataLayer = window.dataLayer || [];-->
<!-- function gtag(){dataLayer.push(arguments);}-->
<!-- gtag('js', new Date());-->

<!-- gtag('config', 'UA-143772295-1');-->
<!-- </script>-->

<!-- &lt;!&ndash; Google Tag Manager &ndash;&gt;-->
<!-- <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':-->
<!-- new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],-->
<!-- j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=-->
<!-- 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);-->
<!-- })(window,document,'script','dataLayer','GTM-KRZMCDW');</script>-->
<!-- &lt;!&ndash; End Google Tag Manager &ndash;&gt;-->

<meta charset=UTF-8>
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">

<!-- <link type="text/css" rel="stylesheet" href="/fontawesome/css/fontawesome-all.css">-->
<link href="/css/domino-ui/domino-ui.css" rel="stylesheet" type="text/css">
<!-- <link type="text/css" rel="stylesheet" href="/css/themes/all-themes.css">-->
<link href="/dev.css" rel="stylesheet" type="text/css">
<!-- <link href="/domino-ui-theme-default.css" rel="stylesheet" type="text/css">-->
<!-- <link href="/domino-ui-colors-dark.css" rel="stylesheet" type="text/css">-->
<!-- <link href="/domino-ui-colors-light.css" rel="stylesheet" type="text/css">-->
<link href="/ui-demo.css" rel="stylesheet" type="text/css">
<link href="/prettify/prettify.css" rel="stylesheet" type="text/css">
<link href="/prettify/desert.css" rel="stylesheet" type="text/css">
<link href="/domino-ui/demo/v2/css/domino-ui/domino-ui.css" rel="stylesheet" type="text/css">
<link href="/domino-ui/demo/v2/dev.css" rel="stylesheet" type="text/css">
<link href="/domino-ui/demo/v2/ui-demo.css" rel="stylesheet" type="text/css">
<link href="/domino-ui/demo/v2/prettify/prettify.css" rel="stylesheet" type="text/css">
<link href="/domino-ui/demo/v2/prettify/desert.css" rel="stylesheet" type="text/css">

<title>ui-demo</title>
<script src="/prettify/prettify.js" type="text/javascript"></script>
<script src="/app.nocache.js"></script>

<script>
((window.gitter = {}).chat = {}).options = {
room: 'domino-gwt/domino-ui'
};

</script>
<!-- <script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>-->
<script src="/domino-ui/demo/v2/prettify/prettify.js" type="text/javascript"></script>
<script src="/domino-ui/demo/v2/app.nocache.js"></script>
</head>

<body class="">
<!--&lt;!&ndash; Google Tag Manager (noscript) &ndash;&gt;-->
<!--<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KRZMCDW"-->
<!-- height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>-->
<!--&lt;!&ndash; End Google Tag Manager (noscript) &ndash;&gt;-->
<iframe id="__gwt_historyFrame" src="javascript:''" style="position:absolute;width:0;height:0;border:0"
tabIndex='-1'></iframe>

Expand Down
3 changes: 2 additions & 1 deletion ui-demo-backend/src/main/resources/config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"http.port": 8090
"http.port": 8090,
"app.root.path": ""
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@ public class AppClientModule implements EntryPoint {
private static final Logger LOGGER = Logger.getLogger(AppClientModule.class.getName());

public void onModuleLoad() {
DominoUIConfig.CONFIG.setElementsFactory(new ElementsFactoryDelegate() {
@Override
public AnchorElement a() {
return new AnchorElement(dom.a())
.setAttribute("tabindex", "0")
.setAttribute("aria-expanded", "true");
}
});
DominoGWT.init(DominoViewOptions.getInstance());

DominoGWT.init(DominoViewOptions.getInstance().setRootPath("domino-ui/demo/v2"));
DominoThemeManager.INSTANCE.applyUserThemes();
ClientApp.make().run();
LOGGER.info("ui-demo Application frontend have been initialized.");
Expand Down
7 changes: 6 additions & 1 deletion ui-demo-server/ui-demo-server-backend/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -36,6 +36,11 @@
<artifactId>ui-demo-server-shared</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-templ-freemarker</artifactId>
<version>3.9.16</version>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.json.Json;
import io.vertx.core.json.JsonObject;
import org.dominokit.domino.api.server.entrypoint.ServerAppEntryPoint;
import org.dominokit.domino.api.server.entrypoint.VertxContext;
import org.dominokit.domino.api.server.plugins.IndexPageContext;
import org.dominokit.domino.uidemoserver.shared.model.ContactList;
import org.dominokit.domino.uidemoserver.shared.model.ContactList_MapperImpl;

Expand All @@ -15,6 +17,9 @@
public class DemoServerEntryPoint implements ServerAppEntryPoint<VertxContext> {
@Override
public void onModulesLoaded(VertxContext vertxContext) {
JsonObject indexContext = new JsonObject();
indexContext.put("appRootPath", vertxContext.config().getString("app.root.path"));
IndexPageContext.INSTANCE.setIndexPageProvider(new DynamicIndexPageProvider(indexContext));
vertxContext
.router()
.route(HttpMethod.GET, "/service/contacts")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package org.dominokit.domino.uidemoserver.server.resources;

import com.google.auto.service.AutoService;
import io.vertx.core.http.HttpServerResponse;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.templ.freemarker.FreeMarkerTemplateEngine;
import org.dominokit.domino.api.server.PluginContext;
import org.dominokit.domino.api.server.plugins.IndexPageProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@AutoService(IndexPageProvider.class)
public class DynamicIndexPageProvider implements IndexPageProvider {

public static final Logger LOGGER = LoggerFactory.getLogger(DynamicIndexPageProvider.class);
private final JsonObject engineContext = new JsonObject();

public DynamicIndexPageProvider(JsonObject engineContext) {
this.engineContext.mergeIn(engineContext);
}

@Override
public HttpServerResponse serveIndexPage(PluginContext context, RoutingContext routingContext, int statusCode) {
LOGGER.info("Loading index page using dynamic index page loader...");
FreeMarkerTemplateEngine engine = FreeMarkerTemplateEngine.create(context.getVertx());

HttpServerResponse response = routingContext
.response()
.setStatusCode(statusCode)
.putHeader("Content-type", "text/html");

engine.render(engineContext
, "templates/index.ftl", processedTemplate -> {
if(processedTemplate.succeeded()) {
String content = processedTemplate.result().toString();
response.putHeader("Content-length", content.length() + "")
.write(content);
response.end();
}else{
response.end();
LOGGER.error("failed to process index page template : ", processedTemplate.cause());
}
});

return response;
}

}

0 comments on commit 51e1f75

Please sign in to comment.