From 39003e87f5779e50783a03732bdb841728b5884b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominika=20Krej=C4=8D=C3=AD?= Date: Fri, 13 Jan 2017 16:07:59 +0100 Subject: [PATCH 1/4] lection -> lesson --- courses/mi-pyt/index.html | 2 +- courses/pyladies/classes/index.html | 2 +- courses/pyladies/cmdline/index.html | 2 +- courses/pyladies/git/index.html | 8 +++--- courses/pyladies/github-api/index.html | 2 +- courses/pyladies/index.html | 2 +- courses/pyladies/inheritance/index.html | 2 +- courses/pyladies/lists/index.html | 2 +- courses/pyladies/pong/index.html | 4 +-- courses/pyladies/pyglet/index.html | 2 +- naucse/__init__.py | 2 +- naucse/routes.py | 38 ++++++++++++------------- naucse/templates.py | 4 +-- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/courses/mi-pyt/index.html b/courses/mi-pyt/index.html index 6cf7e0e0b4..160a1ba554 100644 --- a/courses/mi-pyt/index.html +++ b/courses/mi-pyt/index.html @@ -33,7 +33,7 @@

{% set icon_class = 'glyphicon-pencil' %} {% if 'link' in mat %} - {{ mat['name'] }} + {{ mat['name'] }} {% else %} {{ mat['name'] }} {% endif %} diff --git a/courses/pyladies/classes/index.html b/courses/pyladies/classes/index.html index 894c14dd58..3fe27ef954 100644 --- a/courses/pyladies/classes/index.html +++ b/courses/pyladies/classes/index.html @@ -125,7 +125,7 @@

Třídy

Tady se musím omluvit: - materiály k třetímu srazu + materiály k třetímu srazu tak trochu lhaly. Funkce str, int, float apod. totiž vůbec nejsou funkce – jsou to právě třídy. diff --git a/courses/pyladies/cmdline/index.html b/courses/pyladies/cmdline/index.html index ef16b1f581..4fcad96977 100644 --- a/courses/pyladies/cmdline/index.html +++ b/courses/pyladies/cmdline/index.html @@ -372,7 +372,7 @@

Shrnutí

pro dnešek nám ale budou stačit tyhle. Jen jeden ještě přidáme – příkaz python.

-

Nejdřív ho ale musíme nainstalovat.

+

Nejdřív ho ale musíme nainstalovat.

diff --git a/courses/pyladies/git/index.html b/courses/pyladies/git/index.html index f06c8bb716..98eac0ae96 100644 --- a/courses/pyladies/git/index.html +++ b/courses/pyladies/git/index.html @@ -58,7 +58,7 @@

Git

Budeme hodně pracovat s příkazovou řádkou. Jestli se s ní ještě nekamarádíš, koukni se na - úvod. + úvod.
Nezapomeň: $ na začátku se nepíše; je tu proto, aby šlo poznat že jde o příkaz. @@ -68,7 +68,7 @@

Git

Instalace

Popis instalace Gitu najdeš - zde. + zde. Jestli jsi instalaci přeskočila, projdi si ji teď.
@@ -177,7 +177,7 @@

První revize

Jak na editory?

Na Windows, máš-li - správně nastavený Git, + správně nastavený Git, se použije Poznámkový blok (Notepad) – stačí něco napsat, uložit (Ctrl+S) a zavřít (Alt+F4). @@ -509,7 +509,7 @@

Závěr

Zbyl-li čas, můžeme se podívat na další možnosti Gitu:
diff --git a/courses/pyladies/lists/index.html b/courses/pyladies/lists/index.html index c69546e6e1..73a1df3c0b 100644 --- a/courses/pyladies/lists/index.html +++ b/courses/pyladies/lists/index.html @@ -87,7 +87,7 @@

Vybírání ze seznamů

Hranatými závorkami můžeme získávat podseznamy. - + Diagram z materiálů k řetězcům ukazuje, jak u takového „sekání” číslovat: diff --git a/courses/pyladies/pong/index.html b/courses/pyladies/pong/index.html index f00079f266..8b64a68216 100644 --- a/courses/pyladies/pong/index.html +++ b/courses/pyladies/pong/index.html @@ -12,11 +12,11 @@

Pong

Dnes si prohloubíme znalosti programování grafických aplikací, - které jsme získali na minulé hodině, + které jsme získali na minulé hodině, na reálném problému.
- Naprogramujeme si s pomocí knihovny Pyglet + Naprogramujeme si s pomocí knihovny Pyglet jednu z prvních videoher Pong. Pong vydala společnost Atari jako svůj první titul v roce 1972 a odstartovala tak boom herního průmyslu. diff --git a/courses/pyladies/pyglet/index.html b/courses/pyladies/pyglet/index.html index 2bc8996ea1..0a7116d256 100644 --- a/courses/pyladies/pyglet/index.html +++ b/courses/pyladies/pyglet/index.html @@ -587,7 +587,7 @@

