Skip to content

Commit 38a9104

Browse files
committed
2024-11-13 - created web-ui-external-feedback
1 parent 96e498c commit 38a9104

File tree

625 files changed

+62776
-5
lines changed

Some content is hidden

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

625 files changed

+62776
-5
lines changed

server/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ dependencies {
7878
annotationProcessor("io.micronaut.security:micronaut-security-annotations")
7979

8080
yarnBuildElements(project(":web-ui"))
81+
yarnBuildElements(project(":web-ui-external-feedback"))
8182

8283
implementation("io.micronaut:micronaut-jackson-databind")
8384
implementation("io.micronaut:micronaut-http-client")
@@ -175,6 +176,11 @@ if(System.getenv("SKIP_WEB_UI") == null || System.getenv("SKIP_WEB_UI") == "fals
175176
from configurations.named('yarnBuildElements')
176177
}
177178
}
179+
processResources {
180+
into('public-external-feedback') {
181+
from configurations.named('yarnBuildElements')
182+
}
183+
}
178184
}
179185

180186
application {

server/src/main/java/com/objectcomputing/checkins/security/HomeController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public Map<String, Object> forbidden(@Nullable Principal principal) {
4242
* Forwards any unmapped paths (except those containing a period) to the client {@code index.html}.
4343
* @return forward to client {@code index.html}.
4444
*/
45-
// 2024-10-29 - Note the path excludes "/feedbackExternalRecipient", which is handled by HomeExternalRecipientController
46-
@Get("/{path:^(?!feedbackExternalRecipient)([^\\.]+)$}")
45+
// 2024-10-29 - Note the path excludes "/externalFeedback", which is handled by HomeExternalRecipientController
46+
@Get("/{path:^(?!externalFeedback)([^\\.]+)$}")
4747
public Optional<StreamedFile> forward(String path) {
4848
LOG.info("HomeController, forward, path: " + path);
4949
return environment.getResource("public/index.html").map(StreamedFile::new);

server/src/main/java/com/objectcomputing/checkins/security/HomeExternalRecipientController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public HomeExternalRecipientController(Environment environment) {
3030
this.environment = environment;
3131
}
3232

33-
@Get("/feedbackExternalRecipient/{path:.+}")
33+
@Get("/externalFeedback/{path:.+}")
3434
public Optional<StreamedFile> forward(String path) {
3535
LOG.info("HomeExternalRecipientController, forward, path: " + path);
3636
return environment.getResource("public-external-feedback/index_external_recipient.html").map(StreamedFile::new);

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestServicesImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void sendNewRequestEmail(FeedbackRequest storedRequest) {
159159
reviewerExternalRecipient = feedbackExternalRecipientServices.getById(recipientOrExternalRecipientId);
160160
reviewerFirstName = reviewerExternalRecipient.getFirstName();
161161
reviewerEmail = reviewerExternalRecipient.getEmail();
162-
urlFeedbackSubmit = "/feedbackExternalRecipient/submitForExternalRecipient?request=";
162+
urlFeedbackSubmit = "/externalFeedback/submitForExternalRecipient?request=";
163163
} else {
164164
recipientOrExternalRecipientId = storedRequest.getRecipientId();
165165
reviewerMemberProfile = memberProfileServices.getById(recipientOrExternalRecipientId);

settings.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ pluginManagement {
1111
}
1212
rootProject.name="check-ins"
1313
include "web-ui"
14-
include "server"
14+
include "web-ui-external-feedback"
15+
include "server"

web-ui-external-feedback/.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VITE_APP_API_URL=http://localhost:8080
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
7+
8+
# testing
9+
/coverage
10+
11+
# production
12+
/build
13+
/dist
14+
15+
# misc
16+
.DS_Store
17+
.env.local
18+
.env.development.local
19+
.env.test.local
20+
.env.production.local
21+
22+
npm-debug.log*
23+
yarn-debug.log*
24+
yarn-error.log*
25+
26+
yarn.lock
27+
package-lock.json
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
21.0

web-ui-external-feedback/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
stable/*
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_variables.css

0 commit comments

Comments
 (0)