updated inflector and removed node-sass - it was creating so many build problems etc

functions/package.json

@@ -14,7 +14,7 @@
   "main": "lib/functions/src/index.js",
   "dependencies": {
     "@google-cloud/storage": "^5.8.1",
-    "@lingdocs/pashto-inflector": "3.4.6",
+    "@lingdocs/pashto-inflector": "3.4.8",
     "@types/cors": "^2.8.10",
     "@types/google-spreadsheet": "^3.0.2",
     "cors": "^2.8.5",
@@ -35,6 +35,6 @@
   },
   "private": true,
   "peerDependencies": {
-    "@lingdocs/pashto-inflector": "3.4.6"
+    "@lingdocs/pashto-inflector": "3.4.8"
   }
 }

package.json

@@ -17,12 +17,12 @@
     "url": "git@github.com-lingdocs:lingdocs/lingdocs-main.git"
   },
   "peerDependencies": {
-    "@lingdocs/pashto-inflector": "3.4.6"
+    "@lingdocs/pashto-inflector": "3.4.8"
   },
   "author": "lingdocs.com",
   "license": "MIT",
   "dependencies": {
-    "@lingdocs/pashto-inflector": "3.4.6",
+    "@lingdocs/pashto-inflector": "3.4.8",
     "lokijs": "^1.5.12",
     "nano": "^9.0.5",
     "passport-github2": "^0.1.12",

website/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.2",
-    "@lingdocs/pashto-inflector": "3.4.6",
+    "@lingdocs/pashto-inflector": "3.4.8",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
@@ -14,14 +14,12 @@
     "@types/node": "^14.14.33",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.2",
-    "bootstrap": "^4.6.0",
     "classnames": "^2.2.6",
     "cron": "^1.8.2",
     "dayjs": "^1.10.4",
     "lokijs": "^1.5.11",
     "mousetrap": "^1.6.5",
     "nano": "^9.0.3",
-    "node-sass": "^5.0.0",
     "papaparse": "^5.3.0",
     "passport-github2": "^0.1.12",
     "passport-google-oauth": "^2.0.0",
@@ -111,6 +109,6 @@
     "user-event": "^4.0.0"
   },
   "peerDependencies": {
-    "@lingdocs/pashto-inflector": "3.4.6"
+    "@lingdocs/pashto-inflector": "3.4.8"
   }
 }

website/src/App.tsx

@@ -67,8 +67,7 @@ import * as AT from "./types/account-types";
 import ReactGA from "react-ga";
 // tslint:disable-next-line
 import "@fortawesome/fontawesome-free/css/all.css";
-import "./custom-bootstrap.scss";
+import "./custom-bootstrap.css";
-// tslint:disable-next-line: ordered-imports
 import "./App.css";
 import classNames from "classnames";
 import { getTextOptions } from "./lib/get-text-options";

website/src/custom-bootstrap.scss

@@ -1,36 +1,8 @@
-/**
+// This is the source file for the custom bootstrap file custom-bootstrap.scss
- * Copyright (c) 2021 lingdocs.com
+// I compiled it seperately because node-sass is a world of pain
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-// Import Bootstrap and its default variables
-// Required
 
 $body-bg: #fefefe;
 $body-color: #333;
 
 @import '~bootstrap/scss/bootstrap.scss';
-// @import "~bootstrap/scss/bootstrap-grid.scss";
-// @import "~bootstrap/scss/bootstrap-reboot.scss";
-// @import "~bootstrap/scss/_utilities.scss";
-// @import "~bootstrap/scss/_functions.scss";
-// @import "~bootstrap/scss/_variables.scss";
-// @import "~bootstrap/scss/_mixins.scss";
 
-// @import "~bootstrap/scss/_alert.scss";
-// @import "~bootstrap/scss/_list-group.scss";
-// @import "~bootstrap/scss/_modal.scss";
-// @import "~bootstrap/scss/_type.scss";
-// @import "~bootstrap/scss/_nav.scss";
-// @import "~bootstrap/scss/_navbar.scss";
-// @import "~bootstrap/scss/_buttons.scss";
-// @import "~bootstrap/scss/_button-group.scss";
-// @import "~bootstrap/scss/_forms.scss";
-// @import "~bootstrap/scss/_custom-forms.scss";
-// @import "~bootstrap/scss/_input-group.scss";
-// @import "~bootstrap/scss/_root.scss";
-
-// // Optional

yarn.lock

@@ -55,9 +55,9 @@
     "regenerator-runtime" "^0.13.4"
 
 "@babel/types@^7.18.6":
-  "integrity" "sha512-qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw=="
+  "integrity" "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg=="
-  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz"
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz"
-  "version" "7.18.8"
+  "version" "7.18.9"
   dependencies:
     "@babel/helper-validator-identifier" "^7.18.6"
     "to-fast-properties" "^2.0.0"
@@ -178,10 +178,10 @@
   "resolved" "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz"
   "version" "9.2.1"
 
-"@lingdocs/pashto-inflector@3.4.0":
+"@lingdocs/pashto-inflector@3.4.8":
-  "integrity" "sha512-WBq0uatnfAJREl/GZFNd5OMxLvQ/B2tQABv4dM6sLp9jmZXOAh3rrQSBmEf0RTjdTsyL4XSDEJ7Rw7vDDxQhiw=="
+  "integrity" "sha512-l0yw4QVd+uaQSsyybP5+PmBVO6nhhxGzRqaPkVlK+R/UQZdytpmxligIExtrOnQLyFu2RWwocGPYlV/HYpFQZw=="
-  "resolved" "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.4.0.tgz"
+  "resolved" "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.4.8.tgz"
-  "version" "3.4.0"
+  "version" "3.4.8"
   dependencies:
     "@formkit/auto-animate" "^1.0.0-beta.1"
     "classnames" "^2.2.6"