diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..07b3e45
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,23 @@
+module.exports = {
+ env: {
+ browser: true,
+ es2021: true,
+ },
+ extends: [
+ 'plugin:react/recommended',
+ 'xo',
+ ],
+ parserOptions: {
+ ecmaFeatures: {
+ jsx: true,
+ },
+ ecmaVersion: 12,
+ sourceType: 'module',
+ },
+ plugins: [
+ 'react',
+ ],
+ rules: {
+ "arrow-parens": ["error", "always"]
+ },
+};
diff --git a/package.json b/package.json
index 034a292..dc0de94 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,9 @@
"devDependencies": {
"@parcel/transformer-image": "2.0.0-rc.0",
"@parcel/transformer-sass": "2.0.0-rc.0",
+ "eslint": "^7.32.0",
+ "eslint-config-xo": "^0.38.0",
+ "eslint-plugin-react": "^7.25.1",
"parcel": "^2.0.0-rc.0"
},
"dependencies": {
diff --git a/src/App.jsx b/src/App.jsx
index ffbf018..51bba26 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,70 +1,72 @@
-import React, { Component } from "react";
+import React, {Component} from 'react';
import './App.scss';
-import { declineSaimiar } from './saimiar_morphology.js';
+import {declineSaimiar} from './saimiar_morphology.js';
-const backendUrl = "https://kucinakobackend.ichigo.everydayimshuflin.com";
+const backendUrl = 'https://kucinakobackend.ichigo.everydayimshuflin.com';
function makeRequest(queryString, jsonHandler) {
- const effectiveUrl = `${backendUrl}/${queryString}`
- fetch(`${effectiveUrl}`)
- .then((resp) => {
- return resp.json()
- })
- .then((json) => {
- jsonHandler(json);
- });
+ const effectiveUrl = `${backendUrl}/${queryString}`;
+ fetch(`${effectiveUrl}`)
+ .then((resp) => resp.json())
+ .then((json) => {
+ jsonHandler(json);
+ });
}
function renderConlangName(name) {
- if (name == "saimiar") {
- return "Saimiar";
- }
- if (name == "elesu") {
- return "Elésu";
- }
+ if (name === 'saimiar') {
+ return 'Saimiar';
+ }
- if (name === "juteyuji") {
- return "Juteyuji";
- }
- if (name === "tukvaysi") {
- return "Tukvaysi";
- }
+ if (name === 'elesu') {
+ return 'Elésu';
+ }
+
+ if (name === 'juteyuji') {
+ return 'Juteyuji';
+ }
+
+ if (name === 'tukvaysi') {
+ return 'Tukvaysi';
+ }
}
function Entry(props) {
- const conlang = props.conlang;
- if (conlang === "saimiar") {
- return ;
- }
- return Unknown entry type for { conlang }
;
+ const {conlang} = props;
+ if (conlang === 'saimiar') {
+ return ;
+ }
+
+ return Unknown entry type for { conlang }
;
}
function SaiEntry(props) {
- const entry = props.entry;
- const synCategory = entry.syn_category;
- const isNominal = synCategory == 'nominal';
- console.log(isNominal);
- return (
-
- { entry.sai } - { entry.eng }
-
-
- { entry.syn_category }
- { entry.morph_type ? `\t\t${entry.morph_type}` : null }
-
- { isNominal ? formatMorphology(entry) : null }
-
-
- );
+ const {entry} = props;
+ const synCategory = entry.syn_category;
+ const isNominal = synCategory === 'nominal';
+ console.log(isNominal);
+ return (
+
+ { entry.sai } - { entry.eng }
+
+
+ { entry.syn_category }
+ { entry.morph_type ? `\t\t${entry.morph_type}` : null }
+
+ { isNominal ? formatMorphology(entry) : null }
+
+
+ );
}
function formatMorphology(entry) {
- const decl = declineSaimiar(entry);
- if (!decl) {
- return '';
- }
- return (
+ const decl = declineSaimiar(entry);
+ if (!decl) {
+ return '';
+ }
+
+ return (
Abs: {decl.abs}, Erg: {decl.erg},
Adp: {decl.adp},
All: {decl.all},
@@ -72,118 +74,115 @@ function formatMorphology(entry) {
Ell: {decl.ell},
Inst: {decl.inst},
Rel: {decl.rel}
- );
+ );
}
class Results extends Component {
- constructor(props) {
- super(props);
- this.content = this.content.bind(this);
- }
+ constructor(props) {
+ super(props);
+ this.content = this.content.bind(this);
+ }
- content() {
- const conlang = this.props.conlang;
- const num = this.props.searchResults.length;
- const renderedName = renderConlangName(conlang);
- const searchType = (this.props.direction === "toConlang") ? `English -> ${renderedName}` : `${renderedName} -> English`;
- const header = (
-
+ content() {
+ const {conlang} = this.props;
+ const num = this.props.searchResults.length;
+ const renderedName = renderConlangName(conlang);
+ const searchType = (this.props.direction === 'toConlang') ? `English -> ${renderedName}` : `${renderedName} -> English`;
+ const header = (
+
Searched for { this.props.searchTerm }, { searchType }, found { num } result(s)
-
);
- const entries = this.props.searchResults.map(
- (entry, idx) =>
- );
- return [header].concat(entries);
- }
+
- { results ? this.content() : "No search" }
-
- );
- }
+ render() {
+ const results = this.props.searchResults;
+ return (
+
+ { results ? this.content() : 'No search' }
+
+ );
+ }
}
class App extends Component {
- constructor(props) {
- super(props);
- this.input = React.createRef();
- this.handleLangChange = this.handleLangChange.bind(this);
+ constructor(props) {
+ super(props);
+ this.input = React.createRef();
+ this.handleLangChange = this.handleLangChange.bind(this);
- this.searchEng = this.searchEng.bind(this);
- this.searchSaimiar = this.searchSaimiar.bind(this);
+ this.searchEng = this.searchEng.bind(this);
+ this.searchSaimiar = this.searchSaimiar.bind(this);
- this.state = {
- searchResults: null,
- conlang: "saimiar",
- direction: null,
- searchTerm: null
- };
- }
+ this.state = {
+ searchResults: null,
+ conlang: 'saimiar',
+ direction: null,
+ searchTerm: null,
+ };
+ }
- searchSaimiar(evt) {
- const searchTerm = this.input.current.value;
- const request = `saimiar?sai=like.*${searchTerm}*`
- if (searchTerm === "") {
- this.setState({ searchResults: null, searchTerm: null, direction: null });
- } else {
- makeRequest(request, (json) => {
- this.setState({ searchResults: json, searchTerm, direction: "toEnglish" });
- });
- }
- }
+ searchSaimiar(_evt) {
+ const searchTerm = this.input.current.value;
+ const request = `saimiar?sai=like.*${searchTerm}*`;
+ if (searchTerm === '') {
+ this.setState({searchResults: null, searchTerm: null, direction: null});
+ } else {
+ makeRequest(request, (json) => {
+ this.setState({searchResults: json, searchTerm, direction: 'toEnglish'});
+ });
+ }
+ }
- searchEng(evt) {
- const searchTerm = this.input.current.value;
- const request = `saimiar?eng=like.*${searchTerm}*`
- if (searchTerm === "") {
- this.setState({ searchResults: null, searchTerm: null, });
- } else {
- makeRequest(request, (json) => {
- this.setState({ searchResults: json, searchTerm, direction: "toConlang" });
- });
- }
- }
+ searchEng(_evt) {
+ const searchTerm = this.input.current.value;
+ const request = `saimiar?eng=like.*${searchTerm}*`;
+ if (searchTerm === '') {
+ this.setState({searchResults: null, searchTerm: null});
+ } else {
+ makeRequest(request, (json) => {
+ this.setState({searchResults: json, searchTerm, direction: 'toConlang'});
+ });
+ }
+ }
- handleLangChange(evt) {
- const conlang = evt.target.value;
- this.setState({ conlang });
- }
+ handleLangChange(evt) {
+ const conlang = evt.target.value;
+ this.setState({conlang});
+ }
- render() {
-
- return(
-
-
-
-
Kucinako
-
-
-
-
-
-
-
-
-
-
+
+
Kucinako
+
+
+
+
+
+
+
+
+
+