Skip to content

Commit 743da6f

Browse files
Merge pull request #43 from pebble-dev/forum-updates
Forum updates
2 parents ce0b03f + c2c414f commit 743da6f

File tree

7 files changed

+973
-277
lines changed

7 files changed

+973
-277
lines changed

html/index.html

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
</link>
2424
<script type="text/javascript" src="/res/js/config.js"></script>
2525
<script type="text/javascript" src="/res/js/oauth.js"></script>
26+
<script type="text/javascript" src="/res/js/jszip.min.js"></script>
27+
<script type="text/javascript" src="/res/js/FileSaver.min.js"></script>
2628
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/confetti.browser.min.js"></script>
2729

2830

@@ -792,6 +794,44 @@ <h3> <i class="fas fa-traffic-light text-warning mr-2"></i> Speed Warning! </h3>
792794
</div>
793795
</div>
794796

797+
<div class="modal fade mt-5" data-backdrop="static" tabindex="-1" role="dialog" id="forumSetModal"
798+
aria-hidden="true">
799+
<div class="modal-dialog modal-lg" role="document">
800+
<div class="modal-content p-4">
801+
802+
<div class="modal-body">
803+
<div class="row ml-3 mt-3">
804+
<h3> <i class="fab fa-discourse text-coral"></i> Rebble Forum Connection </h3>
805+
</div>
806+
<div class="col-12 mt-3 hidden" id="forum_set_text">
807+
You can link your <span class="appOrFace lcase">app</span> to a thread on the <a target="_blank" class="data-rbl-forum-link" href="set_in_config">Rebble Forum</a>, so that <span class="appOrFace lcase">app</span> updates will be automatically posted to the associated thread.
808+
<br><br>
809+
Create a topic on the forum, then paste the URL below to link it.
810+
</div>
811+
<div class="col-12 mt-3 hidden" id="forum_update_text">
812+
Your <span class="appOrFace lcase">app</span> is currently linked to <a href="#" target="_blank" class="data-forum-url">this forum topic</a>.
813+
<br><br>
814+
You can provide an alternate topic URL below to change where release alerts are automatically posted.
815+
</div>
816+
817+
<div class="col-12 mt-3 font-weight-light">
818+
<input class="simple" style="max-width: 500px;" placeholder="https://forum.rebble.io/t/my-amazing-watchface/123"
819+
id="forum_set_url_inp"></input>
820+
<div class="small ml-0 text-warning hidden" id="forum_set_url_error_msg"> An error occured </div>
821+
<button class="btn btn-md btn-primary"
822+
onclick="setForumURL($('#forum_set_url_inp').val())"
823+
id="forumSetBtn">Link to this topic</button>
824+
</div>
825+
</div>
826+
827+
828+
<div class="modal-footer float-left noborder">
829+
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
830+
</div>
831+
</div>
832+
</div>
833+
</div>
834+
795835

796836
<div class="container page hidden" id="master-home">
797837
<div class="row mt-5">
@@ -833,8 +873,9 @@ <h1 id="appinfo-appname"> </h1> <a target="_blank" class="ml-3 small pt-2 nodec"
833873
<i class="fas fa-code-branch ml-4"></i> <span id="appinfo-latestrelease"> </span>
834874
<span id="appinfo-type"> <i class="far fa-clock ml-4"></i> Watchface </span>
835875
</li>
836-
<li> <i id="statusIcon" class="far fa-check-circle"></i> <span id="statusText"> Published
837-
</span> </li>
876+
<li>
877+
<i id="statusIcon" class="far fa-check-circle"></i> <span id="statusText"> Published </span>
878+
</li>
838879
<li class="mt-1">
839880
<img src="/res/img/icon_og.png" class="supports-aplite tinyicon"
840881
onclick="changePreviewWatchPlatform('aplite', this, true)" title="Aplite" />
@@ -857,6 +898,8 @@ <h1 id="appinfo-appname"> </h1> <a target="_blank" class="ml-3 small pt-2 nodec"
857898
class="fas fa-upload"></i> New Release </btn>
858899
<btn class="btn btn-secondary noshadow appinfobtn" onclick="showAppListingEditor(this)"
859900
id="editStoreListingBtn"> <i class="fas fa-align-justify"></i> Edit Store Listing </btn>
901+
<btn class="btn btn-secondary noshadow appinfobtn" onclick="showForumModal()"
902+
id="editForumConfigBtn"> <i id="forumConnectionStatusIcon" class="fab fa-discourse"></i> Forum Connection </btn>
860903
</div>
861904

