Skip to content

Commit 44ad76e

Browse files
wadewegnerwadewegner
committed
Formatting updates
1 parent b477e7e commit 44ad76e

File tree

7 files changed

+37
-214
lines changed

7 files changed

+37
-214
lines changed

‎dist/assets/css/main.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19386,12 +19386,12 @@ a.sfdx-logo:visited {
1938619386
.sfdx-output {
1938719387
width: 100%;
1938819388
height: 350px;
19389-
border-radius: 0.125rem;
19390-
border: 1px solid #d8dde6;
1939119389
padding: 0.75rem;
1939219390
line-height: 1.5rem;
1939319391
color: #54698d;
19394-
resize: none; }
19392+
resize: none;
19393+
word-break:break-all;
19394+
overflow: scroll; }
1939519395

1939619396
.sfdx-slim {
1939719397
margin: 0 5%; }

‎lib/apis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function (router) {
4444
}
4545

4646
if (!error_message) {
47-
resultMessage = `${count}) ${message}\n${resultMessage}`;
47+
resultMessage = `${count}) ${message}<br/>${resultMessage}`;
4848
} else {
4949
resultMessage = `${resultMessage}`;
5050
}

‎scripts/deploying.bak.js

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎scripts/deploying.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
$(document).ready(() => {
22

3-
function update_status(newMessage, excludeCount) {
4-
let message = '';
3+
function update_status(newMessage) {
54

6-
if (excludeCount) {
7-
message = `${newMessage}\n${message}`;
8-
} else {
9-
newMessage = newMessage.replace(/^\s+|\s+$/g, '');
10-
message = `${newMessage}\n${message}`;
11-
}
5+
let message = '';
6+
newMessage = newMessage.replace(/^\s+|\s+$/g, '');
7+
message = `${newMessage}<br/>${message}`;
128

13-
$('textarea#status').val(message);
9+
$('#status').text(message);
10+
$('#status').html($('#status').text());
1411
}
1512

1613
function poll(guid) {
@@ -72,7 +69,7 @@ $(document).ready(() => {
7269
// update_status(`Started job: ${settings.guid}`);
7370
},
7471
error: (commandDataResponse) => {
75-
update_status(`Sorry, something went wrong. Please log an issue on github: https://github.com/wadewegner/deploy-to-sfdx/issues.\n\nError: ${commandDataResponse.responseText}\n`, true);
72+
update_status(`Sorry, something went wrong. Please log an issue on github: https://github.com/wadewegner/deploy-to-sfdx/issues.\n\nError: ${commandDataResponse.responseText}\n`);
7673
$('div#loaderBlock').hide();
7774
}
7875
});

‎src/scss/main.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ a.sfdx-logo:visited {
2525
.sfdx-output {
2626
width: 100%;
2727
height: 350px;
28-
border-radius: $border-radius-small;
29-
border: 1px solid $color-border;
30-
padding: $spacing-small;
28+
padding: 0.75rem;
3129
line-height: 1.5rem;
32-
color: $color-text-input-disabled;
33-
resize: none;
30+
color: #54698d;
31+
resize: none;
32+
word-break:break-all;
33+
overflow: scroll;
3434
}
3535

3636
.sfdx-slim {

‎views/pages/choose.ejs

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,28 @@
66
<h2 class="slds-text-heading_medium slds-p-top_medium slds-p-bottom_medium">Confirm Deployment Details</h2>
77

88
<p class="slds-p-bottom_medium">
9-
<strong>Deploying To</strong><br />
9+
<strong>Deploying to:</strong><br />
1010
<%= user_name %>
1111
</p>
1212
<p>
13-
<strong>Choose a Repo</strong><br />
13+
<strong>Choose a repo:</strong><br />
1414

1515
<fieldset class="slds-form-element">
1616
<div class="slds-form-element__control">
17-
<span class="slds-radio">
18-
<input type="radio" id="radio-1" name="options" checked="checked" value="https://github.com/forcedotcom/sfdx-dreamhouse">
19-
<label class="slds-radio__label" for="radio-1">
20-
<span class="slds-radio_faux"></span>
21-
<span class="slds-form-element__label"><a href="https://github.com/forcedotcom/sfdx-dreamhouse" target="_blank">https://github.com/forcedotcom/sfdx-dreamhouse</a></span>
22-
</label>
23-
</span>
24-
25-
<span class="slds-radio">
26-
<input type="radio" id="radio-2" name="options" value="https://github.com/forcedotcom/sfdx-simple">
27-
<label class="slds-radio__label" for="radio-2">
28-
<span class="slds-radio_faux"></span>
29-
<span class="slds-form-element__label"><a href="https://github.com/forcedotcom/sfdx-simple" target="_blank">https://github.com/forcedotcom/sfdx-simple</a></span>
30-
</label>
31-
</span>
32-
33-
<span class="slds-radio">
34-
<input type="radio" id="radio-3" name="options" value="https://github.com/ccoenraets/northern-trail">
35-
<label class="slds-radio__label" for="radio-3">
36-
<span class="slds-radio_faux"></span>
37-
<span class="slds-form-element__label"><a href="https://github.com/ccoenraets/northern-trail" target="_blank">https://github.com/ccoenraets/northern-trail</a></span>
38-
</label>
39-
</span>
40-
41-
<!-- <span class="slds-radio">
42-
<input type="radio" id="radio-4" name="options" value="https://github.com/muenzpraeger/salesforce-einstein-platform-apex">
43-
<label class="slds-radio__label" for="radio-4">
44-
<span class="slds-radio_faux"></span>
45-
<span class="slds-form-element__label"><a href="https://github.com/muenzpraeger/salesforce-einstein-platform-apex" target="_blank">https://github.com/muenzpraeger/salesforce-einstein-platform-apex</a></span>
46-
</label>
47-
</span> -->
48-
17+
18+
<% var urls = ['https://github.com/forcedotcom/sfdx-dreamhouse', 'https://github.com/forcedotcom/sfdx-simple', 'https://github.com/ccoenraets/northern-trail', 'https://github.com/muenzpraeger/salesforce-einstein-platform-apex'] %>
19+
<% for (var i = 0; i < urls.length; i++) { %>
20+
21+
22+
<span class="slds-radio">
23+
<input type="radio" id="radio-<%=i%>" name="options" checked="checked" value="<%= urls[i] %>">
24+
<label class="slds-radio__label" for="radio-<%=i%>">
25+
<span class="slds-radio_faux"></span> <%= urls[i] %>
26+
<span class="slds-form-element__label"><a href="<%= urls[i] %>" target="_blank">^</a></span>
27+
</label>
28+
</span>
29+
30+
<% } %>
4931

5032
</div>
5133
</fieldset>

‎views/pages/deploying.ejs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121

2222
</div>
2323
</div>
24-
25-
<textarea id="status" class="slds-m-bottom_small sfdx-output"></textarea>
24+
25+
<div class="slds-box sfdx-output">
26+
<div id="status"></div>
27+
</div>
28+
2629
</main>
2730

2831
<input type="hidden" id="template" value="<%= template %>"></input>

0 commit comments

Comments
 (0)