From 656015661784e13eb3bae3905ca0977472989c84 Mon Sep 17 00:00:00 2001 From: Sendou Date: Sun, 17 Nov 2019 01:12:13 +0200 Subject: [PATCH] builds browser title + prettier conf --- .eslintrc.js | 49 ------------------- .prettierrc.json | 7 +++ .../src/components/builds/BuildsBrowser.js | 14 ++++-- react-ui/src/components/common/BuildCard.js | 46 ++++++++--------- 4 files changed, 40 insertions(+), 76 deletions(-) delete mode 100644 .eslintrc.js create mode 100644 .prettierrc.json diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 8572b08e1..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,49 +0,0 @@ -module.exports = { - "env": { - "browser": true, - "es6": true, - "jest/globals": true - }, - "extends": [ - "eslint:recommended", - "plugin:react/recommended" - ], - "parserOptions": { - "ecmaFeatures": { - "jsx": true, - "modules": true - }, - "ecmaVersion": 2018, - "sourceType": "module" - }, - "plugins": [ - "react", "jest" - ], - "rules": { - "indent": [ - "error", - 2 - ], - "linebreak-style": [ - "error", - "windows" - ], - "quotes": [ - "error", - "single" - ], - "semi": [ - "error", - "never" - ], - "eqeqeq": "error", - "no-trailing-spaces": "error", - "object-curly-spacing": [ - "error", "always" - ], - "arrow-spacing": [ - "error", { "before": true, "after": true } - ], - "react/prop-types": 0 - } -} \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 000000000..73878ae6a --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,7 @@ +{ + "trailingComma": "es5", + "tabWidth": 2, + "semi": false, + "singleQuote": false, + "prettier.semi": false +} \ No newline at end of file diff --git a/react-ui/src/components/builds/BuildsBrowser.js b/react-ui/src/components/builds/BuildsBrowser.js index 0153426a6..838a058ae 100644 --- a/react-ui/src/components/builds/BuildsBrowser.js +++ b/react-ui/src/components/builds/BuildsBrowser.js @@ -1,4 +1,4 @@ -import React from "react" +import React, { useEffect } from "react" import { useQuery } from "@apollo/react-hooks" import { useQueryParams, StringParam, NumberParam } from "use-query-params" import WeaponDropdown from "../common/WeaponDropdown" @@ -12,13 +12,19 @@ import WpnImage from "../common/WpnImage" const BuildsBrowser = () => { const [query, setQuery] = useQueryParams({ weapon: StringParam, - page: NumberParam + page: NumberParam, }) const { page = 1, weapon } = query const { data, error, loading } = useQuery(searchForBuildsByWeapon, { - variables: query + variables: query, }) - console.log("weapon", weapon) + + useEffect(() => { + document.title = weapon + ? `${weapon} Builds - sendou.ink` + : "Builds Browser - sendou.ink" + }, [weapon]) + const weaponsList = () => { if (loading) return if (error) return diff --git a/react-ui/src/components/common/BuildCard.js b/react-ui/src/components/common/BuildCard.js index f5e7bd69d..a13801c8f 100644 --- a/react-ui/src/components/common/BuildCard.js +++ b/react-ui/src/components/common/BuildCard.js @@ -1,13 +1,13 @@ -import React, { useState } from "react"; -import { Card, Image, Icon, Popup, Button } from "semantic-ui-react"; -import { Link } from "react-router-dom"; -import english_internal from "../../utils/english_internal.json"; -import AbilityIcon from "./AbilityIcon"; +import React, { useState } from "react" +import { Card, Image, Icon, Popup, Button } from "semantic-ui-react" +import { Link } from "react-router-dom" +import english_internal from "../../utils/english_internal.json" +import AbilityIcon from "./AbilityIcon" -import { wpnMedium } from "../../assets/imageImports"; -import top500 from "../../assets/xleaderboardIcons/all.png"; -import BuildDeleteModal from "../user/BuildDeleteModal.js"; -import AddBuildForm from "../user/AddBuildForm.js"; +import { wpnMedium } from "../../assets/imageImports" +import top500 from "../../assets/xleaderboardIcons/all.png" +import BuildDeleteModal from "../user/BuildDeleteModal.js" +import AddBuildForm from "../user/AddBuildForm.js" const BuildCard = ({ build, @@ -16,19 +16,19 @@ const BuildCard = ({ removeBuildFunction, editBuildFunction, showWeapon = true, - showDescription = true + showDescription = true, }) => { - const [showEdit, setShowEdit] = useState(false); + const [showEdit, setShowEdit] = useState(false) function removeAbility(gearIndex, slotIndex) { - let copyOfArray = [...existingAbilities]; - copyOfArray[gearIndex][slotIndex] = ""; - setAbilities(copyOfArray); + let copyOfArray = [...existingAbilities] + copyOfArray[gearIndex][slotIndex] = "" + setAbilities(copyOfArray) } const buildTitle = - !build.title || build.title === "" ? `${build.weapon} Build` : build.title; - const buildDescription = !build.description ? "" : build.description; + !build.title || build.title === "" ? `${build.weapon} Build` : build.title + const buildDescription = !build.description ? "" : build.description if (showEdit) return ( @@ -39,7 +39,7 @@ const BuildCard = ({ editBuildFunction={editBuildFunction} /> - ); + ) const BCard = () => { return ( @@ -111,7 +111,7 @@ const BuildCard = ({
{build.clothingItem && ( @@ -171,10 +171,10 @@ const BuildCard = ({ )} - ); - }; + ) + } - return ; -}; + return +} -export default BuildCard; +export default BuildCard