Skip to content

Commit 4e13b63

Browse files
sadiquisadiqui
authored
Merge branch '01-edu:master' into master
2 parents b82e739 + a5130a3 commit 4e13b63

7 files changed

Lines changed: 46 additions & 47 deletions

File tree

‎subjects/ascii-art-web/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Implement the following HTTP endpoints:
1515
1. GET `/`: Sends HTML response, the main page.\
1616
1.1. GET Tip: [go templates](https://golang.org/pkg/html/template/) to receive and display data from the server.
1717

18-
2. POST `/ascii-art`: that sends data to Go server (text and a banner)\
19-
2.1. POST Tip: use form and other types of [tags](https://developer.mozilla.org/en-US/docs/Web/HTML/Element) to make the post request.\
18+
2. POST `/ascii-art`: that sends data (text and specified banner) to the Go server.\
19+
2.1. POST Tip: use form and other types of [tags](https://developer.mozilla.org/en-US/docs/Web/HTML/Element) to make the post request.
2020

2121
The way you display the result from the POST is up to you. What we recommend are one of the following :
2222

@@ -25,18 +25,18 @@ The way you display the result from the POST is up to you. What we recommend are
2525

2626
The main page must have:
2727

28-
- text input
29-
- radio buttons, select object or anything else to switch between banners
30-
- button, which sends a POST request to '/ascii-art' and outputs the result on the page.
28+
- a text input field
29+
- radio buttons, select object or another method to switch between banners
30+
- a button that sends a POST request to '/ascii-art' and displays the result on the page.
3131

3232
### HTTP status code
3333

3434
Your endpoints must return appropriate HTTP status codes.
3535

36-
- OK (200), if everything went without errors.
37-
- Not Found, if nothing is found, for example templates or banners.
38-
- Bad Request, for incorrect requests.
39-
- Internal Server Error, for unhandled errors.
36+
- 200 OK, if everything went without errors.
37+
- 404 Not Found, if nothing is found, for example templates or banners.
38+
- 400 Bad Request, for incorrect requests.
39+
- 500 Internal Server Error, for unhandled errors.
4040

4141
## Markdown
4242

‎subjects/ascii-art/README.md‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ $$@@$$$$$$$$``````````@@$$@@$$$$$$
3636
- It is recommended to have **test files** for [unit testing](https://go.dev/doc/tutorial/add-a-test).
3737

3838
- Some **banner** files with a specific graphical template representation using ASCII will be given. The files are formatted in a way that is not necessary to change them.
39-
4039
- [shadow](shadow.txt)
4140
- [standard](standard.txt)
4241
- [thinkertoy](thinkertoy.txt)
@@ -113,32 +112,32 @@ student$ go run . "HeLlO" | cat -e
113112
$
114113
$
115114
student$ go run . "Hello There" | cat -e
116-
_ _ _ _ _______ _ $
117-
| | | | | | | | |__ __| | | $
118-
| |__| | ___ | | | | ___ | | | |__ ___ _ __ ___ $
119-
| __ | / _ \ | | | | / _ \ | | | _ \ / _ \ | '__| / _ \ $
120-
| | | | | __/ | | | | | (_) | | | | | | | | __/ | | | __/ $
121-
|_| |_| \___| |_| |_| \___/ |_| |_| |_| \___| |_| \___| $
122-
$
123-
$
115+
_ _ _ _ _______ _ $
116+
| | | | | | | | |__ __| | | $
117+
| |__| | ___ | | | | ___ | | | |__ ___ _ __ ___ $
118+
| __ | / _ \ | | | | / _ \ | | | _ \ / _ \ | '__| / _ \ $
119+
| | | | | __/ | | | | | (_) | | | | | | | | __/ | | | __/ $
120+
|_| |_| \___| |_| |_| \___/ |_| |_| |_| \___| |_| \___| $
121+
$
122+
$
124123
student$ go run . "1Hello 2There" | cat -e
125-
_ _ _ _ _______ _ $
126-
_ | | | | | | | | ____ |__ __| | | $
127-
/ | | |__| | ___ | | | | ___ |___ \ | | | |__ ___ _ __ ___ $
128-
| | | __ | / _ \ | | | | / _ \ __) | | | | _ \ / _ \ | '__| / _ \ $
129-
| | | | | | | __/ | | | | | (_) | / __/ | | | | | | | __/ | | | __/ $
130-
|_| |_| |_| \___| |_| |_| \___/ |_____| |_| |_| |_| \___| |_| \___| $
131-
$
132-
$
124+
_ _ _ _ _______ _ $
125+
_ | | | | | | | | ____ |__ __| | | $
126+
/ | | |__| | ___ | | | | ___ |___ \ | | | |__ ___ _ __ ___ $
127+
| | | __ | / _ \ | | | | / _ \ __) | | | | _ \ / _ \ | '__| / _ \ $
128+
| | | | | | | __/ | | | | | (_) | / __/ | | | | | | | __/ | | | __/ $
129+
|_| |_| |_| \___| |_| |_| \___/ |_____| |_| |_| |_| \___| |_| \___| $
130+
$
131+
$
133132
student$ go run . "{Hello There}" | cat -e
134-
__ _ _ _ _ _______ _ __ $
135-
/ / | | | | | | | | |__ __| | | \ \ $
136-
| | | |__| | ___ | | | | ___ | | | |__ ___ _ __ ___ | | $
137-
/ / | __ | / _ \ | | | | / _ \ | | | _ \ / _ \ | '__| / _ \ \ \ $
138-
\ \ | | | | | __/ | | | | | (_) | | | | | | | | __/ | | | __/ / / $
139-
| | |_| |_| \___| |_| |_| \___/ |_| |_| |_| \___| |_| \___| | | $
140-
\_\ /_/ $
141-
$
133+
__ _ _ _ _ _______ _ __ $
134+
/ / | | | | | | | | |__ __| | | \ \ $
135+
| | | |__| | ___ | | | | ___ | | | |__ ___ _ __ ___ | | $
136+
/ / | __ | / _ \ | | | | / _ \ | | | _ \ / _ \ | '__| / _ \ \ \ $
137+
\ \ | | | | | __/ | | | | | (_) | | | | | | | | __/ | | | __/ / / $
138+
| | |_| |_| \___| |_| |_| \___/ |_| |_| |_| \___| |_| \___| | | $
139+
\_\ /_/ $
140+
$
142141
student$ go run . "Hello\nThere" | cat -e
143142
_ _ _ _ $
144143
| | | | | | | | $

‎subjects/blockchain/retrieve-transaction-in-out/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ _+ 0.01 fee_
1515

1616
### Instructions
1717

18-
Using a local Bitcoin node RPC API, create a function `retrieveTxValue()` that takes as input a hash of a simple transaction, and returns an object with an array of inputs values and an array outputs values in this transaction.
18+
Using a local Bitcoin node RPC API, create a function `retrieveTransactionInOut()` that takes as input a hash of a simple transaction, and returns an object with an array of inputs values and an array outputs values in this transaction.
1919

2020
The Bitcoin node RPC interface is expected to be running with the following parameters:
2121

@@ -29,8 +29,8 @@ rpcpassword=multipass
2929
### Usage
3030

3131
```js
32-
txHash = 'd030023d96b9170af9ec2fe5d9b62a5eacbcbf144c68f3f45d68bca72d1d3649'
33-
retrieveTxData(txHash)
32+
txHash = "d030023d96b9170af9ec2fe5d9b62a5eacbcbf144c68f3f45d68bca72d1d3649";
33+
retrieveTxData(txHash);
3434
/* Expected :
3535
{
3636
in: [ 0.18075094 ],

‎subjects/make-your-game/score-handling/audit/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#### Functional
22

3-
###### Has the requirement for the allowed packages been respected? (Reminder for this project: only [standard packages](https://golang.org/pkg/))
3+
###### Has the requirement for the allowed packages been respected? (Reminder for this project: only [standard packages](https://golang.org/pkg/) and [Gorilla](https://pkg.go.dev/github.com/gorilla/websocket))
44

55
##### Play and finish the game.
66

‎subjects/real-time-forum/typing-in-progress/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This engine must have/display:
1919
- A websocket to establish the connection with both users
2020
- An animation so that the user can see that you are typing, this animation should be smooth (no interruptions/janks) and just enough to draw attention for the user to see (user friendly)
2121
- The name of the user that is typing
22-
- Whenever the user stops typing or finishes the conversation, it should not display the animation
22+
- Whenever the user stops typing or finishes the conversation, it should not display the animation, a short delay may optionally be added for better UX
2323

2424
To help with the display of the typing in progress you can take a look on the js [event](https://developer.mozilla.org/en-US/docs/Web/Events) list, mainly the **Keyboard events** and the **Focus events**
2525

‎subjects/real-time-forum/typing-in-progress/audit.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
###### Has the requirement for the allowed packages been respected? (Check the [allowed packages](README.md))
44

5-
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each one. With one user start typing.
5+
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each. Start typing with one of the users.
66

77
###### Is there any animation confirming that the typing in progress is working?
88

@@ -18,13 +18,13 @@
1818

1919
###### Can you confirm that the typing in progress has the name of the user that is typing?
2020

21-
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each one. With one user starting to type and then stopping.
21+
##### Using the same two browsers, start typing with one of the users, then stop typing.
2222

2323
###### Can you confirm that the typing in progress engine stopped when the user stop typing?
2424

25-
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each one, then start a conversation between the users.
25+
##### Using the same two browsers, start a conversation between two users.
2626

27-
###### Is the typing in progress engine working properly for both users? (each one can see when whether the other is typing or not)
27+
###### Is the typing in progress engine working properly for both users? (each one should be able to see whether the other is typing or not)
2828

2929
#### Bonus
3030

‎subjects/real-time-forum/typing-in-progress/audit/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
###### Has the requirement for the allowed packages been respected? (Check the [allowed packages](README.md))
44

5-
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each one. With one user start typing.
5+
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each. Start typing with one of the users.
66

77
###### Is there any animation confirming that the typing in progress is working?
88

@@ -18,13 +18,13 @@
1818

1919
###### Can you confirm that the typing in progress has the name of the user that is typing?
2020

21-
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each one. With one user starting to type and then stopping.
21+
##### Using the same two browsers, start typing with one of the users, then stop typing.
2222

2323
###### Can you confirm that the typing in progress engine stopped when the user stop typing?
2424

25-
##### Open two browsers (ex: Chrome and Firefox or private windows) and log in with different users in each one, then start a conversation between the users.
25+
##### Using the same two browsers, start a conversation between two users.
2626

27-
###### Is the typing in progress engine working properly for both users? (each one can see when whether the other is typing or not)
27+
###### Is the typing in progress engine working properly for both users? (each one should be able to see whether the other is typing or not)
2828

2929
#### Bonus
3030

0 commit comments

Comments
 (0)