Skip to content

Commit 179ceda

Browse files
committed
covert jade attr syntax to pug attr syntax
1 parent 14c8112 commit 179ceda

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ if (hash === helper.getHash()) {
128128
console.log('');
129129
logger.debug('Detected that we have launched successfully before');
130130
logger.debug('Welcome back - Initiating start up\n\n');
131+
process.env.app_state = 'start_waiting';
131132
process.env.app_first_setup = 'no';
132133
enroll_admin(1, function (e) {
133134
if (e == null) {

views/marbles.pug

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ extends ./template/layout.pug
33

44
block custom_header
55
// --------------- Header -------------- //
6-
script(src='/js/ui_events.js?v=#{bag.jshash}')
7-
script(src='/js/websocket.js?v=#{bag.jshash}')
8-
script(src='/js/startup.js?v=#{bag.jshash}')
9-
script(src='/js/tx_story.js?v=#{bag.jshash}')
6+
script(src='/js/ui_events.js?v=' + bag.jshash)
7+
script(src='/js/websocket.js?v=' + bag.jshash)
8+
script(src='/js/startup.js?v=' + bag.jshash)
9+
script(src='/js/tx_story.js?v=' + bag.jshash)
1010
script(type='text/javascript').
1111
$(document).ready(function(){
1212

views/panel_startup.pug

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@
8989
p Edit the details below to try again.
9090
br
9191
.stepInputLegend CA
92-
input(type="text" placeholder="CA ex: 192.168.99.100:8888" name="caUrl" value="#{bag.creds.ca}").longer
92+
input(type="text" placeholder="CA ex: 192.168.99.100:8888" name="caUrl" value=bag.creds.ca).longer
9393
br
9494
.stepInputLegend Enroll ID
95-
input(type="text" placeholder="Enroll Id" name="enrollId" value="#{bag.creds.admin_id}").longer
95+
input(type="text" placeholder="Enroll Id" name="enrollId" value=bag.creds.admin_id).longer
9696
br
9797
.stepInputLegend Enroll Secret
98-
input(type="text" placeholder="Enroll Secret" name="enrollSecret" value="#{bag.creds.admin_secret}").longer
98+
input(type="text" placeholder="Enroll Secret" name="enrollSecret" value=bag.creds.admin_secret).longer
9999
br
100100
br
101101
button(type="button")#enrollAdmin Retry
@@ -117,16 +117,16 @@
117117

118118
br
119119
.stepInputLegend Orderer
120-
input(type="text" placeholder="Orderer ex: 192.168.99.100:5151" name="ordererUrl" value="#{bag.creds.orderer}").longer
120+
input(type="text" placeholder="Orderer ex: 192.168.99.100:5151" name="ordererUrl" value=bag.creds.orderer).longer
121121
br
122122
.stepInputLegend Peer
123-
input(type="text" placeholder="Peer ex: 192.168.99.100:7051" name="peerUrl" value="#{bag.creds.peer}").longer
123+
input(type="text" placeholder="Peer ex: 192.168.99.100:7051" name="peerUrl" value=bag.creds.peer).longer
124124
br
125125
.stepInputLegend Chaincode ID
126-
input(type="text" placeholder="Chaincode ID" name="chaincodeId" value="#{bag.creds.chaincode_id}").longer
126+
input(type="text" placeholder="Chaincode ID" name="chaincodeId" value=bag.creds.chaincode_id).longer
127127
br
128128
.stepInputLegend Chaincode Version
129-
input(type="text" placeholder="Chaincode Version" name="chaincodeVersion" value="#{bag.creds.chaincode_version}").longer
129+
input(type="text" placeholder="Chaincode Version" name="chaincodeVersion" value=bag.creds.chaincode_version).longer
130130
br
131131
button(type="button")#retryDeploy Retry
132132

@@ -140,11 +140,11 @@
140140
p These are the identies that can own marbles.
141141
br
142142
.stepInputLegend Company
143-
input(type="text" value="#{bag.marble_company}" disabled="disabled").longer
143+
input(type="text" value=bag.marble_company disabled="disabled").longer
144144
br
145145

146146
.stepInputLegend Owners
147-
input(type="text" placeholder="bob, bill, amy" name="marbleOwners" value="#{bag.creds.marble_owners}").longer
147+
input(type="text" placeholder="bob, bill, amy" name="marbleOwners" value=bag.creds.marble_owners).longer
148148
br
149149
br
150150
button(type="button")#registerOwners Register

views/template/layout.pug

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ html
1212
link(rel="icon" href="/imgs/favicon-32.png" sizes="32x32")
1313
link(rel="icon" href="/imgs/favicon-96.png" sizes="96x96")
1414
link(rel="stylesheet" href="/css/font-awesome-4.5.0/css/font-awesome.min.css")
15-
link(type="text/css" rel="stylesheet" href="/css/main.min.css?v=#{bag.csshash}")
15+
link(type="text/css" rel="stylesheet" href="/css/main.min.css?v=" + bag.csshash)
1616
script(src='/js/util/jquery-2.2.4.min.js')
1717
script(src='/js/util/jquery-ui-1.11.4/jquery-ui.min.js')
1818
script(src='/js/util/jquery.ui.touch-punch.min.js')
19-
script(src='/js/funk.js?v=#{bag.jshash}')
20-
script(src='/js/blockchain.js?v=#{bag.jshash}')
21-
script(src='/js/ui_building.js?v=#{bag.jshash}')
19+
script(src='/js/funk.js?v=' + bag.jshash)
20+
script(src='/js/blockchain.js?v=' + bag.jshash)
21+
script(src='/js/ui_building.js?v=' + bag.jshash)
2222
script(type='text/javascript').
2323
var bag = !{JSON.stringify(bag)}; //throw json over to JS
2424
console.log('bag', bag);

0 commit comments

Comments
 (0)