Merge branch 'main' of http://192.168.1.163:3000/inmake/graff-mate-client
This commit is contained in:
@@ -1 +1,5 @@
|
||||
VITE_API_URL=http://192.168.1.204:3000/
|
||||
<<<<<<< HEAD
|
||||
VITE_API_URL=http://192.168.1.204:3000/
|
||||
=======
|
||||
VITE_API_URL=http://192.168.1.204:3000
|
||||
>>>>>>> b8d191113582cbbfeaea9d0bea544c445a25c2ac
|
||||
|
||||
@@ -15,7 +15,7 @@ function TableSelector({
|
||||
}: TableSelectorProps) {
|
||||
console.log(tables);
|
||||
return (
|
||||
<div className='flex gap-[0.556vw] overflow-x-auto -mx-[1.111vw] pl-[1.111vw] [scrollbar-width:none]'>
|
||||
<div className="flex gap-[0.556vw] overflow-x-auto -mx-[1.111vw] pl-[1.111vw] [scrollbar-width:none]">
|
||||
{tables.map((table) => (
|
||||
<button
|
||||
key={table.id}
|
||||
@@ -29,20 +29,20 @@ function TableSelector({
|
||||
selectedTable?.id === table.id && "bg-[#F6F6F6]"
|
||||
)}
|
||||
>
|
||||
<p className='button-m font-medium'>{table.name}</p>
|
||||
<p className="button-m font-medium">{table.name}</p>
|
||||
{table.status === "offline" ? (
|
||||
<p className='text-[#D6D6D6] font-medium caption-s'>Недоступен</p>
|
||||
<p className="text-[#D6D6D6] font-medium caption-s">Недоступен</p>
|
||||
) : table.sessions &&
|
||||
table.sessions.length > 0 &&
|
||||
table.sessions[0].status !== "ended" ? (
|
||||
<div className='flex gap-[0.139vw] items-center'>
|
||||
<span className='size-[0.883vw] text-[#7B60F3]'>
|
||||
<div className="flex gap-[0.139vw] items-center">
|
||||
<span className="size-[0.883vw] text-[#7B60F3]">
|
||||
<LightningIcon />
|
||||
</span>
|
||||
<p className='caption-s text-[#7B60F3] font-medium'>Идет сеанс</p>
|
||||
<p className="caption-s text-[#7B60F3] font-medium">Идет сеанс</p>
|
||||
</div>
|
||||
) : (
|
||||
<p className='text-[#29AF61] caption-s font-medium'>Свободен</p>
|
||||
<p className="text-[#29AF61] caption-s font-medium">Свободен</p>
|
||||
)}
|
||||
</button>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user