From 4c7f4a8d9e3295b4c44c67a9386889fe58f8385e Mon Sep 17 00:00:00 2001 From: Stan Silvert Date: Thu, 4 Jun 2020 13:21:22 -0400 Subject: [PATCH] KEYCLOAK-11268: Change project layout --- .../ui/account2/page/AbstractAccountPage.java | 1 - themes/.gitignore | 1 + themes/pom.xml | 19 ++++++- .../theme/keycloak-preview/account/index.ftl | 14 ++--- .../account/resources/.gitignore | 14 +---- .../resources/app/assets/img/QRCode.png | Bin 10924 -> 0 bytes .../app/assets/img/keycloak-logo-min.png | Bin 2601 -> 0 bytes .../app/assets/img/keycloak-logo.png | Bin 5268 -> 0 bytes .../account/resources/content.js | 12 ++--- .../environments/environment.prod.ts | 3 -- .../resources/environments/environment.ts | 8 --- ...PageScripts.js => welcome-page-scripts.js} | 2 +- .../account/{resources => src}/.babelrc | 2 +- .../account/{resources => src}/.eslintrc.js | 0 .../keycloak-preview/account/src/.gitignore | 2 + .../account/{resources => src}/README.md | 0 .../account/{resources => src}/app/App.tsx | 0 .../{resources => src}/app/ContentPages.tsx | 6 +-- .../account/{resources => src}/app/Main.tsx | 0 .../{resources => src}/app/PageNav.tsx | 2 +- .../{resources => src}/app/PageToolbar.tsx | 0 .../app/account-service/account.service.ts | 0 .../app/content/ContentAlert.tsx | 0 .../app/content/ContentPage.tsx | 0 .../app/content/account-page/AccountPage.tsx | 0 .../aia-page/AppInitiatedActionPage.tsx | 0 .../applications-page/ApplicationsPage.tsx | 0 .../authenticator-page/AuthenticatorPage.tsx | 0 .../DeviceActivityPage.tsx | 0 .../LinkedAccountsPage.tsx | 0 .../AbstractResourceTable.tsx | 0 .../my-resources-page/EditTheResource.tsx | 0 .../my-resources-page/MyResourcesPage.tsx | 0 .../my-resources-page/PermissionRequest.tsx | 0 .../my-resources-page/ResourcesTable.tsx | 0 .../my-resources-page/ShareTheResource.tsx | 0 .../SharedResourcesTable.tsx | 0 .../content/page-not-found/PageNotFound.tsx | 0 .../content/signingin-page/SigningInPage.tsx | 0 .../app/keycloak-service/keycloak.service.ts | 0 .../{resources => src}/app/util/AIACommand.ts | 0 .../{resources => src}/app/util/ParseLink.ts | 0 .../app/util/RedirectUri.ts | 0 .../{resources => src}/app/util/TimeUtil.ts | 0 .../app/widgets/ContinueCancelModal.tsx | 0 .../app/widgets/LocaleSelectors.tsx | 0 .../{resources => src}/app/widgets/Logout.tsx | 0 .../{resources => src}/app/widgets/Msg.tsx | 0 .../app/widgets/ReferrerDropdownItem.tsx | 0 .../app/widgets/ReferrerLink.tsx | 0 .../app/widgets/features.ts | 0 .../account/{resources => src}/eslint.cmd | 0 .../{resources => src}/package-lock.json | 51 ++++++++++++++++++ .../account/{resources => src}/package.json | 8 +-- .../{resources => src}/snowpack.config.js | 11 ++-- .../account/{resources => src}/tsconfig.json | 0 .../keycloak-preview/account/theme.properties | 2 +- 57 files changed, 105 insertions(+), 53 deletions(-) delete mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/QRCode.png delete mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/keycloak-logo-min.png delete mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/keycloak-logo.png delete mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/environments/environment.prod.ts delete mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/environments/environment.ts rename themes/src/main/resources/theme/keycloak-preview/account/resources/{WelcomePageScripts.js => welcome-page-scripts.js} (98%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/.babelrc (82%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/.eslintrc.js (100%) create mode 100644 themes/src/main/resources/theme/keycloak-preview/account/src/.gitignore rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/README.md (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/App.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/ContentPages.tsx (95%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/Main.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/PageNav.tsx (96%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/PageToolbar.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/account-service/account.service.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/ContentAlert.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/ContentPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/account-page/AccountPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/aia-page/AppInitiatedActionPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/applications-page/ApplicationsPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/authenticator-page/AuthenticatorPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/device-activity-page/DeviceActivityPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/linked-accounts-page/LinkedAccountsPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/AbstractResourceTable.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/EditTheResource.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/MyResourcesPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/PermissionRequest.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/ResourcesTable.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/ShareTheResource.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/my-resources-page/SharedResourcesTable.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/page-not-found/PageNotFound.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/content/signingin-page/SigningInPage.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/keycloak-service/keycloak.service.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/util/AIACommand.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/util/ParseLink.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/util/RedirectUri.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/util/TimeUtil.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/ContinueCancelModal.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/LocaleSelectors.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/Logout.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/Msg.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/ReferrerDropdownItem.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/ReferrerLink.tsx (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/app/widgets/features.ts (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/eslint.cmd (100%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/package-lock.json (99%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/package.json (85%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/snowpack.config.js (55%) rename themes/src/main/resources/theme/keycloak-preview/account/{resources => src}/tsconfig.json (100%) diff --git a/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/page/AbstractAccountPage.java b/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/page/AbstractAccountPage.java index ade34bb8ab..78b947a213 100644 --- a/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/page/AbstractAccountPage.java +++ b/testsuite/integration-arquillian/tests/other/base-ui/src/test/java/org/keycloak/testsuite/ui/account2/page/AbstractAccountPage.java @@ -41,7 +41,6 @@ public abstract class AbstractAccountPage extends AuthRealm { public UriBuilder createUriBuilder() { String fragment = null; if (hashPath != null) { - hashPath.add(0, "app"); // TODO remove this once KEYCLOAK-11268 is resolved fragment = "/" + String.join("/", hashPath); } diff --git a/themes/.gitignore b/themes/.gitignore index 64f5a0a681..bda76414e3 100644 --- a/themes/.gitignore +++ b/themes/.gitignore @@ -1 +1,2 @@ node +web_modules diff --git a/themes/pom.xml b/themes/pom.xml index 2d73bbc339..3adba182bd 100755 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -15,12 +15,25 @@ src/main/resources/theme/keycloak/common/resources - src/main/resources/theme/keycloak-preview/account/resources + src/main/resources/theme/keycloak-preview/account/src ci --no-optional --ignore-scripts + + maven-clean-plugin + + + + ${dir.account2}/web_modules + + + ${dir.common}/web_modules + + + + com.github.eirslett frontend-maven-plugin @@ -110,9 +123,11 @@ **/Gruntfile.js **/Gemfile* **/.* + **/git-Logo.svg - **/keycloak-preview/account/resources/node_modules/** + + **/keycloak-preview/account/src/** diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl index f5ce7d942e..ebf5468db2 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl +++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl @@ -130,7 +130,7 @@ document.getElementById("landingLoggedInUser").innerHTML = loggedInUserName('${msg("unknownUser")}', '${msg("fullName")}'); } - loadjs("/app/Main.js"); + loadjs("/Main.js"); }).error(function() { alert('failed to initialize keycloak'); @@ -231,7 +231,7 @@
${msg("personalInfoIntroMessage")}
- +
@@ -242,9 +242,9 @@
${msg("accountSecurityIntroMessage")}
- - - + + +
@@ -255,7 +255,7 @@
${msg("applicationsIntroMessage")}
- +
@@ -266,7 +266,7 @@
${msg("resourceIntroMessage")}
- +
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/.gitignore b/themes/src/main/resources/theme/keycloak-preview/account/resources/.gitignore index 87a9386336..fe968d73d2 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/.gitignore +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/.gitignore @@ -1,24 +1,14 @@ -# ignore typescript-generated files +# ignore typescript-generated files *.js *.js.map -# ignore keycloak.json - we won't need this much longer -keycloak.json - # ignore log files *.log -# Do not commit, installed at compile time -node_modules - # Don't ignore these -!keycloak.js -!snowpack.config.js -!.eslintrc.js !WelcomePageScripts.js !content.js public/app.css public/base.css -public/assets/ -web_modules/ \ No newline at end of file +public/assets/ \ No newline at end of file diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/QRCode.png b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/QRCode.png deleted file mode 100644 index 38b551dc2c53a1243b87974fb627b71557669fb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10924 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 (dZkbahC3pXHU8QL@x*{NqC0 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 VR(5|}Tmv3f5crCl6T`s|^IsF{PP_mB diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/keycloak-logo.png b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/keycloak-logo.png deleted file mode 100644 index ca53f0a04ba97029b387ada299ae4b454b54ccd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5268 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 akN*dX+`h$pZtd{^0000 {Msg.localize(page.label, page.labelParams)} @@ -158,10 +158,10 @@ export function makeRoutes(): React.ReactNode { const routes: React.ReactElement[] = pageDefs.map((page: PageDef) => { if (isModulePageDef(page)) { const node: React.ReactNode = React.createElement(page.module[page.componentName], {'pageDef': page}); - return node} />; + return node} />; } else { const pageDef: ComponentPageDef = page as ComponentPageDef; - return ; + return ; } }); diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/Main.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/Main.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/Main.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/Main.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/PageNav.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/PageNav.tsx similarity index 96% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/PageNav.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/PageNav.tsx index 00d36c1754..fbc693085b 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/PageNav.tsx +++ b/themes/src/main/resources/theme/keycloak-preview/account/src/app/PageNav.tsx @@ -37,7 +37,7 @@ class PageNavigation extends React.Component { const items: PageDef[] = flattenContent(content); const firstItem = items[0]; for (let item of items) { - const itemPath: string = '/app/' + item.path; + const itemPath: string = '/' + item.path; if (itemPath === currentPath) { return item; } diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/PageToolbar.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/PageToolbar.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/PageToolbar.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/PageToolbar.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/account-service/account.service.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/account-service/account.service.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/account-service/account.service.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/account-service/account.service.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/ContentAlert.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/ContentAlert.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/ContentAlert.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/ContentAlert.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/ContentPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/ContentPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/ContentPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/ContentPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/account-page/AccountPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/account-page/AccountPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/account-page/AccountPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/account-page/AccountPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/aia-page/AppInitiatedActionPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/aia-page/AppInitiatedActionPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/aia-page/AppInitiatedActionPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/aia-page/AppInitiatedActionPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/ApplicationsPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/applications-page/ApplicationsPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/applications-page/ApplicationsPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/applications-page/ApplicationsPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/authenticator-page/AuthenticatorPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/authenticator-page/AuthenticatorPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/authenticator-page/AuthenticatorPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/authenticator-page/AuthenticatorPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/device-activity-page/DeviceActivityPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/device-activity-page/DeviceActivityPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/device-activity-page/DeviceActivityPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/device-activity-page/DeviceActivityPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/linked-accounts-page/LinkedAccountsPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/linked-accounts-page/LinkedAccountsPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/linked-accounts-page/LinkedAccountsPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/linked-accounts-page/LinkedAccountsPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/AbstractResourceTable.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/AbstractResourceTable.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/AbstractResourceTable.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/AbstractResourceTable.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/EditTheResource.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/EditTheResource.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/EditTheResource.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/EditTheResource.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/MyResourcesPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/MyResourcesPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/MyResourcesPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/MyResourcesPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/PermissionRequest.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/PermissionRequest.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/PermissionRequest.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/PermissionRequest.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/ResourcesTable.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/ResourcesTable.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/ResourcesTable.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/ResourcesTable.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/ShareTheResource.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/ShareTheResource.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/ShareTheResource.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/ShareTheResource.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/SharedResourcesTable.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/SharedResourcesTable.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/my-resources-page/SharedResourcesTable.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/SharedResourcesTable.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/page-not-found/PageNotFound.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/page-not-found/PageNotFound.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/page-not-found/PageNotFound.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/page-not-found/PageNotFound.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/signingin-page/SigningInPage.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/content/signingin-page/SigningInPage.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/content/signingin-page/SigningInPage.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/content/signingin-page/SigningInPage.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/keycloak-service/keycloak.service.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/keycloak-service/keycloak.service.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/keycloak-service/keycloak.service.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/keycloak-service/keycloak.service.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/AIACommand.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/util/AIACommand.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/AIACommand.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/util/AIACommand.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/ParseLink.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/util/ParseLink.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/ParseLink.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/util/ParseLink.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/RedirectUri.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/util/RedirectUri.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/RedirectUri.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/util/RedirectUri.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/TimeUtil.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/util/TimeUtil.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/util/TimeUtil.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/util/TimeUtil.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/ContinueCancelModal.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/ContinueCancelModal.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/ContinueCancelModal.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/ContinueCancelModal.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/LocaleSelectors.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/LocaleSelectors.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/LocaleSelectors.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/LocaleSelectors.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/Logout.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/Logout.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/Logout.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/Logout.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/Msg.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/Msg.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/Msg.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/Msg.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/ReferrerDropdownItem.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/ReferrerDropdownItem.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/ReferrerDropdownItem.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/ReferrerDropdownItem.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/ReferrerLink.tsx b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/ReferrerLink.tsx similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/ReferrerLink.tsx rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/ReferrerLink.tsx diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/features.ts b/themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/features.ts similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/widgets/features.ts rename to themes/src/main/resources/theme/keycloak-preview/account/src/app/widgets/features.ts diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/eslint.cmd b/themes/src/main/resources/theme/keycloak-preview/account/src/eslint.cmd similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/eslint.cmd rename to themes/src/main/resources/theme/keycloak-preview/account/src/eslint.cmd diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/package-lock.json b/themes/src/main/resources/theme/keycloak-preview/account/src/package-lock.json similarity index 99% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/package-lock.json rename to themes/src/main/resources/theme/keycloak-preview/account/src/package-lock.json index c3da8d8f1f..61423f7ed9 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/package-lock.json +++ b/themes/src/main/resources/theme/keycloak-preview/account/src/package-lock.json @@ -4581,6 +4581,12 @@ "is-symbol": "^1.0.2" } }, + "es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=", + "dev": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -6339,6 +6345,12 @@ } } }, + "interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true + }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -8675,6 +8687,15 @@ } } }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "^1.1.6" + } + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -9113,6 +9134,36 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "shelljs": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "shx": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.2.tgz", + "integrity": "sha512-aS0mWtW3T2sHAenrSrip2XGv39O9dXIFUqxAEWHEOS1ePtGIBavdPJY1kE2IHl14V/4iCbUiNDPGdyYTtmhSoA==", + "dev": true, + "requires": { + "es6-object-assign": "^1.0.3", + "minimist": "^1.2.0", + "shelljs": "^0.8.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/package.json b/themes/src/main/resources/theme/keycloak-preview/account/src/package.json similarity index 85% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/package.json rename to themes/src/main/resources/theme/keycloak-preview/account/src/package.json index f68ee5bb53..4baa08eb2d 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/package.json +++ b/themes/src/main/resources/theme/keycloak-preview/account/src/package.json @@ -3,12 +3,13 @@ "version": "1.0.0", "description": "keycloak-preview account management written in React", "scripts": { - "build": "snowpack && npm run check-types && npm run babel", - "babel": "babel --source-maps --extensions \".js,.ts,.tsx\" app/ --out-dir app/", + "build": "snowpack && npm run check-types && npm run babel && npm run move-web_modules", + "babel": "babel --source-maps --extensions \".js,.ts,.tsx\" app/ --out-dir ../resources/", "babel:watch": "npm run babel -- --watch", "check-types": "tsc --noImplicitAny --strictNullChecks --jsx react -p ./", "check-types:watch": "npm run check-types -- -w", - "lint": "eslint ./app/**/*.ts*" + "lint": "eslint ./app/**/*.ts*", + "move-web_modules": "shx mv web_modules ../../../keycloak/common/resources" }, "keywords": [], "author": "Stan Silvert", @@ -42,6 +43,7 @@ "eslint-plugin-react": "^7.12.4", "rollup-plugin-copy": "^3.3.0", "rollup-plugin-postcss": "^2.5.0", + "shx": "^0.3.2", "snowpack": "^1.7.0", "typescript": "^3.8.3" }, diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/snowpack.config.js b/themes/src/main/resources/theme/keycloak-preview/account/src/snowpack.config.js similarity index 55% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/snowpack.config.js rename to themes/src/main/resources/theme/keycloak-preview/account/src/snowpack.config.js index d86f9f0421..5b70dd30f2 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/snowpack.config.js +++ b/themes/src/main/resources/theme/keycloak-preview/account/src/snowpack.config.js @@ -1,17 +1,20 @@ const copy = require('rollup-plugin-copy'); const postcss = require('rollup-plugin-postcss'); +const appDest = '../resources/' +const appDestPublic = appDest + 'public/' + module.exports = { rollup: { plugins: [ postcss({ - extract: 'public/app.css' + extract: appDestPublic + 'app.css' }), copy({ targets: [ - { src: 'node_modules/@patternfly/react-core/dist/styles/base.css', dest: 'public/' }, - { src: 'node_modules/@patternfly/react-core/dist/styles/assets/fonts/overpass-webfont/overpass*.woff2', dest: 'public/assets/fonts/overpass-webfont/'}, - { src: 'node_modules/@patternfly/react-core/dist/styles/assets/pficon/pficon.woff2', dest: 'public/assets/pficon/'}, + { src: 'node_modules/@patternfly/react-core/dist/styles/base.css', dest: appDestPublic }, + { src: 'node_modules/@patternfly/react-core/dist/styles/assets/fonts/overpass-webfont/overpass*.woff2', dest: appDestPublic + 'assets/fonts/overpass-webfont/'}, + { src: 'node_modules/@patternfly/react-core/dist/styles/assets/pficon/pficon.woff2', dest: appDestPublic + 'assets/pficon/'}, ], }) ] diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/tsconfig.json b/themes/src/main/resources/theme/keycloak-preview/account/src/tsconfig.json similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/tsconfig.json rename to themes/src/main/resources/theme/keycloak-preview/account/src/tsconfig.json diff --git a/themes/src/main/resources/theme/keycloak-preview/account/theme.properties b/themes/src/main/resources/theme/keycloak-preview/account/theme.properties index 63e2004ad6..96a0c78c92 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/theme.properties +++ b/themes/src/main/resources/theme/keycloak-preview/account/theme.properties @@ -1,6 +1,6 @@ parent=base deprecatedMode=false -scripts=WelcomePageScripts.js content.js +scripts=welcome-page-scripts.js content.js developmentMode=false # This is the logo in upper lefthand corner.