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.

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

Begin frontend template soybean admin #193

Merged
merged 73 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
20b4103
Removing PrimeVue template
amengus87 Jun 26, 2024
9875661
Init Soybean Admin Template
amengus87 Jun 27, 2024
a538384
Fix gradle task depends
amengus87 Jun 27, 2024
04d3a76
Show Gradle Stacktrace
amengus87 Jun 27, 2024
b33d059
Setup pnpm
amengus87 Jun 27, 2024
3a794d5
Try without pnpm-lock.yaml
amengus87 Jun 27, 2024
e597bd7
Fix pnpm build
amengus87 Jun 27, 2024
1db2dbc
Fix build
amengus87 Jun 27, 2024
e10407d
Fix build
amengus87 Jun 27, 2024
84020a2
Fix build
amengus87 Jun 27, 2024
dd2ebed
Change Frontend Jar destination (to backend build dir)
amengus87 Jun 27, 2024
f175541
Ignore .pnpm-store
isontheline Jun 27, 2024
c3d194d
chore: Update build.gradle to depend on pnpmBuild task for compileJav…
amengus87 Jun 28, 2024
10bad49
Removing bootProdRun Gradle Task on backend project
amengus87 Jun 28, 2024
3e2b94e
chore: Change timeout for build job to 15 minutes
amengus87 Jun 28, 2024
ad93b41
Removing unused Frontend Scripts Commands
amengus87 Jun 28, 2024
d44be7c
Set packages version to 0.0.0 default
amengus87 Jun 28, 2024
e9c154c
Updating favicon
amengus87 Jun 28, 2024
6ae42c8
Update logo used in admin
amengus87 Jun 28, 2024
b9034f7
Update title : Suffixed by " • dRAGon"
amengus87 Jun 28, 2024
8b9a6dd
Update about page
amengus87 Jun 28, 2024
5c4bcd0
Updating Login Page bakground
amengus87 Jun 28, 2024
35c9290
Update documentation about "Launching dRAGon"
amengus87 Jul 3, 2024
06f4ff6
Update documentation about "Launching dRAGon"
amengus87 Jul 3, 2024
5ec7dad
Using Mockoon to mock API
amengus87 Jul 3, 2024
490037c
Using Mockoon to mock API
amengus87 Jul 3, 2024
a99a832
Using Mockoon to mock API
amengus87 Jul 3, 2024
a9a868a
Updating port 1984 to 8519
isontheline Jul 3, 2024
be7adfd
Updating doc to launch frontend + mock server
isontheline Jul 3, 2024
27a65ea
Removing Proxy / Demo
amengus87 Jul 4, 2024
09e5bac
Splitting /api/app endpoints : Health / Info
amengus87 Jul 4, 2024
c318daf
Update components
amengus87 Jul 4, 2024
1979232
Enhancement to the service base URL definition
amengus87 Jul 4, 2024
41df1cb
chore: Update Docusaurus dependencies to latest versions
amengus87 Jul 4, 2024
817694f
chore: Update Docusaurus dependencies to latest versions
amengus87 Jul 4, 2024
2ff84d6
Update API Specifications
amengus87 Jul 4, 2024
3e93e79
Update API Specifications
amengus87 Jul 4, 2024
9135af6
Update default color light / dark
amengus87 Jul 4, 2024
3303c50
Frontend : Improving default color light / dark theme
amengus87 Jul 4, 2024
4fe6531
Merge remote-tracking branch 'origin/staging' into frontend-template-…
amengus87 Jul 4, 2024
3b87a63
Adding help page inside frontend
amengus87 Jul 5, 2024
dcd2bf2
Adding help page inside frontend
amengus87 Jul 5, 2024
9433ad0
Removing Online Iconify
amengus87 Jul 5, 2024
fb36d7e
Removing Online Iconify
amengus87 Jul 5, 2024
ac3323a
Removing Online Iconify
amengus87 Jul 5, 2024
e1cbd62
Help page is now opened as target blank
amengus87 Jul 5, 2024
8ee7c77
Updating frontend dependencies
isontheline Jul 5, 2024
13fe6b4
Fix dark mode switch
isontheline Jul 5, 2024
8a0b23d
Update dark / light icons
isontheline Jul 5, 2024
ceb05ce
Update dark / light icons
isontheline Jul 5, 2024
073d5cc
Removing unused pages
isontheline Jul 5, 2024
beb1513
Merge staging into frontend-template-soybean-admin
amengus87 Jul 22, 2024
6b51d9b
Merge branch 'staging' into frontend-template-soybean-admin
amengus87 Jul 22, 2024
da83b52
Move build folder to builder
amengus87 Jul 22, 2024
89bd63b
chore: Ignore build folder in git
amengus87 Jul 22, 2024
64f8227
Disabling Gradle daemons in order to reduce memory usage on dev conta…
amengus87 Jul 22, 2024
c37bbf8
Disabling console.log calls
amengus87 Jul 22, 2024
5c097b2
Fix eslint
amengus87 Jul 22, 2024
6005013
Fix eslint
amengus87 Jul 22, 2024
ee87465
Removing internal documentation in favour of GitBook
amengus87 Jul 22, 2024
80bbd4e
Removing internal documentation in favour of GitBook
isontheline Jul 22, 2024
2045b30
Removing Gradle plugin : org.openapi.generator
isontheline Jul 23, 2024
fa68a6c
Merge branch 'staging' into frontend-template-soybean-admin
amengus87 Jul 24, 2024
fcf6ceb
Merge pull request #177 from dRAGon-Okinawa/staging
amengus87 Jul 25, 2024
92176cb
Merge pull request #183 from dRAGon-Okinawa/staging
amengus87 Jul 26, 2024
3527519
Updating dashboard
amengus87 Jul 30, 2024
7770b6f
Merge branch 'staging' into frontend-template-soybean-admin
amengus87 Jul 30, 2024
7d7a221
Removed unused functions pages
amengus87 Jul 30, 2024
44f6d9b
Removing unused parts + updating icons
amengus87 Jul 30, 2024
8ecf3f2
Updating icons and labels
isontheline Jul 30, 2024
e60f25f
Hiding unused menus
isontheline Jul 30, 2024
387f91a
Fix pnpmLint error
isontheline Jul 30, 2024
b0f971d
Fix pnpmLint error
isontheline Jul 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 1 addition & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
"postStartCommand": ".devcontainer/postStart.sh",
"postCreateCommand": ".devcontainer/postCreate.sh",
"forwardPorts": [
1984,
1985,
3000,
4173
1985
],
"customizations": {
"vscode": {
Expand Down
5 changes: 4 additions & 1 deletion .devcontainer/postCreate.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash

echo "Setting up pnpm store..."
mkdir -p /tmp/pnpm && pnpm config set store-dir /tmp/pnpm/

echo "Building the project..."
gradle npmInstall build
gradle pnpmInstall build
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
- [ ] I have added unit and integration tests for my change
- [ ] I have manually run all the unit and integration tests in the module I have added/changed, and they are all green
<!-- Before adding documentation and example(s) (below), please wait until the PR is reviewed and approved. -->
- [ ] I have added/updated the [documentation](https://github.com/dRAGon-Okinawa/dRAGon/tree/main/docs)
- [ ] I have added/updated the [documentation](https://docs.dragon.okinawa)
22 changes: 5 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: pnpm/action-setup@v4
with:
version: 9.4.0
- uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 8.7
Expand All @@ -42,15 +45,10 @@ jobs:
run: gradle createRelease

- name: Set Frontend Version
run: npm version from-git --no-git-tag-version --prefix frontend
- name: Set Docs Version
run: npm version from-git --no-git-tag-version --prefix docs
run: pnpm version from-git --no-git-tag-version --prefix frontend

- name: Test dRAGon
run: gradle npmInstall npmLint checkstyleMain checkstyleTest test

- name: Build Documentation
run: npm install --prefix docs && npm run build --prefix docs
run: gradle pnpmInstall pnpmLint checkstyleMain checkstyleTest test --stacktrace

- name: Build dRAGon
run: gradle bootJar -Pversion=$(gradle cV -q -Prelease.quiet)
Expand Down Expand Up @@ -93,13 +91,3 @@ jobs:
github.ref == 'refs/heads/main' &&
github.repository == 'dragon-okinawa/dragon'
run: gradle pushRelease

- name: Deploy Documentation
uses: JamesIves/github-pages-deploy-action@releases/v3
if: |
github.ref == 'refs/heads/main' &&
github.repository == 'dragon-okinawa/dragon'
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: docs/build
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
build
gradle
.gradle
bin
.vscode
.DS_Store
*.class
*.class
.pnpm-store
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/openjdk/jdk:17-ubuntu
LABEL org.opencontainers.image.source="https://github.com/dRAGon-Okinawa/dRAGon"

EXPOSE 1985
EXPOSE 1984
EXPOSE 8519

RUN mkdir /data
RUN chown app:app /data
Expand Down
1 change: 1 addition & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
9 changes: 6 additions & 3 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,20 @@ tasks.register("bootProdRun") {
systemProperty("spring.profiles.active", "prod")
}
}
finalizedBy("bootRun")
}

jacoco {
toolVersion = "0.8.12"
}

tasks.register('copyWebApp', Copy) {
dependsOn(':frontend:jar')
dependsOn(':frontend:pnpmBuild')
from "$rootDir/frontend/dist"
into "$buildDir/resources/main/static/."
}

tasks.named('compileJava') {
dependsOn(':frontend:jar')
dependsOn(':frontend:pnpmBuild')
}

tasks.named('processResources') {
Expand Down
3 changes: 2 additions & 1 deletion backend/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
version=0.0.0
version=0.0.0
org.gradle.daemon=false
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import io.swagger.v3.oas.annotations.tags.Tag;

@RestController
@RequestMapping("/api/app/health")
@RequestMapping("/api/app")
@Tag(name = "Health", description = "Health Check API Endpoints")
public class HealthOpenApiController {
@GetMapping("/status")
public class HealthAppApiController {
@GetMapping("/health")
@ApiResponse(responseCode = "200", description = "dRAGon app is alive.")
@Operation(summary = "Check dRAGon app health", description = "Returns a simple message to confirm that the app is alive.")
public String health() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package ai.dragon.controller.api.app;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import ai.dragon.util.VersionUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;

@RestController
@RequestMapping("/api/app/info")
@Tag(name = "App Information", description = "Information about the dRAGon app.")
public class InfoAppApiController {
@GetMapping("/version")
@ApiResponse(responseCode = "200", description = "dRAGon app version.")
@Operation(summary = "Get dRAGon app version", description = "Returns the version of the dRAGon app.")
public String version() {
return VersionUtil.getVersion();

Check warning on line 20 in backend/src/main/java/ai/dragon/controller/api/app/InfoAppApiController.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/ai/dragon/controller/api/app/InfoAppApiController.java#L20

Added line #L20 was not covered by tests
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
System.out.println("================================================");
System.out.println(String.format("APP URL\t\t : %s://%s:%d/", scheme, host, port));
System.out.println(String.format("Swagger UI\t : %s://%s:%d/api/swagger-ui.html", scheme, host, port));
System.out.println(String.format("JobRunr\t\t : %s://%s:%d/", scheme, host, 1984));
System.out.println(String.format("JobRunr\t\t : %s://%s:%d/", scheme, host, 8519));

Check warning on line 41 in backend/src/main/java/ai/dragon/listener/DragonApplicationListener.java

View check run for this annotation

Codecov / codecov/patch

backend/src/main/java/ai/dragon/listener/DragonApplicationListener.java#L41

Added line #L41 was not covered by tests
System.out.println("================================================");
}
}
2 changes: 1 addition & 1 deletion backend/src/main/resources/application-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ org:
enabled: true
dashboard:
enabled: true
port: 1984
port: 8519
jobs:
default-number-of-retries: 10 # Number of retries for a failing job
retry-back-off-time-seed: 3 # Time seed for the exponential back-off policy
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ org:
enabled: true
dashboard:
enabled: true
port: 1984
port: 8519
jobs:
default-number-of-retries: 10 # Number of retries for a failing job
retry-back-off-time-seed: 3 # Time seed for the exponential back-off policy
Expand Down
23 changes: 0 additions & 23 deletions docs/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions docs/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions docs/babel.config.js

This file was deleted.

36 changes: 0 additions & 36 deletions docs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'com.github.node-gradle.node' version '7.0.2'
id 'org.openapi.generator' version '7.5.0'
}

ext {
Expand All @@ -22,38 +21,3 @@ task test(type: NpmTask) {
outputs.dir("dist")
args = ['run', 'build']
}

task buildOpenApiMarkdownDocs(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
dependsOn(':backend:generateOpenApiDocs')
generatorName.set("markdown")
inputSpecRootDirectory.set("$backendBuildDir/docs/api")
cleanupOutput.set(true)
outputDir.set("$backendBuildDir/docs/api/markdown")
doFirst {
delete "$backendBuildDir/docs/api/markdown"
}
doLast {
delete "docs/api/specification"
copy {
from("$backendBuildDir/docs/api/markdown")
into("docs/api/specification")
filter {
String line -> line
.replace("[**Map**](../Models/object.md)", "**Map**")
.replace("[**Object**](.md)", "**object**")
.replace("{uuid}", "\\{uuid\\}")
.replace("http://localhost:8080", "http://localhost:1985")
.replace("# Documentation for merged spec", "# Specification")
}
}
delete "docs/api/specification/.openapi-generator"
delete "docs/api/specification/.openapi-generator-ignore"
delete "static/openapi"
copy {
from("$backendBuildDir/docs/api") {
include 'swagger-*.json'
}
into("static/openapi")
}
}
}
28 changes: 0 additions & 28 deletions docs/docs/about-dragon/README.mdx

This file was deleted.

1 change: 0 additions & 1 deletion docs/docs/about-dragon/_category_.yml

This file was deleted.

1 change: 0 additions & 1 deletion docs/docs/about-dragon/glossary/_category_.yml

This file was deleted.

27 changes: 0 additions & 27 deletions docs/docs/about-dragon/glossary/farm.mdx

This file was deleted.

Loading