Move user-profile-page as frontend package

zanata · Jul 28, 2015 · 724697d · 724697d
1 parent 6989241
commit 724697d
Show file tree

Hide file tree

Showing 32 changed files with 6 additions and 9 deletions.
diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -19,9 +19,6 @@
     <npm.cli.script>${node.install.directory}/node/npm/bin/npm-cli.js</npm.cli.script>
     <!-- in seconds. 10 is the default value -->
     <npm.cache.min>10</npm.cache.min>
-
-    <!-- ==== list of modules to build by npm and node ==== -->
-    <module.user-profile-page>user-profile-page</module.user-profile-page>
   </properties>
 
 
@@ -75,13 +72,13 @@
 
         <executions>
           <execution>
-            <id>execute npm install for: ${module.user-profile-page}</id>
+            <id>execute npm install for: ${project.artifactId}</id>
             <phase>process-resources</phase>
             <goals>
               <goal>exec</goal>
             </goals>
             <configuration>
-              <workingDirectory>${web.target}/${module.user-profile-page}</workingDirectory>
+              <workingDirectory>${web.target}</workingDirectory>
               <arguments>
                 <argument>${npm.cli.script}</argument>
                 <argument>install</argument>
@@ -91,13 +88,13 @@
             </configuration>
           </execution>
           <execution>
-            <id>execute npm run build for: ${module.user-profile-page}</id>
+            <id>execute npm run build for: ${project.artifactId}</id>
             <phase>compile</phase>
             <goals>
               <goal>exec</goal>
             </goals>
             <configuration>
-              <workingDirectory>${web.target}/${module.user-profile-page}</workingDirectory>
+              <workingDirectory>${web.target}</workingDirectory>
               <arguments>
                 <argument>${npm.cli.script}</argument>
                 <argument>run</argument>

