Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
635a01e
GitHub issue#1462, Code refactor to load cleaner JSON files instead o…
RishiRajSahu Jan 24, 2018
13cc597
GitHub issue#1462, Code refactor to load cleaner JSON files instead o…
RishiRajSahu Jan 24, 2018
2de5178
Github issue#1458, Fix price quote mechanism
Jan 24, 2018
ddc8e0a
deploying feature branch to dev env.
Jan 24, 2018
71deb4c
Listing fixes
Jan 24, 2018
56563ca
GitHub issue#1462, Code refactor to load cleaner JSON files instead o…
RishiRajSahu Jan 25, 2018
da613a5
Merge pull request #1630 from appirio-tech/feature/code_refactor_for_…
Jan 25, 2018
b5bb919
Merge branch 'feature/project_configuration_documentation' into featu…
Jan 25, 2018
4e5e700
reverted temp deployment of feature branch to dev
Jan 25, 2018
f39374a
Merge pull request #1631 from appirio-tech/feature/fixed_quote_price
Jan 25, 2018
6cd49cc
GitHub issue#1462, Code refactor to load cleaner JSON files instead o…
RishiRajSahu Jan 25, 2018
074eedf
Issue 1635
tpwwu Jan 26, 2018
13a66d0
Issue 1636
tpwwu Jan 26, 2018
02dd991
Issue #1569 Fix jumping footer when toggle filters
tpwwu Jan 27, 2018
6e23599
Issue #1615
tpwwu Jan 26, 2018
2be6b00
issue-1616
deanveleker Jan 27, 2018
801097d
Disable the action called by search bar.
chongluo Jan 27, 2018
b6512ce
Fix[#1453] Project tags must be clickable and used as search term
sadathanwar17 Jan 28, 2018
81e7ee9
issue-1632 Move My Projects switch inline with the view switch tab
chongluo Jan 28, 2018
77de025
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
maxceem Jan 29, 2018
9c7ae5e
updated to topcoder-react-utils package dependencies, use package-loc…
maxceem Jan 30, 2018
8fe97d8
draft working version of webpack configs, save before adding global: …
maxceem Jan 30, 2018
55b195d
fix some scss to add :global without issues
maxceem Jan 30, 2018
8d53ec1
added :global to scss files
maxceem Jan 30, 2018
8e3652f
Fully working webpack configs based on topcoder-react-utils
maxceem Jan 31, 2018
47a89d7
fix linter configuration and lint errors after eslint version was upd…
maxceem Jan 31, 2018
0f4544e
Fix minor typo
arku Feb 1, 2018
d6d9ff6
- upgraded to topcoder-react-utils@0.0.39
maxceem Feb 1, 2018
456e64d
removed console.log
maxceem Feb 1, 2018
2e74cf2
Merge branch 'dev' into feature/project_configuration_documentation
RishiRajSahu Feb 1, 2018
aabe633
import modules from appirio-tech-react-components per package to redu…
maxceem Feb 1, 2018
6ec64c6
import per method from lodash
maxceem Feb 2, 2018
1be160d
Revert "import per method from lodash"
maxceem Feb 2, 2018
6209a67
ignore moment .locale files
maxceem Feb 2, 2018
6de0cea
Added babel-plugin-lodash to exclude full lodash lib and include only…
maxceem Feb 2, 2018
87a9793
removed unused 'isomorphic-fetch'
maxceem Feb 2, 2018
a8f2300
Textarea hide scroll
afrisalyp Feb 3, 2018
567617e
Issue #1575 - Sorting the project list view should not reload the pag…
passimm Feb 3, 2018
822b74f
Merge pull request #1639 from tpwwu/issue-1635
gondzo Feb 4, 2018
e44b213
Merge pull request #1641 from tpwwu/issue-1636
gondzo Feb 4, 2018
feac132
Merge pull request #1642 from tpwwu/issue-1615
gondzo Feb 4, 2018
aa8b11e
Merge pull request #1644 from tpwwu/issue-1569
gondzo Feb 4, 2018
532c835
Merge pull request #1646 from deanveleker/issue-1616
gondzo Feb 4, 2018
dcdf322
Merge pull request #1648 from chongluo/issue-1603
gondzo Feb 4, 2018
609325d
Merge pull request #1649 from appirio-tech/Project_Tags
gondzo Feb 4, 2018
ddc5f0f
Merge pull request #1651 from chongluo/issue-1632
gondzo Feb 4, 2018
43d2d17
Merge pull request #1659 from arun1595/patch-1
gondzo Feb 4, 2018
88db054
Merge pull request #1671 from afrisalyp/issue-1368-bb07
gondzo Feb 4, 2018
896ac9a
Vertically center the notification bell icon
arku Feb 4, 2018
bcdff2a
lint fixes
gondzo Feb 4, 2018
9bcb8a2
merge dev
gondzo Feb 4, 2018
14b82fa
fix shrinkwrap
gondzo Feb 5, 2018
e90a9f5
deploy bommunity fixes branch
gondzo Feb 5, 2018
2dd71c5
Merge branch 'bugBash07' into sort_proj_list
gondzo Feb 5, 2018
c5f8f7e
Merge branch 'dev' into feature/project_configuration_documentation
RishiRajSahu Feb 5, 2018
c12e448
Made feature branch undeployable
RishiRajSahu Feb 5, 2018
f9f514e
Merge pull request #1676 from appirio-tech/feature/project_configurat…
RishiRajSahu Feb 5, 2018
eeac6b8
merge 1656
gondzo Feb 5, 2018
e04122b
bugfix: 1) reserve other search criteria when changing sort option 2)…
passimm Feb 5, 2018
17a3c2f
Merge pull request #1672 from passimm/sort_proj_list
gondzo Feb 5, 2018
3de5a60
Issue #1437 - Page update reload suggestion
passimm Jan 27, 2018
2c23bd5
fix package-lock
gondzo Feb 5, 2018
13a7bb0
update circle
gondzo Feb 5, 2018
51239c3
update circle
gondzo Feb 5, 2018
5e97dc2
bugfix: 1) do not auto-reload when feed is changed 2) fix reload butt…
passimm Feb 5, 2018
f1b9f21
update circle
gondzo Feb 5, 2018
335e756
update circle
gondzo Feb 5, 2018
99e6207
lint
gondzo Feb 5, 2018
4778a75
upgrade circleci
gondzo Feb 6, 2018
b69d0a7
upgrade circleci
gondzo Feb 6, 2018
5778ac5
Merge branch 'hotfix/LoadingIndicator' into dev
gondzo Feb 7, 2018
ccbc935
fix loading indicator icon
gondzo Feb 7, 2018
ef33ae9
Merge branch 'hotfix/LoadingIndicator' into bugBash07
gondzo Feb 7, 2018
7deafca
Merge pull request #1685 from appirio-tech/hotfix/IBM_Chatbot_content…
Feb 12, 2018
78295bc
Merge pull request #1674 from arun1595/notifications-icon-tweak
Feb 12, 2018
877a409
Github issue#1403, Handle null values for gclid - Google Click Id fro…
Feb 13, 2018
ed384b8
fixed lint error
Feb 13, 2018
8b3cee5
Merge pull request #1687 from appirio-tech/feature/handle_null_string…
Feb 13, 2018
0a4d72c
removed redux-logger from production build
maxceem Feb 13, 2018
a85d30e
removed webpack-bundle-analyzer from dev dependencies
maxceem Feb 13, 2018
d1ee28c
Merge branch 'bugBash07' into issue-1629
maxceem Feb 13, 2018
1cf9ab7
Merge pull request #1688 from maxceem/issue-1629
gondzo Feb 13, 2018
00641a5
Merge branch '1437_page_update' of git://github.com/passimm/connect-a…
gondzo Feb 13, 2018
64fc558
merge page reload changes
gondzo Feb 13, 2018
1818074
fix reload button style
gondzo Feb 13, 2018
ce519ab
Merge branch 'bugBash07' into dev
gondzo Feb 13, 2018
60c6eac
merge bugBash 07
gondzo Feb 13, 2018
c2103c5
lint
gondzo Feb 13, 2018
e34a48d
update package lock
gondzo Feb 13, 2018
346eb33
deploy dev
gondzo Feb 13, 2018
7978228
fixes for #1696
veshu Feb 17, 2018
d3ef7c0
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
maxceem Feb 17, 2018
2fff5c1
issue #1697 - Browser's logging not showing file name.
maxceem Feb 17, 2018
1a6426a
Merge pull request #1699 from maxceem/issue-1697
gondzo Feb 17, 2018
72c6040
Merge pull request #1698 from veshu/dev
gondzo Feb 17, 2018
0013a26
fix chat bot overlap
veshu Feb 17, 2018
61c5c77
fix link overlap project detail
veshu Feb 17, 2018
8c21cec
fix overlap of direct links
veshu Feb 17, 2018
e0d017d
Merge pull request #1700 from veshu/dev
gondzo Feb 17, 2018
48be086
Fix minor typo
arku Feb 17, 2018
9712fab
lint
gondzo Feb 18, 2018
79c19d1
Merge pull request #1701 from arun1595/typo-fix
Feb 23, 2018
869d6bc
fix topic sort order
gondzo Feb 23, 2018
297aeaf
Fix styles for the message feed
Feb 23, 2018
29646cf
Language fix
Feb 23, 2018
1438d9c
linting, logo and back link styling fixed
Feb 23, 2018
3c57f75
fix position of edit post icon
Feb 23, 2018
910a0b2
sync with master
Feb 26, 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
1 change: 1 addition & 0 deletions .build-info
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"rndkey":"\\þû\u001c±7åI–\u0007ïˆRªÞǤ¦\u0015Ц\u0007¥ç\u001e:ÄX)™P§","timestamp":"2018-02-17T13:13:13.277Z"}
59 changes: 59 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
version: 2
jobs:
test:
docker:
- image: circleci/node:8.9.4
steps:
- checkout
- restore_cache:
key: test-node-modules-{{ checksum "package-lock.json" }}
- run: npm install
- save_cache:
key: test-node-modules-{{ checksum "package-lock.json" }}
paths:
- node_modules
- run: npm run lint
- run: npm run test
- run: npm run build
- persist_to_workspace:
root: .
paths:
- dist

