Skip to content

Commit

Permalink
[CE-352] Remove unused theme files
Browse files Browse the repository at this point in the history
Remove basic,vue theme files.
Fix babel build failed after upgrade to babel 7.

Change-Id: Ib4459351ac268c509e794bb3696cecd18d4de7c8
Signed-off-by: Haitao Yue <hightall@me.com>
  • Loading branch information
hightall committed May 4, 2018
1 parent 956b4a4 commit c3742cc
Show file tree
Hide file tree
Showing 205 changed files with 15 additions and 28,709 deletions.
6 changes: 3 additions & 3 deletions docker-compose-build-js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version: '2'
services:
build-admin-js:
build:
context: $ROOT_PATH/src/themes/$THEME/static
context: $ROOT_PATH/src/static
volumes:
- ./src/$STATIC_FOLDER:/var/www
- ./src/$TEMPLATE_FOLDER:/templates
- ./src/static:/var/www
- ./src/templates:/templates
6 changes: 3 additions & 3 deletions docker-compose-check-js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ version: '2'
services:
check-js:
build:
context: $ROOT_PATH/src/themes/react/static
dockerfile: $ROOT_PATH/src/themes/react/static/Dockerfile-check-js
context: $ROOT_PATH/src/static
dockerfile: $ROOT_PATH/src/static/Dockerfile-check-js
volumes:
- ./src/themes/react/static:/var/www
- ./src/static:/var/www
command: bash -c "ln -sf /node_modules /var/www/dashboard/node_modules && cd /var/www/dashboard && npm run lint && rm -rf node_modules"
7 changes: 7 additions & 0 deletions dockerhub/latest/operator-dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
#
# SPDX-License-Identifier: Apache-2.0
#
FROM node:8.11 as build_js
MAINTAINER haitao yue "hightall@me.com"
RUN cd /tmp && git clone https://github.com/hyperledger/cello.git
RUN cp -r /tmp/cello/src/themes/react/static /var/www
RUN cd /var/www/dashboard && npm install && npm run build

FROM hyperledger/cello-baseimage:x86_64-latest

COPY --from=build_js /var/www/dist /app/static/dist
CMD if [ "$DEBUG" = "True" ]; then python dashboard.py ; else gunicorn -w 1 --worker-class eventlet -b 0.0.0.0:8080 dashboard:app ;fi
4 changes: 2 additions & 2 deletions src/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
logger.setLevel(LOG_LEVEL)
logger.addHandler(log_handler)

STATIC_FOLDER = os.getenv("STATIC_FOLDER", "themes/basic/static")
TEMPLATE_FOLDER = os.getenv("TEMPLATE_FOLDER", "themes/basic/templates")
STATIC_FOLDER = "static"
TEMPLATE_FOLDER = "templates"
app = Flask(__name__, static_folder=STATIC_FOLDER,
template_folder=TEMPLATE_FOLDER)
socketio = SocketIO(app)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const path = require('path');
export default {
entry: 'src/index.js',
extraBabelPlugins: [
'transform-decorators-legacy',
['import', { libraryName: 'antd', libraryDirectory: 'es', style: true }],
],
env: {
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion src/themes/basic/static/css/bootstrap-table.min.css

This file was deleted.

6 changes: 0 additions & 6 deletions src/themes/basic/static/css/bootstrap.min.css

This file was deleted.

110 changes: 0 additions & 110 deletions src/themes/basic/static/css/dashboard.css

This file was deleted.

1 change: 0 additions & 1 deletion src/themes/basic/static/css/dataTables.bootstrap.min.css

This file was deleted.

Loading

0 comments on commit c3742cc

Please sign in to comment.