Skip to content

Commit de37e48

Browse files
authored
Merge pull request #1657 from appirio-tech/dev
Production release
2 parents 7c4046e + 080fd37 commit de37e48

File tree

461 files changed

+7244
-4996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+7244
-4996
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ SCSS Files
107107
}
108108
}
109109
}
110+
SVG Icons
111+
- This repository uses plugin babel-plugin-inline-react-svg
112+
- The plugin is used to inline-embed svg icons inside the markup
113+
114+
Steps to adding new icons
115+
- Insert the svg file in the ~/src/assets/images/ directory
116+
- Add a new icon component file in directory ~/src/components/Icons/Icon-Name.jsx and reference it on the global
117+
icon component in the ~/src/components/icons/ directory
118+
- Wrap the svg icon inside an object for caching to optimize on perfomance.
110119
```
111120

112121
### Writing Tests

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ deployment:
2929
commands:
3030
- ./deploy.sh TEST01
3131
test02:
32-
branch: notifications
32+
branch: bugBash06
3333
owner: appirio-tech
3434
commands:
3535
- ./deploy.sh TEST02

config/constants/dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
AUTH0_CLIENT_ID : process.env.AUTH0_CLIENT_ID_DEV,
1313
domain : 'topcoder-dev.com',
1414
DOMAIN : 'topcoder-dev.com',
15-
CONNECT_MESSAGE_API_URL: process.env.CONNECT_MESSAGE_API_URL,
15+
CONNECT_MESSAGE_API_URL: process.env.CONNECT_MESSAGE_API_URL,
1616
ENV : 'DEV',
1717

1818
PROJECTS_API_URL : 'https://api.topcoder-dev.com',

config/webpack/default.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = {
3434
options: {
3535
babelrc: false,
3636
presets: [ 'env', 'react', 'stage-2' ],
37-
plugins: [ 'lodash' ]
37+
plugins: ['lodash', 'inline-react-svg']
3838
}
3939
}, {
4040
test: /\.(coffee|litcoffee|cjsx)$/,
@@ -91,7 +91,10 @@ module.exports = {
9191
'.gif',
9292
'.jpg',
9393
'.cjsx'
94-
]
94+
],
95+
alias: {
96+
handlebars: 'handlebars/dist/handlebars.min.js'
97+
}
9598
},
9699

97100
plugins: [
@@ -111,8 +114,7 @@ module.exports = {
111114
// Only emit files when there are no errors
112115
new webpack.NoEmitOnErrorsPlugin(),
113116
new ExtractCssChunks({
114-
filename: '[name].css',
115-
justExtract: true
117+
filename: '[name].css'
116118
})
117119
]
118120
}

config/webpack/development.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ module.exports = webpackMerge.strategy({
2626
plugins: [
2727
'lodash',
2828
// add react hot reloader
29-
'react-hot-loader/babel'
29+
'react-hot-loader/babel',
30+
'inline-react-svg'
3031
]
3132
}
3233
}, {

0 commit comments

Comments
 (0)