Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactored everything separating the front from the backend and having projects for container creation and another one for tests #223

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

refactored everything separating the front from the backend and having projects for container creation and another one for tests #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c45e3a
refactor to follow a pipeline and have independent projects
efqsouthworks Oct 5, 2021
cebdee3
added e2e tests
efqsouthworks Oct 7, 2021
b78b976
Added instructions for build and deploy
efqsouthworks Oct 7, 2021
728f03d
code cleanse
efqsouthworks Oct 7, 2021
85bf3f1
added build support for raspberry docker images
efqsouthworks Oct 10, 2021
aefbf38
disable frontend-plugin in eclipse
efqsouthworks Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions Dockerfile
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions LICENSE
View file
Open in desktop

This file was deleted.

2,271 changes: 22 additions & 2,249 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 0 additions & 43 deletions app.json
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions backend-docker-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM adoptopenjdk/openjdk11

ADD target/lib .
WORKDIR /

# Just echo so we can see, if everything is there :)
RUN ls -l

VOLUME /tmp

# Add Spring Boot app.jar to Container
RUN mv *.jar app.jar

ENV JAVA_OPTS=""

# Fire up our Spring Boot app by default
ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
54 changes: 54 additions & 0 deletions backend-docker-image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?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"
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>backend-docker-image</artifactId>
<packaging>pom</packaging>

<parent>
<groupId>de.jonashackt</groupId>
<artifactId>spring-boot-vuejs</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
</properties>

<dependencies>
<dependency>
<groupId>de.jonashackt</groupId>
<artifactId>backend</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
de.jonashackt
</includeGroupIds>
<outputDirectory>target/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
26 changes: 0 additions & 26 deletions backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,32 +105,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy Vue.js frontend content</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>src/main/resources/public</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${project.parent.basedir}/frontend/target/dist</directory>
<includes>
<include>static/</include>
<include>index.html</include>
<include>favicon.ico</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
24 changes: 24 additions & 0 deletions ...nd/src/main/java/de/jonashackt/springbootvuejs/configuration/ControllerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package de.jonashackt.springbootvuejs.configuration;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
public class ControllerConfiguration {

@Bean
public WebMvcConfigurer corsConfigurer() {
return new WebMvcConfigurer() {
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**").allowedOrigins(
"http://localhost",
"http://eduyayo.sytes.net",
"http://eduyayo.sytes.net:8080");
}
};
}

}
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# this configuration needs to correspond to the Vue.js frontends' vue.config.js devServer.proxy.target configuration!
# otherwise you may experience errors like: Proxy error: Could not proxy request /api/hello from localhost:8080 to http://localhost:8098... (ECONNREFUSED).
server.port=8098
server.port=8080
spring.security.user.name=sina
spring.security.user.password=miller
102 changes: 102 additions & 0 deletions e2e-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?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"
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>e2e-test</artifactId>
<packaging>jar</packaging>

<parent>
<groupId>de.jonashackt</groupId>
<artifactId>spring-boot-vuejs</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
</properties>

<dependencies>
<!-- allows reactor to order the other projects before this one -->
<dependency>
<groupId>de.jonashackt</groupId>
<artifactId>backend-docker-image</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>de.jonashackt</groupId>
<artifactId>frontend-docker-image</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>

<!-- embedded webdriver -->
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.0.3</version>
</dependency>

<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>com.dkanejs.maven.plugins</groupId>
<artifactId>docker-compose-maven-plugin</artifactId>
<version>4.0.0</version>
<executions>
<execution>
<id>up</id>
<phase>pre-integration-test</phase>
<goals>
<goal>up</goal>
</goals>
</execution>
<execution>
<id>down</id>
<phase>post-integration-test</phase>
<goals>
<goal>down</goal>
</goals>
</execution>
</executions>
<configuration>
<detachedMode>true</detachedMode>
<services>
<service>frontend</service>
<service>backend</service>
</services>
<composeFile>${project.basedir}/src/test/resources/docker-compose.yml</composeFile>
</configuration>
</plugin>
</plugins>
</build>

</project>
Loading