Skip to content

Commit 7c22e79

Browse files
committed
🚚 Move extras from instructor to learner view
1 parent 0719b13 commit 7c22e79

20 files changed

+41
-31
lines changed

config.yaml

+11-1
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,22 @@ episodes:
9898

9999
# Information for Learners
100100
learners:
101+
- quiz.md
101102
- learner-setup.md
102-
- vscode.md
103+
- common-issues.md
103104
- reference.md
105+
- vscode.md
106+
- software-architecture-extra.md
107+
- programming-paradigms.md
108+
- procedural-programming.md
109+
- functional-programming.md
110+
- object-oriented-programming.md
111+
- persistence.md
112+
- databases.md
104113

105114
# Information for Instructors
106115
instructors:
116+
- instructor-notes.md
107117

108118
# Learner Profiles
109119
profiles:

episodes/00-setting-the-scene.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ intended for people who have already been developing code in Python (or other la
154154
and applying it to their own problems after gaining basic software development skills.
155155
So, it is expected for you to have some prerequisite knowledge on the topics covered,
156156
as outlined at the [beginning of the lesson](../index.md#prerequisites).
157-
Check out this [quiz](../instructors/quiz.md) to help you test your prior knowledge
157+
Check out this [quiz](../learners/quiz.md) to help you test your prior knowledge
158158
and determine if this course is for you.
159159

160160

@@ -165,7 +165,7 @@ and determine if this course is for you.
165165
## Setup, Common Issues \& Fixes
166166

167167
Have you [setup and installed](../learners/setup.md) all the tools and accounts required for this course?
168-
Check the list of [common issues, fixes \& tips](../instructors/common-issues.md)
168+
Check the list of [common issues, fixes \& tips](../learners/common-issues.md)
169169
if you experience any problems running any of the tools you installed -
170170
your issue may be solved there.
171171

episodes/10-section1-intro.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Here is an overview of the tools we will be using.
6262
## Setup, Common Issues \& Fixes
6363

6464
Have you [setup and installed](../learners/setup.md) all the tools and accounts required for this course?
65-
Check the list of [common issues, fixes \& tips](../instructors/common-issues.md)
65+
Check the list of [common issues, fixes \& tips](../learners/common-issues.md)
6666
if you experience any problems running any of the tools you installed -
6767
your issue may be solved there.
6868

@@ -83,7 +83,7 @@ and isolate our software project from other Python projects we may work on.
8383

8484
***Note:** some Windows users experience the issue where Python hangs from Git Bash
8585
(i.e. typing `python` causes it to just hang with no error message or output) -
86-
[see the solution to this issue](../instructors/common-issues.md#python-hangs-in-git-bash).*
86+
[see the solution to this issue](../learners/common-issues.md#python-hangs-in-git-bash).*
8787

8888
### Integrated Development Environment (IDE)
8989

episodes/12-virtual-environments.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ $ python --version # on Windows — Windows installation comes with a python.exe
213213
```
214214

215215
If you are using Windows and invoking `python` command causes your Git Bash terminal to hang with no error message or output, you may
216-
need to create an alias for the python executable `python.exe`, as explained in the [troubleshooting section](../instructors/common-issues.md#python-hangs-in-git-bash).
216+
need to create an alias for the python executable `python.exe`, as explained in the [troubleshooting section](../learners/common-issues.md#python-hangs-in-git-bash).
217217

218218

219219
::::::::::::::::::::::::::::::::::::::::::::::::::

episodes/32-software-architecture-design.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ such as [Excalidraw](https://excalidraw.com/).
252252
::::::::::::::::::::::::::::::::::::::::::::::::::
253253

254254
We have been developing our software using the **Model-View-Controller** (MVC) architecture,
255-
but MVC is just one of the common [software architectural patterns](../instructors/software-architecture-extra.md)
255+
but MVC is just one of the common [software architectural patterns](../learners/software-architecture-extra.md)
256256
and is not the only choice we could have made.
257257

258258
### Model-View-Controller (MVC) Architecture

episodes/35-software-architecture-revisited.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,16 @@ Instead there are two rules which must be followed for these arguments:
318318

319319
### Additional Reading Material \& References
320320

321-
Now that we have covered and revisited [software architecture](../instructors/software-architecture-extra.md)
322-
and [different programming paradigms](../instructors/programming-paradigms.md)
321+
Now that we have covered and revisited [software architecture](../learners/software-architecture-extra.md)
322+
and [different programming paradigms](../learners/programming-paradigms.md)
323323
and how we can integrate them into our architecture,
324324
there are two optional extra episodes which you may find interesting.
325325

326326
Both episodes cover the persistence layer of software architectures
327327
and methods of persistently storing data, but take different approaches.
328-
The episode on [persistence with JSON](../instructors/persistence.md) covers
328+
The episode on [persistence with JSON](../learners/persistence.md) covers
329329
some more advanced concepts in Object Oriented Programming, while
330-
the episode on [databases](../instructors/databases.md) starts to build towards a true multilayer architecture,
330+
the episode on [databases](../learners/databases.md) starts to build towards a true multilayer architecture,
331331
which would allow our software to handle much larger quantities of data.
332332

333333
## Towards Collaborative Software Development

episodes/60-wrap-up.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ and in which order you should consider learning skills.
139139

140140
Below are some additional resources to help you continue learning:
141141

142-
- [Additional episode on persisting data](../instructors/persistence.md)
143-
- [Additional episode on databases](../instructors/databases.md)
142+
- [Additional episode on persisting data](../learners/persistence.md)
143+
- [Additional episode on databases](../learners/databases.md)
144144
- [CodeRefinery courses on FAIR
145145
(Findable, Accessible, Interoperable, and Reusable)
146146
software practices][coderefinery-lessons]

index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ After going through this course, participants will be able to:
9595
## Prerequisites
9696

9797
Before joining this training, participants should meet the following criteria.
98-
(You can use [this short quiz](instructors/quiz.md) to test your prerequisite knowledge.)
98+
(You can use [this short quiz](learners/quiz.md) to test your prerequisite knowledge.)
9999

100100
### Git
101101

instructors/instructor-notes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: Instructor Notes
66

77
## Common Issues \& Tips
88

9-
Check out a [list of issues](../instructors/common-issues.md) previous participants of the course encountered
9+
Check out a [list of issues](../learners/common-issues.md) previous participants of the course encountered
1010
and some tips to help you with troubleshooting at the workshop.
1111

1212

instructors/common-issues.md learners/common-issues.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ More details on command line prompt customisation can be found in this
4848

4949
When accessing external services and websites
5050
(such as GitHub using `git` or to
51-
[install Python packages with `pip`](../instructors/common-issues.md#connection-issues-when-installing-packages-with-pip-over-vpn-or-protected-networks---proxy-needed)),
51+
[install Python packages with `pip`](../learners/common-issues.md#connection-issues-when-installing-packages-with-pip-over-vpn-or-protected-networks---proxy-needed)),
5252
you may experience connection errors
5353
(e.g. similar to `fatal: unable to access '....': Failed connect to github.com`)
5454
or a connection that hangs.
File renamed without changes.
File renamed without changes.

learners/learner-setup.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ to follow the course.
1616
## Common Issues \& Tips
1717

1818
If you are having issues installing or running some of the tools below,
19-
check a list of [common issues](instructors/common-issues.md) other course participants encountered and some useful tips for using the tools and working through the material.
19+
check a list of [common issues](learners/common-issues.md) other course participants encountered and some useful tips for using the tools and working through the material.
2020

2121

2222
::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -276,7 +276,7 @@ $ python --version # on Windows — Windows installation comes with a python.exe
276276
```
277277

278278
If you are using Windows and invoking `python` command causes your Git Bash terminal to hang with no error message or output, you may
279-
need to create an alias for the python executable `python.exe`, as explained in the [troubleshooting section](instructors/common-issues.md#python-hangs-in-git-bash).
279+
need to create an alias for the python executable `python.exe`, as explained in the [troubleshooting section](learners/common-issues.md#python-hangs-in-git-bash).
280280

281281
If all is well with your installation, you should see something like:
282282

File renamed without changes.

instructors/procedural-programming.md learners/procedural-programming.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Key features of procedural programming include:
3131

3232
To better understand procedural programming, it is useful to compare it with other prevalent
3333
programming paradigms such as
34-
[object-oriented programming](../instructors/object-oriented-programming.md) (OOP)
35-
and [functional programming](../instructors/functional-programming.md)
34+
[object-oriented programming](../learners/object-oriented-programming.md) (OOP)
35+
and [functional programming](../learners/functional-programming.md)
3636
to shed light on their distinctions, advantages, and drawbacks.
3737

3838
Procedural programming uses a very detailed list of instructions to tell the computer what to do
@@ -43,11 +43,11 @@ structure (rather than iteration).
4343
Procedural languages treat data and procedures as two different
4444
entities whereas, in functional programming, code is also treated as data - functions
4545
can take other functions as arguments or return them as results.
46-
Compare and contract [two different implementations](../instructors/functional-programming.md#functional-vs-procedural-programming)
46+
Compare and contract [two different implementations](../learners/functional-programming.md#functional-vs-procedural-programming)
4747
of the same functionality in procedural and functional programming styles
4848
to better grasp their differences.
4949

50-
Procedural and [object-oriented programming](../instructors/object-oriented-programming.md) have fundamental differences in their approach to
50+
Procedural and [object-oriented programming](../learners/object-oriented-programming.md) have fundamental differences in their approach to
5151
organising code and solving problems.
5252
In procedural programming, the code is structured around functions and procedures that execute a
5353
specific task or operations. Object-oriented programming is based around objects and classes,
@@ -58,7 +58,7 @@ objects.
5858
However, OOP goes further by encapsulating related data and methods within objects,
5959
enabling a higher level of abstraction and separation between different components.
6060
Inheritance and polymorphism are two vital features provided by OOP, which are not intrinsically
61-
supported by procedural languages. [Inheritance](../instructors/object-oriented-programming.md#inheritance) allows the creation of classes that inherit
61+
supported by procedural languages. [Inheritance](../learners/object-oriented-programming.md#inheritance) allows the creation of classes that inherit
6262
properties and methods from existing classes – enabling code reusability and reducing redundancy.
6363
[Polymorphism](../episodes/33-code-decoupling-abstractions.md#polymorphism) permits a single function or method to operate on multiple data types or objects,
6464
improving flexibility and adaptability.

instructors/programming-paradigms.md learners/programming-paradigms.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ keypoints:
1414

1515
## Programming Paradigms
1616

17-
In addition to [architectural decisions](../instructors/software-architecture-extra.md) on bigger components of your code, it is important
17+
In addition to [architectural decisions](../learners/software-architecture-extra.md) on bigger components of your code, it is important
1818
to understand the wider landscape of programming paradigms and languages,
1919
with each supporting at least one way to approach a problem and structure your code.
2020
In many cases, particularly with modern languages,
@@ -81,7 +81,7 @@ Functional Programming is a separate paradigm that
8181
places much stronger constraints on the behaviour of a function
8282
and structures the code differently as we will see soon.
8383

84-
You can read more in an [extra episode on Procedural Programming](../instructors/procedural-programming.md).
84+
You can read more in an [extra episode on Procedural Programming](../learners/procedural-programming.md).
8585

8686
### Functional Programming
8787

@@ -116,7 +116,7 @@ we also gain the ability to run many operations in parallel
116116
as it is guaranteed that each operation will not interact with any of the others -
117117
this is essential if we want to process this much data in a reasonable amount of time.
118118

119-
You can read more in an [extra episode on Functional Programming](../instructors/functional-programming.md).
119+
You can read more in an [extra episode on Functional Programming](../learners/functional-programming.md).
120120

121121
### Object Oriented Programming
122122

@@ -144,7 +144,7 @@ Most people would classify Object Oriented Programming as an
144144
(with the extra feature being the objects), but
145145
[others disagree](https://stackoverflow.com/questions/38527078/what-is-the-difference-between-imperative-and-object-oriented-programming).
146146

147-
You can read more in an [extra episode on Object Oriented Programming](../instructors/object-oriented-programming.md).
147+
You can read more in an [extra episode on Object Oriented Programming](../learners/object-oriented-programming.md).
148148

149149
## Other Paradigms
150150

@@ -154,8 +154,8 @@ for much more information see the Wikipedia's page on
154154
[programming paradigms](https://en.wikipedia.org/wiki/Programming_paradigm).
155155

156156
We have mainly used Procedural Programming in this lesson, but you can
157-
have a closer look at [Functional](../instructors/functional-programming.md) and
158-
[Object Oriented Programming](../instructors/object-oriented-programming.md) paradigms
157+
have a closer look at [Functional](../learners/functional-programming.md) and
158+
[Object Oriented Programming](../learners/object-oriented-programming.md) paradigms
159159
in extra episodes and how they can affect our architectural design choices.
160160

161161

File renamed without changes.

learners/setup.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Please make sure that you have all the necessary software and accounts setup ahead of the workshop
66
as described in the [Setup](learners/learner-setup.md) section.
7-
Also check the list of [common issues, fixes \& tips](instructors/common-issues.md)
7+
Also check the list of [common issues, fixes \& tips](learners/common-issues.md)
88
if you experience any problems running any of the tools you installed -
99
your issue may be solved there.
1010

instructors/software-architecture-extra.md learners/software-architecture-extra.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ but larger scale templates which operate at the level of whole programs,
3737
or collections or programs.
3838
Model-View-Controller (which we chose for our project) is one of the best known architecture
3939
patterns.
40-
Many patterns rely on concepts from [Object Oriented Programming](../instructors/object-oriented-programming.md).
40+
Many patterns rely on concepts from [Object Oriented Programming](../learners/object-oriented-programming.md).
4141

4242
There are many online sources of information about design and architecture patterns,
4343
often giving concrete examples of cases where they may be useful.

0 commit comments

Comments
 (0)