From 7bd2e22979c40dcbc17cbe2ac7dcdacd41e84766 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:52:37 +0300 Subject: [PATCH] chapter on present verb form --- package.json | 7 +- src/components/Carousel.js | 42 +- src/components/Formula.js | 18 - src/components/formula/Formula.js | 25 +- src/content/equatives/other-equatives.mdx | 2 +- src/content/index.js | 5 + src/content/inflection/inflection-intro.mdx | 2 +- src/content/verbs/present-time.svg | 437 +++++++++++++ .../verbs/present-time.svg:Zone.Identifier | 0 src/content/verbs/present-verbs.mdx | 142 ++++ src/content/verbs/reality-graph.svg | 611 ++++++++++++++++++ .../verbs/reality-graph.svg:Zone.Identifier | 0 .../verb-categories/simple-gramm-trans.js | 16 +- yarn.lock | 8 +- 14 files changed, 1252 insertions(+), 63 deletions(-) delete mode 100644 src/components/Formula.js create mode 100644 src/content/verbs/present-time.svg create mode 100644 src/content/verbs/present-time.svg:Zone.Identifier create mode 100644 src/content/verbs/present-verbs.mdx create mode 100644 src/content/verbs/reality-graph.svg create mode 100644 src/content/verbs/reality-graph.svg:Zone.Identifier diff --git a/package.json b/package.json index 88e0cb9..09556cc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", - "@lingdocs/pashto-inflector": "^0.6.9", + "@lingdocs/pashto-inflector": "^0.7.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", @@ -35,7 +35,10 @@ "get-words": "node scripts/get-words.js" }, "eslintConfig": { - "extends": "react-app" + "extends": "react-app", + "rules": { + "jsx-a11y/accessible-emoji": "off" + } }, "browserslist": { "production": [ diff --git a/src/components/Carousel.js b/src/components/Carousel.js index e9442bc..81faacb 100644 --- a/src/components/Carousel.js +++ b/src/components/Carousel.js @@ -41,26 +41,28 @@ export default function(props) { } return (
-
- {"previous"} - {title ? -
{title}
- : -
{body}
- } - {"next"} +
+
+ {"previous"} + {title ? +
{title}
+ : +
{body}
+ } + {"next"} +
{title &&
{body} diff --git a/src/components/Formula.js b/src/components/Formula.js deleted file mode 100644 index 01ffdff..0000000 --- a/src/components/Formula.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Copyright (c) 2021 lingdocs.com - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - */ - -import React from "react"; - -export default function(props) { - return ( - - Formula: - {props.children} - - ); -} \ No newline at end of file diff --git a/src/components/formula/Formula.js b/src/components/formula/Formula.js index 29e7273..cae95b1 100644 --- a/src/components/formula/Formula.js +++ b/src/components/formula/Formula.js @@ -1,18 +1,25 @@ import React from "react"; -import "./formula.css"; -import teacher from "./teacher-small.png"; +// import "./formula.css"; +// import teacher from "./teacher-small.png"; function Formula(props) { - console.log(props); return ( -
-
{props.title}
-
{props.children}
-
- teacher -
+
+
🧪 Formula:
+ 
+                {props.children}
+
) + // return ( + //
+ //
{props.title}
+ //
{props.children}
+ //
+ // + //
+ //
+ // ) } export default Formula; \ No newline at end of file diff --git a/src/content/equatives/other-equatives.mdx b/src/content/equatives/other-equatives.mdx index 95f88f6..83b900b 100644 --- a/src/content/equatives/other-equatives.mdx +++ b/src/content/equatives/other-equatives.mdx @@ -25,7 +25,7 @@ import { } from "@lingdocs/pashto-inflector"; import psmd from "../../lib/psmd"; import EquativeFormChoice from "../../components/EquativeFormChoice"; -import Formula from "../../components/Formula"; +import Formula from "../../components/formula/Formula"; import Link from "../../components/Link"; ## Future / Presumptive Equative diff --git a/src/content/index.js b/src/content/index.js index 31a07f9..7c02288 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -20,6 +20,7 @@ import * as bundledPlurals from "!babel-loader!mdx-loader!./nouns/bundled-plural import * as verbAspect from "!babel-loader!mdx-loader!./verbs/verb-aspect.mdx"; import * as verbsIntro from "!babel-loader!mdx-loader!./verbs/verbs-intro.mdx"; +import * as presentVerbs from "!babel-loader!mdx-loader!./verbs/present-verbs.mdx"; import * as verbEndings from "!babel-loader!mdx-loader!./verbs/verb-endings.mdx"; import * as rootsAndStems from "!babel-loader!mdx-loader!./verbs/roots-and-stems.mdx"; import * as sentenceStructure from "!babel-loader!mdx-loader!./verbs/sentence-structure.mdx"; @@ -88,6 +89,10 @@ const contentTree = [ import: verbAspect, slug: "verb-aspect", }, + { + import: presentVerbs, + slug: "present-verbs", + }, { import: verbEndings, slug: "verb-endings", diff --git a/src/content/inflection/inflection-intro.mdx b/src/content/inflection/inflection-intro.mdx index 4640d6f..f63e18f 100644 --- a/src/content/inflection/inflection-intro.mdx +++ b/src/content/inflection/inflection-intro.mdx @@ -25,7 +25,7 @@ import { import Carousel from "../../components/Carousel"; import Table from "../../components/Table"; import InlineInflectionButton from "../../components/InlineInflectionButton"; -import Formula from "../../components/Formula.js"; +import Formula from "../../components/formula/Formula.js"; import catInflectionGif from "../../images/cat-inflection.gif"; export const singleInflectionHeadRow = [ diff --git a/src/content/verbs/present-time.svg b/src/content/verbs/present-time.svg new file mode 100644 index 0000000..3877fb8 --- /dev/null +++ b/src/content/verbs/present-time.svg @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/content/verbs/present-time.svg:Zone.Identifier b/src/content/verbs/present-time.svg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/src/content/verbs/present-verbs.mdx b/src/content/verbs/present-verbs.mdx new file mode 100644 index 0000000..6117cba --- /dev/null +++ b/src/content/verbs/present-verbs.mdx @@ -0,0 +1,142 @@ +--- +title: Present +--- + +import { + defaultTextOptions as opts, + Examples, + InlinePs, + removeFVariants, + ConjugationViewer, +} from "@lingdocs/pashto-inflector"; +import psmd from "../../lib/psmd"; +import Carousel from "../../components/Carousel"; +import Link from "../../components/Link"; +import Formula from "../../components/formula/Formula"; +import verbs from "../../words/verbs"; +import shuffleArray from "../../lib/shuffle-array"; +import realityGraph from "./reality-graph.svg"; +import presentTime from "./present-time.svg"; + +export const basicVerbs = verbs.filter((v) => !v.entry.c?.includes("gramm. trans.")); + +The first verb form we'll learn is the **present**. This will be the first tool in our toolbox of verb forms. 🧰 With each verb form we'll learn two things: + +1. 🧪 How to make it +2. 🔨 When to use it + +## How to make it + +As with all verb forms, the **present form** is made by following a very simple formula which is the same for every single verb. + + + Imperfective Stem + Present Ending + + +The present ending will change according to what the subject is. Have a look through the verbs below and see how the present form follows the same formula for all of them. 👇 + + { + return { + title: , + body: , + }; +}}/> + +**Notes:** + +- To make the verb negative, you just add a in front of the verb. +- To make the verb into a question, you just have to change the tone of voice. The word order doesn't change. + +## When to use it + +You use this form to talk about something that: + +- happens generally +- is currently happening +- or is definitely about to happen + +So if we think of a graph of reality like this, + +
+ +
+ +The **present form** would look something like this: + +
+ +
+ +Here are some examples of how the present form is used in different situations: + +### Happens generally + +{psmd([ + { + p: "مونږ هره ورځ چای **سکو**.", + f: "moonG hăra wradz chaay **skoo**.", + e: "We **drink** tea every day.", + }, + { + p: "زما پلار پتلون **اغوندي**.", + f: "zmaa plaar patloon **aghondee**.", + e: "My dad **wears** pants." + }, + { + p: "زه په عربي **نه پوهېږم**.", + f: "zu pu arabee **nú poheGum**.", + e: "I **don't understand** Arabic.", + }, + { + p: "ته له مرګه **وېرېږې**؟", + f: "tu la marga **weréGe**?", + e: "**Are** you **afraid** of death?" + }, +])} + +### Is currently happening + +{psmd([ + { + p: "نن شپه ستوري **ځلېږي**.", + f: "nun shpa storee **dzaléGee**.", + e: "The stars **are shining** tonight.", + }, + { + p: "زه بازار ته **ځم**.", + f: "zu baazaar ta **dzum**.", + e: "I'm **going** to the bazaar." + }, + { + p: "هغوي اوس ډوډۍ **خوري**", + f: "haghwee oos DoDuy **khoree**.", + e: "They are **eating** food now.", + }, + { + p: "ته څه **کوې**؟", + f: "tu tsu **kawe**?", + e: "What **are** you **doing**?" + }, +])} + +### Is definately about to happen + +{psmd([ + { + p: "**هغه نن **راځي.", + f: "haghá nun **raadzée**.", + e: "**He's coming** today.", + }, +])} + + diff --git a/src/content/verbs/reality-graph.svg b/src/content/verbs/reality-graph.svg new file mode 100644 index 0000000..59c1658 --- /dev/null +++ b/src/content/verbs/reality-graph.svg @@ -0,0 +1,611 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/content/verbs/reality-graph.svg:Zone.Identifier b/src/content/verbs/reality-graph.svg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/src/words/verb-categories/simple-gramm-trans.js b/src/words/verb-categories/simple-gramm-trans.js index 319c062..dffc8cf 100644 --- a/src/words/verb-categories/simple-gramm-trans.js +++ b/src/words/verb-categories/simple-gramm-trans.js @@ -7,12 +7,12 @@ */ module.exports = [ - { ts: 1577383674332, e: "to howl" },// انګولل - to howl, wail - { ts: 1527818962, e: "to sneeze" },// پرنجل - to sneeze - { ts: 1527821425, e: "to cough" },// ټوخل - to cough - { ts: 1527812767, e: "to laugh" },// خندل - to laugh - { ts: 1605360223155, e: "to jump" },// دنګل - to jump, leap, run, race - { ts: 1605360127430, e: "to swing" },// زنګل - to swing, rock (back and forth) - { ts: 1527812717, e: "to swing" },// ژړل - to cry - { ts: 1591899573844, e: "to dance" },// نڅل - to dance + { ts: 1577383674332, e: "to howl" },// انګولل - to howl, wail + { ts: 1527818962, e: "to sneeze" },// پرنجل - to sneeze + { ts: 1527821425, e: "to cough" },// ټوخل - to cough + { ts: 1527812767, e: "to laugh" },// خندل - to laugh + { ts: 1605360223155, e: "to jump" },// دنګل - to jump, leap, run, race + { ts: 1605360127430, e: "to swing" },// زنګل - to swing, rock (back and forth) + { ts: 1527812717, e: "to swing" },// ژړل - to cry + { ts: 1591899573844, e: "to dance" },// نڅل - to dance ] diff --git a/yarn.lock b/yarn.lock index 4c9a820..e3af5e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1554,10 +1554,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@lingdocs/pashto-inflector@^0.6.9": - version "0.6.9" - resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.6.9.tgz#924bfc8f35cd9947196ce6ceb4ac346f6c91a8d5" - integrity sha512-EfFkxC1SQS+zXhIbiS5HqQfKUV31TDIY0f6QUGN60pMcILDerHUghUlicsgEdbfb88asiplXb434eCU62z9Prg== +"@lingdocs/pashto-inflector@^0.7.0": + version "0.7.1" + resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.7.1.tgz#0790a4987455bb4c39bfda3efdb89edca7d7c020" + integrity sha512-F0j644Zduxudr/V1r97U2wYA80B9SwDm8Xk1nOwOVz53EoF9y25673iTSHwbefB4XgpUSfPYM7yipEqUE/0zlA== dependencies: classnames "^2.2.6" pbf "^3.2.1"