Skip to content

Commit

Permalink
[CE-87] Disable login checking for basic theme
Browse files Browse the repository at this point in the history
Currently, the react theme is adding a login checking, however, this
will prevent the basic theme due to template missing.

Will disable the loging check module until the it's done.

Also fix several script patch problems in the setup scripts.

Change-Id: I28110ac1667f0f4137e1e975ab752608511a2137
Signed-off-by: Baohua Yang <[email protected]>
  • Loading branch information
yeasy committed Jul 16, 2017
1 parent affbdad commit 9f67961
Show file tree
Hide file tree
Showing 6 changed files with 238 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ stop: ##@Service Stop service
restart: stop start ##@Service Restart service

setup-master: ##@Environment Setup dependency for master node
bash scripts/master_node/setup.sh
cd scripts/master_node && bash setup.sh

setup-worker: ##@Environment Setup dependency for worker node
bash scripts/worker_node/setup.sh
cd scripts/worker_node && bash setup.sh

build-js: ##@Nodejs Build js files for react
bash scripts/master_node/build_reactjs.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/master_node/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ command -v docker-compose >/dev/null 2>&1 || { echo_r >&2 "No docker-compose fou
&& echo_r "Warn: existing containers may cause unpredictable failure, suggest to clean them using docker rm"

echo_b "Download dependent Images..."
bash download_images.sh
bash ./download_images.sh

echo_b "Checking local mounted database path ${DB_DIR}..."
[ ! -d ${DB_DIR} ] \
Expand Down
5 changes: 1 addition & 4 deletions scripts/worker_node/setup_docker_worker_node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ docker tag hyperledger/fabric-peer:$ARCH-$IMG_TAG hyperledger/fabric-tools
docker tag hyperledger/fabric-orderer:$ARCH-$IMG_TAG hyperledger/fabric-orderer
docker tag hyperledger/fabric-ca:$ARCH-$IMG_TAG hyperledger/fabric-ca


echo_b "Copy required fabric 1.0 artifacts"


ARTIFACTS_DIR=/opt/cello
USER=`whoami`
echo_b "Checking local artifacts path ${ARTIFACTS_DIR}..."
Expand All @@ -53,6 +50,6 @@ echo_b "Checking local artifacts path ${ARTIFACTS_DIR}..."
&& sudo chown -R ${USER}:${USER} ${ARTIFACTS_DIR}

echo_b "Setup ip forward rules"
sysctl -w net.ipv4.ip_forward=1
sudo sysctl -w net.ipv4.ip_forward=1

echo_g "Setup done"
3 changes: 1 addition & 2 deletions src/resources/cluster_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,7 @@ def cluster_create():
return make_fail_resp(error="config not validated",
data=config.get_data())

if cluster_handler.create(name=name, host_id=host_id,
network_type=network_type, config=config):
if cluster_handler.create(name=name, host_id=host_id, config=config):
logger.debug("cluster POST successfully")
return make_ok_resp(code=CODE_CREATED)
else:
Expand Down
5 changes: 3 additions & 2 deletions src/resources/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

@bp_index.route('/', methods=['GET'])
@bp_index.route('/index', methods=['GET'])
@login_required
# @login_required
def show():
request_debug(r, logger)
hosts = list(host_handler.list(filter_data={}))
Expand All @@ -48,7 +48,8 @@ def show():

clusters_temp = len(list(cluster_handler.list(filter_data={
"user_id": "/^__/"}, col_name="active")))
username, is_admin = current_user.username, current_user.isAdmin
# username, is_admin = current_user.username, current_user.isAdmin
username, is_admin = 'admin', True

return render_template("index.html", hosts=hosts,
hosts_free=hosts_free,
Expand Down
230 changes: 230 additions & 0 deletions src/themes/basic/templates/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@

<!-- Copyright IBM Corp, All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
-->

<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Block Chain Cloud Service">
<meta name="author" content="Baohua Yang">
<link rel="icon" href="../static/img/favicon.ico">
<link rel="stylesheet" href="{{ url_for('static', filename='js/dist/login.css') }}">

<meta name="viewport" content="width=device-width, initial-scale=1">

{% block head %}
<title>Cello Dashboard - Login</title>
{% endblock %}
<style>
body {
margin: 0;
font:normal 75% Arial, Helvetica, sans-serif;
}

canvas {
display: block;
vertical-align: bottom;
}

/* ---- particles.js container ---- */

#particles-js {
position: absolute;
width: 100%;
height: 100%;
background-color: #152935;
background-image: url("");
background-repeat: no-repeat;
background-size: cover;
background-position: 50% 50%;
}

/* ---- stats.js ---- */

.count-particles{
background: #000022;
position: absolute;
top: 48px;
left: 0;
width: 80px;
color: #13E8E9;
font-size: .8em;
text-align: left;
text-indent: 4px;
line-height: 14px;
padding-bottom: 2px;
font-family: Helvetica, Arial, sans-serif;
font-weight: bold;
}

.js-count-particles{
font-size: 1.1em;
}

#stats,
.count-particles{
-webkit-user-select: none;
}

#stats{
border-radius: 3px 3px 0 0;
overflow: hidden;
}