diff --git a/.../src/main/web/user-profile-page/README.md → frontend/src/main/web/README.md b/.../src/main/web/user-profile-page/README.md → frontend/src/main/web/README.md
diff --git a/...nd/src/main/web/user-profile-page/copy.sh → frontend/src/main/web/copy.sh b/...nd/src/main/web/user-profile-page/copy.sh → frontend/src/main/web/copy.sh
diff --git a/...src/main/web/user-profile-page/index.html → frontend/src/main/web/index.html b/...src/main/web/user-profile-page/index.html → frontend/src/main/web/index.html
diff --git a/...d/src/main/web/user-profile-page/index.js → frontend/src/main/web/index.js b/...d/src/main/web/user-profile-page/index.js → frontend/src/main/web/index.js
diff --git a/.../user-profile-page/lib/actions/Actions.js → frontend/src/main/web/lib/actions/Actions.js b/.../user-profile-page/lib/actions/Actions.js → frontend/src/main/web/lib/actions/Actions.js
diff --git a/...ge/lib/components/CalendarMonthMatrix.jsx → ...eb/lib/components/CalendarMonthMatrix.jsx b/...ge/lib/components/CalendarMonthMatrix.jsx → ...eb/lib/components/CalendarMonthMatrix.jsx
diff --git a/.../lib/components/CalendarPeriodHeading.jsx → .../lib/components/CalendarPeriodHeading.jsx b/.../lib/components/CalendarPeriodHeading.jsx → .../lib/components/CalendarPeriodHeading.jsx
diff --git a/...age/lib/components/CategoryItemMatrix.jsx → ...web/lib/components/CategoryItemMatrix.jsx b/...age/lib/components/CategoryItemMatrix.jsx → ...web/lib/components/CategoryItemMatrix.jsx
diff --git a/...ge/lib/components/CategoryMatrixTable.jsx → ...eb/lib/components/CategoryMatrixTable.jsx b/...ge/lib/components/CategoryMatrixTable.jsx → ...eb/lib/components/CategoryMatrixTable.jsx
diff --git a/...age/lib/components/ContentStateFilter.jsx → ...web/lib/components/ContentStateFilter.jsx b/...age/lib/components/ContentStateFilter.jsx → ...web/lib/components/ContentStateFilter.jsx
diff --git a/...page/lib/components/ContributionChart.jsx → .../web/lib/components/ContributionChart.jsx b/...page/lib/components/ContributionChart.jsx → .../web/lib/components/ContributionChart.jsx
diff --git a/...profile-page/lib/components/DayMatrix.jsx → ...src/main/web/lib/components/DayMatrix.jsx b/...profile-page/lib/components/DayMatrix.jsx → ...src/main/web/lib/components/DayMatrix.jsx
diff --git a/...-profile-page/lib/components/DropDown.jsx → .../src/main/web/lib/components/DropDown.jsx b/...-profile-page/lib/components/DropDown.jsx → .../src/main/web/lib/components/DropDown.jsx
diff --git a/.../lib/components/FilterableMatrixTable.jsx → .../lib/components/FilterableMatrixTable.jsx b/.../lib/components/FilterableMatrixTable.jsx → .../lib/components/FilterableMatrixTable.jsx
diff --git a/...ge/lib/components/RecentContributions.jsx → ...eb/lib/components/RecentContributions.jsx b/...ge/lib/components/RecentContributions.jsx → ...eb/lib/components/RecentContributions.jsx
diff --git a/...profile-page/lib/constants/ActionTypes.js → ...src/main/web/lib/constants/ActionTypes.js b/...profile-page/lib/constants/ActionTypes.js → ...src/main/web/lib/constants/ActionTypes.js
diff --git a/...ser-profile-page/lib/constants/Configs.js → ...end/src/main/web/lib/constants/Configs.js b/...ser-profile-page/lib/constants/Configs.js → ...end/src/main/web/lib/constants/Configs.js
diff --git a/...ser-profile-page/lib/constants/Options.js → ...end/src/main/web/lib/constants/Options.js b/...ser-profile-page/lib/constants/Options.js → ...end/src/main/web/lib/constants/Options.js
diff --git a/...e/lib/dispatchers/UserMatrixDispatcher.js → ...b/lib/dispatchers/UserMatrixDispatcher.js b/...e/lib/dispatchers/UserMatrixDispatcher.js → ...b/lib/dispatchers/UserMatrixDispatcher.js
diff --git a/...rofile-page/lib/stores/UserMatrixStore.js → ...rc/main/web/lib/stores/UserMatrixStore.js b/...rofile-page/lib/stores/UserMatrixStore.js → ...rc/main/web/lib/stores/UserMatrixStore.js
diff --git a/...e-page/lib/stores/__mocks__/superagent.js → ...in/web/lib/stores/__mocks__/superagent.js b/...e-page/lib/stores/__mocks__/superagent.js → ...in/web/lib/stores/__mocks__/superagent.js
diff --git a/...b/stores/__tests__/UserMatrixStoreTest.js → ...b/stores/__tests__/UserMatrixStoreTest.js b/...b/stores/__tests__/UserMatrixStoreTest.js → ...b/stores/__tests__/UserMatrixStoreTest.js
diff --git a/...er-profile-page/lib/stores/userStats.json → ...nd/src/main/web/lib/stores/userStats.json b/...er-profile-page/lib/stores/userStats.json → ...nd/src/main/web/lib/stores/userStats.json
diff --git a/...user-profile-page/lib/utils/DateHelper.js → ...tend/src/main/web/lib/utils/DateHelper.js b/...user-profile-page/lib/utils/DateHelper.js → ...tend/src/main/web/lib/utils/DateHelper.js
diff --git a/...web/user-profile-page/npm-shrinkwrap.json → frontend/src/main/web/npm-shrinkwrap.json b/...web/user-profile-page/npm-shrinkwrap.json → frontend/src/main/web/npm-shrinkwrap.json
diff --git a/...c/main/web/user-profile-page/package.json → frontend/src/main/web/package.json b/...c/main/web/user-profile-page/package.json → frontend/src/main/web/package.json
diff --git a/...ain/web/user-profile-page/preprocessor.js → frontend/src/main/web/preprocessor.js b/...ain/web/user-profile-page/preprocessor.js → frontend/src/main/web/preprocessor.js
diff --git a/.../src/main/web/user-profile-page/server.js → frontend/src/main/web/server.js b/.../src/main/web/user-profile-page/server.js → frontend/src/main/web/server.js
diff --git a/...n/web/user-profile-page/webpack.config.js → frontend/src/main/web/webpack.config.js b/...n/web/user-profile-page/webpack.config.js → frontend/src/main/web/webpack.config.js
diff --git a/.../user-profile-page/webpack.prod.config.js → frontend/src/main/web/webpack.prod.config.js b/.../user-profile-page/webpack.prod.config.js → frontend/src/main/web/webpack.prod.config.js
@@ -11,7 +11,7 @@ module.exports = {
   ],
   output: {
     path: bundleDest,
-    filename: path.basename(__dirname) + '.bundle.min.js',
+    filename: 'frontend.bundle.min.js',
     pathinfo: true
   },
   module: {

diff --git a/zanata-war/src/main/webapp/profile/home.xhtml b/zanata-war/src/main/webapp/profile/home.xhtml
@@ -43,6 +43,6 @@
     </div>
 
     <script type="text/javascript"
-      src="#{request.contextPath}/user-profile-page.bundle.min.js"></script>
+      src="#{request.contextPath}/frontend.bundle.min.js"></script>
   </ui:define>
 </ui:composition>