Skip to content

Commit

Permalink
refactor: Renamed the frontend directory inside the frontend module t…
Browse files Browse the repository at this point in the history 
…o "project"
  • Loading branch information
@chrisdutz
chrisdutz committed Jan 21, 2024
1 parent dbbcbd5 commit 663bf95
Show file tree
Hide file tree
Showing 31 changed files with 17 additions and 190 deletions.
191 changes: 9 additions & 182 deletions .gitignore
View file
Expand Up @@ -201,188 +201,15 @@ DartConfiguration.tcl
/out/
/.idea/codeStyles/codeStyleConfig.xml
/.idea/codeStyles/Project.xml
/.idea/.name

# Develocity
.mvn/.gradle-enterprise/
/plc4j/tools/ui/frontend/frontend/node/
/plc4j/tools/ui/frontend/frontend/node_modules/
/plc4j/tools/ui/frontend/frontend/dist/
/plc4j/tools/ui/backend/storage/settings/log/log.ctrl
/plc4j/tools/ui/backend/storage/settings/log/log1.dat
/plc4j/tools/ui/backend/storage/settings/log/logmirror.ctrl
/plc4j/tools/ui/backend/storage/settings/log/README_DO_NOT_TOUCH_FILES.txt
/plc4j/tools/ui/backend/storage/settings/seg0/c1a1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c1b1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c1c0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c1d1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c1e0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c1f1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c2a1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c2b1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c2c1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c2d0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c2e1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c2f0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c3a1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c3b1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c3c0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c3d1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c3e1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c3f1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c4a1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c4b0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c4c1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c4d0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c4e1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c4f1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c10.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c20.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c31.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c41.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c51.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c60.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c71.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c81.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c90.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c101.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c111.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c121.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c130.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c141.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c150.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c161.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c171.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c180.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c191.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c200.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c211.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c221.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c230.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c241.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c251.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c260.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c271.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c281.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c290.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c300.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c311.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c321.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c331.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c340.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c351.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c361.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c371.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c380.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c391.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c400.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c411.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c421.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c430.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c441.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c451.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c461.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c470.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c481.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c490.dat
/plc4j/tools/ui/backend/storage/settings/seg0/c501.dat
/plc4j/tools/ui/backend/storage/settings/seg0/ca1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/cb1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/cc0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/cd1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/ce1.dat
/plc4j/tools/ui/backend/storage/settings/seg0/cf0.dat
/plc4j/tools/ui/backend/storage/settings/seg0/README_DO_NOT_TOUCH_FILES.txt
/plc4j/tools/ui/backend/storage/settings/db.lck
/plc4j/tools/ui/backend/storage/settings/dbex.lck
/plc4j/tools/ui/backend/storage/settings/README_DO_NOT_TOUCH_FILES.txt
/plc4j/tools/ui/backend/storage/settings/service.properties
/.idea/.name
/storage/settings/log/log.ctrl
/storage/settings/log/log1.dat
/storage/settings/log/logmirror.ctrl
/storage/settings/log/README_DO_NOT_TOUCH_FILES.txt
/storage/settings/seg0/c1a1.dat
/storage/settings/seg0/c1b1.dat
/storage/settings/seg0/c1c0.dat
/storage/settings/seg0/c1d1.dat
/storage/settings/seg0/c1e0.dat
/storage/settings/seg0/c1f1.dat
/storage/settings/seg0/c2a1.dat
/storage/settings/seg0/c2b1.dat
/storage/settings/seg0/c2c1.dat
/storage/settings/seg0/c2d0.dat
/storage/settings/seg0/c2e1.dat
/storage/settings/seg0/c2f0.dat
/storage/settings/seg0/c3a1.dat
/storage/settings/seg0/c3b1.dat
/storage/settings/seg0/c3c0.dat
/storage/settings/seg0/c3d1.dat
/storage/settings/seg0/c3e1.dat
/storage/settings/seg0/c3f1.dat
/storage/settings/seg0/c4a1.dat
/storage/settings/seg0/c4b0.dat
/storage/settings/seg0/c4c1.dat
/storage/settings/seg0/c4d0.dat
/storage/settings/seg0/c4e1.dat
/storage/settings/seg0/c4f1.dat
/storage/settings/seg0/c10.dat
/storage/settings/seg0/c20.dat
/storage/settings/seg0/c31.dat
/storage/settings/seg0/c41.dat
/storage/settings/seg0/c51.dat
/storage/settings/seg0/c60.dat
/storage/settings/seg0/c71.dat
/storage/settings/seg0/c81.dat
/storage/settings/seg0/c90.dat
/storage/settings/seg0/c101.dat
/storage/settings/seg0/c111.dat
/storage/settings/seg0/c121.dat
/storage/settings/seg0/c130.dat
/storage/settings/seg0/c141.dat
/storage/settings/seg0/c150.dat
/storage/settings/seg0/c161.dat
/storage/settings/seg0/c171.dat
/storage/settings/seg0/c180.dat
/storage/settings/seg0/c191.dat
/storage/settings/seg0/c200.dat
/storage/settings/seg0/c211.dat
/storage/settings/seg0/c221.dat
/storage/settings/seg0/c230.dat
/storage/settings/seg0/c241.dat
/storage/settings/seg0/c251.dat
/storage/settings/seg0/c260.dat
/storage/settings/seg0/c271.dat
/storage/settings/seg0/c281.dat
/storage/settings/seg0/c290.dat
/storage/settings/seg0/c300.dat
/storage/settings/seg0/c311.dat
/storage/settings/seg0/c321.dat
/storage/settings/seg0/c331.dat
/storage/settings/seg0/c340.dat
/storage/settings/seg0/c351.dat
/storage/settings/seg0/c361.dat
/storage/settings/seg0/c371.dat
/storage/settings/seg0/c380.dat
/storage/settings/seg0/c391.dat
/storage/settings/seg0/c400.dat
/storage/settings/seg0/c411.dat
/storage/settings/seg0/c421.dat
/storage/settings/seg0/c430.dat
/storage/settings/seg0/c441.dat
/storage/settings/seg0/c451.dat
/storage/settings/seg0/c461.dat
/storage/settings/seg0/c470.dat
/storage/settings/seg0/c481.dat
/storage/settings/seg0/c490.dat
/storage/settings/seg0/c501.dat
/storage/settings/seg0/ca1.dat
/storage/settings/seg0/cb1.dat
/storage/settings/seg0/cc0.dat
/storage/settings/seg0/cd1.dat
/storage/settings/seg0/ce1.dat
/storage/settings/seg0/cf0.dat
/storage/settings/seg0/README_DO_NOT_TOUCH_FILES.txt
/storage/settings/db.lck
/storage/settings/dbex.lck
/storage/settings/README_DO_NOT_TOUCH_FILES.txt
/storage/settings/service.properties