.count-particles{
border-radius: 0 0 3px 3px;
}
</style>

</head>

<body id="particles-js">

<div id="root"></div>
<script src="{{ url_for('static', filename='login/particles.min.js') }}"></script>
<script>
particlesJS("particles-js", {
"particles": {
"number": {
"value": 100,
"density": {
"enable": true,
"value_area": 1000
}
},
"color": {
"value": "#ffffff"
},
"shape": {
"type": "circle",
"stroke": {
"width": 0,
"color": "#000000"
},
"polygon": {
"nb_sides": 5
},
"image": {
"src": "img/github.svg",
"width": 100,
"height": 100
}
},
"opacity": {
"value": 0.5,
"random": false,
"anim": {
"enable": false,
"speed": 1,
"opacity_min": 0.1,
"sync": false
}
},
"size": {
"value": 3,
"random": true,
"anim": {
"enable": false,
"speed": 40,
"size_min": 0.1,
"sync": false
}
},
"line_linked": {
"enable": true,
"distance": 150,
"color": "#ffffff",
"opacity": 0.4,
"width": 1
},
"move": {
"enable": true,
"speed": 6,
"direction": "none",
"random": false,
"straight": false,
"out_mode": "out",
"bounce": false,
"attract": {
"enable": false,
"rotateX": 600,
"rotateY": 1200
}
}
},
"interactivity": {
"detect_on": "canvas",
"events": {
"onhover": {
"enable": true,
"mode": "grab"
},
"onclick": {
"enable": true,
"mode": "push"
},
"resize": true
},
"modes": {
"grab": {
"distance": 140,
"line_linked": {
"opacity": 1
}
},
"bubble": {
"distance": 400,
"size": 40,
"duration": 2,
"opacity": 8,
"speed": 3
},
"repulse": {
"distance": 200,
"duration": 0.4
},
"push": {
"particles_nb": 4
},
"remove": {
"particles_nb": 2
}
}
},
"retina_detect": true
});


/* ---- stats.js config ---- */

var count_particles, stats, update;
stats = new Stats;
stats.setMode(0);
stats.domElement.style.position = 'absolute';
stats.domElement.style.left = '0px';
stats.domElement.style.top = '0px';
document.body.appendChild(stats.domElement);
count_particles = document.querySelector('.js-count-particles');
update = function() {
stats.begin();
stats.end();
if (window.pJSDom[0].pJS.particles && window.pJSDom[0].pJS.particles.array) {
count_particles.innerText = window.pJSDom[0].pJS.particles.array.length;
}
requestAnimationFrame(update);
};
requestAnimationFrame(update);
</script>
<script src="//cdn.bootcss.com/react/15.4.2/react.min.js"></script>
<script src="//cdn.bootcss.com/react/15.4.2/react-dom.min.js"></script>
<script src="//cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
<script src="//cdn.bootcss.com/validator/7.0.0/validator.min.js"></script>
<script src="{{ url_for('static', filename='js/dist/login.js') }}"> </script>

</body>
</html>

0 comments on commit 9f67961

Please sign in to comment.