Merge pull request #86 from jmorganca/welcome-screen-improve
welcome screen improvements
This commit is contained in:
hoyyeva
GitHub
commit
c05219aa0d
|
|
@ -11,6 +11,10 @@ body {
|
||||||
-webkit-app-region: drag;
|
-webkit-app-region: drag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.no-drag {
|
||||||
|
-webkit-app-region: no-drag;
|
||||||
|
}
|
||||||
|
|
||||||
.blink {
|
.blink {
|
||||||
-webkit-animation: 1s blink step-end infinite;
|
-webkit-animation: 1s blink step-end infinite;
|
||||||
-moz-animation: 1s blink step-end infinite;
|
-moz-animation: 1s blink step-end infinite;
|
||||||
|
|
|
||||||
147
app/src/app.tsx
147
app/src/app.tsx
|
|
@ -1,6 +1,6 @@
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import copy from 'copy-to-clipboard'
|
import copy from 'copy-to-clipboard'
|
||||||
import { DocumentDuplicateIcon } from '@heroicons/react/24/outline'
|
import { CheckIcon, DocumentDuplicateIcon } from '@heroicons/react/24/outline'
|
||||||
import Store from 'electron-store'
|
import Store from 'electron-store'
|
||||||
import { getCurrentWindow } from '@electron/remote'
|
import { getCurrentWindow } from '@electron/remote'
|
||||||
|
|
||||||
|
|
@ -17,86 +17,95 @@ enum Step {
|
||||||
|
|
||||||
export default function () {
|
export default function () {
|
||||||
const [step, setStep] = useState<Step>(Step.WELCOME)
|
const [step, setStep] = useState<Step>(Step.WELCOME)
|
||||||
|
const [commandCopied, setCommandCopied] = useState<boolean>(false)
|
||||||
|
|
||||||
const command = 'ollama run orca'
|
const command = 'ollama run orca'
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='mx-auto flex min-h-screen w-full flex-col justify-between bg-white px-4 pt-16'>
|
<div className='drag'>
|
||||||
{step === Step.WELCOME && (
|
<div className='mx-auto flex min-h-screen w-full flex-col justify-between bg-white px-4 pt-16'>
|
||||||
<>
|
{step === Step.WELCOME && (
|
||||||
<div className='mx-auto text-center'>
|
<>
|
||||||
<h1 className='mb-6 mt-4 text-2xl tracking-tight text-gray-900'>Welcome to Ollama</h1>
|
<div className='mx-auto text-center'>
|
||||||
<p className='mx-auto w-[65%] text-sm text-gray-400'>
|
<h1 className='mb-6 mt-4 text-2xl tracking-tight text-gray-900'>Welcome to Ollama</h1>
|
||||||
Let's get you up and running with your own large language models.
|
<p className='mx-auto w-[65%] text-sm text-gray-400'>
|
||||||
</p>
|
Let's get you up and running with your own large language models.
|
||||||
<button
|
|
||||||
onClick={() => setStep(Step.CLI)}
|
|
||||||
className='rounded-dm mx-auto my-8 w-[40%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
|
|
||||||
>
|
|
||||||
Next
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className='mx-auto'>
|
|
||||||
<OllamaIcon />
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
{step === Step.CLI && (
|
|
||||||
<>
|
|
||||||
<div className='mx-auto flex flex-col space-y-28 text-center'>
|
|
||||||
<h1 className='mt-4 text-2xl tracking-tight text-gray-900'>Install the command line</h1>
|
|
||||||
<pre className='mx-auto text-4xl text-gray-400'>> ollama</pre>
|
|
||||||
<div className='mx-auto'>
|
|
||||||
<button
|
|
||||||
onClick={async () => {
|
|
||||||
await install()
|
|
||||||
getCurrentWindow().show()
|
|
||||||
getCurrentWindow().focus()
|
|
||||||
setStep(Step.FINISH)
|
|
||||||
}}
|
|
||||||
className='rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
|
|
||||||
>
|
|
||||||
Install
|
|
||||||
</button>
|
|
||||||
<p className='mx-auto my-4 w-[70%] text-xs text-gray-400'>
|
|
||||||
You will be prompted for administrator access
|
|
||||||
</p>
|
</p>
|
||||||
|
<button
|
||||||
|
onClick={() => setStep(Step.CLI)}
|
||||||
|
className='no-drag rounded-dm mx-auto my-8 w-[40%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div className='mx-auto'>
|
||||||
</>
|
<OllamaIcon />
|
||||||
)}
|
</div>
|
||||||
{step === Step.FINISH && (
|
</>
|
||||||
<>
|
)}
|
||||||
<div className='mx-auto flex flex-col space-y-20 text-center'>
|
{step === Step.CLI && (
|
||||||
<h1 className='mt-4 text-2xl tracking-tight text-gray-900'>Run your first model</h1>
|
<>
|
||||||
<div className='flex flex-col'>
|
<div className='mx-auto flex flex-col space-y-28 text-center'>
|
||||||
<div className='group relative flex items-center'>
|
<h1 className='mt-4 text-2xl tracking-tight text-gray-900'>Install the command line</h1>
|
||||||
<pre className='language-none text-2xs w-full rounded-md bg-gray-100 px-4 py-3 text-start leading-normal'>
|
<pre className='mx-auto text-4xl text-gray-400'>> ollama</pre>
|
||||||
{command}
|
<div className='mx-auto'>
|
||||||
</pre>
|
|
||||||
<button
|
<button
|
||||||
className='absolute right-[5px] rounded-md border bg-white/90 px-2 py-2 text-gray-400 opacity-0 backdrop-blur-xl hover:text-gray-600 group-hover:opacity-100'
|
onClick={async () => {
|
||||||
onClick={() => {
|
await install()
|
||||||
copy(command)
|
getCurrentWindow().show()
|
||||||
|
getCurrentWindow().focus()
|
||||||
|
setStep(Step.FINISH)
|
||||||
}}
|
}}
|
||||||
|
className='no-drag rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
|
||||||
>
|
>
|
||||||
<DocumentDuplicateIcon className='h-4 w-4 text-gray-500' />
|
Install
|
||||||
</button>
|
</button>
|
||||||
|
<p className='mx-auto my-4 w-[70%] text-xs text-gray-400'>
|
||||||
|
You will be prompted for administrator access
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<p className='mx-auto my-4 w-[70%] text-xs text-gray-400'>Run this command in your favorite terminal.</p>
|
|
||||||
</div>
|
</div>
|
||||||
<button
|
</>
|
||||||
onClick={() => {
|
)}
|
||||||
store.set('first-time-run', true)
|
{step === Step.FINISH && (
|
||||||
window.close()
|
<>
|
||||||
}}
|
<div className='mx-auto flex flex-col space-y-20 text-center'>
|
||||||
className='rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
|
<h1 className='mt-4 text-2xl tracking-tight text-gray-900'>Run your first model</h1>
|
||||||
>
|
<div className='flex flex-col'>
|
||||||
Finish
|
<div className='group relative flex items-center'>
|
||||||
</button>
|
<pre className='language-none text-2xs w-full rounded-md bg-gray-100 px-4 py-3 text-start leading-normal'>
|
||||||
</div>
|
{command}
|
||||||
</>
|
</pre>
|
||||||
)}
|
<button
|
||||||
|
className={`no-drag absolute right-[5px] px-2 py-2 ${commandCopied ? 'text-gray-900 opacity-100 hover:cursor-auto' : 'text-gray-200 opacity-50 hover:cursor-pointer'} hover:text-gray-900 hover:font-bold group-hover:opacity-100`}
|
||||||
|
onClick={() => {
|
||||||
|
copy(command)
|
||||||
|
setCommandCopied(true)
|
||||||
|
setTimeout(() => setCommandCopied(false), 3000)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{commandCopied ? (
|
||||||
|
<CheckIcon className='h-4 w-4 text-gray-500 font-bold' />
|
||||||
|
) : (
|
||||||
|
<DocumentDuplicateIcon className='h-4 w-4 text-gray-500' />
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p className='mx-auto my-4 w-[70%] text-xs text-gray-400'>Run this command in your favorite terminal.</p>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => {
|
||||||
|
store.set('first-time-run', true)
|
||||||
|
window.close()
|
||||||
|
}}
|
||||||
|
className='no-drag rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
|
||||||
|
>
|
||||||
|
Finish
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue