diff --git a/README.md b/README.md index d595643..5ec4355 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To run the app on your own machine run ```pipenv install``` to install requested ## Docker-compose -You may want to know `docker run -p 3200:5000 latin .`. +When in directory with `Dockerfile ` run `docker run -p 3200:5000 latin .`. To update docker image: 1. Go to `/etc/docker-compose/latin` and run `docker-compose build`. diff --git a/app/routes.py b/app/routes.py index 7317b59..5602e73 100644 --- a/app/routes.py +++ b/app/routes.py @@ -9,7 +9,9 @@ capitula = [ {'title': '02 Familia Romana', 'pensa': ['A', 'B'], 'exercitia': [1, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13]}, - {'title': '03 Puer Improbus'}, + {'title': '03 Puer Improbus', + 'pensa': ['A', 'B'], + 'exercitia': [1, 2, 3, 4]}, {'title': '04 Dominus et Servi'}, {'title': '05 Villa et Hortus'}, {'title': '06 Via Latina'}, diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_1 b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_1 new file mode 100644 index 0000000..cd7e5d9 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_1 @@ -0,0 +1,9 @@ +cantat|iam|īrātus|laetus|plōrat|pulsat|rīdet|venit|videt|vocat +Iūlia _cantat_: "Lalla, lalla!" Iūlia _laeta_ est. +Mārcus laetus nōn est, Mārcus _īrātus_ est. +Mārcus Iūliam _pulsat_. +_Iam_ Iūlia nōn cantat, sed _plōrat_. +Mārcus _rīdet_: "Hahahae!" +Iūlia: "Ubi est māter?" Iūlia Aemiliam nōn _videt_. +Iūlia Aemiliam _vocat_: "Mamma!" +Aemilia _venit_. \ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_1.html b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_1.html new file mode 100644 index 0000000..4e02849 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_1.html @@ -0,0 +1,11 @@ +volabula: cantat, iam, īrātus, laetus, plōrat, pulsat, rīdet, venit, videt, vocat +
    +
  1. Iūlia : "Lalla, lalla!" Iūlia est.
  2. +
  3. Mārcus laetus nōn est, Mārcus est.
  4. +
  5. Mārcus Iūliam .
  6. +
  7. Iūlia nōn cantat, sed .
  8. +
  9. Mārcus : "Hahahae!"
  10. +
  11. Iūlia: "Ubi est māter?" Iūlia Aemiliam nōn .
  12. +
  13. Iūlia Aemiliam : "Mamma!"
  14. +
  15. Aemilia .
  16. +
\ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_2 b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_2 new file mode 100644 index 0000000..9acbd52 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_2 @@ -0,0 +1,9 @@ +-um|-am|mē +Mārcus Iūli_am_ pulsat. +Mārcus Quīnt_um_ nōn videt, sed Quīntus Mārc_um_ videt. +Quīntus: "Quid? Mārcus puell_am_ pulsat?" +Quīntus Mārc_um_ pulsat, et Mārcus pulsat Quīnt_um_. +Iūlia nōn videt Aemili_am_. +Iūlia Aemili_am_ vocat: "Mamma!" +Mārcus īrātus Iūli_am_ pulsat. +Iūlia: "Mamma! Mārcus _mē_ pulsat!" \ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_2.html b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_2.html new file mode 100644 index 0000000..9359616 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_2.html @@ -0,0 +1,11 @@ +volabula: -um, -am, mē +
    +
  1. Mārcus Iūli pulsat.
  2. +
  3. Mārcus Quīnt nōn videt, sed Quīntus Mārc videt.
  4. +
  5. Quīntus: "Quid? Mārcus puell pulsat?"
  6. +
  7. Quīntus Mārc pulsat, et Mārcus pulsat Quīnt.
  8. +
  9. Iūlia nōn videt Aemili.
  10. +
  11. Iūlia Aemili vocat: "Mamma!"
  12. +
  13. Mārcus īrātus Iūli pulsat.
  14. +
  15. Iūlia: "Mamma! Mārcus pulsat!"
  16. +
\ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_3 b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_3 new file mode 100644 index 0000000..4c6b317 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_3 @@ -0,0 +1,10 @@ +-at|-et|-it +Iūlia cant_at_, et Mārcus eam puls_at_! +Iam Iūlia nōn cant_at_, sed plōr_at_. +Iūlia Aemiliam nōn vid_et_; Iūlia Aemiliam voc_at_. +Aemilia ven_it_ et interrog_at_: "Ubi est Iūlius?" +Mārcus respond_et_: "Pater dorm_it_." +Quīntus Iūlium voc_at_. +Iūlius dorm_it_ neque Quīntum aud_it_. +Mārcus rīdet, quia Iūlius nōn ven_it_. +Aemilia Mārcum verber_at_. \ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_3.html b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_3.html new file mode 100644 index 0000000..030f770 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_3.html @@ -0,0 +1,12 @@ +volabula: -at, -et, -it +
    +
  1. Iūlia cant, et Mārcus eam puls!
  2. +
  3. Iam Iūlia nōn cant, sed plōr.
  4. +
  5. Iūlia Aemiliam nōn vid; Iūlia Aemiliam voc.
  6. +
  7. Aemilia ven et interrog: "Ubi est Iūlius?"
  8. +
  9. Mārcus respond: "Pater dorm."
  10. +
  11. Quīntus Iūlium voc.
  12. +
  13. Iūlius dorm neque Quīntum aud.
  14. +
  15. Mārcus rīdet, quia Iūlius nōn ven.
  16. +
  17. Aemilia Mārcum verber.
  18. +
\ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_4 b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_4 new file mode 100644 index 0000000..ab97829 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_4 @@ -0,0 +1,13 @@ +audit|cūr|dormit|eam|eum|hīc|improbus|interrogat|neque|probus|quia|repondet|tē|verberat +Aemilia Quīntum _interrogat_: "Quis mē vocat?" +Quīntus _respondet_: "Iūlia _tē_ vocat." +Aemilia _interrogat_: "_Cūr_ Iūlia plōrat?" +Quīntus _respondet_: "Iūlia plōrat, quia Mārcus eam pulsat." +Aemilia: "Mārcis puer _improbus_ est! Ubi est Iūlius?" +Quīntus: "Pater nōn _hīc_ est, sed Mārcus _hīc_ est," +Quīntus Iūlium vocat; Iūlius _eum_ [: Quīntus] nōn _audit_. +Mārcus: "Pater _dormit_ neque tē audit." +Iūlius Quīntus nōn audit _neque_ venit. +Aemilia Mārcus _verberat_: tuxtax! +Mārcus plōrat. Iūlius Mārcus _audit_; iam Iūlius nōn _dormit_. +Mārcus nōn puer _probus_, sed puer improbus est. \ No newline at end of file diff --git a/app/templates/Exercitia/03_Puer_Improbus_Exercitium_4.html b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_4.html new file mode 100644 index 0000000..2367ce3 --- /dev/null +++ b/app/templates/Exercitia/03_Puer_Improbus_Exercitium_4.html @@ -0,0 +1,15 @@ +volabula: audit, cūr, dormit, eam, eum, hīc, improbus, interrogat, neque, probus, quia, repondet, tē, verberat +
    +
  1. Aemilia Quīntum : "Quis mē vocat?"
  2. +
  3. Quīntus : "Iūlia vocat."
  4. +
  5. Aemilia : " Iūlia plōrat?"
  6. +
  7. Quīntus : "Iūlia plōrat, quia Mārcus eam pulsat."
  8. +
  9. Aemilia: "Mārcis puer est! Ubi est Iūlius?"
  10. +
  11. Quīntus: "Pater nōn est, sed Mārcus est,"
  12. +
  13. Quīntus Iūlium vocat; Iūlius [: Quīntus] nōn .
  14. +
  15. Mārcus: "Pater neque tē audit."
  16. +
  17. Iūlius Quīntus nōn audit venit.
  18. +
  19. Aemilia Mārcus : tuxtax!
  20. +
  21. Mārcus plōrat. Iūlius Mārcus ; iam Iūlius nōn .
  22. +
  23. Mārcus nōn puer , sed puer improbus est.
  24. +
\ No newline at end of file