862905
<div class="row mt-5 ml-1 appinfoscreen animated fadeIn" id="appinfo-secondary">
@@ -1478,7 +1521,7 @@ <h1 class="lite"> New release for <span class="data-release-app">your app</span>
14781521

14791522
</div>
14801523
<!-- <div class="ml-4 mt-5" id="navButtons">
1481-
1524+
14821525
<button class="previousstep" onclick="reverseAppRelease()" id="btn_rel_prev"> <i class="fas fa-backward"></i> Back </button>
14831526
<button class="previousstep highlight" onclick="validateThenProgressRelease()" id="btn_rel_next"> Next <i class="fas fa-forward"></i> </button>
14841527
<br><br><br>
@@ -1526,7 +1569,7 @@ <h1 class="lite"> New release for <span class="data-release-app">your app</span>
15261569
<div class="mt-2"><a class="mt-3" href="https://github.com/pebble-dev/rebble-dev-portal/issues/new"
15271570
target="_blank"> Report a dev portal issue <i class="fas fa-external-link-alt"></i> </a></div>
15281571
<div class="mt-2"><a class="mt-3" href="#" onclick="downloadArchive()"> Download a colossal archive of the whole
1529-
entire app store! <i class="fas fa-regular fa-file-export"></i> </a></div>
1572+
entire app store! <i class="fas fa-regular fa-cloud-download-alt"></i> </a></div>
15301573
<br>
15311574
<h4 class="mt-4"> Settings </h4>
15321575
<div class="">

html/res/css/devPortal.css

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ body {
33
--color-background: #f6faf8;
44
--color-header: #373a3c;
55
--color-rebble-orange: #ff4700;
6+
--color-rebble-coral: #f9a285;
67
--color-rebble-green: #6fa673;
78
--color-rebble-amber: #FFB449;
89
--color-rebble-red: #AF0000;
@@ -28,6 +29,9 @@ body {
2829
.light-red {
2930
background-color: var(--color-rebble-red) !important;
3031
}
32+
.text-coral {
33+
color: #f9a285;
34+
}
3135

3236

3337
.lite {
@@ -135,6 +139,14 @@ footer {
135139
margin-left: 10px;
136140
}
137141

142+
.btn.small {
143+
height:30px;
144+
padding: 0px;
145+
padding-left: 20px;
146+
padding-right: 20px;
147+
font-size: 10px;
148+
margin: 0px;
149+
}
138150

139151

140152
/* Login */
@@ -242,15 +254,18 @@ ul.nodec > li {
242254
margin: 0 auto;
243255
}
244256
.spinner-sm {
245-
border: 4px solid black;
246-
border-top: 4px solid var(--color-rebble-orange);
257+
border: 4px solid black;
258+
border-top: 4px solid var(--color-rebble-orange);
247259
border-radius: 50%;
248260
width: 20px;
249261
height: 20px;
250262
animation: spin 2s linear infinite;
251263
margin: 0 auto;
252264
margin-top: 10px;
253265
}
266+
.spin {
267+
animation: spin 2s linear infinite;
268+
}
254269

255270
@keyframes spin {
256271
0% { transform: rotate(0deg); }
@@ -506,7 +521,7 @@ img.small {
506521

507522
.modal-dialog .modal-content {
508523
border-radius: 10px !important;
509-
font-weight: 600;
524+
font-weight: 400;
510525
}
511526

512527
.lcase {
@@ -605,3 +620,6 @@ table.nodec td {
605620
.btn-info {
606621
background-color: var(--color-rebble-blue) !important;
607622
}
623+
.modal-body .btn {
624+
margin-left: 0px;
625+
}

html/res/js/config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ config = {
1313
wizardUpdateDevID: "/api/dp/wizard/reassign/",
1414
wizardApp: "/api/dp/wizard/app/",
1515
downloadArchive: "/api/dp/archive/latest",
16+
forumUpdate: '/api/dp/app/{appID}/forum'
1617
},
1718
misc: {
1819
appstoreUrl: "https://apps.rebble.io/en_US/application/",
1920
assetBase: "https://assets2.rebble.io/",
2021
screenshotAsset: "https://assets2.rebble.io/144x168/",
2122
screenshotAssetRound: "https://assets2.rebble.io/180x180/",
2223
bannerAsset: "https://assets2.rebble.io/720x320/",
23-
developerUrl: "https://apps.rebble.io/en_US/developer/"
24+
developerUrl: "https://apps.rebble.io/en_US/developer/",
25+
forumBaseUrl: "https://forum.rebble.io"
2426
}
2527
}

0 commit comments

Comments
 (0)