Merge branch 'master' of github.com:cs-uob/COMSM0085

docs/exercises/part2/app1/index.html

@@ -148,7 +148,7 @@ <h1 id="a-complete-application-part-1"><a class="header" href="#a-complete-appli
 <p>In this workshop we will set up and inspect a complete application including database, Java back-end/API and React front-end.</p>
 <p>Just one short video to introduce the topic:</p>
 <div class="table-wrapper"><table><thead><tr><th>Video</th><th style="text-align: right">Length</th><th>Slides</th></tr></thead><tbody>
-<tr><td><a href="">Application</a></td><td style="text-align: right">18 minutes</td><td><a href="">slides</a></td></tr>
+<tr><td><a href="https://web.microsoftstream.com/video/52fa34a2-02f8-4988-9fa1-21a317acbde3">Application</a></td><td style="text-align: right">9 minutes</td><td><a href="https://uob-my.sharepoint.com/:b:/g/personal/me17847_bristol_ac_uk/EU-n9IGv5SxGu5tR7HrTsz8B4-e8ERD6i7ct2mPeoLZbQQ?e=zUVT6e">slides</a></td></tr>
 </tbody></table>
 </div>
 <p>Please try the steps on the &quot;setting things up&quot; page before you come to the workshop - ideally you will then be able to start the walkthrough in the workshop itself immediately, but if you get stuck in the set-up, you will be able to ask for help at the very start.</p>

docs/exercises/part2/print.html

@@ -1671,7 +1671,7 @@ <h2 id="exercises-11"><a class="header" href="#exercises-11">Exercises</a></h2>
 </ul>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="installing-react"><a class="header" href="#installing-react">Installing React</a></h1>
 <h2 id="nodejs-and-npm"><a class="header" href="#nodejs-and-npm">Nodejs and NPM</a></h2>
-<p>JavaScript's original selling point was that it runs in the browser. <a href="react/nodejs.org">NodeJS</a> is a JavaScript runtime without a browser, so you can for example write a server / back-end in JavaScript too. Using a library called <a href="react/electronjs.org">Electron</a>, you can even write desktop apps in JavaScript/NodeJS (Electron is essentially google's Chrome browser without the branding, so you can use it to build your own user interface.) We will need NodeJS to run React, which compiles JSX code into JavaScript and HTML.</p>
+<p>JavaScript's original selling point was that it runs in the browser. <a href="https://nodejs.org">NodeJS</a> is a JavaScript runtime without a browser, so you can for example write a server / back-end in JavaScript too. Using a library called <a href="https://electronjs.org">Electron</a>, you can even write desktop apps in JavaScript/NodeJS (Electron is essentially google's Chrome browser without the branding, so you can use it to build your own user interface.) We will need NodeJS to run React, which compiles JSX code into JavaScript and HTML.</p>
 <p>NodeJS comes with its own package manager, NPM (NodeJS Package Manager). The shell command to run it is <code>npm</code>, but there is also <code>npx</code> which downloads the latest version of a package and immediately runs it, if it contains a command-line tool.</p>
 <ul>
 <li>Install NodeJS for your operating system. On alpine, use <code>sudo apk add nodejs npm</code>; for other operating systems you can download it from <a href="https://nodejs.org/en/">nodejs.org</a> or use your system's package manager, if available.</li>
@@ -1894,7 +1894,7 @@ <h2 id="read-all-about-it"><a class="header" href="#read-all-about-it">Read all
 <p>In this workshop we will set up and inspect a complete application including database, Java back-end/API and React front-end.</p>
 <p>Just one short video to introduce the topic:</p>
 <div class="table-wrapper"><table><thead><tr><th>Video</th><th style="text-align: right">Length</th><th>Slides</th></tr></thead><tbody>
-<tr><td><a href="app1/">Application</a></td><td style="text-align: right">18 minutes</td><td><a href="app1/">slides</a></td></tr>
+<tr><td><a href="https://web.microsoftstream.com/video/52fa34a2-02f8-4988-9fa1-21a317acbde3">Application</a></td><td style="text-align: right">9 minutes</td><td><a href="https://uob-my.sharepoint.com/:b:/g/personal/me17847_bristol_ac_uk/EU-n9IGv5SxGu5tR7HrTsz8B4-e8ERD6i7ct2mPeoLZbQQ?e=zUVT6e">slides</a></td></tr>
 </tbody></table>
 </div>
 <p>Please try the steps on the &quot;setting things up&quot; page before you come to the workshop - ideally you will then be able to start the walkthrough in the workshop itself immediately, but if you get stuck in the set-up, you will be able to ask for help at the very start.</p>

docs/exercises/part2/react/installing.html

@@ -146,7 +146,7 @@ <h1 class="menu-title">Exercises</h1>
                     <main>
                         <h1 id="installing-react"><a class="header" href="#installing-react">Installing React</a></h1>
 <h2 id="nodejs-and-npm"><a class="header" href="#nodejs-and-npm">Nodejs and NPM</a></h2>
-<p>JavaScript's original selling point was that it runs in the browser. <a href="nodejs.org">NodeJS</a> is a JavaScript runtime without a browser, so you can for example write a server / back-end in JavaScript too. Using a library called <a href="electronjs.org">Electron</a>, you can even write desktop apps in JavaScript/NodeJS (Electron is essentially google's Chrome browser without the branding, so you can use it to build your own user interface.) We will need NodeJS to run React, which compiles JSX code into JavaScript and HTML.</p>
+<p>JavaScript's original selling point was that it runs in the browser. <a href="https://nodejs.org">NodeJS</a> is a JavaScript runtime without a browser, so you can for example write a server / back-end in JavaScript too. Using a library called <a href="https://electronjs.org">Electron</a>, you can even write desktop apps in JavaScript/NodeJS (Electron is essentially google's Chrome browser without the branding, so you can use it to build your own user interface.) We will need NodeJS to run React, which compiles JSX code into JavaScript and HTML.</p>
 <p>NodeJS comes with its own package manager, NPM (NodeJS Package Manager). The shell command to run it is <code>npm</code>, but there is also <code>npx</code> which downloads the latest version of a package and immediately runs it, if it contains a command-line tool.</p>
 <ul>
 <li>Install NodeJS for your operating system. On alpine, use <code>sudo apk add nodejs npm</code>; for other operating systems you can download it from <a href="https://nodejs.org/en/">nodejs.org</a> or use your system's package manager, if available.</li>

exercises/part2/src/app1/index.md

@@ -6,6 +6,6 @@ Just one short video to introduce the topic:
 
 | Video | Length | Slides |
 |-------|-------:|--------|
-| [Application]() | 18 minutes | [slides]() |
+| [Application](https://web.microsoftstream.com/video/52fa34a2-02f8-4988-9fa1-21a317acbde3) | 9 minutes | [slides](https://uob-my.sharepoint.com/:b:/g/personal/me17847_bristol_ac_uk/EU-n9IGv5SxGu5tR7HrTsz8B4-e8ERD6i7ct2mPeoLZbQQ?e=zUVT6e) |
 
 Please try the steps on the "setting things up" page before you come to the workshop - ideally you will then be able to start the walkthrough in the workshop itself immediately, but if you get stuck in the set-up, you will be able to ask for help at the very start.