Pokračování příště

ale zkus si k němu sednout, a s pomocí komentářů ho pochopit. Kdyby komentáře nestačily, jsou k Pongu připravené - i podrobné materiály. + i podrobné materiály.
A chceš-li se do Pygletu ponořit hlouběji, diff --git a/naucse/__init__.py b/naucse/__init__.py index 74e62fa474..2218c1b8e7 100644 --- a/naucse/__init__.py +++ b/naucse/__init__.py @@ -5,7 +5,7 @@ from elsa import cli from naucse.routes import app -from naucse.templates import template_function, static, course_url, lection_url +from naucse.templates import template_function, static, course_url, lesson_url from naucse.filters import convert_markdown from naucse.utils import read_yaml diff --git a/naucse/routes.py b/naucse/routes.py index c864b03b90..8d3fecc29e 100644 --- a/naucse/routes.py +++ b/naucse/routes.py @@ -50,22 +50,22 @@ def course_page(course): abort(404) -# Lection page. -@app.route('/courses///', defaults={'page': 'index'}) -@app.route('/courses////') -def course_lection(course, lection, page): - info = read_yaml("courses/" + course + "/" + lection + "/info.yml") - template = 'courses/{}/{}/{}.{}'.format(course, lection, page, info['style']) +# Lesson page. +@app.route('/courses///', defaults={'page': 'index'}) +@app.route('/courses////') +def course_lesson(course, lesson, page): + info = read_yaml("courses/" + course + "/" + lesson + "/info.yml") + template = 'courses/{}/{}/{}.{}'.format(course, lesson, page, info['style']) - # Static in the specific lection. - def lection_static_url(path): - return url_for('lection_static', course=course, lection=lection, path=path) + # Static in the specific lesson. + def lesson_static_url(path): + return url_for('lesson_static', course=course, lesson=lesson, path=path) - # Link to the specific lection. - def lection_url(lection): - return url_for('course_lection', course=course, lection=lection, page=page) + # Link to the specific lesson. + def lesson_url(lesson): + return url_for('course_lesson', course=course, lesson=lesson, page=page) file = open(template, 'r') @@ -74,20 +74,20 @@ def lection_url(lection): try: if info['style'] == "md": - return render_template('templates/markdown_page.html', static=lection_static_url, lection=lection_url, title=title, content=content) + return render_template('templates/markdown_page.html', static=lesson_static_url, lesson=lesson_url, title=title, content=content) elif info['style'] == "ipynb": - return render_template('templates/ipython_page.html', static=lection_static_url, lection=lection_url, title=title, content=content) + return render_template('templates/ipython_page.html', static=lesson_static_url, lesson=lesson_url, title=title, content=content) else: - return render_template(template, static=lection_static_url, lection=lection_url) + return render_template(template, static=lesson_static_url, lesson=lesson_url) except TemplateNotFound: abort(404) file.close() -# Static files in lectures. -@app.route('/courses///static/') -def lection_static(course, lection, path): +# Static files in lessons. +@app.route('/courses///static/') +def lesson_static(course, lesson, path): directory = os.path.join(app.root_path, 'courses') - filename = os.path.join(course, lection, 'static', path) + filename = os.path.join(course, lesson, 'static', path) return send_from_directory(directory, filename) diff --git a/naucse/templates.py b/naucse/templates.py index bccaa495ef..c849e808a0 100644 --- a/naucse/templates.py +++ b/naucse/templates.py @@ -21,5 +21,5 @@ def course_url(course): @template_function -def lection_url(course, lection, page='index'): - return url_for('course_lection', course=course, lection=lection, page=page) +def lesson_url(course, lesson, page='index'): + return url_for('course_lesson', course=course, lesson=lesson, page=page) From 8a86e7a5474026d8012d6db697cdf9ff38f865ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominika=20Krej=C4=8D=C3=AD?= Date: Fri, 13 Jan 2017 16:46:36 +0100 Subject: [PATCH 2/4] Remove redundant parts of plans. --- courses/mi-pyt/index.html | 13 +---------- courses/mi-pyt/plan.yml | 12 ----------- courses/pyladies/index.html | 13 +---------- courses/pyladies/plan.yml | 43 ++++++++++--------------------------- 4 files changed, 13 insertions(+), 68 deletions(-) diff --git a/courses/mi-pyt/index.html b/courses/mi-pyt/index.html index 160a1ba554..30970cda0b 100644 --- a/courses/mi-pyt/index.html +++ b/courses/mi-pyt/index.html @@ -15,20 +15,9 @@

