Skip to content

Commit

Permalink
Merge pull request #178 from n4ze3m/next
Browse files Browse the repository at this point in the history
v1.5.1
  • Loading branch information
n4ze3m authored Dec 21, 2023
2 parents b1524e5 + 4d37561 commit f4f2a40
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 13 deletions.
2 changes: 2 additions & 0 deletions app/script/src/widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export function createChatWidget(
let widgetContainerStyle: WidgetContainerStyle = widgetContainer.style;
widgetContainerStyle.boxSizing = "border-box";
widgetContainerStyle.height = "80vh";
widgetContainerStyle.maxWidth = "90vw";
widgetContainerStyle.maxHeight = "90vh";
widgetContainerStyle.position = "fixed";
widgetContainerStyle.display = "none";
widgetContainerStyle.zIndex = "99999999";
Expand Down
2 changes: 1 addition & 1 deletion app/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "app",
"private": true,
"version": "1.5.0",
"version": "1.5.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
8 changes: 4 additions & 4 deletions app/ui/src/components/Bot/Integration/IntegrationGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const IntegrationGrid: React.FC<Props> = ({ data }) => {
{/* GRID */}
<div className="mt-8 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
{data.map((integration) => (
<div className="relative group bg-white p-6 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-500 rounded-lg overflow-hidden border hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer dark:bg-[#0a0a0a] dark:border-[#232222]">
<div className="relative group bg-white p-6 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-500 rounded-lg overflow-hidden border hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer dark:bg-[#0a0a0a] dark:border-[#232222] dark:hover:bg-[#1a1a1a] dark:hover:border-[#232222] hover:bg-gray-50">
<div
onClick={() => {
setSelectedIntegration(integration);
Expand Down Expand Up @@ -124,7 +124,7 @@ export const IntegrationGrid: React.FC<Props> = ({ data }) => {

<Link
to={`/bot/${param.id}/embed`}
className="relative group bg-white p-6 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-500 rounded-lg overflow-hidden border hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer dark:bg-[#0a0a0a] dark:border-[#232222]"
className="relative group bg-white p-6 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-500 rounded-lg overflow-hidden border hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer dark:bg-[#0a0a0a] dark:border-[#232222] dark:hover:bg-[#1a1a1a] dark:hover:border-[#232222] hover:bg-gray-50"
>
<div>
<div className="mb-4">
Expand All @@ -148,10 +148,10 @@ export const IntegrationGrid: React.FC<Props> = ({ data }) => {
</div>
</div>
</Link>

<Link
to={`/bot/${param.id}/integrations/api`}
className="relative group bg-white p-6 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-500 rounded-lg overflow-hidden border hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer dark:bg-[#0a0a0a] dark:border-[#232222]"
className="relative group bg-white p-6 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-500 rounded-lg overflow-hidden border hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer dark:bg-[#0a0a0a] dark:border-[#232222] dark:hover:bg-[#1a1a1a] dark:hover:border-[#232222] hover:bg-gray-50"
>
<div>
<div className="mb-4">
Expand Down
4 changes: 2 additions & 2 deletions app/ui/src/components/Bot/Playground/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ export const PlaygroundgForm = () => {
textarea.style.height = "auto";
}
};

return (
<div className="p-3 md:p-6 md:bg-white md:dark:bg-[#0a0a0a] md:border md:rounded-t-xl border-black/10 dark:border-gray-900/50">
<div className="p-3 md:p-6 md:bg-white dark:bg-[#0a0a0a] border rounded-t-xl border-black/10 dark:border-gray-900/50">
<div className="flex-grow space-y-6 ">
<div className="flex">
<form
Expand Down
4 changes: 2 additions & 2 deletions app/ui/src/components/Bot/Playground/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export const PlaygroundBody = () => {
</div>
) : (
<div>
<div>
<div className="md:ml-[150px]">
<PlaygroundChat />
</div>
<div>
<div className="bottom-0 w-full md:!bg-transparent md:!border-0 fixed border-t bg-white pt-2">
<div className="bottom-0 w-full bg-transparent border-0 fixed pt-2">
<div className="stretch mx-2 flex flex-row gap-3 md:mx-4 lg:mx-auto lg:max-w-2xl xl:max-w-3xl">
<div className="relative flex flex-col h-full flex-1 items-stretch md:flex-col">
<PlaygroundgForm />
Expand Down
4 changes: 2 additions & 2 deletions app/ui/src/components/Dashboard/DashboardGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ export const DashboardGrid = () => {
{data.map((bot: any) => (
<Link
to={`/bot/${bot.id}`}
className="flex rounded-md hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer"
className="flex rounded-md hover:shadow-lg transition-shadow duration-300 ease-in-out cursor-pointer border border-gray-200 bg-white dark:bg-[#0a0a0a] dark:border-[#232222] dark:hover:bg-[#1a1a1a] dark:hover:border-[#232222] hover:bg-gray-50"
key={bot.id}
>
<div className="w-full truncate rounded-md border border-gray-200 bg-white dark:bg-[#0a0a0a] dark:border-[#232222]">
<div className="w-full truncate ">
<div className="flex flex-1 items-center justify-between ">
<div className="flex-1 truncate px-4 py-4">
<h3 className="text-xl font-semibold text-gray-900 hover:text-gray-600 flex-shrink truncate dark:text-gray-200 dark:hover:text-gray-300">
Expand Down
2 changes: 1 addition & 1 deletion app/ui/src/routes/settings/model.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default function SettingsModelRoot() {
<dl className="mt-6 space-y-6 divide-y divide-gray-100 text-sm leading-6 ">
<div className="mt-5 md:col-span-2 md:mt-0">
<Table
pagination={false}
// pagination={false}
dataSource={data.data}
columns={[
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dialoqbase",
"version": "1.5.0",
"version": "1.5.1",
"description": "Create chatbots with ease",
"scripts": {
"ui:dev": "pnpm run --filter ui dev",
Expand Down
9 changes: 9 additions & 0 deletions server/prisma/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ const MODELS: {
local_model: false,
config: "{}",
},
{
model_id: "accounts/fireworks/models/qwen-72b-chat",
name: "Qwen 72b chat (Fireworks)",
model_type: "chat",
stream_available: true,
model_provider: "Fireworks",
local_model: false,
config: "{}",
},
];

const newModels = async () => {
Expand Down

0 comments on commit f4f2a40

Please sign in to comment.