# Just tests commited code.
deployDev:
docker:
- image: cibuilds/aws
steps:
- checkout
- attach_workspace:
at: ./workspace
- run: ./deploy.sh DEV no-cache

deployProd:
docker:
- image: cibuilds/aws
steps:
- checkout
- attach_workspace:
at: ./workspace
- run: ./deploy.sh PROD

workflows:
version: 2
build:
jobs:
- test
- deployDev:
requires:
- test
filters:
branches:
only: dev
- deployProd:
requires:
- test
filters:
branches:
only: master

2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"react/jsx-closing-bracket-location": 2,
"jsx-quotes": [2, "prefer-double"],
"react/jsx-boolean-value": 2,
"react/wrap-multilines": 2,
"react/jsx-wrap-multilines": 2,
"react/self-closing-comp": 2,
"react/no-is-mounted": 2
},
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#### For folks working on this code base, we're ogaznizing coding style and general guidelines [here](https://github.com/appirio-tech/connect-app/wiki/Community-Work-Read-Me-First!).
#### 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!).

# 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]_
Expand Down
45 changes: 0 additions & 45 deletions circle.yml

This file was deleted.

12 changes: 12 additions & 0 deletions config/babel/webpack-coffee.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* Babel config for CoffeeScript only.
*
* We disable modules for `env` preset of `babel` for CoffeeScript to avoid error
* 'Uncaught ReferenceError exports is not defined'
*/
const topCoderBabelConfig = require('topcoder-react-utils/config/babel/webpack')