Kurz MI-PYT

{% for lesson in plan %}

- {% if 'date' in lesson %} - Lekce {{ loop.index }} - {{ lesson['name'] }} - {% else %} - {{ lesson['name'] }} - {% endif %} + {{ lesson['name'] }}

- {% if 'description' in lesson %} -

- {{ lesson['description'] }} -

- {% endif %} {% for mat in lesson['materials'] %} - {% set done = mat.get('done', lesson.get('done', False)) %} - {% set done_class = 'section-done' if done else 'section-todo' %}
{% set icon_class = 'glyphicon-pencil' %} diff --git a/courses/mi-pyt/plan.yml b/courses/mi-pyt/plan.yml index 3510578ac0..e762ff9dd9 100644 --- a/courses/mi-pyt/plan.yml +++ b/courses/mi-pyt/plan.yml @@ -1,49 +1,37 @@ - name: Lekce materials: - name: Requests a click - type: lesson link: 01-requests-click - name: Flask - type: lesson link: 02-flask - name: Moduly - type: lesson link: 03-moduly - name: Testování - type: lesson link: 04-testovani - name: Dokumentace - type: lesson link: 05-dokumentace - name: Pandas - type: lesson link: 06-pandas - name: Numpy - type: lesson link: 07-numpy - name: Cython - type: lesson link: 08-cython - name: GUI v Pythonu - type: lesson link: 09-pyqt - name: Generátory a AsyncIO - type: lesson link: 10-async - name: Magie - type: lesson link: 11-magie - name: MicroPython - type: lesson link: 12-micropython diff --git a/courses/pyladies/index.html b/courses/pyladies/index.html index 6595be449e..86ace2f705 100644 --- a/courses/pyladies/index.html +++ b/courses/pyladies/index.html @@ -15,20 +15,9 @@

Začátečnický kurz PyLadies

{% for lesson in plan %}

- {% if 'date' in lesson %} - Lekce {{ loop.index }} - {{ lesson['name'] }} - {% else %} - {{ lesson['name'] }} - {% endif %} + {{ lesson['name'] }}

- {% if 'description' in lesson %} -

- {{ lesson['description'] }} -

- {% endif %} {% for mat in lesson['materials'] %} - {% set done = mat.get('done', lesson.get('done', False)) %} - {% set done_class = 'section-done' if done else 'section-todo' %}
{% set icon_class = 'glyphicon-pencil' %} diff --git a/courses/pyladies/plan.yml b/courses/pyladies/plan.yml index cffaa80fa9..6aa9aaf31e 100644 --- a/courses/pyladies/plan.yml +++ b/courses/pyladies/plan.yml @@ -1,120 +1,99 @@ - name: Instalace materials: - name: Úvod do příkazové řádky - type: lesson link: cmdline - name: Instalace Pythonu a první krůčky s ním - type: lesson link: install - name: Instalace editoru - type: lesson link: install_editor - name: Instalace Gitu - type: lesson link: install_git + - name: První program materials: - name: První program - type: lesson link: hello-world - name: Chybové hlášky a `print` - type: lesson link: printing - name: Proměnné - type: lesson link: variables - name: Porovnávání - type: lesson link: comparisons - name: "*Nebo* anebo *a*" - type: lesson link: and-or + - name: Cykly materials: - name: Funkce - type: lesson link: functions - name: Želva a cykly - type: lesson link: turtle - name: Cyklus `While` - type: lesson link: while + - name: Správa zdrojového kódu materials: - name: Git - type: lesson link: git - name: Větvení v Gitu - type: lesson link: branching + - name: Funkce & Řetězce materials: - name: Vlastní funkce - type: lesson link: own_functions - name: Řetězce - type: lesson link: strings + - name: Testování materials: - name: Výjimky - type: lesson link: exceptions - name: Moduly - type: lesson link: modules - name: Testování - type: lesson link: testing - name: Poznámka o importování - type: lesson link: circular_imports + - name: Spolupráce a Open-Source materials: - name: Spolupráce & Open Source - type: lesson link: cooperation_and_OSS - name: Soubory - type: lesson link: files + - name: Seznamy materials: - name: Seznamy - type: lesson link: lists - name: N-tice - type: lesson link: tuples + - name: Grafika materials: - name: Grafika - type: lesson link: pyglet - name: "Praktické cvičení: Pong" - type: lesson link: pong + - name: Slovníky materials: - name: Slovníky - type: lesson link: dicts - name: JSON - type: lesson link: json - name: Github API - type: lesson link: github-api + - name: Třídy materials: - name: Třídy - type: lesson link: classes - name: Dědičnost - type: lesson link: inheritance + - name: Závěrečný projekt materials: - name: Asteroids - type: lesson link: asteroids From c19d6ae17c94cca826a9d0f822208f99d9186bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominika=20Krej=C4=8D=C3=AD?= Date: Fri, 13 Jan 2017 18:49:08 +0100 Subject: [PATCH 3/4] Create lesson names from the lesson plan. --- courses/mi-pyt/index.html | 9 +--- courses/mi-pyt/plan.yml | 47 +++++------------- courses/pyladies/index.html | 9 +--- courses/pyladies/plan.yml | 96 +++++++++++++------------------------ naucse/routes.py | 12 ++++- 5 files changed, 59 insertions(+), 114 deletions(-) diff --git a/courses/mi-pyt/index.html b/courses/mi-pyt/index.html index 30970cda0b..21e5bb2223 100644 --- a/courses/mi-pyt/index.html +++ b/courses/mi-pyt/index.html @@ -19,13 +19,8 @@

