Merge pull request #16 from nrc-cnrc/auto_deploy

Auto deploy

.github/workflows/deploy.yaml

@@ -0,0 +1,24 @@
+name: Deploy Site
+on:
+  push:
+    branches:
+      - auto_deploy
+jobs:
+  build-and-deploy:
+    #concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
+    runs-on: ubuntu-latest
+    steps:
+        - name: Checkout 🛎️
+          uses: actions/checkout@v4
+          with:
+            persist-credentials: false
+        - name: Install and Build 🔧
+          run: |
+            cd VerbApp
+            npm install
+            ionic build --prod  
+        - name: Deploy 🚀
+          uses: JamesIves/github-pages-deploy-action@v3
+          with:
+            folder: VerbApp/www
+            token:  ${{ github.token }}

.gitignore

@@ -130,5 +130,5 @@ dmypy.json
 .pyre/
 
 DataBuilder/JSON
-VerbApp/src/assets/JSON
+VerbApp/src/assets/JSON/*
 DataBuilder/*.csv

DataBuilder/.gitignore

@@ -11,6 +11,8 @@ __pycache__/
 # Distribution / packaging
 .Python
 JSON/
+ERRORS/
+langs/
 build/
 develop-eggs/
 dist/

DataBuilder/src/french.csv → DataBuilder/langs/french/inputfile_fr.csv

@@ -10,9 +10,9 @@ aller, iraient, 3-pl-m, conditionnel-present, go, they (m), conditionnel present
 aller, iraient, 3-pl-f, conditionnel-present, go, they (f), conditionnel present,aller,,
 aller, va, 1-sg, imperatif-present, go, i, imperatif present,aller,,
 aller, allons, 2-sg, imperatif-present, go, you, imperatif present,aller,,
-aller, allez, 3-sg-m, imperatif-present, go, he, imperatif present,aller,,
-aller, allez, 3-sg-f, imperatif-present, go, she, imperatif present,aller,,
-aller, allez, 3-sg-n, imperatif-present, go, it, imperatif present,aller,,
+aller, allez , 3-sg-m, imperatif-present, go, he, imperatif present,aller,,
+aller, allez , 3-sg-f, imperatif-present, go, she, imperatif present,aller,,
+aller, allez , 3-sg-n, imperatif-present, go, it, imperatif present,aller,,
 aller, irai, 1-sg, indicatif-futur, go, i, indicatif futur,aller,,
 aller, iras, 2-sg, indicatif-futur, go, you, indicatif futur,aller,,
 aller, ira, 3-sg-m, indicatif-futur, go, he, indicatif futur,aller,,
@@ -46,7 +46,7 @@ aller, va, 3-sg-m, indicatif-present, go, he, indicatif present,aller,,
 aller, va, 3-sg-f, indicatif-present, go, she, indicatif present,aller,,
 aller, va, 3-sg-n, indicatif-present, go, it, indicatif present,aller,,
 aller, allons, 1-pl, indicatif-present, go, we, indicatif present,aller,,
-aller, allez, 2-pl, indicatif-present, go, you all, indicatif present,aller,,
+aller, allez , 2-pl, indicatif-present, go, you all, indicatif present,aller,,
 aller, vont, 3-pl-m, indicatif-present, go, they (m), indicatif present,aller,,
 aller, vont, 3-pl-f, indicatif-present, go, they (f), indicatif present,aller,,
 aller, all̩, 3-sg-m, participe-passe, go, he, participe passe,aller,,

DataBuilder/requirements.txt

@@ -1,78 +1,49 @@
-apturl==0.5.2
-attrs==19.3.0
-blinker==1.4
-Brlapi==0.7.0
-cached-property==1.5.1
-certifi==2019.11.28
-chardet==3.0.4
-Click==7.0
-colorama==0.4.3
-command-not-found==0.3
-cryptography==2.8
-cupshelpers==1.0
-dbus-python==1.2.16
-defer==1.0.6
-distlib==0.3.6
-distro==1.4.0
-distro-info===0.23ubuntu1
-docker==4.1.0
-docker-compose==1.25.0
-dockerpty==0.4.1
-docopt==0.6.2
-entrypoints==0.3
-filelock==3.8.0
-httplib2==0.14.0
-idna==2.8
-importlib-metadata==1.5.0
-jsonschema==3.2.0
-keyring==18.0.1
-language-selector==0.1
-launchpadlib==1.10.13
-lazr.restfulclient==0.14.2
-lazr.uri==1.0.3
-louis==3.12.0
-more-itertools==4.2.0
-netifaces==0.10.4
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile
+#
+colormap==1.0.4
+    # via -r requirements.in
+contourpy==1.0.7
+    # via matplotlib
+cycler==0.11.0
+    # via matplotlib
+fonttools==4.38.0
+    # via matplotlib
+kiwisolver==1.4.4
+    # via matplotlib
+matplotlib==3.6.0
+    # via
+    #   -r requirements.in
+    #   seaborn
 numpy==1.23.3
-oauthlib==3.1.0
-olefile==0.46
-PAM==0.4.2
-pbr==5.10.0
-pexpect==4.6.0
-Pillow==7.0.0
-pipreqs==0.4.11
-platformdirs==2.5.2
-pycairo==1.16.2
-pycups==1.9.73
-PyGObject==3.36.0
-PyICU==2.4.2
-PyJWT==1.7.1
-pyrsistent==0.15.5
-python-apt==2.0.0+ubuntu0.20.4.7
-python-dateutil==2.7.3
-python-debian===0.1.36ubuntu1
-pyxdg==0.26
-PyYAML==5.3.1
-reportlab==3.5.34
-requests==2.22.0
-requests-unixsocket==0.2.0
-SecretStorage==2.3.1
-simplejson==3.16.0
-six==1.14.0
-stevedore==4.0.0
-systemd-python==234
-testresources==2.0.1
-texttable==1.6.2
-ubuntu-advantage-tools==27.9
-ubuntu-drivers-common==0.0.0
-ufw==0.36
-unattended-upgrades==0.1
-urllib3==1.25.8
-virtualenv==20.16.5
-virtualenv-clone==0.5.7
-virtualenvwrapper==4.8.4
-wadllib==1.3.3
-websocket-client==0.53.0
-xkit==0.0.0
-yarg==0.1.9
-zipp==1.0.0
+    # via
+    #   -r requirements.in
+    #   contourpy
+    #   matplotlib
+    #   pandas
+    #   seaborn
+packaging==23.0
+    # via matplotlib
+pandas==1.5.3
+    # via seaborn
+pillow==9.4.0
+    # via matplotlib
+pyparsing==3.0.9
+    # via matplotlib
+python-dateutil==2.8.2
+    # via
+    #   matplotlib
+    #   pandas
+pytz==2022.7.1
+    # via pandas
+seaborn==0.12.2
+    # via -r requirements.in
+six==1.16.0
+    # via python-dateutil
+termcolor==2.2.0
+    # via -r requirements.in
+textdistance==4.4.0
+    # via -r requirements.in

DataBuilder/src/JSON_test.py

@@ -11,18 +11,18 @@
 class TESTS:
 
     @staticmethod
-    def runtests():
+    def runtests(path):
         """
         Function calls test functions and passes named files. To test on different files of the same format,
         change the arguments in the function calls.
         """
 
         print("\n-------\nTESTING INFORMATION\n-------")
-        TESTS.information_tests("JSON/information.json")
-        TESTS.conjugation_tests("JSON/conjugation.json")
+        TESTS.information_tests(path+"information.json", path)
+        TESTS.conjugation_tests(path+"conjugation.json", path)
 
     @staticmethod
-    def information_tests(file_name):
+    def information_tests(file_name, path):
         '''
         Tests the information file to relay descriptive information of the items inside.
         Checks for duplicate item ids, and duplicate item (translation,base) pairs.
@@ -45,7 +45,7 @@ def information_tests(file_name):
         for cat in json_file:
 
             print("* {} has ({}) unique options.".format(cat['name'].upper(), len(cat['children'])))
-        print("\nSee JSON/information.json file for all unique option(s).\n")
+        print("\nSee "+path+"information.json file for all unique option(s).\n")
 
 
         for cat in json_file:
@@ -112,7 +112,7 @@ def information_tests(file_name):
             print("For more details, see the ERRORS/duplicate_trans_base.txt file.")
 
     @staticmethod
-    def conjugation_tests(file_name):
+    def conjugation_tests(file_name, path):
         '''
         Tests the conjugation.json tree file to find errors around duplicate paths. 
         A duplicate path is one that is not unique, and results in more than one conjugation.
@@ -138,7 +138,7 @@ def conjugation_tests(file_name):
         if not_unique != -1:
             for key in json_file[0]:
                 TESTS.recurse_tree(json_file[0][key], [key])
-            g = open('JSON/information.json', 'r')
+            g = open(path+'information.json', 'r')
             json_informationfile = json.load(g)
             g.close()