Skip to content

Commit 997c4c3

Browse files
change ui module (#118)
* change ui module * change ui module
1 parent 919b99e commit 997c4c3

File tree

320 files changed

+138
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+138
-102
lines changed

.github/workflows/ci-actions.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
- "README.md"
1212

1313
jobs:
14-
jvm-tests:
15-
name: JVM Tests
14+
backend-jvm-tests:
15+
name: Backend JVM Tests
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v2
@@ -24,8 +24,8 @@ jobs:
2424
- name: Maven
2525
run: mvn test
2626

27-
ui-tests:
28-
name: UI Tests
27+
admin-console-tests:
28+
name: Admin Console Tests
2929
runs-on: ubuntu-latest
3030
strategy:
3131
matrix:
@@ -37,12 +37,12 @@ jobs:
3737
with:
3838
node-version: ${{ matrix.node-version }}
3939
- name: Build
40-
working-directory: server/src/main/webapp
40+
working-directory: admin-console/src/main/webapp
4141
run: |
4242
yarn install
4343
yarn build
4444
- name: Test
45-
working-directory: server/src/main/webapp
45+
working-directory: admin-console/src/main/webapp
4646
run: yarn test --coverage --watchAll=false
4747
- uses: codecov/codecov-action@v2.1.0
4848
with:

.github/workflows/container-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
distribution: temurin
1919
cache: maven
2020
- name: Build jvm container image
21-
run: mvn -U -B package --file server/pom.xml -Pcontainer-image -DskipTests \
21+
run: mvn -U -B package --file backend/pom.xml -Pcontainer-image -DskipTests \
2222
-Dquarkus.native.container-build=false \
2323
-Dquarkus.container-image.push=true \
2424
-Dquarkus.container-image.build=true \
@@ -28,5 +28,5 @@ jobs:
2828
-Dquarkus.container-image.tag=early-access \
2929
-Dquarkus.container-image.username=${{ secrets.QUAYIO_USERNAME }} \
3030
-Dquarkus.container-image.password=${{ secrets.QUAYIO_PASSWORD }} \
31-
-P ui
31+
-P admin-console
3232

.github/workflows/pr-build-container-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Build jvm container image
2424
run: |
25-
mvn -U -B package --file server/pom.xml -DskipTests \
25+
mvn -U -B package --file backend/pom.xml -DskipTests \
2626
-Dquarkus.container-image.build=true \
2727
-Dquarkus.container-image.push=true \
2828
-Dquarkus.container-image.build=true \
@@ -32,4 +32,4 @@ jobs:
3232
-Dquarkus.container-image.tag=${{ steps.extract_branch.outputs.branch }} \
3333
-Dquarkus.container-image.username=${{ github.actor }} \
3434
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }} \
35-
-P ui
35+
-P admin-console

README.md

Lines changed: 2 additions & 2 deletions

admin-console/pom.xml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
4+
Copyright 2019 Project OpenUBL, Inc. and/or its affiliates
5+
and other contributors as indicated by the @author tags.
6+
7+
Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
19+
-->
20+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 camel-quarkus-aws2-s3:https://maven.apache.org/xsd/maven-4.0.0.xsd"
21+
xmlns="http://maven.apache.org/POM/4.0.0"
22+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
23+
<modelVersion>4.0.0</modelVersion>
24+
25+
<parent>
26+
<groupId>io.github.project-openubl</groupId>
27+
<artifactId>ublhub-parent</artifactId>
28+
<version>2.0.0-SNAPSHOT</version>
29+
</parent>
30+
31+
<name>UblHub :: Admin Console</name>
32+
<artifactId>admin-console</artifactId>
33+
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<groupId>com.github.eirslett</groupId>
38+
<artifactId>frontend-maven-plugin</artifactId>
39+
<version>1.12.1</version>
40+
<configuration>
41+
<workingDirectory>${project.basedir}/src/main/webapp</workingDirectory>
42+
<installDirectory>target</installDirectory>
43+
</configuration>
44+
<executions>
45+
<execution>
46+
<id>install node and yarn</id>
47+
<goals>
48+
<goal>install-node-and-yarn</goal>
49+
</goals>
50+
<configuration>
51+
<nodeVersion>v12.22.7</nodeVersion>
52+
<yarnVersion>v1.22.15</yarnVersion>
53+
</configuration>
54+
</execution>
55+
<execution>
56+
<id>yarn install</id>
57+
<goals>
58+
<goal>yarn</goal>
59+
</goals>
60+
<configuration>
61+
<arguments>install --network-timeout 600000</arguments>
62+
</configuration>
63+
</execution>
64+
<execution>
65+
<id>yarn run build</id>
66+
<goals>
67+
<goal>yarn</goal>
68+
</goals>
69+
<configuration>
70+
<arguments>run build</arguments>
71+
</configuration>
72+
</execution>
73+
</executions>
74+
</plugin>
75+
</plugins>
76+
</build>
77+
</project>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)