{% for mat in lesson['materials'] %}
- {% set icon_class = 'glyphicon-pencil' %} - - {% if 'link' in mat %} - {{ mat['name'] }} - {% else %} - {{ mat['name'] }} - {% endif %} + + {{ names.get(mat['link']) }}
{% endfor %}
diff --git a/courses/mi-pyt/plan.yml b/courses/mi-pyt/plan.yml index e762ff9dd9..964f809cd3 100644 --- a/courses/mi-pyt/plan.yml +++ b/courses/mi-pyt/plan.yml @@ -1,37 +1,14 @@ - name: Lekce materials: - - name: Requests a click - link: 01-requests-click - - - name: Flask - link: 02-flask - - - name: Moduly - link: 03-moduly - - - name: Testování - link: 04-testovani - - - name: Dokumentace - link: 05-dokumentace - - - name: Pandas - link: 06-pandas - - - name: Numpy - link: 07-numpy - - - name: Cython - link: 08-cython - - - name: GUI v Pythonu - link: 09-pyqt - - - name: Generátory a AsyncIO - link: 10-async - - - name: Magie - link: 11-magie - - - name: MicroPython - link: 12-micropython + - link: 01-requests-click + - link: 02-flask + - link: 03-moduly + - link: 04-testovani + - link: 05-dokumentace + - link: 06-pandas + - link: 07-numpy + - link: 08-cython + - link: 09-pyqt + - link: 10-async + - link: 11-magie + - link: 12-micropython diff --git a/courses/pyladies/index.html b/courses/pyladies/index.html index 86ace2f705..08f1633642 100644 --- a/courses/pyladies/index.html +++ b/courses/pyladies/index.html @@ -19,13 +19,8 @@

