Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/router upgrade #197

Merged
merged 15 commits into from
Dec 21, 2017
Merged

Chore/router upgrade #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
881c856
refactor(router): bump to react-router v4
frickjack Nov 29, 2017
6d15604
fix(router): fix UX bugs from new router
frickjack Nov 29, 2017
2ac0d06
fix(jest): fix tests broken by new router
frickjack Nov 30, 2017
2153d28
fix(Certificate): up react-form ver to fix errs
frickjack Nov 30, 2017
da48dac
fix(eslint): style conformance
frickjack Nov 30, 2017
4637d45
chore(Jenkinsfile): introduce NOOP Jenkinsfile
frickjack Nov 30, 2017
5f55fbe
fix(AuthTimeoutPopup): referencing undefined var
frickjack Nov 30, 2017
172c3cb
fix(AuthPopup): mv auth popup to ProtectedContent
frickjack Nov 30, 2017
030dbc6
fix(typos): bad var name, path match, codacy
frickjack Dec 1, 2017
0f29097
fix(bgcolor): refactor for bgcolor
frickjack Dec 5, 2017
015763a
fix(Jenkinsfile): k8sDeploy stage
frickjack Dec 20, 2017
e4dc5a4
style(codacy): tweaks for codacy eslint
frickjack Dec 20, 2017
816d04e
style(eslint): npm run elint -- --fix src
frickjack Dec 20, 2017
a341163
fix(eslint): disable couple checks
frickjack Dec 20, 2017
b71c896
fix(eslint): add some easy fixes
thanh-nguyen-dang Dec 20, 2017
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
6 changes: 4 additions & 2 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ module.exports = {
// see https://github.com/clayne11/eslint-import-resolver-meteor/issues/17
// - seems to affect Codacy :-(
"import/extensions": ["off", "never"],
"react/jsx-indent": "off"
}
"react/jsx-indent": "off",
"react/forbid-prop-types": "off",
"react/prefer-stateless-function": "off",
},
};
34 changes: 34 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!groovy

pipeline {
agent any

stages {
stage('FetchCode') {
steps {
checkout scm
}
}
stage('k8sDeploy') {
steps {
echo "GIT_BRANCH is $env.GIT_BRANCH"
echo "GIT_COMMIT is $env.GIT_COMMIT"
script {
def helper = new uchicago.cdis.KubeHelper(this);
helper.deployBranch("portal-service");
}
}
}
}
post {
success {
slackSend color: 'good', message: "https://jenkins.planx-pla.net/job/$env.JOB_NAME/\nuc-cdis/data-portal pipeline succeeded"
}
failure {
slackSend color: 'bad', message: "https://jenkins.planx-pla.net/job/$env.JOB_NAME/\nuc-cdis/data-portal pipeline failed"
}
unstable {
slackSend color: 'bad', message: "https://jenkins.planx-pla.net/job/$env.JOB_NAME/\nuc-cdis/data-portal pipeline unstable"
}
}
}
127 changes: 77 additions & 50 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"file-saver": "^1.3.3",
"graphiql": "^0.11.5",
"graphql": "^0.8.2",
"history": "^2.1.2",
"history": "^4.7.2",
"ignore-loader": "^0.1.2",
"isomorphic-fetch": "^2.2.1",
"material-design-icons": "^3.0.1",
Expand All @@ -30,14 +30,12 @@
"react": "^15.6.2",
"react-ace": "^4.1.6",
"react-dom": "^15.6.2",
"react-form": "^1.2.7",
"react-form": "^2.12.1",
"react-highlight": "^0.10.0",
"react-redux": "^5.0.0",
"react-relay": "^1.3.0",
"react-redux": "^5.0.6",
"react-relay": "^1.4.1",
"react-remarkable": "^1.1.1",
"react-router": "^2.8.0",
"react-router-redux": "^4.0.0",
"react-router-relay": "^0.14.0",
"react-router-dom": "^4.2.2",
"react-select": "^1.0.0-rc.7",
"react-tap-event-plugin": "^2.0.1",
"recharts": "^1.0.0-apha.5",
Expand Down
Loading