From 724697d768fe60d91211e385434806b6296dcf2d Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Tue, 28 Jul 2015 10:50:56 +1000 Subject: [PATCH] Move user-profile-page as frontend package --- frontend/pom.xml | 11 ++++------- .../src/main/web/{user-profile-page => }/README.md | 0 frontend/src/main/web/{user-profile-page => }/copy.sh | 0 .../src/main/web/{user-profile-page => }/index.html | 0 .../src/main/web/{user-profile-page => }/index.js | 0 .../{user-profile-page => }/lib/actions/Actions.js | 0 .../lib/components/CalendarMonthMatrix.jsx | 0 .../lib/components/CalendarPeriodHeading.jsx | 0 .../lib/components/CategoryItemMatrix.jsx | 0 .../lib/components/CategoryMatrixTable.jsx | 0 .../lib/components/ContentStateFilter.jsx | 0 .../lib/components/ContributionChart.jsx | 0 .../lib/components/DayMatrix.jsx | 0 .../lib/components/DropDown.jsx | 0 .../lib/components/FilterableMatrixTable.jsx | 0 .../lib/components/RecentContributions.jsx | 0 .../lib/constants/ActionTypes.js | 0 .../{user-profile-page => }/lib/constants/Configs.js | 0 .../{user-profile-page => }/lib/constants/Options.js | 0 .../lib/dispatchers/UserMatrixDispatcher.js | 0 .../lib/stores/UserMatrixStore.js | 0 .../lib/stores/__mocks__/superagent.js | 0 .../lib/stores/__tests__/UserMatrixStoreTest.js | 0 .../{user-profile-page => }/lib/stores/userStats.json | 0 .../{user-profile-page => }/lib/utils/DateHelper.js | 0 .../web/{user-profile-page => }/npm-shrinkwrap.json | 0 .../src/main/web/{user-profile-page => }/package.json | 0 .../main/web/{user-profile-page => }/preprocessor.js | 0 .../src/main/web/{user-profile-page => }/server.js | 0 .../web/{user-profile-page => }/webpack.config.js | 0 .../{user-profile-page => }/webpack.prod.config.js | 2 +- zanata-war/src/main/webapp/profile/home.xhtml | 2 +- 32 files changed, 6 insertions(+), 9 deletions(-) rename frontend/src/main/web/{user-profile-page => }/README.md (100%) rename frontend/src/main/web/{user-profile-page => }/copy.sh (100%) rename frontend/src/main/web/{user-profile-page => }/index.html (100%) rename frontend/src/main/web/{user-profile-page => }/index.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/actions/Actions.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/CalendarMonthMatrix.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/CalendarPeriodHeading.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/CategoryItemMatrix.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/CategoryMatrixTable.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/ContentStateFilter.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/ContributionChart.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/DayMatrix.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/DropDown.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/FilterableMatrixTable.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/components/RecentContributions.jsx (100%) rename frontend/src/main/web/{user-profile-page => }/lib/constants/ActionTypes.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/constants/Configs.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/constants/Options.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/dispatchers/UserMatrixDispatcher.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/stores/UserMatrixStore.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/stores/__mocks__/superagent.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/stores/__tests__/UserMatrixStoreTest.js (100%) rename frontend/src/main/web/{user-profile-page => }/lib/stores/userStats.json (100%) rename frontend/src/main/web/{user-profile-page => }/lib/utils/DateHelper.js (100%) rename frontend/src/main/web/{user-profile-page => }/npm-shrinkwrap.json (100%) rename frontend/src/main/web/{user-profile-page => }/package.json (100%) rename frontend/src/main/web/{user-profile-page => }/preprocessor.js (100%) rename frontend/src/main/web/{user-profile-page => }/server.js (100%) rename frontend/src/main/web/{user-profile-page => }/webpack.config.js (100%) rename frontend/src/main/web/{user-profile-page => }/webpack.prod.config.js (94%) diff --git a/frontend/pom.xml b/frontend/pom.xml index f4e9f91e73..a75d7fcb21 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -19,9 +19,6 @@ ${node.install.directory}/node/npm/bin/npm-cli.js 10 - - - user-profile-page @@ -75,13 +72,13 @@ - execute npm install for: ${module.user-profile-page} + execute npm install for: ${project.artifactId} process-resources exec - ${web.target}/${module.user-profile-page} + ${web.target} ${npm.cli.script} install @@ -91,13 +88,13 @@ - execute npm run build for: ${module.user-profile-page} + execute npm run build for: ${project.artifactId} compile exec - ${web.target}/${module.user-profile-page} + ${web.target} ${npm.cli.script} run diff --git a/frontend/src/main/web/user-profile-page/README.md b/frontend/src/main/web/README.md similarity index 100% rename from frontend/src/main/web/user-profile-page/README.md rename to frontend/src/main/web/README.md diff --git a/frontend/src/main/web/user-profile-page/copy.sh b/frontend/src/main/web/copy.sh similarity index 100% rename from frontend/src/main/web/user-profile-page/copy.sh rename to frontend/src/main/web/copy.sh diff --git a/frontend/src/main/web/user-profile-page/index.html b/frontend/src/main/web/index.html similarity index 100% rename from frontend/src/main/web/user-profile-page/index.html rename to frontend/src/main/web/index.html diff --git a/frontend/src/main/web/user-profile-page/index.js b/frontend/src/main/web/index.js similarity index 100% rename from frontend/src/main/web/user-profile-page/index.js rename to frontend/src/main/web/index.js diff --git a/frontend/src/main/web/user-profile-page/lib/actions/Actions.js b/frontend/src/main/web/lib/actions/Actions.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/actions/Actions.js rename to frontend/src/main/web/lib/actions/Actions.js diff --git a/frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx b/frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx rename to frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx b/frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx rename to frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx b/frontend/src/main/web/lib/components/CategoryItemMatrix.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx rename to frontend/src/main/web/lib/components/CategoryItemMatrix.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx b/frontend/src/main/web/lib/components/CategoryMatrixTable.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx rename to frontend/src/main/web/lib/components/CategoryMatrixTable.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx b/frontend/src/main/web/lib/components/ContentStateFilter.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx rename to frontend/src/main/web/lib/components/ContentStateFilter.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx b/frontend/src/main/web/lib/components/ContributionChart.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx rename to frontend/src/main/web/lib/components/ContributionChart.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx b/frontend/src/main/web/lib/components/DayMatrix.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx rename to frontend/src/main/web/lib/components/DayMatrix.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx b/frontend/src/main/web/lib/components/DropDown.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx rename to frontend/src/main/web/lib/components/DropDown.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx b/frontend/src/main/web/lib/components/FilterableMatrixTable.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx rename to frontend/src/main/web/lib/components/FilterableMatrixTable.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx b/frontend/src/main/web/lib/components/RecentContributions.jsx similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx rename to frontend/src/main/web/lib/components/RecentContributions.jsx diff --git a/frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js b/frontend/src/main/web/lib/constants/ActionTypes.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js rename to frontend/src/main/web/lib/constants/ActionTypes.js diff --git a/frontend/src/main/web/user-profile-page/lib/constants/Configs.js b/frontend/src/main/web/lib/constants/Configs.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/constants/Configs.js rename to frontend/src/main/web/lib/constants/Configs.js diff --git a/frontend/src/main/web/user-profile-page/lib/constants/Options.js b/frontend/src/main/web/lib/constants/Options.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/constants/Options.js rename to frontend/src/main/web/lib/constants/Options.js diff --git a/frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js b/frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js rename to frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js diff --git a/frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js b/frontend/src/main/web/lib/stores/UserMatrixStore.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js rename to frontend/src/main/web/lib/stores/UserMatrixStore.js diff --git a/frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js b/frontend/src/main/web/lib/stores/__mocks__/superagent.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js rename to frontend/src/main/web/lib/stores/__mocks__/superagent.js diff --git a/frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js b/frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js rename to frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js diff --git a/frontend/src/main/web/user-profile-page/lib/stores/userStats.json b/frontend/src/main/web/lib/stores/userStats.json similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/stores/userStats.json rename to frontend/src/main/web/lib/stores/userStats.json diff --git a/frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js b/frontend/src/main/web/lib/utils/DateHelper.js similarity index 100% rename from frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js rename to frontend/src/main/web/lib/utils/DateHelper.js diff --git a/frontend/src/main/web/user-profile-page/npm-shrinkwrap.json b/frontend/src/main/web/npm-shrinkwrap.json similarity index 100% rename from frontend/src/main/web/user-profile-page/npm-shrinkwrap.json rename to frontend/src/main/web/npm-shrinkwrap.json diff --git a/frontend/src/main/web/user-profile-page/package.json b/frontend/src/main/web/package.json similarity index 100% rename from frontend/src/main/web/user-profile-page/package.json rename to frontend/src/main/web/package.json diff --git a/frontend/src/main/web/user-profile-page/preprocessor.js b/frontend/src/main/web/preprocessor.js similarity index 100% rename from frontend/src/main/web/user-profile-page/preprocessor.js rename to frontend/src/main/web/preprocessor.js diff --git a/frontend/src/main/web/user-profile-page/server.js b/frontend/src/main/web/server.js similarity index 100% rename from frontend/src/main/web/user-profile-page/server.js rename to frontend/src/main/web/server.js diff --git a/frontend/src/main/web/user-profile-page/webpack.config.js b/frontend/src/main/web/webpack.config.js similarity index 100% rename from frontend/src/main/web/user-profile-page/webpack.config.js rename to frontend/src/main/web/webpack.config.js diff --git a/frontend/src/main/web/user-profile-page/webpack.prod.config.js b/frontend/src/main/web/webpack.prod.config.js similarity index 94% rename from frontend/src/main/web/user-profile-page/webpack.prod.config.js rename to frontend/src/main/web/webpack.prod.config.js index 44f2731372..9a2d2eabc6 100644 --- a/frontend/src/main/web/user-profile-page/webpack.prod.config.js +++ b/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 index acf2bd5125..2b8697dfc7 100644 --- a/zanata-war/src/main/webapp/profile/home.xhtml +++ b/zanata-war/src/main/webapp/profile/home.xhtml @@ -43,6 +43,6 @@ + src="#{request.contextPath}/frontend.bundle.min.js">