Merge pull request #10668 from murdos/react-adjustments

React resources reorg
jhipster · Aug 25, 2024 · 8ccb5bf · 8ccb5bf
2 parents f8efc0d + 4a30415
commit 8ccb5bf
Show file tree

Hide file tree

Showing 36 changed files with 6 additions and 36 deletions.
diff --git a/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java b/...n/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/.../tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java b/.../tech/jhipster/lite/generator/client/react/security/jwt/domain/ReactJwtModuleFactory.java
@@ -16,9 +16,9 @@ public class ReactJwtModuleFactory {
 
   private static final String APP = "<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/common/reacti18n/src/main/webapp/app/i18n.ts.mustache b/src/main/resources/generator/client/common/reacti18n/src/main/webapp/app/i18n.ts.mustache
diff --git a/.../resources/generator/client/common/reacti18n/src/main/webapp/assets/english.json.mustache b/.../resources/generator/client/common/reacti18n/src/main/webapp/assets/english.json.mustache
diff --git a/...n/resources/generator/client/common/reacti18n/src/main/webapp/assets/french.json.mustache b/...n/resources/generator/client/common/reacti18n/src/main/webapp/assets/french.json.mustache
diff --git a/...rces/generator/client/react/.eslintrc.cjs → ...generator/client/react/core/.eslintrc.cjs b/...rces/generator/client/react/.eslintrc.cjs → ...generator/client/react/core/.eslintrc.cjs
diff --git a/...p/app/common/primary/app/App.css.mustache → ...p/app/common/primary/app/App.css.mustache b/...p/app/common/primary/app/App.css.mustache → ...p/app/common/primary/app/App.css.mustache
diff --git a/...p/app/common/primary/app/App.tsx.mustache → ...p/app/common/primary/app/App.tsx.mustache b/...p/app/common/primary/app/App.tsx.mustache → ...p/app/common/primary/app/App.tsx.mustache
diff --git a/...ct/src/main/webapp/app/index.css.mustache → ...re/src/main/webapp/app/index.css.mustache b/...ct/src/main/webapp/app/index.css.mustache → ...re/src/main/webapp/app/index.css.mustache
diff --git a/...ct/src/main/webapp/app/index.tsx.mustache → ...re/src/main/webapp/app/index.tsx.mustache b/...ct/src/main/webapp/app/index.tsx.mustache → ...re/src/main/webapp/app/index.tsx.mustache
diff --git a/...rc/main/webapp/app/vite-env.d.ts.mustache → ...rc/main/webapp/app/vite-env.d.ts.mustache b/...rc/main/webapp/app/vite-env.d.ts.mustache → ...rc/main/webapp/app/vite-env.d.ts.mustache
diff --git a/...webapp/assets/JHipster-Lite-neon-blue.png → ...webapp/assets/JHipster-Lite-neon-blue.png b/...webapp/assets/JHipster-Lite-neon-blue.png → ...webapp/assets/JHipster-Lite-neon-blue.png
diff --git a/...eact/src/main/webapp/assets/ReactLogo.png → ...core/src/main/webapp/assets/ReactLogo.png b/...eact/src/main/webapp/assets/ReactLogo.png → ...core/src/main/webapp/assets/ReactLogo.png
diff --git a/...react/src/main/webapp/index.html.mustache → .../core/src/main/webapp/index.html.mustache b/...react/src/main/webapp/index.html.mustache → .../core/src/main/webapp/index.html.mustache
diff --git a/.../common/primary/app/App.spec.tsx.mustache → .../common/primary/app/App.spec.tsx.mustache b/.../common/primary/app/App.spec.tsx.mustache → .../common/primary/app/App.spec.tsx.mustache
diff --git a/.../common/primary/app/App.test.tsx.mustache → .../common/primary/app/App.test.tsx.mustache b/.../common/primary/app/App.test.tsx.mustache → .../common/primary/app/App.test.tsx.mustache
diff --git a/...rces/generator/client/react/tsconfig.json → ...generator/client/react/core/tsconfig.json b/...rces/generator/client/react/tsconfig.json → ...generator/client/react/core/tsconfig.json
diff --git a/...ator/client/react/vite.config.ts.mustache → ...client/react/core/vite.config.ts.mustache b/...ator/client/react/vite.config.ts.mustache → ...client/react/core/vite.config.ts.mustache
diff --git a/...or/client/react/vitest.config.ts.mustache → ...ient/react/core/vitest.config.ts.mustache b/...or/client/react/vitest.config.ts.mustache → ...ient/react/core/vitest.config.ts.mustache
diff --git a/.../generator/client/react/postcss.config.js → ...ient/react/security/jwt/postcss.config.js b/.../generator/client/react/postcss.config.js → ...ient/react/security/jwt/postcss.config.js
diff --git a/.../common/primary/app/LoginApp.tsx.mustache → .../common/primary/app/LoginApp.tsx.mustache b/.../common/primary/app/LoginApp.tsx.mustache → .../common/primary/app/LoginApp.tsx.mustache
diff --git a/...p/app/common/services/storage.ts.mustache → ...p/app/common/services/storage.ts.mustache b/...p/app/common/services/storage.ts.mustache → ...p/app/common/services/storage.ts.mustache
diff --git a/...ogin/primary/loginForm/index.tsx.mustache → ...ogin/primary/loginForm/index.tsx.mustache b/...ogin/primary/loginForm/index.tsx.mustache → ...ogin/primary/loginForm/index.tsx.mustache
diff --git a/...ary/loginModal/EyeFilledIcon.tsx.mustache → ...ary/loginModal/EyeFilledIcon.tsx.mustache b/...ary/loginModal/EyeFilledIcon.tsx.mustache → ...ary/loginModal/EyeFilledIcon.tsx.mustache
diff --git a/...oginModal/EyeSlashFilledIcon.tsx.mustache → ...oginModal/EyeSlashFilledIcon.tsx.mustache b/...oginModal/EyeSlashFilledIcon.tsx.mustache → ...oginModal/EyeSlashFilledIcon.tsx.mustache
diff --git a/...imary/loginModal/LoginModal.scss.mustache → ...imary/loginModal/LoginModal.scss.mustache b/...imary/loginModal/LoginModal.scss.mustache → ...imary/loginModal/LoginModal.scss.mustache
diff --git a/...gin/primary/loginModal/index.tsx.mustache → ...gin/primary/loginModal/index.tsx.mustache b/...gin/primary/loginModal/index.tsx.mustache → ...gin/primary/loginModal/index.tsx.mustache
diff --git a/...rimary/loginModal/interface.d.ts.mustache → ...rimary/loginModal/interface.d.ts.mustache b/...rimary/loginModal/interface.d.ts.mustache → ...rimary/loginModal/interface.d.ts.mustache
diff --git a/...bapp/app/login/services/login.ts.mustache → ...bapp/app/login/services/login.ts.mustache b/...bapp/app/login/services/login.ts.mustache → ...bapp/app/login/services/login.ts.mustache
diff --git a/.../common/services/storage.test.ts.mustache → .../common/services/storage.test.ts.mustache b/.../common/services/storage.test.ts.mustache → .../common/services/storage.test.ts.mustache
diff --git a/...primary/loginForm/index.test.tsx.mustache → ...primary/loginForm/index.test.tsx.mustache b/...primary/loginForm/index.test.tsx.mustache → ...primary/loginForm/index.test.tsx.mustache
diff --git a/...rimary/loginModal/index.test.tsx.mustache → ...rimary/loginModal/index.test.tsx.mustache b/...rimary/loginModal/index.test.tsx.mustache → ...rimary/loginModal/index.test.tsx.mustache
diff --git a/...nit/login/services/login.test.ts.mustache → ...nit/login/services/login.test.ts.mustache b/...nit/login/services/login.test.ts.mustache → ...nit/login/services/login.test.ts.mustache
diff --git a/...generator/client/react/tailwind.config.js → ...ent/react/security/jwt/tailwind.config.js b/...generator/client/react/tailwind.config.js → ...ent/react/security/jwt/tailwind.config.js
diff --git a/src/test/features/client/reacti18n.feature → src/test/features/client/react-i18n.feature b/src/test/features/client/reacti18n.feature → src/test/features/client/react-i18n.feature
diff --git a/...ava/tech/jhipster/lite/generator/client/react/i18n/domain/ReactI18nModuleFactoryTest.java b/...ava/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(