Skip to content

Commit

Permalink
Merge pull request wurmlab#723 from tadast/tt/email-notifications
Browse files Browse the repository at this point in the history
Modify the loading screen for cloud
  • Loading branch information
yannickwurm committed Jan 30, 2024
2 parents e1a63f8 + ad465cf commit 8eede0d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
},
"scripts": {
"watch": "webpack --watch",
"watch-cloud": "webpack --watch --env=reportPluginsPath='../sequence_server_js_extensions/report_plugins.js' --env=downloadLinks='../sequence_server_js_extensions/conserved_domains/download_links.js' --env=hitButtons='../sequence_server_js_extensions/hit_buttons.js'",
"watch-cloud": "webpack --watch --env=reportPluginsPath='../sequence_server_js_extensions/report_plugins.js' --env=downloadLinks='../sequence_server_js_extensions/conserved_domains/download_links.js' --env=hitButtons='../sequence_server_js_extensions/hit_buttons.js' --env=targetEnv='cloud'",
"test": "jest",
"minify:css": "cleancss public/css/sequenceserver.css > public/css/sequenceserver.min.css",
"build": "webpack && npm run minify:css",
"build-cloud": "webpack --env=reportPluginsPath='../sequence_server_js_extensions/report_plugins.js' --env=downloadLinks='../sequence_server_js_extensions/conserved_domains/download_links.js' --env=hitButtons='../sequence_server_js_extensions/hit_buttons.js' && npm run minify:css"
"build-cloud": "webpack --env=reportPluginsPath='../sequence_server_js_extensions/report_plugins.js' --env=downloadLinks='../sequence_server_js_extensions/conserved_domains/download_links.js' --env=hitButtons='../sequence_server_js_extensions/hit_buttons.js' --env=targetEnv='cloud' && npm run minify:css"
},
"dependencies": {
"babel-plugin-transform-export-extensions": "^6.22.0",
Expand Down
3 changes: 3 additions & 0 deletions public/js/report.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ class Report extends Component {
<br />
You can bookmark the page and come back to it later or share the
link with someone.
<br />
<br />
{ process.env.targetEnv === 'cloud' && <b>If the job takes more than 10 minutes to complete, we will send you an email upon completion.</b> }
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion public/sequenceserver-report.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module.exports = (env, argv) => {
$: 'jquery',
jQuery: 'jquery',
}),
new webpack.EnvironmentPlugin({ NODE_ENV: 'development' }),
new webpack.EnvironmentPlugin({ NODE_ENV: 'development', targetEnv: env.targetEnv || 'standalone'}),
new webpack.DefinePlugin({
process: { env: {} },
})
Expand Down

0 comments on commit 8eede0d

Please # to comment.