Skip to content

Commit 4f467c3

Browse files
BrooklinJazzBrooklinJazz
committed
sync notebooks and fix makeup/markdown styles
1 parent 571eb06 commit 4f467c3

File tree

187 files changed

+10801
-14712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+10801
-14712
lines changed

‎assets/css/makeup.css

+72-72
Large diffs are not rendered by default.

‎lib/elixir_newbie_web/live/content_live.ex

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ defmodule ElixirNewbieWeb.ContentLive do
33

44
def render(assigns) do
55
~H"""
6-
<section class="bg-[url('/images/background-smoke-transparent.webp')] min-h-screen bg-black bg-no-repeat bg-contain text-white">
6+
<section class="min-h-screen bg-black text-white">
77
<.navigation />
88
<section class="mx-auto w-2/3">
99
<a class="mb-10 block rounded-lg bg-gray-500 p-6 text-2xl hover:opacity-75" href={@badge_url}>Run in Livebook</a>
@@ -16,10 +16,12 @@ defmodule ElixirNewbieWeb.ContentLive do
1616
end
1717

1818
def mount(%{"id" => id}, _session, socket) do
19-
lesson = ElixirNewbie.AcademyContent.get_lesson(id, socket.assigns.live_action)
19+
# hrefs will include the .livemd in the url so we remove it.
20+
path = Path.basename(id, ".livemd")
21+
lesson = ElixirNewbie.AcademyContent.get_lesson(path, socket.assigns.live_action)
2022

2123
url =
22-
"https://github.com/DockYard-Academy/curriculum/blob/main/#{socket.assigns.live_action}/#{id}.livemd"
24+
"https://github.com/DockYard-Academy/curriculum/blob/main/#{socket.assigns.live_action}/#{path}.livemd"
2325

2426
query_params = URI.encode_query(%{"url" => url})
2527
badge_url = "https://livebook.dev/run?" <> query_params

‎priv/academy_content/exercises/agent_journal.md

+47-62
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,32 @@
77
```elixir
88
Mix.install([
99
{:jason, "~> 1.4"},
10-
{:kino, "~> 0.8.0", override: true},
10+
{:kino, "~> 0.9", override: true},
1111
{:youtube, github: "brooklinjazz/youtube"},
1212
{:hidden_cell, github: "brooklinjazz/hidden_cell"}
1313
])
1414
```
1515

1616
## Navigation
1717

18-
[Return Home](../start.livemd)<span style="padding: 0 30px"></span>
19-
[Report An Issue](https://github.com/DockYard-Academy/beta_curriculum/issues/new?assignees=&labels=&template=issue.md&title=)
20-
21-
## Setup
22-
23-
Ensure you type the `ea` keyboard shortcut to evaluate all Elixir cells before starting. Alternatively you can evaluate the Elixir cells as you read.
18+
<div style="display: flex; align-items: center; width: 100%; justify-content: space-between; font-size: 1rem; color: #61758a; background-color: #f0f5f9; height: 4rem; padding: 0 1rem; border-radius: 1rem;">
19+
<div style="display: flex;">
20+
<i class="ri-home-fill"></i>
21+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../start.livemd">Home</a>
22+
</div>
23+
<div style="display: flex;">
24+
<i class="ri-bug-fill"></i>
25+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="https://github.com/DockYard-Academy/curriculum/issues/new?assignees=&labels=&template=issue.md&title=Agent Journal">Report An Issue</a>
26+
</div>
27+
<div style="display: flex;">
28+
<i class="ri-arrow-left-fill"></i>
29+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../reading/agents_and_ets.livemd">State: Agent And ETS</a>
30+
</div>
31+
<div style="display: flex;">
32+
<a style="display: flex; color: #61758a; margin-right: 1rem;" href="../exercises/inventory_management.livemd">ETS Inventory Management</a>
33+
<i class="ri-arrow-right-fill"></i>
34+
</div>
35+
</div>
2436

2537
## Agent Journal
2638

@@ -346,69 +358,42 @@ defmodule AdvancedJournal do
346358
end
347359
```
348360

349-
## Mark As Completed
350-
351-
<!-- livebook:{"attrs":{"source":"file_name = Path.basename(Regex.replace(~r/#.+/, __ENV__.file, \"\"), \".livemd\")\n\nsave_name =\n case Path.basename(__DIR__) do\n \"reading\" -> \"agent_journal_reading\"\n \"exercises\" -> \"agent_journal_exercise\"\n end\n\nprogress_path = __DIR__ <> \"/../progress.json\"\nexisting_progress = File.read!(progress_path) |> Jason.decode!()\n\ndefault = Map.get(existing_progress, save_name, false)\n\nform =\n Kino.Control.form(\n [\n completed: input = Kino.Input.checkbox(\"Mark As Completed\", default: default)\n ],\n report_changes: true\n )\n\nTask.async(fn ->\n for %{data: %{completed: completed}} <- Kino.Control.stream(form) do\n File.write!(\n progress_path,\n Jason.encode!(Map.put(existing_progress, save_name, completed), pretty: true)\n )\n end\nend)\n\nform","title":"Track Your Progress"},"chunks":null,"kind":"Elixir.HiddenCell","livebook_object":"smart_cell"} -->
352-
353-
```elixir
354-
file_name = Path.basename(Regex.replace(~r/#.+/, __ENV__.file, ""), ".livemd")
355-
356-
save_name =
357-
case Path.basename(__DIR__) do
358-
"reading" -> "agent_journal_reading"
359-
"exercises" -> "agent_journal_exercise"
360-
end
361-
362-
progress_path = __DIR__ <> "/../progress.json"
363-
existing_progress = File.read!(progress_path) |> Jason.decode!()
364-
365-
default = Map.get(existing_progress, save_name, false)
366-
367-
form =
368-
Kino.Control.form(
369-
[
370-
completed: input = Kino.Input.checkbox("Mark As Completed", default: default)
371-
],
372-
report_changes: true
373-
)
374-
375-
Task.async(fn ->
376-
for %{data: %{completed: completed}} <- Kino.Control.stream(form) do
377-
File.write!(
378-
progress_path,
379-
Jason.encode!(Map.put(existing_progress, save_name, completed), pretty: true)
380-
)
381-
end
382-
end)
383-
384-
form
385-
```
386-
387361
## Commit Your Progress
388362

389-
Run the following in your command line from the curriculum folder to track and save your progress in a Git commit.
390-
Ensure that you do not already have undesired or unrelated changes by running `git status` or by checking the source control tab in Visual Studio Code.
363+
DockYard Academy now recommends you use the latest [Release](https://github.com/DockYard-Academy/curriculum/releases) rather than forking or cloning our repository.
364+
365+
Run `git status` to ensure there are no undesirable changes.
366+
Then run the following in your command line from the `curriculum` folder to commit your progress.
391367

392368
```
393-
$ git checkout -b agent-journal-exercise
394369
$ git add .
395-
$ git commit -m "finish agent journal exercise"
396-
$ git push origin agent-journal-exercise
370+
$ git commit -m "finish Agent Journal exercise"
371+
$ git push
397372
```
398373

399-
Create a pull request from your `agent-journal-exercise` branch to your `solutions` branch.
400-
Please do not create a pull request to the DockYard Academy repository as this will spam our PR tracker.
401-
402-
**DockYard Academy Students Only:**
374+
We're proud to offer our open-source curriculum free of charge for anyone to learn from at their own pace.
403375

404-
Notify your instructor by including `@BrooklinJazz` in your PR description to get feedback.
405-
You (or your instructor) may merge your PR into your solutions branch after review.
376+
We also offer a paid course where you can learn from an instructor alongside a cohort of your peers.
377+
We will accept applications for the June-August 2023 cohort soon.
406378

407-
If you are interested in joining the next academy cohort, [sign up here](https://academy.dockyard.com/) to receive more news when it is available.
408-
409-
## Up Next
379+
## Navigation
410380

411-
| Previous | Next |
412-
| -------------------------------------------------------- | --------------------------------------------------------: |
413-
| [State: Agent and ETS](../reading/agents_and_ets.livemd) | [ETS Warehouse](../exercises/inventory_management.livemd) |
381+
<div style="display: flex; align-items: center; width: 100%; justify-content: space-between; font-size: 1rem; color: #61758a; background-color: #f0f5f9; height: 4rem; padding: 0 1rem; border-radius: 1rem;">
382+
<div style="display: flex;">
383+
<i class="ri-home-fill"></i>
384+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../start.livemd">Home</a>
385+
</div>
386+
<div style="display: flex;">
387+
<i class="ri-bug-fill"></i>
388+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="https://github.com/DockYard-Academy/curriculum/issues/new?assignees=&labels=&template=issue.md&title=Agent Journal">Report An Issue</a>
389+
</div>
390+
<div style="display: flex;">
391+
<i class="ri-arrow-left-fill"></i>
392+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../reading/agents_and_ets.livemd">State: Agent And ETS</a>
393+
</div>
394+
<div style="display: flex;">
395+
<a style="display: flex; color: #61758a; margin-right: 1rem;" href="../exercises/inventory_management.livemd">ETS Inventory Management</a>
396+
<i class="ri-arrow-right-fill"></i>
397+
</div>
398+
</div>
414399

‎priv/academy_content/exercises/anagram.md

+49-60
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,32 @@
77
```elixir
88
Mix.install([
99
{:jason, "~> 1.4"},
10-
{:kino, "~> 0.8.0", override: true},
10+
{:kino, "~> 0.9", override: true},
1111
{:youtube, github: "brooklinjazz/youtube"},
1212
{:hidden_cell, github: "brooklinjazz/hidden_cell"}
1313
])
1414
```
1515

1616
## Navigation
1717

18-
[Return Home](../start.livemd)<span style="padding: 0 30px"></span>
19-
[Report An Issue](https://github.com/DockYard-Academy/beta_curriculum/issues/new?assignees=&labels=&template=issue.md&title=)
18+
<div style="display: flex; align-items: center; width: 100%; justify-content: space-between; font-size: 1rem; color: #61758a; background-color: #f0f5f9; height: 4rem; padding: 0 1rem; border-radius: 1rem;">
19+
<div style="display: flex;">
20+
<i class="ri-home-fill"></i>
21+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../start.livemd">Home</a>
22+
</div>
23+
<div style="display: flex;">
24+
<i class="ri-bug-fill"></i>
25+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="https://github.com/DockYard-Academy/curriculum/issues/new?assignees=&labels=&template=issue.md&title=Anagram">Report An Issue</a>
26+
</div>
27+
<div style="display: flex;">
28+
<i class="ri-arrow-left-fill"></i>
29+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../exercises/palindrome.livemd">Palindrome</a>
30+
</div>
31+
<div style="display: flex;">
32+
<a style="display: flex; color: #61758a; margin-right: 1rem;" href="../exercises/animal_generator.livemd">Animal Generator</a>
33+
<i class="ri-arrow-right-fill"></i>
34+
</div>
35+
</div>
2036

2137
## Anagram
2238

@@ -31,7 +47,7 @@ For example **bored** and **robed** are anagrams.
3147

3248
```elixir
3349
defmodule Anagram do
34-
def anagram?(string1, string2) do
50+
def anagram?(word, possible_anagram) do
3551
sort_string(word) == sort_string(possible_anagram)
3652
end
3753

@@ -70,7 +86,7 @@ defmodule Anagram do
7086
iex> Anagram.anagram?("robed", "bored")
7187
true
7288
"""
73-
def anagram?(string1, string2) do
89+
def anagram?(word, possible_anagram) do
7490
end
7591