const envPresetIndex = topCoderBabelConfig.presets.find((preset) => preset === 'env')
topCoderBabelConfig.presets.splice(envPresetIndex, 1, ['env', { modules: false }])

module.exports = topCoderBabelConfig
44 changes: 44 additions & 0 deletions config/webpack/common-modifications.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/**
* Function which is applied to webpack config from topcoder-react-utils
* and perform some common modification specific to connect app which cannot be applied using
* webpack merge.
*/

module.exports = function (config) {
/*
Exclude some folders from babel-loader
*/
const jsxRule = config.module.rules.find(rule => /jsx/.test(rule.test.toString()))
jsxRule.exclude = [
/node_modules[\\/](?!appirio-tech.*|topcoder|tc-)/,
/src[\\/]assets[\\/]fonts/
]

/*
Add babel-plugin-lodash to exclude full lodash lib and include only necessary methods
*/
jsxRule.options.plugins = (jsxRule.options.plugins || []).concat(['lodash'])

/*
Include packages `appirio-tech-react-components` and `tc-ui`
to `.scss` rule
*/
const scssRule = config.module.rules.find(rule => /scss/.test(rule.test.toString()))
scssRule.exclude = /node_modules[\\/](?!appirio-tech-react-components|tc-ui)/

/*
Remove outputPath as otherwise in development mode files cannot be found
in the webpack in-memory filesystem
TODO understand why it happens, fix it another way, remove this
*/
const imagesRule = config.module.rules.find(rule => /gif/.test(rule.test.toString()))
delete imagesRule.options.outputPath

/*
Remove outputPath as otherwise in development mode files cannot be found
in the webpack in-memory filesystem
TODO understand why it happens, fix it another way, remove this
*/
const fontsRule = config.module.rules.find(rule => /woff2/.test(rule.test.toString()))
delete fontsRule.options.outputPath
}
100 changes: 100 additions & 0 deletions config/webpack/common.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/**
* Common part of webpack config specific to connect app
*
* This config is merged to development and production configs
* and is not supposed to be used directly by itself.
*/
'use strict'

