Merge branch 'gptscript-ai:main' into main

saiyam1814 · web-flow · commit d452dd5d73d6 · 2024-02-14T11:05:50.000+05:30
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,9 @@
 FROM golang:1.22.0-alpine3.19 AS build
-RUN apk add -U --no-cache make git
-COPY / /src/gptscript
+RUN apk add -U --no-cache make git npm
+COPY . /src/gptscript
 WORKDIR /src/gptscript
-RUN make build
+
+RUN make all
 
 FROM alpine AS release
 COPY --from=build /src/gptscript/bin /usr/local/bin/
diff --git a/ui/app.config.ts b/ui/app.config.ts
@@ -1,6 +1,6 @@
 export default defineAppConfig({
   ui: {
-    primary: 'slate',
+    primary: '#63797C',
     gray: 'cool',
 
     card: {
diff --git a/ui/app.vue b/ui/app.vue
@@ -30,7 +30,10 @@ function toggle() {
         <UButton icon="i-heroicons-bars-3" @click="toggle"/>
       </div>
       <div class="flex-initial">
-        <img src="~/assets/logo.svg" class="dark:invert" style="height: 100%; padding: 0.25rem;"/>
+        <img src="~/assets/logo.svg" style="height: 40px; margin: 5px 0 5px 0.5rem;"/>
+      </div>
+      <div class="flex-initial">
+        <img src="~/assets/logotype.svg" class="dark:invert" style="height: 30px; margin: 12px 0 8px 5px;"/>
       </div>
 
       <div class="flex-1"/>
diff --git a/ui/assets/logo.svg b/ui/assets/logo.svg
diff --git a/ui/assets/logotype.svg b/ui/assets/logotype.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 684.48 138.4"><defs><style>.a{fill:#ff7240;}</style></defs><path class="a" d="M-719.81,621.7" transform="translate(0 0)"/><path d="M108.28,51.65v8.14q0,22.59-14.45,36.59t-37.35,14q-24.4,0-40.44-15.89T0,55.72q0-23,15.89-39T55.27.75a55.14,55.14,0,0,1,27,6.7,49.63,49.63,0,0,1,19,17.85L83.43,35.54A28,28,0,0,0,72.06,25a35.35,35.35,0,0,0-16.94-4.07q-15.06,0-24.77,9.87T20.63,55.72q0,14.91,9.87,24.62t26.13,9.72q12,0,19.95-5.35A26.6,26.6,0,0,0,87.35,70H55.42V51.65Z" transform="translate(0 0)"/><path d="M162.35,2.86q15.21,0,25.6,10.24a33.93,33.93,0,0,1,10.39,25.15A33.92,33.92,0,0,1,188,63.4q-10.39,10.25-25.6,10.24H143.82v34.64H123V2.86Zm0,51.36a14.51,14.51,0,0,0,11-4.6,15.87,15.87,0,0,0,4.37-11.37,15.79,15.79,0,0,0-4.37-11.44,14.62,14.62,0,0,0-11-4.52H143.82V54.22Z" transform="translate(0 0)"/><path d="M279.67,2.86V22.74H251.2v85.54H230.42V22.74H202.11V2.86Z" transform="translate(0 0)"/><path d="M324.24,110.39q-15.66,0-26.35-7a37.45,37.45,0,0,1-15.06-19l17.77-10.4q6.18,16.13,24.25,16.12,8.73,0,12.8-3.16a10,10,0,0,0-.91-16.65q-5-3.07-17.77-6.7a110.15,110.15,0,0,1-12-4.21,51.86,51.86,0,0,1-9.79-5.65,23,23,0,0,1-7.45-9,29.3,29.3,0,0,1-2.56-12.65q0-14.31,10.16-22.82T321.84.75A40.75,40.75,0,0,1,344.35,7a42.05,42.05,0,0,1,15.14,17.4L342,34.49q-6.33-13.56-20.18-13.56-6.48,0-10.17,2.94a9.27,9.27,0,0,0-3.69,7.6,9.58,9.58,0,0,0,4.14,8.06q4.14,3.09,15.89,6.7c3.21,1,5.65,1.79,7.3,2.34s3.92,1.41,6.78,2.56a40.24,40.24,0,0,1,6.63,3.24,53.43,53.43,0,0,1,5.34,4.06,21.12,21.12,0,0,1,4.6,5.27,30.18,30.18,0,0,1,2.71,6.55,29.65,29.65,0,0,1,1.13,8.36q0,14.61-10.62,23.2T324.24,110.39Z" transform="translate(0 0)"/><path d="M413.1,110.39q-17,0-28.39-11.45T373.34,70.63q0-16.86,11.37-28.31T413.1,30.87a39.1,39.1,0,0,1,20,5.27,35.11,35.11,0,0,1,13.7,14.16l-16.72,9.79a17,17,0,0,0-6.85-7.38A19.87,19.87,0,0,0,413,50a19.43,19.43,0,0,0-14.46,5.8q-5.73,5.79-5.72,14.83a20,20,0,0,0,5.72,14.68A19.43,19.43,0,0,0,413,91.11a20.7,20.7,0,0,0,10.46-2.63,16.56,16.56,0,0,0,6.85-7.31l16.87,9.64a37.63,37.63,0,0,1-14,14.23A38.59,38.59,0,0,1,413.1,110.39Z" transform="translate(0 0)"/><path d="M477.4,45.93a20.32,20.32,0,0,1,9-10.84,27.33,27.33,0,0,1,13.93-3.62V53.16a22.83,22.83,0,0,0-15.88,3.62q-7,4.66-7,15.51v36H458V33H477.4Z" transform="translate(0 0)"/><path d="M521.22,23.94a11.36,11.36,0,0,1-8.35-3.54,11.4,11.4,0,0,1-3.54-8.35,11.7,11.7,0,0,1,3.54-8.44A11.28,11.28,0,0,1,521.22,0a11.47,11.47,0,0,1,8.51,3.61,11.7,11.7,0,0,1,3.54,8.44,11.4,11.4,0,0,1-3.54,8.35A11.55,11.55,0,0,1,521.22,23.94Zm-9.63,84.34V33H531v75.3Z" transform="translate(0 0)"/><path d="M592.61,30.87q15.21,0,26,11.52t10.77,28.24q0,16.73-10.77,28.24t-26,11.52q-15.81,0-24.4-11v39H548.79V33h19.42v8.89Q576.81,30.88,592.61,30.87ZM574.09,85.92a20.07,20.07,0,0,0,14.91,6,20.34,20.34,0,0,0,15-6q6-6,5.95-15.29T604,55.34a20.33,20.33,0,0,0-15-5.94,20.06,20.06,0,0,0-14.91,5.94q-5.88,6-5.88,15.29T574.09,85.92Z" transform="translate(0 0)"/><path d="M684.48,51.65h-17V83q0,3.92,2,5.72a8.94,8.94,0,0,0,5.72,2,84.88,84.88,0,0,0,9.34-.08v17.62q-20,2.27-28.24-3.76T648,83V51.65h-13.1V33H648V17.77l19.43-5.87V33h17Z" transform="translate(0 0)"/></svg>
diff --git a/ui/pages/index.vue b/ui/pages/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="text-center">
-    <h1 class="text-center">Welcome to GPTScript!</h1>
+    <h1>Welcome to GPTScript!</h1>
+
+    <img src="~/assets/logo.svg" width="300px" style="aspect-ratio: preserve;" class="inline m-5" align="center" />
 
     <h2 class="mt-20"><i class="i-heroicons-arrow-long-left align-middle text-lg"/> Choose a script to get started.</h2>
   </div>
diff --git a/ui/tailwind.config.ts b/ui/tailwind.config.ts
@@ -1,4 +1,4 @@
-import type { Config } from 'tailwindcss'
+import type { Config } from 'tailwindcss/types/config'
 import defaultTheme from 'tailwindcss/defaultTheme'
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Config } from 'tailwindcss'`
	`1`	`+import type { Config } from 'tailwindcss/types/config'`
`2`	`2`	`import defaultTheme from 'tailwindcss/defaultTheme'`
`3`	`3`
`4`	`4`