From 1e02fb7e5641e6b81bf64db5bb6efb85117bfb1f Mon Sep 17 00:00:00 2001 From: Little Dipper Date: Sun, 18 Jun 2023 02:50:28 +0200 Subject: [PATCH] from jsx to tsx --- containers/react/package-lock.json | 17 ++--------------- .../react/src/components/Alert/GreenAlert.jsx | 2 +- .../react/src/components/Alert/RedAlert.jsx | 2 +- .../react/src/components/Alert/YellowAlert.jsx | 2 +- .../react/src/components/{App.jsx => App.tsx} | 16 ++++++++-------- .../src/components/{Footer.jsx => Footer.tsx} | 0 .../src/components/{Header.jsx => Header.tsx} | 2 +- .../Messages/{Chats.jsx => Chats.tsx} | 6 +++--- .../Messages/{Input.jsx => Input.tsx} | 0 .../Messages/{Message.jsx => Message.tsx} | 5 ++++- .../Messages/{MessageMe.jsx => MessageMe.tsx} | 0 .../Messages/{MessageYou.jsx => MessageYou.tsx} | 0 .../Messages/{Modal.jsx => Modal.tsx} | 2 +- .../{ModalSetting.jsx => ModalSetting.tsx} | 2 +- .../Profile/{EditName.jsx => EditName.tsx} | 0 .../Profile/{Logout.jsx => Logout.tsx} | 0 .../Profile/{Win_Loss.jsx => Win_Loss.tsx} | 0 .../Sidebar/{Backdrop.jsx => Backdrop.tsx} | 0 .../components/Sidebar/{Modal.jsx => Modal.tsx} | 4 ++-- .../Sidebar/{SidebarData.js => SidebarData.tsx} | 2 +- .../Social/{Friend.jsx => Friend.tsx} | 0 .../{FriendRequest.jsx => FriendRequest.tsx} | 0 .../Social/{Social.jsx => Social.tsx} | 4 ++-- containers/react/src/index.js | 4 ++-- .../react/src/pages/{Game.jsx => Game.tsx} | 0 .../react/src/pages/{Home.jsx => Home.tsx} | 4 ++-- .../react/src/pages/{Login42.js => Login42.tsx} | 0 .../src/pages/{Messages.jsx => Messages.tsx} | 2 +- .../react/src/pages/{Social.jsx => Social.tsx} | 0 29 files changed, 33 insertions(+), 43 deletions(-) rename containers/react/src/components/{App.jsx => App.tsx} (78%) rename containers/react/src/components/{Footer.jsx => Footer.tsx} (100%) rename containers/react/src/components/{Header.jsx => Header.tsx} (98%) rename containers/react/src/components/Messages/{Chats.jsx => Chats.tsx} (98%) rename containers/react/src/components/Messages/{Input.jsx => Input.tsx} (100%) rename containers/react/src/components/Messages/{Message.jsx => Message.tsx} (96%) rename containers/react/src/components/Messages/{MessageMe.jsx => MessageMe.tsx} (100%) rename containers/react/src/components/Messages/{MessageYou.jsx => MessageYou.tsx} (100%) rename containers/react/src/components/Messages/{Modal.jsx => Modal.tsx} (98%) rename containers/react/src/components/Messages/{ModalSetting.jsx => ModalSetting.tsx} (99%) rename containers/react/src/components/Profile/{EditName.jsx => EditName.tsx} (100%) rename containers/react/src/components/Profile/{Logout.jsx => Logout.tsx} (100%) rename containers/react/src/components/Profile/{Win_Loss.jsx => Win_Loss.tsx} (100%) rename containers/react/src/components/Sidebar/{Backdrop.jsx => Backdrop.tsx} (100%) rename containers/react/src/components/Sidebar/{Modal.jsx => Modal.tsx} (94%) rename containers/react/src/components/Sidebar/{SidebarData.js => SidebarData.tsx} (96%) rename containers/react/src/components/Social/{Friend.jsx => Friend.tsx} (100%) rename containers/react/src/components/Social/{FriendRequest.jsx => FriendRequest.tsx} (100%) rename containers/react/src/components/Social/{Social.jsx => Social.tsx} (96%) rename containers/react/src/pages/{Game.jsx => Game.tsx} (100%) rename containers/react/src/pages/{Home.jsx => Home.tsx} (97%) rename containers/react/src/pages/{Login42.js => Login42.tsx} (100%) rename containers/react/src/pages/{Messages.jsx => Messages.tsx} (94%) rename containers/react/src/pages/{Social.jsx => Social.tsx} (100%) diff --git a/containers/react/package-lock.json b/containers/react/package-lock.json index 6d4d5b38..a0474a11 100644 --- a/containers/react/package-lock.json +++ b/containers/react/package-lock.json @@ -6141,7 +6141,6 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -7512,8 +7511,7 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -8843,7 +8841,6 @@ "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.12.8.tgz", "integrity": "sha512-ylobYq3tGFjjAmRdBs5pL/R1+4AmOm69g/JbF5DcNETfRe8L9CjaX4acG83MjYdIsbsTGJmtR5qKx4glNmXO4A==", "dependencies": { - "@emotion/is-prop-valid": "^0.8.2", "tslib": "^2.4.0" }, "optionalDependencies": { @@ -10719,7 +10716,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", "graceful-fs": "^4.2.9", "jest-regex-util": "^27.5.1", "jest-serializer": "^27.5.1", @@ -12276,7 +12272,6 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { - "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -13776,7 +13771,6 @@ "inBundle": true, "license": "MIT", "dependencies": { - "@colors/colors": "1.5.0", "string-width": "^4.2.0" }, "engines": { @@ -14313,8 +14307,7 @@ "inBundle": true, "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/cliui": "^8.0.2", - "@pkgjs/parseargs": "^0.11.0" + "@isaacs/cliui": "^8.0.2" }, "engines": { "node": ">=14" @@ -14600,7 +14593,6 @@ "inBundle": true, "license": "MIT", "dependencies": { - "encoding": "^0.1.13", "minipass": "^5.0.0", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" @@ -14980,7 +14972,6 @@ "inBundle": true, "license": "MIT", "dependencies": { - "encoding": "^0.1.13", "minipass": "^3.1.6", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" @@ -18329,7 +18320,6 @@ "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", - "fsevents": "^2.3.2", "html-webpack-plugin": "^5.5.0", "identity-obj-proxy": "^3.0.0", "jest": "^27.4.3", @@ -18766,9 +18756,6 @@ "version": "2.79.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", - "dependencies": { - "fsevents": "~2.3.2" - }, "bin": { "rollup": "dist/bin/rollup" }, diff --git a/containers/react/src/components/Alert/GreenAlert.jsx b/containers/react/src/components/Alert/GreenAlert.jsx index cded387b..ff7ee12d 100644 --- a/containers/react/src/components/Alert/GreenAlert.jsx +++ b/containers/react/src/components/Alert/GreenAlert.jsx @@ -1,4 +1,4 @@ -import Backdrop from "../Sidebar/Backdrop" +import Backdrop from "../Sidebar/Backdrop.tsx" import { motion } from 'framer-motion' import { AiOutlineCheckCircle } from "react-icons/ai"; import '../../styles/Messages.css' diff --git a/containers/react/src/components/Alert/RedAlert.jsx b/containers/react/src/components/Alert/RedAlert.jsx index 3a9104b1..3ead8e8a 100644 --- a/containers/react/src/components/Alert/RedAlert.jsx +++ b/containers/react/src/components/Alert/RedAlert.jsx @@ -1,4 +1,4 @@ -import Backdrop from "../Sidebar/Backdrop" +import Backdrop from "../Sidebar/Backdrop.tsx" import { motion } from 'framer-motion' import { BiErrorCircle } from "react-icons/bi"; import '../../styles/Messages.css' diff --git a/containers/react/src/components/Alert/YellowAlert.jsx b/containers/react/src/components/Alert/YellowAlert.jsx index bbedcdca..0627e676 100644 --- a/containers/react/src/components/Alert/YellowAlert.jsx +++ b/containers/react/src/components/Alert/YellowAlert.jsx @@ -1,4 +1,4 @@ -import Backdrop from "../Sidebar/Backdrop" +import Backdrop from "../Sidebar/Backdrop.tsx" import { motion } from 'framer-motion' import { GrTrophy } from "react-icons/gr"; import '../../styles/Messages.css' diff --git a/containers/react/src/components/App.jsx b/containers/react/src/components/App.tsx similarity index 78% rename from containers/react/src/components/App.jsx rename to containers/react/src/components/App.tsx index 2a0e4389..7e7f99ef 100644 --- a/containers/react/src/components/App.jsx +++ b/containers/react/src/components/App.tsx @@ -2,23 +2,23 @@ import React from "react"; import {Routes, Route} from 'react-router-dom'; import HomeLogin from "../pages/Home.js"; -import Home from "../pages/Home.jsx"; +import Home from "../pages/Home.tsx"; import PlayButton from "./Game/PlayButton.js"; -import Field from "../pages/Field"; -import Login42 from "../pages/Login42.js"; -import Messages from "../pages/Messages.jsx"; +import Field from "../pages/Field.js"; +import Login42 from "../pages/Login42.tsx"; +import Messages from "../pages/Messages.tsx"; import QrCode from '../pages/QrCode.jsx' import { useLocation } from "react-router-dom"; import {AnimatePresence} from "framer-motion"; -import SuccessToken from '../script/tokenSuccess' +import SuccessToken from '../script/tokenSuccess.js' import DoubleAuth from "../pages/2fa.js"; -import Game from "../pages/Game.jsx"; -import Social from "../components/Social/Social.jsx"; -import Logout from "../components/Profile/Logout.jsx"; +import Game from "../pages/Game.tsx"; +import Social from "./Social/Social.tsx"; +import Logout from "./Profile/Logout.tsx"; function AnimatedRoute () { const location = useLocation(); diff --git a/containers/react/src/components/Footer.jsx b/containers/react/src/components/Footer.tsx similarity index 100% rename from containers/react/src/components/Footer.jsx rename to containers/react/src/components/Footer.tsx diff --git a/containers/react/src/components/Header.jsx b/containers/react/src/components/Header.tsx similarity index 98% rename from containers/react/src/components/Header.jsx rename to containers/react/src/components/Header.tsx index 15c06b7d..d8624ad4 100644 --- a/containers/react/src/components/Header.jsx +++ b/containers/react/src/components/Header.tsx @@ -5,7 +5,7 @@ import {Link} from 'react-router-dom'; // import { SidebarData } from './Sidebar/SidebarData'; import DefaultPicture from '../assets/profile.jpg' import { motion, AnimatePresence } from 'framer-motion' -import Modal from './Sidebar/Modal'; +import Modal from './Sidebar/Modal.tsx'; // import {BiLogOutCircle} from 'react-icons/bi'; // import AnimatePresence from import '../styles/Header.css'; diff --git a/containers/react/src/components/Messages/Chats.jsx b/containers/react/src/components/Messages/Chats.tsx similarity index 98% rename from containers/react/src/components/Messages/Chats.jsx rename to containers/react/src/components/Messages/Chats.tsx index b70b604a..61041b3c 100644 --- a/containers/react/src/components/Messages/Chats.jsx +++ b/containers/react/src/components/Messages/Chats.tsx @@ -5,9 +5,9 @@ import styled from "styled-components"; import DefaultPic from '../../assets/profile.jpg' import api from '../../script/axiosApi'; import { motion , AnimatePresence} from "framer-motion"; -import Modal from "./Modal"; +import Modal from "./Modal.tsx"; -import Message from "./Message" +import Message from "./Message.tsx" // import Input from "./Input"; //react icons @@ -21,7 +21,7 @@ import { Rank } from "../../DataBase/DataRank"; import GreenAlert from "../Alert/GreenAlert"; import RedAlert from "../Alert/RedAlert"; import YellowAlert from "../Alert/YellowAlert"; -import ModalSetting from "./ModalSetting"; +import ModalSetting from "./ModalSetting.tsx"; const TouchDiv = styled.div` diff --git a/containers/react/src/components/Messages/Input.jsx b/containers/react/src/components/Messages/Input.tsx similarity index 100% rename from containers/react/src/components/Messages/Input.jsx rename to containers/react/src/components/Messages/Input.tsx diff --git a/containers/react/src/components/Messages/Message.jsx b/containers/react/src/components/Messages/Message.tsx similarity index 96% rename from containers/react/src/components/Messages/Message.jsx rename to containers/react/src/components/Messages/Message.tsx index f333e267..8e99ef90 100644 --- a/containers/react/src/components/Messages/Message.jsx +++ b/containers/react/src/components/Messages/Message.tsx @@ -32,7 +32,10 @@ function MessageMe({message, own}){ const scrollRef = useRef(); useEffect(() => { - scrollRef.current?.scrollIntoView({ behavior: "smooth"}) + if (scrollRef.current) + { + scrollRef.current.scrollIntoView({ behavior: "smooth",}) + } const fetchProfilePicture = async () => { try { // const user = await api.get("/profile"); diff --git a/containers/react/src/components/Messages/MessageMe.jsx b/containers/react/src/components/Messages/MessageMe.tsx similarity index 100% rename from containers/react/src/components/Messages/MessageMe.jsx rename to containers/react/src/components/Messages/MessageMe.tsx diff --git a/containers/react/src/components/Messages/MessageYou.jsx b/containers/react/src/components/Messages/MessageYou.tsx similarity index 100% rename from containers/react/src/components/Messages/MessageYou.jsx rename to containers/react/src/components/Messages/MessageYou.tsx diff --git a/containers/react/src/components/Messages/Modal.jsx b/containers/react/src/components/Messages/Modal.tsx similarity index 98% rename from containers/react/src/components/Messages/Modal.jsx rename to containers/react/src/components/Messages/Modal.tsx index 4dea9b6e..83010b98 100644 --- a/containers/react/src/components/Messages/Modal.jsx +++ b/containers/react/src/components/Messages/Modal.tsx @@ -1,5 +1,5 @@ import { motion } from "framer-motion"; -import Backdrop from "../Sidebar/Backdrop"; +import Backdrop from "../Sidebar/Backdrop.tsx"; import { Rank } from "../../DataBase/DataRank" import '../../styles/Messages.css' import { useState } from "react"; diff --git a/containers/react/src/components/Messages/ModalSetting.jsx b/containers/react/src/components/Messages/ModalSetting.tsx similarity index 99% rename from containers/react/src/components/Messages/ModalSetting.jsx rename to containers/react/src/components/Messages/ModalSetting.tsx index d642cd21..0ea44d24 100644 --- a/containers/react/src/components/Messages/ModalSetting.jsx +++ b/containers/react/src/components/Messages/ModalSetting.tsx @@ -1,5 +1,5 @@ import { motion } from "framer-motion"; -import Backdrop from "../Sidebar/Backdrop"; +import Backdrop from "../Sidebar/Backdrop.tsx"; import { Rank } from "../../DataBase/DataRank" import '../../styles/Messages.css' import { useState } from "react"; diff --git a/containers/react/src/components/Profile/EditName.jsx b/containers/react/src/components/Profile/EditName.tsx similarity index 100% rename from containers/react/src/components/Profile/EditName.jsx rename to containers/react/src/components/Profile/EditName.tsx diff --git a/containers/react/src/components/Profile/Logout.jsx b/containers/react/src/components/Profile/Logout.tsx similarity index 100% rename from containers/react/src/components/Profile/Logout.jsx rename to containers/react/src/components/Profile/Logout.tsx diff --git a/containers/react/src/components/Profile/Win_Loss.jsx b/containers/react/src/components/Profile/Win_Loss.tsx similarity index 100% rename from containers/react/src/components/Profile/Win_Loss.jsx rename to containers/react/src/components/Profile/Win_Loss.tsx diff --git a/containers/react/src/components/Sidebar/Backdrop.jsx b/containers/react/src/components/Sidebar/Backdrop.tsx similarity index 100% rename from containers/react/src/components/Sidebar/Backdrop.jsx rename to containers/react/src/components/Sidebar/Backdrop.tsx diff --git a/containers/react/src/components/Sidebar/Modal.jsx b/containers/react/src/components/Sidebar/Modal.tsx similarity index 94% rename from containers/react/src/components/Sidebar/Modal.jsx rename to containers/react/src/components/Sidebar/Modal.tsx index 0e946cc3..ae9ed8b1 100644 --- a/containers/react/src/components/Sidebar/Modal.jsx +++ b/containers/react/src/components/Sidebar/Modal.tsx @@ -1,6 +1,6 @@ import {motion} from "framer-motion" -import Backdrop from "./Backdrop" -import { SidebarData } from "./SidebarData" +import Backdrop from "./Backdrop.tsx" +import { SidebarData } from "./SidebarData.tsx" import {Link} from 'react-router-dom'; import * as AiIcons from 'react-icons/ai'; diff --git a/containers/react/src/components/Sidebar/SidebarData.js b/containers/react/src/components/Sidebar/SidebarData.tsx similarity index 96% rename from containers/react/src/components/Sidebar/SidebarData.js rename to containers/react/src/components/Sidebar/SidebarData.tsx index afbf3d52..2ac00198 100644 --- a/containers/react/src/components/Sidebar/SidebarData.js +++ b/containers/react/src/components/Sidebar/SidebarData.tsx @@ -10,7 +10,7 @@ export const SidebarData = [ { title: 'Home/Login', path: '/', - icon: , + icon: , cName: 'nav-text' }, { diff --git a/containers/react/src/components/Social/Friend.jsx b/containers/react/src/components/Social/Friend.tsx similarity index 100% rename from containers/react/src/components/Social/Friend.jsx rename to containers/react/src/components/Social/Friend.tsx diff --git a/containers/react/src/components/Social/FriendRequest.jsx b/containers/react/src/components/Social/FriendRequest.tsx similarity index 100% rename from containers/react/src/components/Social/FriendRequest.jsx rename to containers/react/src/components/Social/FriendRequest.tsx diff --git a/containers/react/src/components/Social/Social.jsx b/containers/react/src/components/Social/Social.tsx similarity index 96% rename from containers/react/src/components/Social/Social.jsx rename to containers/react/src/components/Social/Social.tsx index ef09288f..5916b866 100644 --- a/containers/react/src/components/Social/Social.jsx +++ b/containers/react/src/components/Social/Social.tsx @@ -4,8 +4,8 @@ import React, { useState, useEffect, useRef } from "react"; import styled from "styled-components"; -import Friend from './Friend.jsx'; -import FriendRequest from './FriendRequest.jsx'; +import Friend from './Friend.tsx'; +import FriendRequest from './FriendRequest.tsx'; import { ImBlocked } from 'react-icons/im'; import { MdOutlineGroupAdd } from 'react-icons/md'; diff --git a/containers/react/src/index.js b/containers/react/src/index.js index 9d57ed67..9d37d521 100644 --- a/containers/react/src/index.js +++ b/containers/react/src/index.js @@ -3,9 +3,9 @@ import ReactDOM from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; import reportWebVitals from './reportWebVitals'; -import Header from './components/Header'; +import Header from './components/Header.tsx'; import Head from './pages/Head'; -import App from './components/App'; +import App from './components/App.tsx'; import './styles/index.css'; import './styles/App.css' diff --git a/containers/react/src/pages/Game.jsx b/containers/react/src/pages/Game.tsx similarity index 100% rename from containers/react/src/pages/Game.jsx rename to containers/react/src/pages/Game.tsx diff --git a/containers/react/src/pages/Home.jsx b/containers/react/src/pages/Home.tsx similarity index 97% rename from containers/react/src/pages/Home.jsx rename to containers/react/src/pages/Home.tsx index ad99f226..2b2e0169 100644 --- a/containers/react/src/pages/Home.jsx +++ b/containers/react/src/pages/Home.tsx @@ -14,12 +14,12 @@ import '../styles/Profile.css' // import '../styles/App.css' import DefaultPicture from "../assets/profile.jpg"; -import WinLoss from "../components/Profile/Win_Loss"; +import WinLoss from "../components/Profile/Win_Loss.tsx"; import { motion, AnimatePresence } from 'framer-motion' // import { AiFillEdit } from 'react-icons/ai' // import { GrClose } from 'react-icons/gr' import { Link } from "react-router-dom"; -import ModalEdit from "../components/Profile/EditName"; +import ModalEdit from "../components/Profile/EditName.tsx"; import {AiOutlineHistory} from 'react-icons/ai' // import { Link } from "react-router-dom"; // import {UserProfile} from "../DataBase/DataUserProfile"; diff --git a/containers/react/src/pages/Login42.js b/containers/react/src/pages/Login42.tsx similarity index 100% rename from containers/react/src/pages/Login42.js rename to containers/react/src/pages/Login42.tsx diff --git a/containers/react/src/pages/Messages.jsx b/containers/react/src/pages/Messages.tsx similarity index 94% rename from containers/react/src/pages/Messages.jsx rename to containers/react/src/pages/Messages.tsx index 42500997..3130e2ab 100644 --- a/containers/react/src/pages/Messages.jsx +++ b/containers/react/src/pages/Messages.tsx @@ -1,6 +1,6 @@ import React from "react"; // import Sidebar from '../components/Messages/Sidebar' -import Chats from "../components/Messages/Chats" +import Chats from "../components/Messages/Chats.tsx" import '../styles/Messages.css' import { motion } from 'framer-motion' diff --git a/containers/react/src/pages/Social.jsx b/containers/react/src/pages/Social.tsx similarity index 100% rename from containers/react/src/pages/Social.jsx rename to containers/react/src/pages/Social.tsx