Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
d8ea763
Merge pull request #2565 from appirio-tech/hotfix/fixed_creation_date…
RishiRajSahu Oct 1, 2018
de75f4f
fix typo in Notifications Settings form
maxceem Oct 3, 2018
3ab8c00
issue #2554 - Newly Added phase is not correctly setting startDate wh…
maxceem Oct 4, 2018
defb71d
Merge pull request #2579 from appirio-tech/issue-2554
RishiRajSahu Oct 4, 2018
aa04d16
Merge pull request #2583 from appirio-tech/hotfix/updated_react_compo…
RishiRajSahu Oct 4, 2018
c9faa33
Update README.md
nkumar-topcoder Oct 5, 2018
4f340d0
fix user profile and change email forms for sake of easy project run …
maxceem Oct 8, 2018
e4afb1b
fix issue #2586 - PostCSS Loader warning in browser console
maxceem Oct 8, 2018
2e95d08
fix lint errors
maxceem Oct 8, 2018
3aa75ea
issue #2587 - Dev Tools on Chrome is extremely slow when exploring st…
maxceem Oct 9, 2018
805ba9d
fix Roboto font loading
maxceem Oct 9, 2018
cf15933
updated and simplified README for new members to quickly run applicat…
maxceem Oct 9, 2018
ad71659
fix README type
maxceem Oct 9, 2018
ff0fc69
Merge pull request #2590 from appirio-tech/feature/update-readme
RishiRajSahu Oct 9, 2018
9998e03
Merge pull request #2589 from appirio-tech/feature/fix-roboto-font
RishiRajSahu Oct 9, 2018
5f5135b
issue #2591 - "TypeError: Cannot read property 'concat' of null" when…
maxceem Oct 10, 2018
8b04a78
fix issue #2543 - Warning: Unknown prop 'data-color' and 'data-cap' i…
maxceem Oct 10, 2018
d2f1a3c
Config CircleCI to test PRs against `cf13` branch and deploy `cf13` b…
maxceem Oct 10, 2018
aecf0a9
Revert "Config CircleCI to test PRs against `cf13` branch and deploy …
maxceem Oct 10, 2018
e3b1e50
Config CircleCI to test PRs against `cf13` branch and deploy `cf13` b…
maxceem Oct 10, 2018
08b7899
fixes #2153
sumitdaga Oct 10, 2018
3d3e585
Revert "Config CircleCI to test PRs against `cf13` branch and deploy …
maxceem Oct 10, 2018
aaa6f8a
Merge pull request #2592 from sumitdaga/issue-2153
maxceem Oct 10, 2018
5175668
fixes #2150
sumitdaga Oct 10, 2018
af60620
fixes pending issue
sumitdaga Oct 10, 2018
00fe110
Merge pull request #2593 from sumitdaga/issue-2150
maxceem Oct 10, 2018
c15431f
issues_2584 Hyperlink text should be blue instead of black in Discuss…
iversonLv Oct 10, 2018
4ca53ae
fixes #2577
sumitdaga Oct 10, 2018
46de214
issue_2580 fixed
Gauravseta Oct 10, 2018
953d10d
Merge pull request #2594 from iversonLv/issues_2584
maxceem Oct 10, 2018
b3f7ed8
fixes #2478
sumitdaga Oct 10, 2018
77b971b
#2154, Disable user select for tabs
zjuasmn Oct 10, 2018
c0a6974
issue_2578 fixed
PrakashDurlabhji Oct 10, 2018
6119172
issues_2454 Edit phase Form for smaller screen sizes
iversonLv Oct 10, 2018
a187cd1
Issues #2567
jacky-zhangjb Oct 10, 2018
4f7e3ee
Fix Jumbled/Incorrect Words Appearing in Projects
gets0ul Oct 10, 2018
2d7e1e8
Allow editing link for final deliverable
gets0ul Oct 11, 2018
c6d6ad9
issue #2576 - Restore Coder the Bot avatar
maxceem Oct 11, 2018
59ed74a
Use productCategories instead of projectTypes for product classificat…
gets0ul Oct 11, 2018
1ba3bb2
Merge pull request #2617 from appirio-tech/hotfix/Fixed_reverted_chan…
RishiRajSahu Oct 11, 2018
a720fb1
add delay bar. fixes #2553
vigneshTheDev Oct 11, 2018
42b3bca
issue_2272 fixed
Gauravseta Oct 11, 2018
861266b
minor fix
Gauravseta Oct 11, 2018
a22cef1
issue_2568 fxed
PrakashDurlabhji Oct 11, 2018
0fef262
#2511 Sidebar jumps when we mark milestone as completed
zjuasmn Oct 11, 2018
218521d
fix warning about key in SelectDropdown component
maxceem Oct 12, 2018
2694b46
Merge pull request #2626 from appirio-tech/hotfix/error_while_expandi…
RishiRajSahu Oct 12, 2018
7f4efd2
issue_2574 fixed
Gauravseta Oct 12, 2018
521aab9
issue_2484 fixed
Oct 13, 2018
0af474e
Merge pull request #2595 from sumitdaga/issue-2577
maxceem Oct 14, 2018
66a6b4c
Merge pull request #2597 from sumitdaga/issue-2478
maxceem Oct 14, 2018
4eecd13
Merge pull request #2598 from zjuasmn/issue2154
maxceem Oct 14, 2018
cd4a758
Merge pull request #2613 from gets0ul/issue_2524
maxceem Oct 14, 2018
940a189
Merge pull request #2608 from maxceem/issue-2576
maxceem Oct 14, 2018
a584af6
Merge branch 'dev' into cf13
maxceem Oct 14, 2018
d8a866f
Merge pull request #2618 from vigneshTheDev/delay-bar-should-be-shown…
maxceem Oct 14, 2018
e64b168
Fix: final deliverable link can only be edited by manager/copilot.
gets0ul Oct 14, 2018
61339d8
Fix also the project list (both card and row modes).
gets0ul Oct 14, 2018
2ed8059
Merge pull request #2602 from gets0ul/issue_2518
maxceem Oct 14, 2018
81e85ed
Refactor the role checking.
gets0ul Oct 14, 2018
924f9df
issuE_2481 fixed
Oct 14, 2018
92f1718
issue_2580 minoxfix
Gauravseta Oct 14, 2018
de5b246
Merge branch 'cf13' of https://github.com/appirio-tech/connect-app in…
Gauravseta Oct 14, 2018
a6e0c1c
Always use newly assigned link value if final delivery phase is compl…
gets0ul Oct 14, 2018
24e8a16
update tooltip layout correctly at smaller screen and remove commente…
iversonLv Oct 14, 2018
d48bae0
Merge pull request #2630 from rashmi73/issue_2481_1
maxceem Oct 15, 2018
f54c6a9
Merge pull request #2596 from Gauravseta/issue_2580
maxceem Oct 15, 2018
5adf18d
Merge pull request #2600 from iversonLv/issues_2454
maxceem Oct 15, 2018
85f1852
additional fix for issue #2518 - fix for REF code
maxceem Oct 15, 2018
a19d1e1
Issues #2567 2
jacky-zhangjb Oct 15, 2018
f52cba6
Fix logic when there is final fix submitted.
gets0ul Oct 15, 2018
44bfa8e
Merge pull request #2621 from zjuasmn/issue2511
maxceem Oct 15, 2018
129f915
Fix lint error.
gets0ul Oct 15, 2018
c33ad7f
Merge pull request #2605 from gets0ul/issue_2492
maxceem Oct 15, 2018
a40f580
Merge branch 'cf13' of https://github.com/appirio-tech/connect-app in…
Gauravseta Oct 15, 2018
061aa1f
Merge pull request #2601 from jankyzhang/cf13
maxceem Oct 16, 2018
5b92621
Fixed bug: keeping phase-topic names in sync with phase name.
RishiRajSahu Oct 16, 2018
998ce99
Hiding specifications title for V3 projects
RishiRajSahu Oct 16, 2018
688272c
Keeping LinksMenu independent of phases
RishiRajSahu Oct 16, 2018
56fa181
lint
RishiRajSahu Oct 16, 2018
1d351c7
Merge branch 'cf13' of https://github.com/appirio-tech/connect-app in…
Gauravseta Oct 16, 2018
745bf28
issue_2574 linting fixed
Gauravseta Oct 16, 2018
25199fe
issue_2272 fixes
Gauravseta Oct 16, 2018
c8a3ca0
issue_2272 css fixes
Gauravseta Oct 16, 2018
0e2c1f0
Merge branch 'cf13' of https://github.com/appirio-tech/connect-app in…
Gauravseta Oct 16, 2018
285ceda
issue_2568 minox fix
PrakashDurlabhji Oct 16, 2018
c078737
Merge branch 'cf13' of https://github.com/appirio-tech/connect-app in…
PrakashDurlabhji Oct 16, 2018
6620869
Merge pull request #2627 from Gauravseta/issue_2574
maxceem Oct 17, 2018
8a633e9
Merge pull request #2635 from appirio-tech/hotfix/fixed_bug_updating_…
RishiRajSahu Oct 17, 2018
876eba3
issue #2637 - When we click notifications on Notifications page they …
maxceem Oct 17, 2018
61c3afb
Merge pull request #2638 from maxceem/issue-2637
maxceem Oct 17, 2018
7827749
Fixed kafka topic constant for project spec modified
Oct 17, 2018
7cd7e3d
issue #2559 - Copy `Submit for Review` button to the dashboard
maxceem Oct 17, 2018
c2935b4
issue_2578 minro fix
PrakashDurlabhji Oct 17, 2018
aa4db4a
linting fixd
PrakashDurlabhji Oct 17, 2018
a063caf
issue_2484 minor fix
Oct 17, 2018
3b06b66
issue_2484 deleting unecessary svg
Oct 17, 2018
681a04c
Merge pull request #2599 from PrakashDurlabhji/issue_2578
maxceem Oct 18, 2018
1e24c8d
Merge pull request #2620 from PrakashDurlabhji/issue_2568
maxceem Oct 18, 2018
5380d6e
issue #2642 - Invalid progress data in left panel
maxceem Oct 18, 2018
d3ab33e
issue #2642 - show progressbar as `Delayed x days` when project is de…
maxceem Oct 18, 2018
14d51fd
Merge pull request #2643 from maxceem/issue-2642
RishiRajSahu Oct 18, 2018
557b0f1
issue #2641 - Enable web notification settings for copilots/managers
maxceem Oct 19, 2018
7cbedf2
issue_2272 minor fix
Gauravseta Oct 19, 2018
78bc6bc
issue_2272 css fix
Gauravseta Oct 20, 2018
15a8df3
linting fixed
Gauravseta Oct 20, 2018
2ff367c
issue_2484 newstyles changes applied
Oct 20, 2018
8c7f10a
issue #1985 - user constants for notifications events instead of hard…
maxceem Oct 22, 2018
d6c2753
Merge pull request #2644 from maxceem/issue-2641
Oct 22, 2018
517214e
issue #2559 - renamed isProjectHasEstimation to isProjectEstimationPr…
maxceem Oct 22, 2018
fb89c75
issue #2559 - refactored VisualProjectEstimateSection to ProjectEstim…
maxceem Oct 22, 2018
3cf3a27
issue_2484 minor fix
Oct 22, 2018
607610f
linting fixd
Oct 22, 2018
13b8865
Merge pull request #2629 from rashmi73/issue_2484
maxceem Oct 23, 2018
cc5a896
Merge pull request #2640 from maxceem/issue-2559
RishiRajSahu Oct 23, 2018
ebfaeeb
issue #2646 - use constants for notifications events instead of hardc…
maxceem Oct 22, 2018
8cdb474
issue #2646 - fix file path
maxceem Oct 23, 2018
f95a16e
Merge pull request #2651 from maxceem/issue-2646
Oct 23, 2018
f378f54
issue_2272 minor css fix
Gauravseta Oct 24, 2018
700a4fd
Merge pull request #2619 from Gauravseta/issue_2272
maxceem Oct 25, 2018
90d4991
issue #2272 - fix vertical align of title and close button
maxceem Oct 25, 2018
645307f
issue #2636 - disabled both customer rules for font rendering
maxceem Oct 25, 2018
502decf
Merge branch 'dev' into cf13
maxceem Oct 25, 2018
5dc3441
Merge branch 'dev' into issue-1985-notifications-reader
maxceem Oct 25, 2018
0c5f526
Merge pull request #2650 from appirio-tech/cf13
RishiRajSahu Oct 25, 2018
c655c45
Small color correction
Oct 25, 2018
3f601a7
issue #2632 - removed variable definitions from connect-app. Updated …
maxceem Oct 26, 2018
209f15f
issue #2632 - removed almost all variables defined in connect-app
maxceem Oct 26, 2018
95b5fd8
issue #2632 - replaced almost all hardcoded colours with color variables
maxceem Oct 26, 2018
59e8e72
Merge branch 'dev' into issue-1985-notifications-reader
maxceem Oct 26, 2018
3e99709
issue #1985 - implemented NotificationReader component and configured…
maxceem Oct 29, 2018
6e7e943
Merge pull request #2657 from maxceem/issue-2632-color-variables
Oct 29, 2018
8ab64d4
winning submission from challenge 30072639 (this versions of submissi…
maxceem Oct 24, 2018
a776610
issue #2654 - refactored code so profile settings partially handled b…
maxceem Oct 27, 2018
55def13
issue #2654 - verification email container with success/failure/expir…
maxceem Oct 30, 2018
e743adb
issue_2568 minox fix
PrakashDurlabhji Oct 16, 2018
dbb181d
issue #1985 - refactored notifications state: now notifications in re…
maxceem Oct 30, 2018
2b6d018
Merge branch 'dev' into issue-1985-notifications-reader
maxceem Oct 30, 2018
62b76ea
issue #1985 - fixed sources generation and total calculation after no…
maxceem Oct 30, 2018
105b38f
issue #1985 - small fixes
maxceem Oct 30, 2018
0520782
issue #1985 - added missed goto for notifications
maxceem Oct 30, 2018
10b386f
issue #1985 - simplified version of NotificationsReader - marks notif…
maxceem Oct 30, 2018
0a20316
issue #1985 - update package-lock.json while trying to fix CircleCI b…
maxceem Oct 31, 2018
0ccaa47
update package-lock.json to fix CircleCI builds
maxceem Oct 31, 2018
36791e3
Merge pull request #2659 from appirio-tech/issue-1985-notifications-r…
RishiRajSahu Oct 31, 2018
24b48e1
Merge branch 'dev' into feature/connect_user_profile_settings
maxceem Nov 1, 2018
7a185cb
Merge pull request #2658 from appirio-tech/feature/connect_user_profi…
RishiRajSahu Nov 1, 2018
b49243d
issue #2662, #2430 - In add-links milestone, link value is not cleare…
maxceem Nov 2, 2018
60bfa17
fix issue #2661 - Discussions: New Post field appears out of the window.
maxceem Nov 2, 2018
8d10f53
fix issue #2663 - Post content lost if posting failed
maxceem Nov 2, 2018
8e0adad
#2654 - fix: avoid reverting to previous values of the notifications …
maxceem Nov 2, 2018
664036b
Merge pull request #2664 from maxceem/issue-2662-clear-add-link
RishiRajSahu Nov 2, 2018
11c5309
Using customer_info trait for pushing to prod as we don't have accoun…
RishiRajSahu Nov 2, 2018
14190dd
Merge pull request #2665 from appirio-tech/feature/using_customer_inf…
RishiRajSahu Nov 2, 2018
c0b01bc
disabled changing email feature at user account settings and small fi…
maxceem Nov 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5
8
73 changes: 32 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
#### For folks working on this code base, we're organizing coding style and general guidelines [here](https://github.com/appirio-tech/connect-app/wiki/Community-Work-Read-Me-First!).
# Topcoder Connect App

# TC Deployment Notes
Topcoder Connect is client facing application of Topcoder. Customers use Topcoder Connect to input requirements of their projects, then managers and
copilots take it from there.

## Requirements

- Node.js 8+
- Npm 5+

## Run locally for development

Prior to running the application locally you should add into your `/etc/hosts` the line `127.0.0.1 local.topcoder-dev.com`.

- `$ npm install` - Installs all dependencies.
- `$ npm start` - Run application in development mode against Topcoder development environment using [dev](https://github.com/appirio-tech/connect-app/blob/dev/config/constants/dev.js) config. In this case the frontend is build in memory by webpack server and uses dev tools like redux-logger.

Open browser with URL http://local.topcoder-dev.com:3000.

## NPM commands

- `$ npm start` - Run application in development mode against Topcoder development environment. In this case the frontend is build in memory by webpack server and uses dev tools like redux-logger.
- `$ npm build` - Create build for production in `/dest` folder. In this case built app is configured to run against Topcoder production environment using [prod](https://github.com/appirio-tech/connect-app/blob/dev/config/constants/master.js) config. Files are being minimized and `gzipped`.
- `$ npm run lint` - Check js code linting.
- `$ npm run lint:fix` - Check js code linting and trying to fix errors automatically.
- `$ npm run test` - Performs tests running. **Note** we don't really have tests, so we only keep this command run successfully.
- `$ npm run test:watch` - Performs tests on files changes.

## TC Deployment Notes
_[TC Deployment Notes should always be kept up to date **on the default branch**. Update these notes when changes to this information occur]_

**General Deployment:** This software is deployed to AWS S3 by CircleCI. It's ultimately delivered through AWS Cloudfront, which is fed from the S3 bucket. There are no EC2 systems involved in the delivery (althought Connect is fed from various micro-services).
Expand All @@ -18,47 +44,12 @@ _[TC Deployment Notes should always be kept up to date **on the default branch**
* The _circle.yml_ file controls the build - see this file if you need to confirm if your commit will deploy anything
* Circle-ci builds can be easily cancelled - please do so if you accidentally trigger an undesired build

# Customer-App

This repository houses new Customer pages, using React, Redux, and Webpack.

## Installation

We use node 8.9.x and npm 6.x, so you may need to download a new version of node. The easiest way is to download [nvm](https://github.com/creationix/nvm). We have a `.nvmrc` file in the root of the project, so you can just run `nvm use` to switch to the correct version of node.

Install dependencies by running the following in the root of the project:
- `npm i`
- **Note:** You must use npm 6.x. Type `npm -v` to ensure you have the correct version.

## NPM Commands
- To run locally, run `npm start` and head to `http://localhost:3000/new_project`
- Run tests with `npm test` or use `npm run test:watch` to rerun tests after files change
- To make sure your code passes linting: `npm run lint`
- To create the build: `npm run build`

## Login

During login, if your see `Invalid URL: http://localhost:3000` error in browser console, just browse http://localhost:3000 and it will show up.

Or, you can add into your `/etc/hosts` the line `127.0.0.1 local.topcoder-dev.com`. And access the app with http://local.topcoder-dev.com:3000. It will prevent you from getting `Invalid URL: http://localhost:3000` and you will be redirected successfully after login.

## Contributing

### Pull Requests

To contribute to the repository, please create a feature branch off of the dev branch. Once you're finished working on the feature, make a pull request to merge it into dev. Please make sure that every pull request has passed the build checks, which appear just before the "Merge pull request" button in github.

### Updating npm-shrinkwrap.json

General workflow to update `npm-shrinkwrap.json` would be:

- `npm install --no-optional` - with old npm-shrinkwrap (--no-optional to skip fsevents)
- update `package.json` if you need to remove/update/add any packages
- remove `npm-shrinkwrap.json`
- `npm install --no-optional` with new `package.json`
- `npm shrinkwrap` - to convert `package-lock.json` to `npm-shrinkwrap.json`
- the new `npm-shrinkwrap.json` will have just the minimal diff

### Code Style

***Checkout the code and comments in `src/components/ExampleComponent` for an example React component, `.scss` file, and tests.***
Expand Down Expand Up @@ -107,12 +98,12 @@ SCSS Files
}
}
SVG Icons
- This repository uses plugin babel-plugin-inline-react-svg
- This repository uses plugin babel-plugin-inline-react-svg
- The plugin is used to inline-embed svg icons inside the markup

Steps to adding new icons
- Insert the svg file in the ~/src/assets/images/ directory
- Add a new icon component file in directory ~/src/components/Icons/Icon-Name.jsx and reference it on the global
- Insert the svg file in the ~/src/assets/images/ directory
- Add a new icon component file in directory ~/src/components/Icons/Icon-Name.jsx and reference it on the global
icon component in the ~/src/components/icons/ directory
- Wrap the svg icon inside an object for caching to optimize on perfomance.
```
Expand Down
40 changes: 40 additions & 0 deletions config/babel/webpack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* Babel config preset.
*
* Here we can update babel config which comes from `topcoder-react-utils` with Connect App specific things.
*/
const topCoderBabelConfig = require('topcoder-react-utils/config/babel/webpack')

/*
Make sure that the list of plugins is defined
*/
topCoderBabelConfig.plugins = topCoderBabelConfig.plugins || []

/*
Add babel-plugin-lodash to exclude full lodash lib and include only necessary methods
*/
topCoderBabelConfig.plugins.push('lodash')

/*
Update options for `inline-react-svg` plugin.
We have to clean `data-color` and `data-cap` attributes in SVG files which are used in Connect App
because otherwise we will have `Warning: Unknown prop` from React
*/
topCoderBabelConfig.plugins = topCoderBabelConfig.plugins.map((plugin) => {
if (plugin === 'inline-react-svg') {
return ['inline-react-svg', {
svgo: {
plugins: [
{
removeAttrs: { attrs: '(data-color|data-cap)' }
}
]

}
}]
}

return plugin
})

module.exports = topCoderBabelConfig
4 changes: 3 additions & 1 deletion config/constants/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ module.exports = {
TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications',
CONNECT_MESSAGE_API_URL: 'https://api.topcoder-dev.com/v5',
TC_SYSTEM_USERID: process.env.DEV_TC_SYSTEM_USERID,
MAINTENANCE_MODE: process.env.DEV_MAINTENANCE_MODE
MAINTENANCE_MODE: process.env.DEV_MAINTENANCE_MODE,

RESET_PASSWORD_URL: 'https://accounts.topcoder-dev.com/connect/reset-password'
}
4 changes: 3 additions & 1 deletion config/constants/master.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ module.exports = {
TC_NOTIFICATION_URL: 'https://api.topcoder.com/v5/notifications',
CONNECT_MESSAGE_API_URL: 'https://api.topcoder.com/v5',
TC_SYSTEM_USERID: process.env.PROD_TC_SYSTEM_USERID,
MAINTENANCE_MODE: process.env.PROD_MAINTENANCE_MODE
MAINTENANCE_MODE: process.env.PROD_MAINTENANCE_MODE,

RESET_PASSWORD_URL: 'https://accounts.topcoder.com/connect/reset-password'
}
10 changes: 7 additions & 3 deletions config/webpack/common-modifications.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
* webpack merge.
*/

const path = require('path')
const dirname = path.resolve(__dirname, '../..')

module.exports = function (config) {
/*
Exclude some folders from babel-loader
Expand All @@ -15,9 +18,10 @@ module.exports = function (config) {
]

/*
Add babel-plugin-lodash to exclude full lodash lib and include only necessary methods
*/
jsxRule.options.plugins = (jsxRule.options.plugins || []).concat(['lodash'])
Use Connect App preset file for babel config
It may contain some modifications of babel config which comes from `topcoder-react-utils`
*/
jsxRule.options.presets = [path.resolve(dirname, './config/babel/webpack.js')]

/*
Include packages `appirio-tech-react-components` and `tc-ui`
Expand Down
Loading