# UI
/plc4j/tools/ui/frontend/project/node/
/plc4j/tools/ui/frontend/project/node_modules/
/plc4j/tools/ui/frontend/project/dist/
/plc4j/tools/ui/frontend/project/.vite/**
/storage/**
/derby.log
14 changes: 7 additions & 7 deletions plc4j/tools/ui/frontend/pom.xml
View file
Expand Up @@ -87,7 +87,7 @@
<jsonLibrary>jackson2</jsonLibrary>
<restOptionsType>AxiosRequestConfig</restOptionsType>
<restResponseType>AxiosPromise</restResponseType>
<outputFile>frontend/src/generated/plc4j-tools-ui-frontend.ts</outputFile>
<outputFile>project/src/generated/plc4j-tools-ui-frontend.ts</outputFile>
</configuration>
</execution>
</executions>
Expand All @@ -113,7 +113,7 @@
<configuration>
<licenseName>apache_v2</licenseName>
<roots>
<root>frontend/src/generated</root>
<root>project/src/generated</root>
</roots>
</configuration>
</execution>
Expand Down Expand Up @@ -153,7 +153,7 @@
</execution>
</executions>
<configuration>
<workingDirectory>frontend</workingDirectory>
<workingDirectory>project</workingDirectory>
<nodeVersion>v20.9.0</nodeVersion>
</configuration>
</plugin>
Expand All @@ -169,7 +169,7 @@
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>frontend/dist</classesDirectory>
<classesDirectory>project/dist</classesDirectory>
<includes>
<include>**</include>
</includes>
Expand All @@ -183,9 +183,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
<exclude>frontend/dist/**</exclude>
<exclude>frontend/node/**</exclude>
<exclude>frontend/node_modules/**</exclude>
<exclude>project/dist/**</exclude>
<exclude>project/node/**</exclude>
<exclude>project/node_modules/**</exclude>
</excludes>
</configuration>
</plugin>
Expand Down
0 .../tools/ui/frontend/frontend/.eslintrc.cjs → ...j/tools/ui/frontend/project/.eslintrc.cjs
View file
File renamed without changes.
0 plc4j/tools/ui/frontend/frontend/.gitignore → plc4j/tools/ui/frontend/project/.gitignore
View file
File renamed without changes.
0 plc4j/tools/ui/frontend/frontend/README.md → plc4j/tools/ui/frontend/project/README.md
View file
File renamed without changes.
0 plc4j/tools/ui/frontend/frontend/index.html → plc4j/tools/ui/frontend/project/index.html
View file
File renamed without changes.
0 ...j/tools/ui/frontend/frontend/package.json → plc4j/tools/ui/frontend/project/package.json
View file
File renamed without changes.
0 ...rontend/frontend/public/plc4x-favicon.png → ...frontend/project/public/plc4x-favicon.png
View file
File renamed without changes
0 plc4j/tools/ui/frontend/frontend/src/App.css → plc4j/tools/ui/frontend/project/src/App.css
View file
File renamed without changes.
0 plc4j/tools/ui/frontend/frontend/src/App.tsx → plc4j/tools/ui/frontend/project/src/App.tsx
View file
File renamed without changes.
0 ...ontend/frontend/src/assets/plc4x-logo.svg → ...rontend/project/src/assets/plc4x-logo.svg
View file
File renamed without changes
0 ...ui/frontend/frontend/src/assets/react.svg → .../ui/frontend/project/src/assets/react.svg
View file
File renamed without changes
0 .../frontend/src/components/DeviceDialog.tsx → ...d/project/src/components/DeviceDialog.tsx
View file
File renamed without changes.
0 ...rontend/src/components/NavigationTree.tsx → ...project/src/components/NavigationTree.tsx
View file
File renamed without changes.
0 ...frontend/src/components/PlcConnection.tsx → .../project/src/components/PlcConnection.tsx
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../src/generated/plc4j-tools-ui-frontend.ts → .../src/generated/plc4j-tools-ui-frontend.ts
View file
Expand Up @@ -19,7 +19,7 @@
*/
/* tslint:disable */
/* eslint-disable */
// Generated using typescript-generator version 3.2.1263 on 2024-01-20 16:17:47.
// Generated using typescript-generator version 3.2.1263 on 2024-01-21 10:36:54.

