Skip to content

Commit

Permalink
#17: Fix the build process + localize hosted stylesheet for material-…
Browse files Browse the repository at this point in the history
…icons/bootstraps
  • Loading branch information
Danil Ko committed Nov 21, 2020
1 parent d701b90 commit f9ecaf9
Show file tree
Hide file tree
Showing 134,122 changed files with 6,401,725 additions and 95 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
48 changes: 42 additions & 6 deletions controller-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
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>

<artifactId>controller.server</artifactId>
<artifactId>controller-server</artifactId>
<packaging>jar</packaging>

<parent>
<groupId>com.musicutility</groupId>
<artifactId>controller-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -20,6 +20,13 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>controller-web</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand All @@ -35,10 +42,9 @@
<version>1.13</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>controller.web</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<groupId>com.fazecast</groupId>
<artifactId>jSerialComm</artifactId>
<version>[2.0.0,3.0.0)</version>
</dependency>
</dependencies>
<build>
Expand All @@ -63,6 +69,36 @@
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources-material-design-icons-iconfont</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes/resources/node_modules/material-design-icons-iconfont/</outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/controller-web/src/main/web/node_modules/material-design-icons-iconfont/</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources-bootstrap</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes/resources/node_modules/bootstrap/</outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/controller-web/src/main/web/node_modules/bootstrap/</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
11 changes: 9 additions & 2 deletions controller-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
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>

<groupId>com.musicutility</groupId>
<artifactId>controller-web</artifactId>
<packaging>pom</packaging>

<parent>
<groupId>com.musicutility</groupId>
<artifactId>controller-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand All @@ -30,6 +30,13 @@
<goal>install-node-and-npm</goal>
</goals>
</execution>
<execution>
<!-- Save the material icon locally hosted https://stackoverflow.com/a/46529620 -->
<id>npm install material-design-icons-iconfont --save</id>
<goals>
<goal>npm</goal>
</goals>
</execution>
<execution>
<id>npm install</id>
<goals>
Expand Down
Binary file not shown.
18 changes: 18 additions & 0 deletions controller-web/src/main/web/dist/musicutility/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Musicutility</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet"
href="node_modules/bootstrap/dist/css/bootstrap.css">
<style>
@import url('node_modules/material-design-icons-iconfont/dist/material-design-icons.css');
</style>
</head>
<body>
<app-root></app-root>
<script src="polyfills-es5.js" nomodule defer></script><script src="polyfills-es2015.js" type="module"></script><script src="styles-es2015.js" type="module"></script><script src="styles-es5.js" nomodule defer></script><script src="runtime-es2015.js" type="module"></script><script src="vendor-es2015.js" type="module"></script><script src="main-es2015.js" type="module"></script><script src="runtime-es5.js" nomodule defer></script><script src="vendor-es5.js" nomodule defer></script><script src="main-es5.js" nomodule defer></script></body>
</html>
1,518 changes: 1,518 additions & 0 deletions controller-web/src/main/web/dist/musicutility/main-es2015.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

100 changes: 100 additions & 0 deletions controller-web/src/main/web/dist/musicutility/main-es5.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit f9ecaf9

Please sign in to comment.