update content structure

instructions/docs/agenda/01-day-1.md

@@ -0,0 +1,79 @@
+---
+sidebar_position: 10
+---
+
+# Day 1 (Monday) 
+<table>
+    <thead>
+        <tr>
+            <th>Time</th>
+            <th>Topic</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>8:30</td>
+            <td>**Registration and name tags**</td>
+        </tr>
+        <tr>
+            <td>09:00</td>
+            <td>
+                **General introduction**<br/>
+                During the welcome and opening of the Academy, we’ll explain the agenda, give a general overview of what everyone can expect to learn, and how certificates will be issued based on each individual's results.
+            </td>
+        </tr>
+        <tr>
+            <td>09:15</td>
+            <td>
+                **Welcome by MoH Côte d’Ivoire**
+            </td>
+        </tr>
+        <tr>
+            <td>09:30</td>
+            <td>
+                **General introductions**
+            </td>
+        </tr>
+        <tr >
+            <td>10:30 - 11:00</td>
+            <td>
+                _Coffee Break_
+            </td>
+        </tr>
+        <tr>
+            <td>11:30 - 12:30</td>
+            <td>
+                **Common courses and presentations**
+                <ul>
+                    <li>UI principles and patterns </li>
+                    <li>Workflow</li>
+                    <li>API Basics</li>
+                    <li>Datastore Basics</li>
+                </ul>
+            </td>
+        </tr>
+        <tr>
+            <td>12:30 - 13:30</td>
+            <td>
+                _Lunch break_
+            </td>
+        </tr>
+        <tr>
+            <td>13:30 - 14:00</td>
+            <td>
+                **Laptop setup**
+            </td>
+        </tr>
+        <tr>
+            <td>14:00 - 17:00</td>
+            <td>
+                **Workshop Day 1 (Environment Setup)**
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+:::warning[to discuss]
+- who's doing the common sessions? is this enough time for four presentations?
+- what's the "workflow" presentation
+:::

instructions/docs/agenda/02-day-2.md

