Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
zismaildev committed Mar 15, 2024
1 parent ab5a4b3 commit 486882b
Show file tree
Hide file tree
Showing 19 changed files with 170 additions and 88 deletions.
Binary file modified Client/public/favicon.ico
Binary file not shown.
Binary file removed Client/src/assets/6057272.jpg
Binary file not shown.
Binary file removed Client/src/assets/bgweb.jpg
Binary file not shown.
Binary file removed Client/src/assets/bgweb.png
Binary file not shown.
Binary file added Client/src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
5 changes: 3 additions & 2 deletions Client/src/components/navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ export const Navbar = () => {
<p className="font-bold text-inherit">CMRU E Sport</p>
</NextLink>
</NavbarBrand>
<ul className="ml-2 hidden justify-start gap-4 lg:flex">

<NavbarContent className="ml-2 hidden justify-start gap-4 sm:flex">
{siteConfig.navItems.map((item) => (
<NavbarItem key={item.href}>
<NextLink
Expand All @@ -44,7 +45,7 @@ export const Navbar = () => {
</NextLink>
</NavbarItem>
))}
</ul>
</NavbarContent>
</NavbarContent>

<NavbarContent
Expand Down
9 changes: 4 additions & 5 deletions Client/src/components/navbar.profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export const NavbarProfile = () => {
>
<DropdownItem
className="h-14 gap-2"
href="/contents/profile"
key="profile"
>
<p className="font-semibold">ลงชื่อเข้าใช้เป็น</p>
Expand All @@ -84,14 +83,14 @@ export const NavbarProfile = () => {
</p>
</DropdownItem>
{session &&
(session.user.role === "admin" ||
session.user.role === "developer") ? (
(session.user.role === "admin" ||
session.user.role === "developer") ? (
<DropdownItem>
<Link href="/admin/dashboard">เมนูแอดมิน</Link>
</DropdownItem>
) : null}
<DropdownItem key="payment">จ่ายเงิน</DropdownItem>
<DropdownItem href="/contents/manageteam">จัดการทีม</DropdownItem>
<DropdownItem href="/contents/profile">โปรไฟล์</DropdownItem>
<DropdownItem href="/contents/seting">ตั้งค่า</DropdownItem>
<DropdownItem className="text-danger" color="danger" key="logout">
ออกจากระบบ
</DropdownItem>
Expand Down
40 changes: 0 additions & 40 deletions Client/src/components/navtour.jsx

This file was deleted.

46 changes: 46 additions & 0 deletions Client/src/components/usage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import React from "react";
import { Tabs, Tab, Card, CardBody } from "@nextui-org/react";

export default function Usage() {
return (
<div className="flex w-full flex-col">
<Tabs aria-label="Options">
<Tab key="all" title="ทั้งหมด">
<Card>
<CardBody>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
</CardBody>
</Card>
</Tab>
<Tab key="coming" title="กำลังจะเปิด">
<Card>
<CardBody>
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
</CardBody>
</Card>
</Tab>
<Tab key="opentoru" title="เปิดรับสมัคร">
<Card>
<CardBody>
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</CardBody>
</Card>
</Tab>
<Tab key="intoru" title="อยู่ระหว่างการแข่งขัน">
<Card>
<CardBody>
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</CardBody>
</Card>
</Tab>
<Tab key="endtoru" title="จบการแข่งขัน">
<Card>
<CardBody>
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</CardBody>
</Card>
</Tab>
</Tabs>
</div>
);
}
4 changes: 2 additions & 2 deletions Client/src/pages/account/login.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { faGoogle } from "@fortawesome/free-brands-svg-icons";
import { faDiscord } from "@fortawesome/free-brands-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Button, Input } from "@nextui-org/react";
import { Button, Input, Image } from "@nextui-org/react";
import { useRouter } from "next/navigation";
import { signIn as NextAuthSignIn } from "next-auth/react";
import React, { useState } from "react";
Expand Down Expand Up @@ -85,7 +85,7 @@ export default function Login() {
>
Google
</Button>
<span style={{ width: "1rem" }}></span> {}
<span style={{ width: "1rem" }}></span> { }
<Button
className="w-full rounded-md bg-[#424549] px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm"
onClick={() => signIn("discord")}
Expand Down
88 changes: 51 additions & 37 deletions Client/src/pages/contents/profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Profile() {
<meta content="width=device-width, initial-scale=1" name="viewport" />
<link href="/logo.ico" rel="icon" />
</Head>
<div className="mx-auto max-w-5xl p-5 text-left sm:px-6 lg:px-8">
<div className="mx-auto max-w-7xl p-5 text-left sm:px-6 lg:px-8">
<h2 className="text-center text-3xl font-bold tracking-tight sm:text-4xl">
Profile
</h2>
Expand All @@ -26,43 +26,57 @@ export default function Profile() {
</h4>
{session ? (
<div>
<div className="mt-5 grid grid-cols-1 gap-4 p-5 sm:grid-cols-1 md:grid-cols-2">
<div>
<Avatar
as="button"
className="w-50 h-50 text-large transition-transform"
isBordered
name="username"
src={session.user.image}
/>
<Card className="p-4 text-center mt-8">
<div className="mt-5 grid grid-cols-1 gap-4 p-5 sm:grid-cols-1 md:grid-cols-2">
<div>
<Avatar
as="button"
className="w-50 h-50 text-large transition-transform"
isBordered
name={session.user.name}
src={session.user.image}
/>
</div>
<div className="mt-3 md:text-right">
<h2 className="text-3xl font-bold tracking-tight sm:text-4xl">
Welcome Back
</h2>
<h4 className="mb-8 text-xl tracking-tight text-gray-600">
{session.user.name}
</h4>
</div>
</div>
<div className="mt-1 md:text-right">
<h2 className="text-3xl font-bold tracking-tight sm:text-4xl">
UserName
</h2>
<h4 className="mb-8 text-xl tracking-tight text-gray-600">
{session.user.name}
</h4>
</div>
</div>
<h2 className="text-3xl font-bold tracking-tight sm:text-4xl">
E-Mail
</h2>
<h4 className="mb-8 text-xl tracking-tight text-gray-600">
{session.user.email}
</h4>
<h2 className="text-3xl font-bold tracking-tight sm:text-4xl">
ทีมของฉัน
</h2>
<h4 className="mb-8 text-xl tracking-tight text-gray-600">
G2 Esport
</h4>
<h2 className="text-3xl font-bold tracking-tight sm:text-4xl">
Role
</h2>
<h4 className="mb-8 text-xl tracking-tight text-gray-600">
{session.user.role}
</h4>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
อีเมล
</h2>
<h4 className="text-left mb-8 text-xl tracking-tight text-gray-600">
{session.user.email}
</h4>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
Bio
</h2>
<h4 className="text-left mb-8 text-xl tracking-tight text-gray-600">
Bio
</h4>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
คณะ
</h2>
<h4 className="text-left mb-8 text-xl tracking-tight text-gray-600">
คณะ
</h4>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
สาขา
</h2>
<h4 className="text-left mb-8 text-xl tracking-tight text-gray-600">
สาขา
</h4>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
ทีมของฉัน
</h2>
<h4 className="text-left mb-8 text-xl tracking-tight text-gray-600">
-
</h4>
</Card>
</div>
) : (
<h2 className="text-center text-3xl font-bold tracking-tight sm:text-4xl">
Expand Down
62 changes: 62 additions & 0 deletions Client/src/pages/contents/seting.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import React from 'react'
import { Card, Input, Button } from "@nextui-org/react";

export default function SetingPage() {
return (
<div className="mx-auto max-w-7xl p-5 text-center sm:px-6 lg:px-8">
<h2 className="text-3xl font-bold tracking-tight sm:text-4xl">
ตั้งค่า
</h2>
<Card className="p-4 text-center mt-8">
<h2 className="mt-10 text-left text-3xl font-bold tracking-tight sm:text-4xl">
โปรไฟล์
</h2>
<h2 className="mt-10 text-left text-2xl font-bold tracking-tight sm:text-1xl">
ชื่อผู้ใช้งาน
</h2>
<Input
isRequired
type="Username"
label="Username"
className="max-w-x5 mt-5 my-3"
/>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
อีเมล
</h2>
<Input
isRequired
type="Email"
label="Email"
className="max-w-x5 mt-5 my-3"
/>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
Bio
</h2>
<Input
type="Bio"
label="Bio"
className="max-w-x5 mt-5 my-3"
/>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
คณะ
</h2>
<Input
type="Faculty"
label="Faculty"
className="max-w-x5 mt-5 my-3"
/>
<h2 className="text-left text-2xl font-bold tracking-tight sm:text-1xl">
สาขา
</h2>
<Input
type="Major"
label="Major"
className="max-w-x5 mt-5 my-3"
/>
<Button color="success">
บันทึก
</Button>
</Card>
</div>
)
}
4 changes: 2 additions & 2 deletions Client/src/pages/contents/tournaments.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import NavTorunaments from "@/components/navtour";
import Head from "next/head";
import React from "react";
import Usage from "@/components/usage";

export default function Tournaments() {
return (
Expand All @@ -15,7 +15,7 @@ export default function Tournaments() {
<h2 className="tracking-tig ht py-5 text-3xl font-bold sm:text-4xl">
รายการแข่งขัน
</h2>
<NavTorunaments />
<Usage />
<br />
<br />
<br />
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.

0 comments on commit 486882b

Please sign in to comment.