Skip to content

Commit

Permalink
[AMORO-3146] Pull amoro-ams-dashboard out of ams-ams as amoro-web (#3147
Browse files Browse the repository at this point in the history
)

* Pull amoro-ams-dashboard out of ams as ams-admin

* Remove amoro-ams-dashboard module

* Modify name to amoro-web

* Modify outer pom names

* remove node under amoro-web

* Modify gitignore of outer module

* Add .ignore under amoro-web and remove src/main folder

---------

Co-authored-by: majin.nathan <[email protected]>
Co-authored-by: baiyangtx <[email protected]>
  • Loading branch information
3 people authored Aug 31, 2024
1 parent 63eb99b commit 9110716
Show file tree
Hide file tree
Showing 177 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- "amoro-ams/amoro-ams-server/**/*"

"module:ams-dashboard":
- "amoro-ams/amoro-ams-dashboard/**/*"
- "amoro-web/**/*"

"module:ams-optimizer":
- "amoro-ams/amoro-ams-optimizer/**/*"
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ conf/
*.tgz

# dashboard static resources
amoro-ams/amoro-ams-dashboard/src/main/resources/static/
amoro-ams/amoro-ams-dashboard/node/
amoro-web/src/main/resources/static/
amoro-web/node/

!amoro-ams/dist/src/main/amoro-bin/bin/
!amoro-ams/dist/src/main/amoro-bin/conf/
2 changes: 1 addition & 1 deletion amoro-ams/amoro-ams-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<dependency>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-ams-dashboard</artifactId>
<artifactId>amoro-web</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
1 change: 0 additions & 1 deletion amoro-ams/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

<modules>
<module>amoro-ams-server</module>
<module>amoro-ams-dashboard</module>
<module>amoro-ams-optimizer</module>
<module>amoro-ams-metrics</module>
<module>dist</module>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ node_modules
.env.local
.env.*.local

components.d.ts
components.d.ts
File renamed without changes.
File renamed without changes.
30 changes: 15 additions & 15 deletions amoro-ams/amoro-ams-dashboard/README.md → amoro-web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This is the Dashboard frontend for Amoro Management Service (AMS).

## Installing Dependencies

In the `amoro-ams/amoro-ams-dashboard` directory, run `pnpm install` to install all the dependencies.
In the `amoro-web` directory, run `pnpm install` to install all the dependencies.

## Running Locally

Expand All @@ -35,13 +35,13 @@ After completing the [Installing Dependencies](#Installing Dependencies) step, y

<b>If You are a frontend developer</b>

In the `amoro-ams/amoro-ams-dashboard` directory, run `pnpm dev:mock` to start a development server for the dashboard app at `http://127.0.0.1:8080`.
In the `amoro-web` directory, run `pnpm dev:mock` to start a development server for the dashboard app at `http://127.0.0.1:8080`.

<b>If You not. You just running `pnpm dev`</b>

### Configure the ams Server to connect to

1. open the `vite.config.ts` under the folder `amoro-ams/amoro-ams-dashboard`
1. open the `vite.config.ts` under the folder `amoro-web`

2. find the `proxy` configuration then unpack annotations and change the `target` to you server location

Expand Down Expand Up @@ -69,12 +69,12 @@ proxy: {

## Building Project

In the `amoro-ams/amoro-ams-dashboard` directory, run `pnpm build` to prepare the dashboard for deployment.
In the `amoro-web` directory, run `pnpm build` to prepare the dashboard for deployment.

## Top Level Directory Structure

```
amoro-ams/amoro-ams-dashboard
amoro-web
|-- mock
|-- public
|-- src
Expand All @@ -91,13 +91,13 @@ amoro-ams/amoro-ams-dashboard
|-- pnpm-lock
```

- [public](amoro-ams/amoro-ams-dashboard/public): The index.html and favicon.ico of this project.
- [src](amoro-ams/amoro-ams-dashboard/src): The source files of this project.
- [src/components](amoro-ams/amoro-ams-dashboard/src/components): All the shared components in the repo, can be used in all views.
- [src/views](amoro-ams/amoro-ams-dashboard/src/views): All the views.
- [src/services](amoro-ams/amoro-ams-dashboard/src/services): The services for the feature component to communicate with ams server.
- [src/utils](amoro-ams/amoro-ams-dashboard/src/utils): The utility functions in this project.
- [src/App.vue](amoro-ams/amoro-ams-dashboard/src/main.tsx): The entrance of this project.
- [vite.config.ts](/amoro-ams/amoro-ams-dashboard/vite.config.ts): The configuration file of vue3.
- [package.json](amoro-ams/amoro-ams-dashboard/package.json): The project build files and package management, it defines the scripts/tasks and the dependent packages for this project.
- [pnpm-lock.yaml](amoro-ams/amoro-ams-dashboard/pnpm-lock.yaml): The package management pnpm lock file.
- [public](amoro-web/public): The index.html and favicon.ico of this project.
- [src](amoro-web/src): The source files of this project.
- [src/components](amoro-web/src/components): All the shared components in the repo, can be used in all views.
- [src/views](amoro-web/src/views): All the views.
- [src/services](amoro-web/src/services): The services for the feature component to communicate with ams server.
- [src/utils](amoro-web/src/utils): The utility functions in this project.
- [src/App.vue](amoro-web/src/main.tsx): The entrance of this project.
- [vite.config.ts](/amoro-web/vite.config.ts): The configuration file of vue3.
- [package.json](amoro-web/package.json): The project build files and package management, it defines the scripts/tasks and the dependent packages for this project.
- [pnpm-lock.yaml](amoro-web/pnpm-lock.yaml): The package management pnpm lock file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions amoro-ams/amoro-ams-dashboard/pom.xml → amoro-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-ams</artifactId>
<artifactId>amoro-parent</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>

<artifactId>amoro-ams-dashboard</artifactId>
<artifactId>amoro-web</artifactId>
<packaging>jar</packaging>
<name>Amoro Project AMS Dashboard</name>
<url>https://amoro.apache.org</url>
Expand All @@ -38,7 +38,7 @@
</properties>

<build>
<finalName>amoro-ams-dashboard-${project.version}</finalName>
<finalName>amoro-web-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

<modules>
<module>amoro-common</module>
<module>amoro-web</module>
<module>amoro-ams</module>
<module>amoro-iceberg-format</module>
<module>amoro-mixed-format</module>
Expand Down

0 comments on commit 9110716

Please sign in to comment.