@@ -0,0 +1,22 @@
+---
+sidebar_position: 15
+---
+
+# Day 2 (Tuesday)
+| Time | Topic | |
+| --- | --- | --- |
+| 09:00 - 10:30 | Opening Workshop | UI Fundamentals: Task 1 (Routing and navigation) |
+| 10:30 - 11:00 | _coffee break_ | |
+| 11:00 - 12:30 | Workshop | UI Fundamentals: Task 2 (Table component) |
+| 12:30 - 13:30 | _lunch break_ | |
+| 13:30 - 15:00 | Workshop | UI Fundamentals: Task 3 (Forms) |
+| 15:00 - 15:30 | _cofee break_ | |
+| 15:30 - 16:30 | Workshop | UI Fundamentals: Task 4 (or API overview?) |
+| 16:30 - 16:45 | Closing | |
+| 16:45 - 17:00 | Q&A (with French support) | |
+
+:::warning[to discuss]
+- Introduction to UI library, Integrated design system and UI docs
+    - will this be covered in first day common session?
+- [https://developers.dhis2.org/events/academy-workshops-2022](https://developers.dhis2.org/events/academy-workshops-2022)
+:::

instructions/docs/agenda/03-day-3.md

@@ -0,0 +1,20 @@
+---
+sidebar_position: 20
+---
+
+# Day 3 (Wednesday)
+| Time | Topic | |
+| --- | --- | --- |
+| 09:00 - 10:30 | Opening Workshop | App Runtime: Data Queries |
+| 10:30 - 11:00 | _coffee break_ | |
+| 11:00 - 12:30 | Workshop | App Runtime: Mutations |
+| 12:30 - 13:30 | _lunch break_ | |
+| 13:30 - 15:00 | Workshop | App Runtime: Alerts |
+| 15:00 - 15:30 | _cofee break_ | |
+| 15:30 - 16:30 | Workshop | App Runtime: Advanced (paging?) |
+| 16:30 - 16:45 | Closing | |
+| 16:45 - 17:00 | Q&A (with French support) | |
+
+:::warning[to discuss]
+- could cover PWAs here?
+:::

instructions/docs/agenda/04-day-4.md

@@ -0,0 +1,21 @@
+---
+sidebar_position: 25
+---
+
+# Day 4 (Thursday)
+| Time | Topic | |
+| --- | --- | --- |
+| 09:00 - 10:30 | Opening Workshop | Data Store |
+| 10:30 - 11:00 | _coffee break_ | |
+| 11:00 - 12:30 | Workshop | Data Store |
+| 12:30 - 13:30 | _lunch break_ | |
+| 13:30 - 15:00 | Workshop | Making apps generic |
+| 15:00 - 15:30 | _cofee break_ | |
+| 15:30 - 16:30 | Workshop | |
+| 16:30 - 16:45 | Closing | |
+| 16:45 - 17:00 | Q&A (with French support) | |
+
+:::warning[to discuss]
+- Some topics could be covered here or last day: Routes API, plugins, App Hub submission, Offline support and PWA 
+-  Alternative Metadata APIs: Gist and JSON Patch
+:::

instructions/docs/agenda/05-day-5.md

@@ -0,0 +1,18 @@
+---
+sidebar_position: 30
+---
+
+:::danger[to discuss]
+still undecided about last day
+:::
+
+# Day 5 (Friday)
+| Time | Topic | |
+| --- | --- | --- |
+| 09:00 - 10:30 | Closing Workshop | |
+| 10:30 - 11:00 | _coffee break_ | |
+| 11:00 - 12:30 | Workshop | |
+| 12:30 - 13:30 | _lunch break_ | |
+| 13:30 - 15:00 | Workshop | |
+| 15:00 - 15:30 | _cofee break / closing_ | |
+

instructions/docs/agenda/_category_.json

@@ -0,0 +1,6 @@
+{
+    "position": 10,
+    "label": "📅 Agenda",
+    "collapsible": true,
+    "collapsed": false
+}

instructions/docs/agenda/agenda.md

@@ -0,0 +1,24 @@
+---
+title: Agenda
+sidebar_position: 5
+---
+
+:::info[Web Academy 2024]
+Monday 15th of May - Friday 19th of May, 2024, 10:00-13:00 CET<br/>
+Abidjan, Côte d'Ivoire
+:::
+
+## Topics
+
+- **Day 1** - Common sessions, Laptop and Platform Setup
+- **Day 2** - UI libraries
+- **Day 3** - App Runtime, Data Query and Data Mutation, advanced Data Queries and Hooks
+- **Day 4** - Data Store, and making apps generic (PWA and DataStore)
+- **Day 5** - Extra topics: Routes API, plugins, App Hub submission, Offline support and PWA 
+
+
+
+
+
+
+

instructions/docs/before-academy/DEBUG.md → instructions/docs/resources/DEBUG.md

@@ -1,6 +1,11 @@
 ---
-sidebar_position: 15
+sidebar_position: 10
 ---
+
+:::danger[ToDo]
+- Are all these instructions still applicable?
+:::
+
 # Live instance debugging
 
 If you can't login to the server: https://academy.demos.dhis2.org/web-app/ or you get some Cross-Origin Resource Sharing (CORs) policy issues in the DevTools Console when trying to connect to your application, please try the following troubleshooting steps:
@@ -17,7 +22,7 @@ When you login to your instance, click on the apps icon and search for **System
 
 See below:
 
-![](../before-academy/assets/resources/cors-whitelist.gif)
+![](../assets/cors-whitelist.gif)
 
 ## If you're using Chrome
 
@@ -49,6 +54,6 @@ If you're having some issues with CodeSandbox:
 
 You could also try disabling the cache from the network tab in Chrome DevTools. See below:
 
-![](./assets/resources/disable-cache.png)
+![](../assets/disable-cache.png)
 
 Hopefully you're now able to connect. If you encounter different errors, please let us know!

instructions/docs/before-academy/GET_STARTED.md → instructions/docs/resources/GET_STARTED.md

@@ -1,20 +1,25 @@
 ---
-sidebar_position: 10
+title: (?obsolete) Get Started
+sidebar_position: 20
 ---
 
 # Get Started
 
+:::danger[ToDo]
+- Will we use GitHub Classroom?
+:::
+
 This guide will help you get started with GitHub Classroom and will show you how to setup your local environment for working and submitting your assignments.
 
 ## GitHub Classroom: Accept assignment
 
 When you receive the invitation link, you will see the following:
 
-![accept-invitation](./assets/resources/accept-invitation.png)
+![accept-invitation](../assets/accept-invitation.png)
 
 Once you accept the invitation, a GitHub repository will be created for you. **Refresh** the page to see your repo. Note that your username will be automatically added as shown below:
 
-![accept-invitation](./assets/resources/repo-student-name.png)
+![accept-invitation](../assets/repo-student-name.png)
 
 Next, let's setup your local environment.
 
@@ -67,12 +72,12 @@ You are now ready to start your application locally!
 
 * From the browser, go to [http://localhost:3000](http://localhost:3000). You will see the following page:
 
-![](./assets/resources/new-app-login-page.png)
+![](../assets/new-app-login-page.png)
 
 * Before you sign in, you need to log in to the DHIS2 instance which will be your **server**:
   - Go to: https://academy.demos.dhis2.org/web-app
   - You will see this page:
-![](./assets/resources/image-of-login.png)
+![](../assets/image-of-login.png)
   - Sign in as username: `admin` and password: `district`
 
 * Finally, go back to [http://localhost:3000](http://localhost:3000) and enter the following:
@@ -85,7 +90,7 @@ password: district
 
 * You should now be able to see your application on the browser. By default the page will look like this:
 
-![](./assets/resources/new-app-login-success.png)
+![](../assets/new-app-login-success.png)
 
 > **NOTE**: If you're getting some errors and can't connect to the server or you're unable to sign in, please check these possible [solutions](./DEBUG.md)
 

instructions/docs/before-academy/UPDATE_TEMPLATE.md → instructions/docs/resources/UPDATE_TEMPLATE.md

@@ -1,7 +1,12 @@
 ---
-sidebar_position: 20
+title: (?obsolete) Updating template
+sidebar_position: 30
 ---
 
+:::danger[ToDo]
+- Will they need to pull updates? If yes, Where will these be? 
+:::
+
 # Update Template Instructions
 
 In order to get the updates on the course material from the template repository, please run the following commands on your terminal:

instructions/docs/resources/_category_.json

@@ -0,0 +1,6 @@
+{
+    "position": 150,
+    "label": "Resources",
+    "collapsible": true,
+    "collapsed": false
+}

instructions/docs/resources/resources.md

@@ -0,0 +1,23 @@
+---
+title: Resources
+sidebar_position: 1
+---
+
+## Useful Links
+
+- **Web & Android App Development Webinar - April 21, 2022**
+
+This high-level webinar covers a non-technical overview of the Application Platform, the progress made in 2021 and the current state of DHIS2 developer tools.
+
+* Recordings:
+    - [Webinar](https://www.youtube.com/watch?v=9uchsESBc7k)
+
+- [**Learn more about the DHIS2 App Platform**](https://developers.dhis2.org/docs/tutorials#learn-about-the-dhis2-app-platform)
+
+- **Developer Portal** - [developers.dhis2.org](https://developers.dhis2.org)
+
+- [**Developer Community**](https://community.dhis2.org/c/development/app-development)
+
+- [**2022 Academy**](https://www.youtube.com/playlist?list=PLo6Seh-066RzKN1UE_53LLEnhtPmy6zRc)
+
+- [Developer Portal - Academy events page](https://developers.dhis2.org/events/developer-academy)