{% for mat in lesson['materials'] %}
- {% set icon_class = 'glyphicon-pencil' %} - - {% if 'link' in mat %} - {{ mat['name'] }} - {% else %} - {{ mat['name'] }} - {% endif %} + + {{ names.get(mat['link']) }}
{% endfor %}
diff --git a/courses/pyladies/plan.yml b/courses/pyladies/plan.yml index 6aa9aaf31e..0093805be5 100644 --- a/courses/pyladies/plan.yml +++ b/courses/pyladies/plan.yml @@ -1,99 +1,67 @@ - name: Instalace materials: - - name: Úvod do příkazové řádky - link: cmdline - - name: Instalace Pythonu a první krůčky s ním - link: install - - name: Instalace editoru - link: install_editor - - name: Instalace Gitu - link: install_git + - link: cmdline + - link: install + - link: install_editor + - link: install_git - name: První program materials: - - name: První program - link: hello-world - - name: Chybové hlášky a `print` - link: printing - - name: Proměnné - link: variables - - name: Porovnávání - link: comparisons - - name: "*Nebo* anebo *a*" - link: and-or + - link: hello-world + - link: printing + - link: variables + - link: comparisons + - link: and-or - name: Cykly materials: - - name: Funkce - link: functions - - name: Želva a cykly - link: turtle - - name: Cyklus `While` - link: while + - link: functions + - link: turtle + - link: while - name: Správa zdrojového kódu materials: - - name: Git - link: git - - name: Větvení v Gitu - link: branching + - link: git + - link: branching - name: Funkce & Řetězce materials: - - name: Vlastní funkce - link: own_functions - - name: Řetězce - link: strings + - link: own_functions + - link: strings - name: Testování materials: - - name: Výjimky - link: exceptions - - name: Moduly - link: modules - - name: Testování - link: testing - - name: Poznámka o importování - link: circular_imports + - link: exceptions + - link: modules + - link: testing + - link: circular_imports - name: Spolupráce a Open-Source materials: - - name: Spolupráce & Open Source - link: cooperation_and_OSS - - name: Soubory - link: files + - link: cooperation_and_OSS + - link: files - name: Seznamy materials: - - name: Seznamy - link: lists - - name: N-tice - link: tuples + - link: lists + - link: tuples - name: Grafika materials: - - name: Grafika - link: pyglet - - name: "Praktické cvičení: Pong" - link: pong + - link: pyglet + - link: pong - name: Slovníky materials: - - name: Slovníky - link: dicts - - name: JSON - link: json - - name: Github API - link: github-api + - link: dicts + - link: json + - link: github-api - name: Třídy materials: - - name: Třídy - link: classes - - name: Dědičnost - link: inheritance + - link: classes + - link: inheritance - name: Závěrečný projekt materials: - - name: Asteroids - link: asteroids + - link: asteroids diff --git a/naucse/routes.py b/naucse/routes.py index 8d3fecc29e..b08b39e178 100644 --- a/naucse/routes.py +++ b/naucse/routes.py @@ -43,9 +43,18 @@ def courses(): @app.route('/courses//') def course_page(course): template = 'courses/{}/index.html'.format(course) + plan = read_yaml("courses/" + course + "/plan.yml") + + lesson_dict = {} + + # Load dictionary of lessons names. + for lesson in plan: + for mat in lesson['materials']: + info_file = read_yaml("courses/" + course + "/" + mat['link'] + "/info.yml") + lesson_dict[mat['link']] = info_file['title'] try: - return render_template(template, plan=read_yaml("courses/" + course + "/plan.yml")) + return render_template(template, plan=read_yaml("courses/" + course + "/plan.yml"), names=lesson_dict) except TemplateNotFound: abort(404) @@ -91,3 +100,4 @@ def lesson_static(course, lesson, path): directory = os.path.join(app.root_path, 'courses') filename = os.path.join(course, lesson, 'static', path) return send_from_directory(directory, filename) + From 1d8be7e74f508fe013ea3db3f20d85e10635f4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominika=20Krej=C4=8D=C3=AD?= Date: Fri, 13 Jan 2017 19:34:08 +0100 Subject: [PATCH 4/4] Allow referencing between courses. --- courses/mi-pyt/index.html | 2 +- courses/pyladies/index.html | 2 +- naucse/routes.py | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/courses/mi-pyt/index.html b/courses/mi-pyt/index.html index 21e5bb2223..7b534a9918 100644 --- a/courses/mi-pyt/index.html +++ b/courses/mi-pyt/index.html @@ -20,7 +20,7 @@

{% for mat in lesson['materials'] %}
- {{ names.get(mat['link']) }} + {{ names.get(mat['link'])[1] }}
{% endfor %}

diff --git a/courses/pyladies/index.html b/courses/pyladies/index.html index 08f1633642..940f9ec3d6 100644 --- a/courses/pyladies/index.html +++ b/courses/pyladies/index.html @@ -20,7 +20,7 @@

{% for mat in lesson['materials'] %}
- {{ names.get(mat['link']) }} + {{ names.get(mat['link'])[1] }}
{% endfor %}

diff --git a/naucse/routes.py b/naucse/routes.py index b08b39e178..f49cecc88c 100644 --- a/naucse/routes.py +++ b/naucse/routes.py @@ -50,8 +50,14 @@ def course_page(course): # Load dictionary of lessons names. for lesson in plan: for mat in lesson['materials']: - info_file = read_yaml("courses/" + course + "/" + mat['link'] + "/info.yml") - lesson_dict[mat['link']] = info_file['title'] + if len(mat['link'].split('/')) != 1: + the_course = mat['link'].split('/')[0] + link = mat['link'].split('/')[1] + else: + link = mat['link'] + the_course = course + info_file = read_yaml("courses/" + the_course + "/" + link + "/info.yml") + lesson_dict[mat['link']] = (the_course, info_file['title']) try: return render_template(template, plan=read_yaml("courses/" + course + "/plan.yml"), names=lesson_dict) @@ -100,4 +106,3 @@ def lesson_static(course, lesson, path): directory = os.path.join(app.root_path, 'courses') filename = os.path.join(course, lesson, 'static', path) return send_from_directory(directory, filename) -