Merge branch 'main' into main

Author: rober-m

.gitpod.Dockerfile

@@ -7,3 +7,6 @@ ENV PATH="/home/gitpod/.ghcup/bin:${PATH}"
 # Install hls and stack
 RUN ghcup install hls
 RUN ghcup install stack
+
+# Install zlib
+RUN sudo apt install -y zlib1g

Changes.md

@@ -0,0 +1,22 @@
+# Proposed changes for next iteration/version
+
+The idea of this file is to have a single source of truth as to which changes we want to do when we update the course.
+Feel free to provide a PR with more proposed changes!
+
+## In general
+
+
+## Lesson 1
+
+### Lecture
+- 
+### Homework
+- 
+
+## Lesson 2
+
+### Lecture
+- Add short explanation about type classes after polymorphysm. Just enough so the students don't struggle until we cover them properly on the type classes lesson.
+- 
+
+### Homework

FAQ.md

@@ -0,0 +1,25 @@
+# FAQ
+
+### I can't run the code cells in the VSCode instance!
+
+As of now, the Haskell kernel is configured to work only with a Binder instance. The VSCode instance is only for the homework. Mainly because we didn't want to encourage students to use their free 50 hs/month of GitPod while going through the lesson if there's a free and open-source alternative (Binder). 
+
+### There's no binder button!
+
+If that's the case, that lesson hasn't been published yet. When it's finalized and recorded, we'll add the button.
+
+### Do I have to pay anything to use all these resources?
+
+NO!
+- The content is free and open source.
+- The cloud service we use to host the interactive versions is also free.
+- And the GitPod instance we use to run the VSCode has a free tier of 50 hs/month, which we believe will be more than enough. In the case you need more than 50 hs/month to do the homework, you can clone the repo and run everything locally (You can install everything using [GHCup](https://www.haskell.org/ghcup/).
+
+### I want something to be different!
+
+Tell us! We want this to be an easy and fun way to learn Haskell. If the community want's something different, we'll adapt the course!
+
+### I have other questions!
+
+- About Haskell? Look for the Haskell channel in [IOG's technical community](https://discord.com/invite/cmveaxuzBn). We'll be there to answer questions!
+- About the repo or the course itself? Create an [issue](https://github.com/input-output-hk/haskell-course/issues)!

Homework/Homework01/Homework01.hs

@@ -0,0 +1,16 @@
+
+-- Question 1
+-- Write a multiline comment below.
+
+-- Question 2
+-- Define a function that takes a value and multiplies it by 3.
+
+-- Question 3
+-- Define a function that calculates the area of a circle.
+
+-- Question 4
+-- Define a function that calculates the volume of a cylinder by composing the previous function together with the height of the cylinder. 
+
+-- Question 5
+-- Define a function that takes the height and radius of a cylinder and checks if the volume is greater than or equal to 42.
+

Homework/Homework02/Homework02.hs

@@ -0,0 +1,33 @@
+
+-- Question 1
+-- Add the type signatures for the functions below and then remove the comments and try to compile.
+-- (Use the types presented in the lecture.)
+
+-- f1 x y z = x ** (y/z)
+
+-- f2 x y z = sqrt (x/y - z)
+
+-- f3 x y = [x == True] ++ [y]
+
+-- f4 x y z = x == (y ++ z)
+
+
+-- Question 2
+-- Are really all variables in Haskell immutable? Try googling for the answer.
+
+
+-- Question 3
+-- Why should we define type signatures of functions? How can they help you? How can they help others?
+
+
+-- Question 4
+-- Why should you define type signatures for variables? How can they help you?
+
+
+-- Question 5
+-- Are there any functions in Haskell that let you transform one type to the other? Try googling for the answer.
+
+
+-- Question 6
+-- Can you also define in Haskell list of lists? Did we showed any example of that? How would you access the inner
+-- most elements?

Homework/Homework03/Homework03.hs

@@ -0,0 +1,30 @@
+-- Question 1
+-- Write a function that checks if the monthly consumption of an electrical device is bigger, equal, or smaller than the maximum allowed and
+-- returns a message accordingly. 
+-- The function has to take the hourly consumption of an electrical device, the hours of daily use, and the maximum monthly consumption allowed.
+-- (Monthly usage = consumption (kW) * hours of daily use (h) * 30 days).
+
+
+-- Question 2
+-- Prelude:
+-- We use the function `show :: a -> String` to transform any type into a String.
+-- So `show 3` will produce `"3"` and `show (3 > 2)` will produce `"True"`.
+
+-- In the previous function, return the excess/savings of consumption as part of the message.
+
+
+-- Question 3
+-- Write a function that showcases the advantages of using let expressions to split a big expression into smaller ones.
+-- Then, share it with other students in Canvas.
+
+
+-- Question 4
+-- Write a function that takes in two numbers and returns their quotient such that it is not greater than 1.
+-- Return the number as a string, and in case the divisor is 0, return a message why the division is not
+-- possible. To implement this function using both guards and if-then-else statements.  
+
+
+-- Question 5
+-- Write a function that takes in two numbers and calculates the sum of squares for the product and quotient
+-- of those numbers. Write the function such that you use a where block inside a let expression and a
+-- let expression inside a where block. 

README.md

@@ -5,13 +5,13 @@
 For a more detailed explanation, keep reading or watch the introduction video:
 [![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=flat&logo=YouTube&logoColor=white)](https://youtu.be/H1vbUKMKvnM)
 
-## How much should I study if I only want to use Marlowe/Plutus?
+## How much should I study if I only wish to use Marlowe/Plutus?
 
 In the [outline](#what-well-cover) below, there are clear stopping points (for both Marlowe and Plutus) where we deem you to know enough Haskell to effectively use the technology.
 
 ## How to read/watch the lessons
 
-To go through the interactive lessons, go to your chosen lesson's outline inside "[What we'll cover](#what-well-cover)" and click on the button that looks like the one below. If the page loads with a "500: Internal Server Error" just refresh it and it should be fine. At the top you will see a console that displays the progress of preparing your interactive lesson. During this time you can scroll down and look at the lesson, that is displayed non-interactively.
+To go through the interactive lessons, go to your chosen lesson's outline inside "[What we'll cover](#what-well-cover)" and click on the button that looks like the one below. If the page loads with a "500: Internal Server Error" just refresh it, and it should be fine. At the top, you will see a console that displays the progress of preparing your interactive lesson. During this time, you can scroll down and look at the lesson, that is displayed non-interactively.
 
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/input-output-hk/haskell-course/HEAD?labpath=%2Flessons%2F01-Introduction-to-haskell.ipynb)
 
@@ -23,27 +23,36 @@ And to see the video, click on the button that looks like this:
 
 1. Clone this repository.
 2. Create a [GitPod](https://www.gitpod.io/) account.
-3. Click this button to create a remote dev environment: [![Visual Studio Code](https://img.shields.io/badge/Visual%20Studio%20Code-0078d7.svg?style=flat&logo=visual-studio-code&logoColor=white)](https://gitpod.io/#https://github.com/rober-m/haskell-bootcamp)
-4. Select the `code/HomeworkXX` folder with the homework you want to complete.
+3. Click this button to create a remote dev environment: [![Visual Studio Code](https://img.shields.io/badge/Visual%20Studio%20Code-0078d7.svg?style=flat&logo=visual-studio-code&logoColor=white)](https://gitpod.io/#https://github.com/input-output-hk/haskell-course)
+4. Select the `Homework/HomeworkXX` folder with the homework you want to complete.
 5. Follow the instructions inside the app/Main.hs file.
+6. Check the solutions in the "solutions" branch!
 
 #### Repository structure
 
     Haskell-Course
         |   |
-        |   |---- code
+        |   |---- Homework
         |          |
         |          |---- Homework01 (Homework for lesson 01)
         |          |---- Homework02 (Homework for lesson 02)
         |          ...
         |
-        |-------- lessons (Lessons in Juptyer notebook format. Access through Binder.)
+        |-------- lessons (Lessons in Jupyter notebook format. Access through Binder.)
                    |
                    |---- 1-Introduction-to-haskell
                    |---- 2-Functions-Data-Types-and-Signatures
 
 Everything else can be safely ignored
 
+## FAQ
+
+[FAQ](FAQ.md)
+
+## Proposed changes for next iteration/version
+
+[Changes](Changes.md)
+
 ## What we'll cover
 
 **This is a tentative outline. Changes can (and will) be made as we advance with the course and gather feedback from students.**
@@ -66,7 +75,9 @@ Everything else can be safely ignored
   - How to open and use GitPod
   - Example of how to complete a homework assignment.
 
-### 2. Data types, Signatures, and Polymorphism
+
+### 2. Data types, Signatures, and Polymorphism [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/input-output-hk/haskell-course/HEAD?labpath=%2Flessons%2F02-Functions-Data-Types-and-Signatures.ipynb) [![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=flat&logo=YouTube&logoColor=white)](https://youtu.be/RABzYje2d2A)
+
 
 - Pragmatic intro to types
 - Type signature
@@ -86,13 +97,14 @@ Everything else can be safely ignored
   - Tuples + Tuples VS Lists
 - Polymorphic values and type variables
 
-### 3. Conditions and helper constructions
+### 3. Conditions and helper constructions [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/input-output-hk/haskell-course/HEAD?labpath=%2Flessons%2F03-Conditions-and-helper-constructions.ipynb) [![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=flat&logo=YouTube&logoColor=white)](https://www.youtube.com/watch?v=G0XPELNZuws)
 
 - If-then-else
 - Guards
-- `let`
+- `let` expressions
 - `where`
-- Using `let` and `where` together
+- Should I use `let` or `where`?
+- Things to keep in mind
 
 ### 4. Pattern matching and Case
 
@@ -105,7 +117,7 @@ Everything else can be safely ignored
 
 ### 5. Improving and combining functions
 
-- Higher order functions
+- Higher-order functions
 - Curried functions
 - Partial application
 - Composing and applying functions (`.` and `$` operators)
@@ -201,7 +213,7 @@ Everything else can be safely ignored
   - Cabal file
   - Using external libraries with Cabal
 
-### 14. Learning on you own and Map
+### 14. Learning on your own and Map
 
 - Using GHCi to find out more
 - Hoogle