Implement beta release build

.github/workflows/changelog-generator.yml

@@ -1,6 +1,9 @@
 name: Changelog generation
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '**-release-build'
 
 jobs:
   generate-changelog:
@@ -42,3 +45,7 @@ jobs:
         removedLabels: 'removed'
         unreleasedLabel: '### Unreleased'
         addSections: '{"documentation":{"prefix":"### Documentation","labels":["documentation"]},"tests":{"prefix":"### Testing","labels":["tests"]}}'
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: Update Changelog for PR
+        file_pattern: CHANGELOG.md

.github/workflows/electron-build.yml

@@ -0,0 +1,34 @@
+name: Electron Build
+
+on:
+  push:
+    branches:
+      - master
+
+defaults:
+  run:
+    working-directory: frontendApp
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: |
+          npm install
+          npm install -g yarn
+      - run: yarn add electron-builder --dev
+      - run: yarn dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/electron-ci.yml

@@ -20,5 +20,5 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm run test
+    - run: yarn install --frozen-lockfile
+    - run: npm test

CHANGELOG.md

@@ -1,25 +1,67 @@
 #
 
-## [###](https://github.com/DIT112-V21/group-09/tree/HEAD)
+## [v0.4.5](https://github.com/DIT112-V21/group-09/tree/v0.4.5) (2021-05-29)
 