const _ = require('lodash')
const path = require('path')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const constants = require('../constants')

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

module.exports = {
/*
Connect app has different output folder rather than topcoder-react-utils
So update it
*/
output: {
path: path.join(dirname, '/dist'),
filename: '[name].[hash].js',
chunkFilename: '[name].[hash].js',
publicPath: '/'
},

resolve: {
/*
Connect app depends on `appirio-tech-react-components` which uses
CoffeeScript so we have to add support for these formats
*/
extensions: [
'.coffee',
'.litcoffee',
'.cjsx'
],
alias: {
/*
Connect app uses handlebars which has some issue with webpack
We have to create an alias to concrete file in order to import it
*/
handlebars: 'handlebars/dist/handlebars.min.js'
}
},

module: {
rules: [{
/*
Connect app depends on `appirio-tech-react-components` which uses
CoffeeScript so we have to add support for it

Note, that we use custom babel config for coffee script which disables modules
*/
test: /\.(coffee|litcoffee|cjsx)$/,
use: [
{
loader: 'babel-loader',
options: {
babelrc: false,
forceEnv: 'development', // by default set env to 'development'
presets: [path.resolve(dirname, './config/babel/webpack-coffee.js')],
plugins: ['lodash']
}
},
'coffee-loader',
'cjsx-loader'
]
}, {
/*
Load SVG files not handled by inline-react-svg babel plugin
*/
test: /\.svg$/,
loader: 'file-loader'
}],
},

plugins: [
/*
Connect app has a custom html template file, so we use it
*/
new HtmlWebpackPlugin({
template: path.join(dirname, '/src/index.html'),
inject: 'body'
}),

/*
Connect app requires a lot of env vars which are defined in constants.
*/
new webpack.DefinePlugin({
'process.env': _.mapValues(constants, (value) => JSON.stringify(value))
}),

/*
Remove some unused files to reduce bundle size
*/
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)
]
}
Loading