Slight re-structure (types)
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useRef, useState } from "react";
|
||||||
import MessageBox from "@/components/MessageBox";
|
import MessageBox from "@/components/MessageBox";
|
||||||
import AppSidebar from "@/components/Sidebar";
|
import AppSidebar from "@/components/Sidebar";
|
||||||
import Message from "@/types/message";
|
import { Message } from "@/types/types";
|
||||||
import useUser, { User } from "@/hooks/get-user";
|
import useUser, { User } from "@/hooks/get-user";
|
||||||
import { NumberMap } from "@/types/typeUtils";
|
import { NumberMap } from "@/types/typeUtils";
|
||||||
import auth, { makeAddress } from "@/lib/auth";
|
import auth, { makeAddress } from "@/lib/auth";
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useRef, useState } from "react";
|
||||||
import MessageBox from "@/components/MessageBox";
|
import MessageBox from "@/components/MessageBox";
|
||||||
import AppSidebar from "@/components/Sidebar";
|
import AppSidebar from "@/components/Sidebar";
|
||||||
import Message from "@/types/message";
|
import { Message } from "@/types/types";
|
||||||
import useUser, { User } from "@/hooks/get-user";
|
import useUser, { User } from "@/hooks/get-user";
|
||||||
import { NumberMap } from "@/types/typeUtils";
|
import { NumberMap } from "@/types/typeUtils";
|
||||||
import auth, { makeAddress } from "@/lib/auth";
|
import auth, { makeAddress } from "@/lib/auth";
|
||||||
|
|||||||
@@ -4,10 +4,9 @@ import { useEffect, useRef, useState } from "react";
|
|||||||
import { useParams } from "next/navigation";
|
import { useParams } from "next/navigation";
|
||||||
import MessageBox from "@/components/MessageBox";
|
import MessageBox from "@/components/MessageBox";
|
||||||
import AppSidebar from "@/components/Sidebar";
|
import AppSidebar from "@/components/Sidebar";
|
||||||
import Message from "@/types/message";
|
import { Message, Server as ServerType } from "@/types/types";
|
||||||
import useUser, { User } from "@/hooks/get-user";
|
import useUser, { User } from "@/hooks/get-user";
|
||||||
import { NumberMap } from "@/types/typeUtils";
|
import { NumberMap } from "@/types/typeUtils";
|
||||||
import ServerType from "@/types/server";
|
|
||||||
import auth, { makeAddress } from "@/lib/auth";
|
import auth, { makeAddress } from "@/lib/auth";
|
||||||
|
|
||||||
export default function Server() {
|
export default function Server() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import Message from "@/types/message";
|
import { Message } from "@/types/types";
|
||||||
import { Button } from "./ui/button";
|
import { Button } from "./ui/button";
|
||||||
import { Input } from "./ui/input";
|
import { Input } from "./ui/input";
|
||||||
import * as emoji from "emoji-picker-react";
|
import * as emoji from "emoji-picker-react";
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
SettingsIcon,
|
SettingsIcon,
|
||||||
Volume2Icon,
|
Volume2Icon,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import Server from "@/types/server";
|
import { Server, Channel } from "@/types/types";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import Cookies from "js-cookie";
|
import Cookies from "js-cookie";
|
||||||
import {
|
import {
|
||||||
@@ -28,7 +28,6 @@ import { Card } from "./ui/card";
|
|||||||
import { Avatar, AvatarFallback, AvatarImage } from "./ui/avatar";
|
import { Avatar, AvatarFallback, AvatarImage } from "./ui/avatar";
|
||||||
import { ScrollArea } from "./ui/scroll-area";
|
import { ScrollArea } from "./ui/scroll-area";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import Channel from "@/types/channel";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { NumberMap } from "@/types/typeUtils";
|
import { NumberMap } from "@/types/typeUtils";
|
||||||
import { User } from "@/hooks/get-user";
|
import { User } from "@/hooks/get-user";
|
||||||
|
|||||||
+1
-2
@@ -1,5 +1,4 @@
|
|||||||
import Message from "@/types/message";
|
import { Message, Server } from "@/types/types";
|
||||||
import Server from "@/types/server";
|
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { Dispatch, RefObject, SetStateAction } from "react";
|
import { Dispatch, RefObject, SetStateAction } from "react";
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
import Channel from "./channel";
|
|
||||||
|
|
||||||
export default interface Server {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
channels: Channel[];
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export default interface Channel {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
kind: "text" | "voice";
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
export default interface Message {
|
|
||||||
id: number;
|
|
||||||
channel_id: string | number;
|
|
||||||
from: number;
|
|
||||||
contents: string;
|
|
||||||
timestamp: number;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
export interface Channel {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
kind: "text" | "voice";
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Message {
|
||||||
|
id: number;
|
||||||
|
channel_id: string | number;
|
||||||
|
from: number;
|
||||||
|
contents: string;
|
||||||
|
timestamp: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Server {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
channels: Channel[];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user