From 6193d91e2ba77a9c009a99cab38166a9557c7cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sun, 25 Aug 2024 14:06:46 +0200 Subject: [PATCH 1/4] chrore(react-i18n): remove unused template resources --- .../src/main/webapp/app/i18n.ts.mustache | 24 ------------------- .../main/webapp/assets/english.json.mustache | 3 --- .../main/webapp/assets/french.json.mustache | 3 --- 3 files changed, 30 deletions(-) delete mode 100644 src/main/resources/generator/client/common/reacti18n/src/main/webapp/app/i18n.ts.mustache delete mode 100644 src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/english.json.mustache delete mode 100644 src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/french.json.mustache diff --git a/src/main/resources/generator/client/common/reacti18n/src/main/webapp/app/i18n.ts.mustache b/src/main/resources/generator/client/common/reacti18n/src/main/webapp/app/i18n.ts.mustache deleted file mode 100644 index 738c25d7376..00000000000 --- a/src/main/resources/generator/client/common/reacti18n/src/main/webapp/app/i18n.ts.mustache +++ /dev/null @@ -1,24 +0,0 @@ -import i18n from 'i18next'; -import { initReactI18next } from 'react-i18next'; - -import Backend from 'i18next-http-backend'; -import LanguageDetector from 'i18next-browser-languagedetector'; - -i18n - .use(Backend) - .use(LanguageDetector) - .use(initReactI18next) - - .init({ - fallbackLng: 'en', - debug: false, - - interpolation: { - escapeValue: false, - }, - backend: { - loadPath: '../assets/locales/{{ lng }}/{{ ns }}.json', - }, - }); - -export default i18n; diff --git a/src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/english.json.mustache b/src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/english.json.mustache deleted file mode 100644 index 1d29147104b..00000000000 --- a/src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/english.json.mustache +++ /dev/null @@ -1,3 +0,0 @@ -{ - "translationEnabled": "Internationalization enabled" -} diff --git a/src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/french.json.mustache b/src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/french.json.mustache deleted file mode 100644 index f4c3ffcea83..00000000000 --- a/src/main/resources/generator/client/common/reacti18n/src/main/webapp/assets/french.json.mustache +++ /dev/null @@ -1,3 +0,0 @@ -{ - "translationEnabled": "Internationalisation activée" -} From 13d2c12ece80b9dc09dd6f6a01b5b053519b6ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sun, 25 Aug 2024 14:07:17 +0200 Subject: [PATCH 2/4] test(react-i18n): code cleanup --- .../client/{reacti18n.feature => react-i18n.feature} | 0 .../react/i18n/domain/ReactI18nModuleFactoryTest.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/test/features/client/{reacti18n.feature => react-i18n.feature} (100%) diff --git a/src/test/features/client/reacti18n.feature b/src/test/features/client/react-i18n.feature similarity index 100% rename from src/test/features/client/reacti18n.feature rename to src/test/features/client/react-i18n.feature diff --git a/src/test/java/tech/jhipster/lite/generator/client/react/i18n/domain/ReactI18nModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/client/react/i18n/domain/ReactI18nModuleFactoryTest.java index 6ef3d826463..1eb0e216be6 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/react/i18n/domain/ReactI18nModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/client/react/i18n/domain/ReactI18nModuleFactoryTest.java @@ -9,12 +9,12 @@ import tech.jhipster.lite.module.domain.JHipsterModulesFixture; @UnitTest -public class ReactI18nModuleFactoryTest { - - public static final ReactI18nModuleFactory factory = new ReactI18nModuleFactory(); +class ReactI18nModuleFactoryTest { private static final String APP_TSX = "src/main/webapp/app/common/primary/app/App.tsx"; + private final ReactI18nModuleFactory factory = new ReactI18nModuleFactory(); + @Test void shouldBuildI18nModule() { JHipsterModule module = factory.buildModule( From 50b43cc62ef909bf4ac067cbf0653c5e291e7d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sun, 25 Aug 2024 14:09:48 +0200 Subject: [PATCH 3/4] refactor(react-core): move resources to a dedicated client/react/core directory --- .../react/core/domain/ReactCoreModulesFactory.java | 2 +- .../generator/client/react/{ => core}/.eslintrc.cjs | 0 .../client/react/{ => core}/postcss.config.js | 0 .../webapp/app/common/primary/app/App.css.mustache | 0 .../webapp/app/common/primary/app/App.tsx.mustache | 0 .../app/common/primary/app/LoginApp.tsx.mustache | 0 .../webapp/app/common/services/storage.ts.mustache | 0 .../src/main/webapp/app/index.css.mustache | 0 .../src/main/webapp/app/index.tsx.mustache | 0 .../app/login/primary/loginForm/index.tsx.mustache | 0 .../primary/loginModal/EyeFilledIcon.tsx.mustache | 0 .../loginModal/EyeSlashFilledIcon.tsx.mustache | 0 .../primary/loginModal/LoginModal.scss.mustache | 0 .../app/login/primary/loginModal/index.tsx.mustache | 0 .../primary/loginModal/interface.d.ts.mustache | 0 .../webapp/app/login/services/login.ts.mustache | 0 .../src/main/webapp/app/vite-env.d.ts.mustache | 0 .../main/webapp/assets/JHipster-Lite-neon-blue.png | Bin .../{ => core}/src/main/webapp/assets/ReactLogo.png | Bin .../{ => core}/src/main/webapp/index.html.mustache | 0 .../unit/common/primary/app/App.spec.tsx.mustache | 0 .../unit/common/primary/app/App.test.tsx.mustache | 0 .../unit/common/services/storage.test.ts.mustache | 0 .../login/primary/loginForm/index.test.tsx.mustache | 0 .../primary/loginModal/index.test.tsx.mustache | 0 .../unit/login/services/login.test.ts.mustache | 0 .../client/react/{ => core}/tailwind.config.js | 0 .../generator/client/react/{ => core}/tsconfig.json | 0 .../client/react/{ => core}/vite.config.ts.mustache | 0 .../react/{ => core}/vitest.config.ts.mustache | 0 30 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/generator/client/react/{ => core}/.eslintrc.cjs (100%) rename src/main/resources/generator/client/react/{ => core}/postcss.config.js (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/common/primary/app/App.css.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/common/primary/app/App.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/common/services/storage.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/index.css.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/index.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/login/services/login.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/app/vite-env.d.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/assets/JHipster-Lite-neon-blue.png (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/assets/ReactLogo.png (100%) rename src/main/resources/generator/client/react/{ => core}/src/main/webapp/index.html.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/test/webapp/unit/common/primary/app/App.spec.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/test/webapp/unit/common/primary/app/App.test.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/test/webapp/unit/common/services/storage.test.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/src/test/webapp/unit/login/services/login.test.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/tailwind.config.js (100%) rename src/main/resources/generator/client/react/{ => core}/tsconfig.json (100%) rename src/main/resources/generator/client/react/{ => core}/vite.config.ts.mustache (100%) rename src/main/resources/generator/client/react/{ => core}/vitest.config.ts.mustache (100%) diff --git a/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java index 7d1acad0607..1ea8a003e5a 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java @@ -11,7 +11,7 @@ public class ReactCoreModulesFactory { - private static final JHipsterSource SOURCE = from("client/react"); + private static final JHipsterSource SOURCE = from("client/react/core"); private static final JHipsterSource SOURCE_COMMON = from("client/common"); private static final JHipsterSource WEBAPP_SOURCE = SOURCE.append("src/main/webapp"); diff --git a/src/main/resources/generator/client/react/.eslintrc.cjs b/src/main/resources/generator/client/react/core/.eslintrc.cjs similarity index 100% rename from src/main/resources/generator/client/react/.eslintrc.cjs rename to src/main/resources/generator/client/react/core/.eslintrc.cjs diff --git a/src/main/resources/generator/client/react/postcss.config.js b/src/main/resources/generator/client/react/core/postcss.config.js similarity index 100% rename from src/main/resources/generator/client/react/postcss.config.js rename to src/main/resources/generator/client/react/core/postcss.config.js diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/common/primary/app/App.css.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/App.css.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/common/primary/app/App.css.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/App.css.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/common/primary/app/App.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/App.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/common/primary/app/App.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/App.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/common/services/storage.ts.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/common/services/storage.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/common/services/storage.ts.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/common/services/storage.ts.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/index.css.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/index.css.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/index.css.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/index.css.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/index.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/index.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/index.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/index.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/login/services/login.ts.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/login/services/login.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/login/services/login.ts.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/login/services/login.ts.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/app/vite-env.d.ts.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/app/vite-env.d.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/app/vite-env.d.ts.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/app/vite-env.d.ts.mustache diff --git a/src/main/resources/generator/client/react/src/main/webapp/assets/JHipster-Lite-neon-blue.png b/src/main/resources/generator/client/react/core/src/main/webapp/assets/JHipster-Lite-neon-blue.png similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/assets/JHipster-Lite-neon-blue.png rename to src/main/resources/generator/client/react/core/src/main/webapp/assets/JHipster-Lite-neon-blue.png diff --git a/src/main/resources/generator/client/react/src/main/webapp/assets/ReactLogo.png b/src/main/resources/generator/client/react/core/src/main/webapp/assets/ReactLogo.png similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/assets/ReactLogo.png rename to src/main/resources/generator/client/react/core/src/main/webapp/assets/ReactLogo.png diff --git a/src/main/resources/generator/client/react/src/main/webapp/index.html.mustache b/src/main/resources/generator/client/react/core/src/main/webapp/index.html.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/main/webapp/index.html.mustache rename to src/main/resources/generator/client/react/core/src/main/webapp/index.html.mustache diff --git a/src/main/resources/generator/client/react/src/test/webapp/unit/common/primary/app/App.spec.tsx.mustache b/src/main/resources/generator/client/react/core/src/test/webapp/unit/common/primary/app/App.spec.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/test/webapp/unit/common/primary/app/App.spec.tsx.mustache rename to src/main/resources/generator/client/react/core/src/test/webapp/unit/common/primary/app/App.spec.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/test/webapp/unit/common/primary/app/App.test.tsx.mustache b/src/main/resources/generator/client/react/core/src/test/webapp/unit/common/primary/app/App.test.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/test/webapp/unit/common/primary/app/App.test.tsx.mustache rename to src/main/resources/generator/client/react/core/src/test/webapp/unit/common/primary/app/App.test.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/test/webapp/unit/common/services/storage.test.ts.mustache b/src/main/resources/generator/client/react/core/src/test/webapp/unit/common/services/storage.test.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/test/webapp/unit/common/services/storage.test.ts.mustache rename to src/main/resources/generator/client/react/core/src/test/webapp/unit/common/services/storage.test.ts.mustache diff --git a/src/main/resources/generator/client/react/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache b/src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache rename to src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache b/src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache rename to src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache diff --git a/src/main/resources/generator/client/react/src/test/webapp/unit/login/services/login.test.ts.mustache b/src/main/resources/generator/client/react/core/src/test/webapp/unit/login/services/login.test.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/src/test/webapp/unit/login/services/login.test.ts.mustache rename to src/main/resources/generator/client/react/core/src/test/webapp/unit/login/services/login.test.ts.mustache diff --git a/src/main/resources/generator/client/react/tailwind.config.js b/src/main/resources/generator/client/react/core/tailwind.config.js similarity index 100% rename from src/main/resources/generator/client/react/tailwind.config.js rename to src/main/resources/generator/client/react/core/tailwind.config.js diff --git a/src/main/resources/generator/client/react/tsconfig.json b/src/main/resources/generator/client/react/core/tsconfig.json similarity index 100% rename from src/main/resources/generator/client/react/tsconfig.json rename to src/main/resources/generator/client/react/core/tsconfig.json diff --git a/src/main/resources/generator/client/react/vite.config.ts.mustache b/src/main/resources/generator/client/react/core/vite.config.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/vite.config.ts.mustache rename to src/main/resources/generator/client/react/core/vite.config.ts.mustache diff --git a/src/main/resources/generator/client/react/vitest.config.ts.mustache b/src/main/resources/generator/client/react/core/vitest.config.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/vitest.config.ts.mustache rename to src/main/resources/generator/client/react/core/vitest.config.ts.mustache From 4a304158ecbed3a1c4be86d1942968d3b67cdf9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sun, 25 Aug 2024 14:21:47 +0200 Subject: [PATCH 4/4] refactor(react-jwt): split react-jwt resources from react-core --- .../react/security/jwt/domain/ReactJwtModuleFactory.java | 4 ++-- .../client/react/{core => security/jwt}/postcss.config.js | 0 .../main/webapp/app/common/primary/app/LoginApp.tsx.mustache | 0 .../src/main/webapp/app/common/services/storage.ts.mustache | 0 .../webapp/app/login/primary/loginForm/index.tsx.mustache | 0 .../app/login/primary/loginModal/EyeFilledIcon.tsx.mustache | 0 .../login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache | 0 .../app/login/primary/loginModal/LoginModal.scss.mustache | 0 .../webapp/app/login/primary/loginModal/index.tsx.mustache | 0 .../app/login/primary/loginModal/interface.d.ts.mustache | 0 .../jwt}/src/main/webapp/app/login/services/login.ts.mustache | 0 .../test/webapp/unit/common/services/storage.test.ts.mustache | 0 .../unit/login/primary/loginForm/index.test.tsx.mustache | 0 .../unit/login/primary/loginModal/index.test.tsx.mustache | 0 .../test/webapp/unit/login/services/login.test.ts.mustache | 0 .../client/react/{core => security/jwt}/tailwind.config.js | 0 16 files changed, 2 insertions(+), 2 deletions(-) rename src/main/resources/generator/client/react/{core => security/jwt}/postcss.config.js (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/common/services/storage.ts.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/main/webapp/app/login/services/login.ts.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/test/webapp/unit/common/services/storage.test.ts.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/src/test/webapp/unit/login/services/login.test.ts.mustache (100%) rename src/main/resources/generator/client/react/{core => security/jwt}/tailwind.config.js (100%) diff --git a/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java index 62cf2bfcf28..2215293a74c 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java @@ -16,9 +16,9 @@ public class ReactJwtModuleFactory { private static final String APP = ""; - private static final JHipsterSource ROOT = from("client/react"); + private static final JHipsterSource ROOT = from("client/react/security/jwt"); - private static final JHipsterSource SOURCE = from("client/react/src"); + private static final JHipsterSource SOURCE = ROOT.append("src"); private static final JHipsterSource APP_SOURCE = SOURCE.append("main/webapp/app"); private static final JHipsterSource TEST_JAVASCRIPT_SOURCE = SOURCE.append("test/webapp/unit"); diff --git a/src/main/resources/generator/client/react/core/postcss.config.js b/src/main/resources/generator/client/react/security/jwt/postcss.config.js similarity index 100% rename from src/main/resources/generator/client/react/core/postcss.config.js rename to src/main/resources/generator/client/react/security/jwt/postcss.config.js diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/common/primary/app/LoginApp.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/common/services/storage.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/common/services/storage.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/common/services/storage.ts.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/common/services/storage.ts.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginForm/index.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/EyeFilledIcon.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/EyeSlashFilledIcon.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/LoginModal.scss.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/index.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/primary/loginModal/interface.d.ts.mustache diff --git a/src/main/resources/generator/client/react/core/src/main/webapp/app/login/services/login.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/services/login.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/main/webapp/app/login/services/login.ts.mustache rename to src/main/resources/generator/client/react/security/jwt/src/main/webapp/app/login/services/login.ts.mustache diff --git a/src/main/resources/generator/client/react/core/src/test/webapp/unit/common/services/storage.test.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/common/services/storage.test.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/test/webapp/unit/common/services/storage.test.ts.mustache rename to src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/common/services/storage.test.ts.mustache diff --git a/src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginForm/index.test.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache rename to src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/primary/loginModal/index.test.tsx.mustache diff --git a/src/main/resources/generator/client/react/core/src/test/webapp/unit/login/services/login.test.ts.mustache b/src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/services/login.test.ts.mustache similarity index 100% rename from src/main/resources/generator/client/react/core/src/test/webapp/unit/login/services/login.test.ts.mustache rename to src/main/resources/generator/client/react/security/jwt/src/test/webapp/unit/login/services/login.test.ts.mustache diff --git a/src/main/resources/generator/client/react/core/tailwind.config.js b/src/main/resources/generator/client/react/security/jwt/tailwind.config.js similarity index 100% rename from src/main/resources/generator/client/react/core/tailwind.config.js rename to src/main/resources/generator/client/react/security/jwt/tailwind.config.js