Skip to content

Commit

Permalink
[add-description]:replace logo with jancsitech logo and edit build mo…
Browse files Browse the repository at this point in the history
…del(orthanc)
  • Loading branch information
zhengdechang2 committed Nov 24, 2022
1 parent 264be97 commit bf47abb
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"scripts": {
"cm": "npx git-cz",
"build": "lerna run build:viewer --stream",
"build": "lerna run build:orthanc --stream",
"build:lt": "lerna run build:viewer:lesion-tracker --stream",
"build:ci": "lerna run build:viewer:ci --stream",
"build:demo": "lerna run build:viewer:demo --stream",
Expand Down
1 change: 1 addition & 0 deletions platform/ui/src/elements/form/DropdownMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
}

.dd-menu-list {
line-height: initial;
position: absolute;
top: 100%;
margin-top: 10px;
Expand Down
2 changes: 1 addition & 1 deletion platform/viewer/.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
#

PUBLIC_URL=/
APP_CONFIG=config/default.js
APP_CONFIG=config/docker_nginx-orthanc.js
1 change: 1 addition & 0 deletions platform/viewer/.webpack/webpack.pwa.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ module.exports = (env, argv) => {
},
});

//configure serve proxy
if (hasProxy) {
mergedConfig.devServer.proxy = {};
// mergedConfig.devServer.proxy[PROXY_TARGET] = PROXY_DOMAIN;
Expand Down
3 changes: 2 additions & 1 deletion platform/viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
"scripts": {
"build:package": "cross-env NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.commonjs.js --progress",
"build:viewer": "cross-env NODE_ENV=production node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js --progress",
"build:orthanc": "cross-env NODE_ENV=production APP_CONFIG=config/docker_nginx-orthanc.js node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js --progress",
"build:viewer:ci": "cross-env NODE_ENV=production PUBLIC_URL=/pwa/ APP_CONFIG=config/netlify.js QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
"build:viewer:demo": "cross-env NODE_ENV=production APP_CONFIG=config/demo.js HTML_TEMPLATE=rollbar.html QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --progress --config .webpack/webpack.pwa.js",
"build:viewer:package": "yarn run build:package",
"dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js",
"dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js",
"dev:orthanc": "cross-env NODE_ENV=development PROXY_TARGET=/dicom-web PROXY_DOMAIN=http://10.10.99.8:8042 APP_CONFIG=config/docker_nginx-orthanc.js webpack-dev-server --config .webpack/webpack.pwa.js",
"dev:viewer": "yarn run dev",
"start": "yarn run dev",
Expand Down
1 change: 1 addition & 0 deletions platform/viewer/public/assets/back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added platform/viewer/public/assets/logo_w.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions platform/viewer/public/config/docker_nginx-orthanc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,20 @@ window.config = {
},
],
},
whiteLabeling: {
createLogoComponentFn: function (React) {
return React.createElement(
'a',
{
target: '_blank',
rel: 'noopener noreferrer',
className: 'text-purple-600 line-through',
href: 'https://www.jancsitech.net/',
},
React.createElement('img', {
src: '../assets/logo_w.png',
})
);
},
},
};
6 changes: 5 additions & 1 deletion platform/viewer/src/components/Header/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/* Home Page */
.entry-header.header-big {
background: rgba(21, 25, 30, 0.7);
padding: 35px var(--study-list-padding);
padding:10px var(--study-list-padding);
height: auto;
display: inline-block;
width: 100%;
Expand Down Expand Up @@ -80,6 +80,9 @@
margin: 3px 0 0 10px;
padding: 0 0 0 10px;
display: inline-block;
position: absolute;
width: 100px;
top: 10px;
}

.header-menu {
Expand All @@ -91,6 +94,7 @@
line-height: 18px;
text-decoration: none;
margin-right: 10px;
line-height: 40px;
}

.entry-header.header-big .header-menu {
Expand Down
9 changes: 2 additions & 7 deletions platform/viewer/src/components/Header/editServerContent.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/* Home Page */
.entry-header.header-big {
background: rgba(21, 25, 30, 0.7);
padding: 35px var(--study-list-padding);
padding: 10px var(--study-list-padding);
height: auto;
display: inline-block;
width: 100%;
Expand Down Expand Up @@ -75,12 +75,6 @@
color: var(--active-color);
}

.header-studyListLinkSection {
border-left: var(--ui-border-thickness) solid var(--ui-border-color);
margin: 3px 0 0 10px;
padding: 0 0 0 10px;
display: inline-block;
}

.header-menu {
color: var(--text-primary-color);
Expand All @@ -91,6 +85,7 @@
line-height: 18px;
text-decoration: none;
margin-right: 10px;
line-height: 40px;
}

.entry-header.header-big .header-menu {
Expand Down
2 changes: 1 addition & 1 deletion platform/viewer/src/components/SidePanel.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex: 1;
flex-flow: row nowrap;
align-items: stretch;
height: calc(100% - var(--toolbar-height) - var(--top-bar-height));
height: calc(100% - var(--toolbar-height) - var(--top-bar-height) - 18px);
width: 100%;
overflow: hidden;
}
Expand Down

0 comments on commit bf47abb

Please sign in to comment.