7692
@doc """
@@ -121,69 +137,42 @@ defmodule AnagramSolver do
121137
end
122138
```
123139

124-
## Mark As Completed
125-
126-
<!-- livebook:{"attrs":{"source":"file_name = Path.basename(Regex.replace(~r/#.+/, __ENV__.file, \"\"), \".livemd\")\n\nsave_name =\n case Path.basename(__DIR__) do\n \"reading\" -> \"anagram_reading\"\n \"exercises\" -> \"anagram_exercise\"\n end\n\nprogress_path = __DIR__ <> \"/../progress.json\"\nexisting_progress = File.read!(progress_path) |> Jason.decode!()\n\ndefault = Map.get(existing_progress, save_name, false)\n\nform =\n Kino.Control.form(\n [\n completed: input = Kino.Input.checkbox(\"Mark As Completed\", default: default)\n ],\n report_changes: true\n )\n\nTask.async(fn ->\n for %{data: %{completed: completed}} <- Kino.Control.stream(form) do\n File.write!(\n progress_path,\n Jason.encode!(Map.put(existing_progress, save_name, completed), pretty: true)\n )\n end\nend)\n\nform","title":"Track Your Progress"},"chunks":null,"kind":"Elixir.HiddenCell","livebook_object":"smart_cell"} -->
127-
128-
```elixir
129-
file_name = Path.basename(Regex.replace(~r/#.+/, __ENV__.file, ""), ".livemd")
130-
131-
save_name =
132-
case Path.basename(__DIR__) do
133-
"reading" -> "anagram_reading"
134-
"exercises" -> "anagram_exercise"
135-
end
136-
137-
progress_path = __DIR__ <> "/../progress.json"
138-
existing_progress = File.read!(progress_path) |> Jason.decode!()
139-
140-
default = Map.get(existing_progress, save_name, false)
141-
142-
form =
143-
Kino.Control.form(
144-
[
145-
completed: input = Kino.Input.checkbox("Mark As Completed", default: default)
146-
],
147-
report_changes: true
148-
)
149-
150-
Task.async(fn ->
151-
for %{data: %{completed: completed}} <- Kino.Control.stream(form) do
152-
File.write!(
153-
progress_path,
154-
Jason.encode!(Map.put(existing_progress, save_name, completed), pretty: true)
155-
)
156-
end
157-
end)
158-
159-
form
160-
```
161-
162140
## Commit Your Progress
163141

164-
Run the following in your command line from the curriculum folder to track and save your progress in a Git commit.
165-
Ensure that you do not already have undesired or unrelated changes by running `git status` or by checking the source control tab in Visual Studio Code.
142+
DockYard Academy now recommends you use the latest [Release](https://github.com/DockYard-Academy/curriculum/releases) rather than forking or cloning our repository.
143+
144+
Run `git status` to ensure there are no undesirable changes.
145+
Then run the following in your command line from the `curriculum` folder to commit your progress.
166146

167147
```
168-
$ git checkout -b anagram-exercise
169148
$ git add .
170-
$ git commit -m "finish anagram exercise"
171-
$ git push origin anagram-exercise
149+
$ git commit -m "finish Anagram exercise"
150+
$ git push
172151
```
173152

174-
Create a pull request from your `anagram-exercise` branch to your `solutions` branch.
175-
Please do not create a pull request to the DockYard Academy repository as this will spam our PR tracker.
176-
177-
**DockYard Academy Students Only:**
178-
179-
Notify your instructor by including `@BrooklinJazz` in your PR description to get feedback.
180-
You (or your instructor) may merge your PR into your solutions branch after review.
153+
We're proud to offer our open-source curriculum free of charge for anyone to learn from at their own pace.
181154

182-
If you are interested in joining the next academy cohort, [sign up here](https://academy.dockyard.com/) to receive more news when it is available.
155+
We also offer a paid course where you can learn from an instructor alongside a cohort of your peers.
156+
We will accept applications for the June-August 2023 cohort soon.
183157

184-
## Up Next
158+
## Navigation
185159

186-
| Previous | Next |
187-
| -------------------------------------------- | -------------------------------------------------------: |
188-
| [Palindrome](../exercises/palindrome.livemd) | [Animal Generator](../exercises/animal_generator.livemd) |
160+
<div style="display: flex; align-items: center; width: 100%; justify-content: space-between; font-size: 1rem; color: #61758a; background-color: #f0f5f9; height: 4rem; padding: 0 1rem; border-radius: 1rem;">
161+
<div style="display: flex;">
162+
<i class="ri-home-fill"></i>
163+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../start.livemd">Home</a>
164+
</div>
165+
<div style="display: flex;">
166+
<i class="ri-bug-fill"></i>
167+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="https://github.com/DockYard-Academy/curriculum/issues/new?assignees=&labels=&template=issue.md&title=Anagram">Report An Issue</a>
168+
</div>
169+
<div style="display: flex;">
170+
<i class="ri-arrow-left-fill"></i>
171+
<a style="display: flex; color: #61758a; margin-left: 1rem;" href="../exercises/palindrome.livemd">Palindrome</a>
172+
</div>
173+
<div style="display: flex;">
174+
<a style="display: flex; color: #61758a; margin-right: 1rem;" href="../exercises/animal_generator.livemd">Animal Generator</a>
175+
<i class="ri-arrow-right-fill"></i>
176+
</div>
177+
</div>
189178

0 commit comments

Comments
 (0)