diff --git a/frontend/src/components/Win_Loss.jsx b/frontend/src/components/Win_Loss.jsx index e02070b0..997e1f72 100644 --- a/frontend/src/components/Win_Loss.jsx +++ b/frontend/src/components/Win_Loss.jsx @@ -4,7 +4,7 @@ // import '../DataBase/DataProfileUser.js' import { DBWinLoss } from '../DataBase/DummyDBWinLoss.js'; import '../styles/Win_Loss.css' -// import { UserProfile } from '../DataBase/DataProfileUser.js'; +import { UserProfile } from '../DataBase/DataUserProfile'; // import color from '../../utils/style/color.js'; @@ -55,7 +55,9 @@ function WinLoss() {

  • {item.title}

    -

    you {item.score} {item.openent}

    +
    +

    {UserProfile.UserName}

    {item.score} {item.openent}

    +
    {/*

    {item.openent}

    */}
    • diff --git a/frontend/src/index.js b/frontend/src/index.js index 51ae5e7f..56a48102 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -7,7 +7,7 @@ import './styles/index.css'; import Header from './components/Header'; // import Home from './pages/Home.jsx'; // import Login42 from './pages/Login42'; -import Head from './pages/Head'; +// import Head from './pages/Head'; // import Field from './pages/Field'; // import PlayButton from './pages/PlayButton'; import reportWebVitals from './reportWebVitals'; @@ -19,7 +19,7 @@ import './styles/App.css' const root = ReactDOM.createRoot(document.getElementById('root')); root.render(
    - + {/* */}
    diff --git a/frontend/src/pages/Home.jsx b/frontend/src/pages/Home.jsx index ce6671f0..ed6d4305 100644 --- a/frontend/src/pages/Home.jsx +++ b/frontend/src/pages/Home.jsx @@ -1,13 +1,13 @@ import { React, useState } from "react"; import '../styles/Profile.css' -import '../styles/App.css' +// import '../styles/App.css' import DefaultPicture from "../assets/profile.jpg"; import WinLoss from "../components/Win_Loss"; import { motion, AnimatePresence } from 'framer-motion' import { AiFillEdit } from 'react-icons/ai' import { Link } from "react-router-dom"; import ModalEdit from "../components/EditName"; -// import {AiOutlineHistory} from 'react-icons/ai' +import {AiOutlineHistory} from 'react-icons/ai' // import { Link } from "react-router-dom"; import {UserProfile} from "../DataBase/DataUserProfile"; @@ -38,7 +38,7 @@ function Profile () { function Home () { const [move, setmove ] = useState(false); return ( - @@ -52,10 +52,10 @@ function Home () {
    setmove(!move)}> - Match History + Match History ) diff --git a/frontend/src/styles/Profile.css b/frontend/src/styles/Profile.css index 1423fb6d..77843ff8 100644 --- a/frontend/src/styles/Profile.css +++ b/frontend/src/styles/Profile.css @@ -1,3 +1,10 @@ +.page { + text-align: center; + /* height: 50vh; */ + /* width: 50vh; */ + /* background-color: black; */ +} + .profile { flex-direction: row; color: white; @@ -29,13 +36,18 @@ color: white; background-color: #5843e4; border-radius: 20px; - padding: 16px; - font-size: 30px; + padding: 14px; + font-size: 1.7rem; text-decoration: none; - margin-top: -400px; font-weight: bold; } +.div_history { + flex-direction: row; + align-items: center; + margin-top: -80px; +} + .edit_name { margin-left: 2rem; font-size: 1.7rem; diff --git a/frontend/src/styles/Win_Loss.css b/frontend/src/styles/Win_Loss.css index 4f73e2d5..8fcc93d5 100644 --- a/frontend/src/styles/Win_Loss.css +++ b/frontend/src/styles/Win_Loss.css @@ -39,6 +39,28 @@ margin-bottom: 5px; } +.content2nd { + color: white; + /* font-size: 22px; */ + font-weight: bold; + display: flex; + flex-direction: row; + text-align: justify; + /* margin-bottom: 5px; */ +} + +.me { + text-align: start; +} + +.score { + text-align: center; +} + +.oponent { + align-items: flex-end; +} + div::-webkit-scrollbar { width: 1; } @@ -48,6 +70,6 @@ div::-webkit-scrollbar-track { } div::-webkit-scrollbar-thumb { - background-color: black; - outline: 1px solid black; + background-color: red; + outline: 3px solid black; } \ No newline at end of file