export interface Device {
id: number;
Expand Down
0 .../tools/ui/frontend/frontend/src/index.css → ...j/tools/ui/frontend/project/src/index.css
View file
File renamed without changes.
0 ...ntend/frontend/src/layouts/MainLayout.tsx → ...ontend/project/src/layouts/MainLayout.tsx
View file
File renamed without changes.
0 ...j/tools/ui/frontend/frontend/src/main.tsx → plc4j/tools/ui/frontend/project/src/main.tsx
View file
File renamed without changes.
0 ...ontend/frontend/src/model/TreeItemData.ts → ...rontend/project/src/model/TreeItemData.ts
View file
File renamed without changes.
0 .../ui/frontend/frontend/src/pages/About.tsx → ...s/ui/frontend/project/src/pages/About.tsx
View file
File renamed without changes.
0 ...i/frontend/frontend/src/pages/Inspect.tsx → ...ui/frontend/project/src/pages/Inspect.tsx
View file
File renamed without changes.
0 ...s/ui/frontend/frontend/src/pages/Mqtt.tsx → ...ls/ui/frontend/project/src/pages/Mqtt.tsx
View file
File renamed without changes.
0 .../ui/frontend/frontend/src/pages/OpcUa.tsx → ...s/ui/frontend/project/src/pages/OpcUa.tsx
View file
File renamed without changes.
0 .../frontend/frontend/src/pages/Settings.tsx → ...i/frontend/project/src/pages/Settings.tsx
View file
File renamed without changes.
0 ...s/ui/frontend/frontend/src/store/index.ts → ...ls/ui/frontend/project/src/store/index.ts
View file
File renamed without changes.
0 ...ui/frontend/frontend/src/utils/Counter.ts → .../ui/frontend/project/src/utils/Counter.ts
View file
File renamed without changes.
0 ...ls/ui/frontend/frontend/src/vite-env.d.ts → ...ols/ui/frontend/project/src/vite-env.d.ts
View file
File renamed without changes.
0 .../tools/ui/frontend/frontend/tsconfig.json → ...j/tools/ui/frontend/project/tsconfig.json
View file
File renamed without changes.
0 ...s/ui/frontend/frontend/tsconfig.node.json → ...ls/ui/frontend/project/tsconfig.node.json
View file
File renamed without changes.
0 ...tools/ui/frontend/frontend/vite.config.ts → .../tools/ui/frontend/project/vite.config.ts
View file
File renamed without changes.

0 comments on commit 663bf95

Please sign in to comment.