Bladeren bron

Use CORS to check for new version from GitHub

Chris Mullins 8 jaren geleden
bovenliggende
commit
713da0f1b9
3 gewijzigde bestanden met toevoegingen van 48 en 25 verwijderingen
  1. 2 2
      dist/index.html.gz.h
  2. 45 22
      web/src/index.html
  3. 1 1
      web/src/js/script.js

File diff suppressed because it is too large
+ 2 - 2
dist/index.html.gz.h


+ 45 - 22
web/src/index.html

@@ -64,28 +64,51 @@
   </div>
 
   <div id="updates-modal" class="modal fade" role="dialog">
-    <div class="modal-dialog">
-      <!-- Modal content-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h2 class="modal-title">Update</h2>
-        </div>
-        <div class="modal-body">
-          <div id="version-summary"></div>
-
-          <hr />
-
-          <h4>Current Version</h4>
-          <div id="current-version"></div>
-        </div>
-        <div class="modal-footer">
-          <a href="/download_update/web" class="btn btn-primary">Update Web UI</a>
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div>
-
-    </div>
+   <div class="modal-dialog">
+     <!-- Modal content-->
+     <div class="modal-content">
+       <div class="modal-header">
+         <button type="button" class="close" data-dismiss="modal">&times;</button>
+         <h2 class="modal-title">Update</h2>
+       </div>
+       <div class="modal-body">
+         <div id="version-summary"></div>
+
+         <hr />
+
+         <h4>Current Version</h4>
+         <div id="current-version"></div>
+
+         <div id="latest-version">
+           <h4>Latest Version</h4>
+           
+           <div class="status"></div>
+           <div id="latest-version-info">
+             <label>Version</label>
+             <div class="info-key" data-key="tag_name"></div>
+
+             <label>Release Date</label>
+             <div class="info-key" data-key="published_at"></div>
+
+             <label>Release Notes</label>
+             <pre class="info-key" data-key="body"></pre>
+
+             <div>
+               <a class="info-key" data-prop="href" data-key="html_url">View on GitHub</a>
+             </div>
+
+             <div>
+               <a class="info-key" id="firmware-link">Download Firmware</a>
+             </div>
+           </div>
+         </div>
+       </div>
+       <div class="modal-footer">
+         <a href="/download_update/web" class="btn btn-primary">Update Web UI</a>
+         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+       </div>
+     </div>
+   </div>
   </div>
 
   <div id="restore-settings-modal" class="modal fade" role="dialog">

+ 1 - 1
web/src/js/script.js

@@ -316,7 +316,7 @@ var handleCheckForUpdates = function() {
   );
 
   $.ajax(
-    '/latest_release',
+    'https://api.github.com/repos/sidoh/esp8266_milight_hub/releases/latest',
     {
       success: function(data) {
         latestRelease = data;