-[Full Changelog](https://github.com/DIT112-V21/group-09/compare/v0.3.0-alpha...HEAD)
+[Full Changelog](https://github.com/DIT112-V21/group-09/compare/v0.3.0-alpha...v0.4.5)
 
 ### Enhancements
 
+- Detect mission targets [\#107](https://github.com/DIT112-V21/group-09/issues/107)
 - Initial config files [\#87](https://github.com/DIT112-V21/group-09/issues/87)
+- The SmartRover 3D model [\#79](https://github.com/DIT112-V21/group-09/issues/79)
 - Custom Mars terrain package [\#78](https://github.com/DIT112-V21/group-09/issues/78)
 - Release and test alpha-1 version [\#57](https://github.com/DIT112-V21/group-09/issues/57)
+- Implement Mission save, load [\#121](https://github.com/DIT112-V21/group-09/pull/121)
+- User registration and login [\#116](https://github.com/DIT112-V21/group-09/pull/116)
+- Implement SmartRover 3D model [\#105](https://github.com/DIT112-V21/group-09/pull/105)
+- Update changelog-generator.yml [\#99](https://github.com/DIT112-V21/group-09/pull/99)
+- Update changelog generator [\#98](https://github.com/DIT112-V21/group-09/pull/98)
 - Implement changelog workflow [\#97](https://github.com/DIT112-V21/group-09/pull/97)
 - Implement Electron config [\#92](https://github.com/DIT112-V21/group-09/pull/92)
 - Update README.md [\#91](https://github.com/DIT112-V21/group-09/pull/91)
 
+### Bug fixes
+
+- \[BUGFIX\] Throttle and turn angle limits [\#101](https://github.com/DIT112-V21/group-09/issues/101)
+- Implement bugfixes [\#117](https://github.com/DIT112-V21/group-09/pull/117)
+
+### Deprecated
+
+- Frontend theme settings [\#35](https://github.com/DIT112-V21/group-09/issues/35)
+
+### Documentation
+
+- Instructions for users [\#33](https://github.com/DIT112-V21/group-09/issues/33)
+- Add Setup Guides [\#104](https://github.com/DIT112-V21/group-09/pull/104)
+
 ###
 
+- Mission target area signpost [\#90](https://github.com/DIT112-V21/group-09/issues/90)
 - \[Task\] Install database system and connect to Frontend app [\#89](https://github.com/DIT112-V21/group-09/issues/89)
+- User registration and login [\#88](https://github.com/DIT112-V21/group-09/issues/88)
+- Mission terrain map [\#77](https://github.com/DIT112-V21/group-09/issues/77)
+- Mission table data processing [\#76](https://github.com/DIT112-V21/group-09/issues/76)
+- Mission preset templates [\#75](https://github.com/DIT112-V21/group-09/issues/75)
+- Mission visual feedback [\#74](https://github.com/DIT112-V21/group-09/issues/74)
+- Persistent settings page [\#64](https://github.com/DIT112-V21/group-09/issues/64)
 - Update README.md to reflect project development [\#58](https://github.com/DIT112-V21/group-09/issues/58)
+- Save and load missions [\#27](https://github.com/DIT112-V21/group-09/issues/27)
+- Retrieve data after software restart [\#26](https://github.com/DIT112-V21/group-09/issues/26)
+- Track mission progress [\#25](https://github.com/DIT112-V21/group-09/issues/25)
+- Create user stories for Sprint 4 [\#21](https://github.com/DIT112-V21/group-09/issues/21)
+- Create user stories for Sprint 3 [\#20](https://github.com/DIT112-V21/group-09/issues/20)
 
 ###
 
+- Implement mission tracking [\#122](https://github.com/DIT112-V21/group-09/pull/122)
+- Implement mission control [\#119](https://github.com/DIT112-V21/group-09/pull/119)
+- Implement restore session [\#118](https://github.com/DIT112-V21/group-09/pull/118)
+- Implement settings page [\#115](https://github.com/DIT112-V21/group-09/pull/115)
+- Implement mission templates [\#114](https://github.com/DIT112-V21/group-09/pull/114)
+- Add QR Code Feature [\#108](https://github.com/DIT112-V21/group-09/pull/108)
+- Implement mission targets [\#106](https://github.com/DIT112-V21/group-09/pull/106)
+- Add user Input into an array [\#103](https://github.com/DIT112-V21/group-09/pull/103)
+- mission-map-update [\#102](https://github.com/DIT112-V21/group-09/pull/102)
 - Update settings layout [\#96](https://github.com/DIT112-V21/group-09/pull/96)
 - Connect database with the frontend app [\#95](https://github.com/DIT112-V21/group-09/pull/95)
 - Connect the frontend with the database [\#94](https://github.com/DIT112-V21/group-09/pull/94)

frontendApp/assets/css/mission.css

@@ -150,8 +150,8 @@ div[id='stream-guide panel-body'] {
 .stream-button {
     position: relative;
     display: inline-block;
-	width: 80px;
-	height: 80px;
+	width: 64px;
+	height: 64px;
     margin: 0 auto;
 
     -webkit-border-radius: 10px;
@@ -249,8 +249,8 @@ div[id='stream-guide panel-body'] {
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f6f6f6',GradientType=0 ); /* IE6-9 */
 
     display: inline-block;
-	width: 80px;
-	height: 80px;
+	width: 64px;
+	height: 64px;
 
     color: #3A474D;
     text-transform: uppercase;
@@ -282,6 +282,10 @@ div[id='stream-guide panel-body'] {
 	color: var(--power-btn-color);
 }
 
+#missionControlPad i.fas {
+	font-size: 1.5em;
+}
+
 #streamButton .disconnected {
 	color: red;
 	text-shadow: 0px -1px #97A63A;

frontendApp/assets/css/user-profile.css

@@ -1,9 +1,3 @@
-.modal-header{
-  font-family:Georgia, 'Times New Roman', Times, serif;
-  color: rgb(211, 17, 59);
-  background-color: blanchedalmond;
-}
-
 .user-profile {
 	grid-area: profile;
 	width: 90px;
@@ -110,4 +104,73 @@
     background-repeat: no-repeat;
     background-position: right calc(.375em + .1875rem) center;
     background-size: calc(.75em + .375rem) calc(.75em + .375rem);
+}
+
+/* Generic modal styling */
+
+.modal-header {
+	color: #fff;
+	background: #feccb1; /* Old browsers */
+	background: -moz-linear-gradient(-45deg,  #feccb1 0%, #f17432 50%, #ea5507 51%, #fb955e 100%); /* FF3.6-15 */
+	background: -webkit-linear-gradient(-45deg,  #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* Chrome10-25,Safari5.1-6 */
+	background: linear-gradient(135deg,  #feccb1 0%,#f17432 50%,#ea5507 51%,#fb955e 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=1); /* IE6-9 fallback on horizontal gradient */
+}
+
+.modal-header > h5 {
+	color: #f8f8f8;
+	font-family: 'Open Sans', 'Lato', 'Roboto', Helvetica, Arial, "sans-serif";
+	font-weight: 400;
+	text-shadow: 1px 1px 2px #451804;
+	font-size: 18pt;
+	text-transform: uppercase;
+}
+
+.modal-body {
+	color: #451804;
+	text-shadow: 1px 1px 2px #f0e7e7;
+
+}
+
+.modal-footer {
+	background-color: #f0e7e7;
+}
+
+#warningPower .modal-footer > button {
+	font-family: 'Lato', 'Roboto', Helvetica, Arial, "sans-serif";
+	font-weight: 800;
+	font-size: 12pt;
+	text-shadow: 1px 1px 1px #451804;
+}
+
+#missionLoadList .modal-content,
+#missionWarning .modal-content, 
+#userModal .modal-content, 
+#warningPower .modal-content {
+	-webkit-box-shadow: 0px 10px 13px -7px #000000, 0px 12px 13px 6px rgba(0,0,0,0.5); 
+	box-shadow: 0px 10px 13px -7px #000000, 0px 12px 13px 6px rgba(0,0,0,0.5);
+}
+
+#missionLoadList .btn-primary, 
+#missionWarning .btn-primary, 
+#warningPower .btn-primary,
+#userModal .btn-primary {
+	background-color: #c1440e;
+}
+
+#missionLoadList .btn-light {
+	background-color: #f0e7e7;
+	color: #451804;
+	border: 1px inset rgb(253, 166, 0, 0.3);
+}
+
+#missionLoadList .btn-light:hover {
+	background-color: #f5f5f5;
+}
+
+#missionLoadList .btn-primary:hover, 
+#missionWarning .btn-primary:hover, 
+#warningPower .btn-primary:hover,
+#userModal .btn-primary:hover {
+	background-color: #e77d11;
 }

frontendApp/assets/js/communication.js

@@ -1,6 +1,6 @@
 const mqtt = require('mqtt')
-let config = require('electron-node-config');
-let mqttConfig = config.get('mqtt.brokerConfig');
+//let mqttConfig = config.get('mqtt.brokerConfig');
+let mqttConfig = = store.get('localMqttSettings');
 const QrScanner = require('./assets/js/qr-scanner.umd.min.js');
 QrScanner.WORKER_PATH = './assets/js/qr-scanner-worker.min.js';
 
@@ -114,11 +114,11 @@ function onConnect () {
 				  var n = 0;	
 
 				  for (var i = 0; i < message.length; i += 3) {
-						n += 4;
 						pixels[n] = message[i];
 						pixels[n + 1] = message[i + 1];
 						pixels[n + 2] = message[i + 2];
 						pixels[n + 3] = 255;
+					  	n += 4;
 				  }
 				  const imageData = new ImageData(pixels, width, height);
 				  ctx.putImageData(imageData, 0, 0);
@@ -587,8 +587,8 @@ const showModal = (title, description, yesBtnLabel = 'Yes', noBtnLabel = 'Cancel
           <div class="modal-body">
             <p>${description}</p>
           </div>
-          <div class="modal-footer bg-light">
-            <button type="button" class="btn btn-warning" data-bs-dismiss="modal">${noBtnLabel}</button>
+          <div class="modal-footer bg-light d-flex justify-content-center">
+            <button type="button" class="btn btn-primary" data-bs-dismiss="modal">${noBtnLabel}</button>
           </div>
         </div>
       </div>

frontendApp/assets/js/map.js

@@ -303,9 +303,9 @@ const missionModal = (title, description, yesBtnLabel, noBtnLabel, action) => {
           <div class="modal-body">
             <p>${description}</p>
           </div>
-          <div class="modal-footer bg-light">
-			<button id="modalYesBtn" type="button" class="btn btn-outline-success" onclick="` + action + `">${yesBtnLabel}</button>
-        	<button id="modalNoBtn" type="button" class="btn btn-outline-danger" data-bs-dismiss="modal" >${noBtnLabel}</button>
+          <div class="modal-footer bg-light d-flex justify-content-center">
+			<button id="modalYesBtn" type="button" class="btn btn-primary me-4" onclick="` + action + `">${yesBtnLabel}</button>
+        	<button id="modalNoBtn" type="button" class="btn btn-warning" data-bs-dismiss="modal" >${noBtnLabel}</button>
           </div>
         </div>
       </div>
@@ -428,14 +428,9 @@ function executeMission() {
 	document.getElementById("map-tab").classList.remove("show");
 	document.getElementById("missionTabs-stream-tab").classList.add("active");
 	document.getElementById("missionTabs-map-tab").classList.remove("active");
-
 	switchPane('stream');
 
-	sendMission(missionContent)
-	.catch((e) =>
-		console.log(e)
-	);
-
+	store.set('missionContent', missionContent);
 };
 
 function loadMission(missionId) {

frontendApp/assets/js/mission.js

@@ -171,12 +171,9 @@ function executeMissionTable() {
 	document.getElementById("table-tab").classList.remove("show");
 	document.getElementById("missionTabs-stream-tab").classList.add("active");
 	document.getElementById("missionTabs-table-tab").classList.remove("active");
-
 	switchPane('stream');
-	sendMission(missionContent)
-	.catch((e) =>
-		console.log(e)
-	);
+
+	store.set('missionContent', missionContent);
 }
 
 function switchPane(pane) {