From 15b9aa674d73f44fac181706d5bbcb65e98fa1a7 Mon Sep 17 00:00:00 2001
From: Hichem Fantar <hichemfantar2049@gmail.com>
Date: Fri, 4 Oct 2024 01:48:40 +0100
Subject: [PATCH 1/6] Update index.ts to add toggleAutoStartup function and
 menu item

---
 macapp/src/index.ts | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/macapp/src/index.ts b/macapp/src/index.ts
index a5d04d5f..f05faeea 100644
--- a/macapp/src/index.ts
+++ b/macapp/src/index.ts
@@ -1,5 +1,15 @@
 import { spawn, ChildProcess } from 'child_process'
-import { app, autoUpdater, dialog, Tray, Menu, BrowserWindow, MenuItemConstructorOptions, nativeTheme } from 'electron'
+import {
+  app,
+  autoUpdater,
+  dialog,
+  Tray,
+  Menu,
+  BrowserWindow,
+  MenuItemConstructorOptions,
+  nativeTheme,
+  Notification,
+} from 'electron'
 import Store from 'electron-store'
 import winston from 'winston'
 import 'winston-daily-rotate-file'
@@ -55,6 +65,7 @@ app.on('ready', () => {
   app.focus({ steal: true })
 
   init()
+  updateTray()
 })
 
 function firstRunWindow() {
@@ -104,6 +115,21 @@ function updateTrayIcon() {
   }
 }
 
+function toggleAutoStartup() {
+  const currentSettings = app.getLoginItemSettings()
+  const newOpenAtLogin = !currentSettings.openAtLogin
+
+  app.setLoginItemSettings({ openAtLogin: newOpenAtLogin })
+
+  const notification = new Notification({
+    title: 'Auto Startup',
+    body: `Auto startup is now ${newOpenAtLogin ? 'enabled' : 'disabled'}`,
+  })
+  notification.show()
+
+  updateTray()
+}
+
 function updateTray() {
   const updateItems: MenuItemConstructorOptions[] = [
     { label: 'An update is available', enabled: false },
@@ -114,13 +140,28 @@ function updateTray() {
     { type: 'separator' },
   ]
 
+  const isAutoStartupEnabled = app.getLoginItemSettings().openAtLogin
+  const toggleAutoStartupItem: MenuItemConstructorOptions = {
+    label: isAutoStartupEnabled ? 'Disable Auto Startup' : 'Enable Auto Startup',
+    click: () => {
+      toggleAutoStartup()
+    },
+  }
+
   const menu = Menu.buildFromTemplate([
     ...(updateAvailable ? updateItems : []),
-    { role: 'quit', label: 'Quit Ollama', accelerator: 'Command+Q' },
+    toggleAutoStartupItem,
+    { role: 'about' },
+    { role: 'quit', accelerator: 'Command+Q' },
   ])
 
   if (!tray) {
     tray = new Tray(trayIconPath())
+    // make sure the tray is updated when clicked to avoid stale info
+    // e.g. user disables auto startup in system preferences but tray menu still shows it as enabled
+    tray.on('click', () => {
+      updateTray()
+    })
   }
 
   tray.setToolTip(updateAvailable ? 'An update is available' : 'Ollama')

From 13d7a281d2fd1b08b22e5ed1eaf659d248cb6b7d Mon Sep 17 00:00:00 2001
From: Hichem Fantar <hichemfantar2049@gmail.com>
Date: Fri, 4 Oct 2024 02:24:40 +0100
Subject: [PATCH 2/6] Refactor index.ts to remove unnecessary updateTray()
 function call

---
 macapp/src/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macapp/src/index.ts b/macapp/src/index.ts
index f05faeea..b4b9bf19 100644
--- a/macapp/src/index.ts
+++ b/macapp/src/index.ts
@@ -65,7 +65,6 @@ app.on('ready', () => {
   app.focus({ steal: true })
 
   init()
-  updateTray()
 })
 
 function firstRunWindow() {

From 6bdf21fb5c873f31c2aefcdae8948363bd385288 Mon Sep 17 00:00:00 2001
From: Hichem Fantar <hichemfantar2049@gmail.com>
Date: Fri, 4 Oct 2024 04:02:28 +0100
Subject: [PATCH 3/6] autostart info alert

---
 macapp/src/app.tsx        | 69 +++++++++++++++++++++++----------------
 macapp/src/index.ts       |  4 +--
 macapp/tailwind.config.js |  1 +
 3 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/macapp/src/app.tsx b/macapp/src/app.tsx
index 449fc851..3e70f113 100644
--- a/macapp/src/app.tsx
+++ b/macapp/src/app.tsx
@@ -45,7 +45,7 @@ export default function () {
         )}
         {step === Step.CLI && (
           <>
-            <div className='mx-auto flex flex-col space-y-28 text-center'>
+            <div className='mx-auto flex flex-col gap-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'>&gt; ollama</pre>
               <div className='mx-auto'>
@@ -74,35 +74,48 @@ export default function () {
         )}
         {step === Step.FINISH && (
           <>
-            <div className='mx-auto flex flex-col space-y-20 text-center'>
+            <div className='mx-auto flex flex-col gap-y-16 text-center'>
               <h1 className='mt-4 text-2xl tracking-tight text-gray-900'>Run your first model</h1>
-              <div className='flex flex-col'>
-                <div className='group relative flex items-center'>
-                  <pre className='language-none text-2xs w-full rounded-md bg-gray-100 px-4 py-3 text-start leading-normal'>
-                    {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:font-bold hover:text-gray-900 group-hover:opacity-100`}
-                    onClick={() => {
-                      copy(command)
-                      setCommandCopied(true)
-                      setTimeout(() => setCommandCopied(false), 3000)
-                    }}
-                  >
-                    {commandCopied ? (
-                      <CheckIcon className='h-4 w-4 font-bold text-gray-500' />
-                    ) : (
-                      <DocumentDuplicateIcon className='h-4 w-4 text-gray-500' />
-                    )}
-                  </button>
+              <div>
+                <div className='flex flex-col'>
+                  <div className='group relative flex items-center'>
+                    <pre className='language-none text-2xs w-full rounded-md bg-gray-100 px-4 py-3 text-start leading-normal'>
+                      {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:font-bold hover:text-gray-900 group-hover:opacity-100`}
+                      onClick={() => {
+                        copy(command)
+                        setCommandCopied(true)
+                        setTimeout(() => setCommandCopied(false), 3000)
+                      }}
+                    >
+                      {commandCopied ? (
+                        <CheckIcon className='h-4 w-4 font-bold text-gray-500' />
+                      ) : (
+                        <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>
+                <div
+                  className='rounded-lg bg-blue-50 p-4 text-start text-sm text-blue-800 dark:bg-gray-800 dark:text-blue-400'
+                  role='alert'
+                >
+                  <span className='font-medium'>
+                    {app.getLoginItemSettings().openAtLogin
+                      ? 'Autostart is enabled by default.'
+                      : 'Autostart is disabled by default.'}
+                  </span>
+                  <p>You can modify this setting in the preferences menu.</p>
                 </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={() => {
diff --git a/macapp/src/index.ts b/macapp/src/index.ts
index b4b9bf19..5ca48da0 100644
--- a/macapp/src/index.ts
+++ b/macapp/src/index.ts
@@ -70,11 +70,11 @@ app.on('ready', () => {
 function firstRunWindow() {
   // Create the browser window.
   welcomeWindow = new BrowserWindow({
-    width: 400,
+    width: 440,
     height: 500,
     frame: false,
     fullscreenable: false,
-    resizable: false,
+    resizable: true,
     movable: true,
     show: false,
     webPreferences: {
diff --git a/macapp/tailwind.config.js b/macapp/tailwind.config.js
index 12e08fc6..e1393b0b 100644
--- a/macapp/tailwind.config.js
+++ b/macapp/tailwind.config.js
@@ -1,5 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
+  darkMode: 'class',
   content: ['./src/**/*.{js,ts,jsx,tsx,mdx}'],
   theme: {},
   plugins: [],

From b64ad4e9f3e565c7222072dc76db9f8e40024338 Mon Sep 17 00:00:00 2001
From: Hichem Fantar <hichemfantar2049@gmail.com>
Date: Fri, 4 Oct 2024 11:46:49 +0100
Subject: [PATCH 4/6] undo change

---
 macapp/src/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macapp/src/index.ts b/macapp/src/index.ts
index 5ca48da0..312ce93c 100644
--- a/macapp/src/index.ts
+++ b/macapp/src/index.ts
@@ -150,7 +150,6 @@ function updateTray() {
   const menu = Menu.buildFromTemplate([
     ...(updateAvailable ? updateItems : []),
     toggleAutoStartupItem,
-    { role: 'about' },
     { role: 'quit', accelerator: 'Command+Q' },
   ])
 

From 963f81e1b6855b5a4ab9024b0002e6ec6d18a656 Mon Sep 17 00:00:00 2001
From: Hichem Fantar <hichemfantar2049@gmail.com>
Date: Fri, 4 Oct 2024 11:54:35 +0100
Subject: [PATCH 5/6] Refactor app.tsx to use font-semibold for autostart info
 alert

---
 macapp/src/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macapp/src/app.tsx b/macapp/src/app.tsx
index 3e70f113..58f4d528 100644
--- a/macapp/src/app.tsx
+++ b/macapp/src/app.tsx
@@ -109,7 +109,7 @@ export default function () {
                   className='rounded-lg bg-blue-50 p-4 text-start text-sm text-blue-800 dark:bg-gray-800 dark:text-blue-400'
                   role='alert'
                 >
-                  <span className='font-medium'>
+                  <span className='font-semibold'>
                     {app.getLoginItemSettings().openAtLogin
                       ? 'Autostart is enabled by default.'
                       : 'Autostart is disabled by default.'}

From 34d27d17af46e346eb5e2d0d0181e794bb99ea24 Mon Sep 17 00:00:00 2001
From: Hichem Fantar <fantar.hichem@gmail.com>
Date: Sun, 20 Oct 2024 00:08:41 +0100
Subject: [PATCH 6/6] Update index.ts

---
 macapp/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macapp/src/index.ts b/macapp/src/index.ts
index 312ce93c..dfa70857 100644
--- a/macapp/src/index.ts
+++ b/macapp/src/index.ts
@@ -121,7 +121,7 @@ function toggleAutoStartup() {
   app.setLoginItemSettings({ openAtLogin: newOpenAtLogin })
 
   const notification = new Notification({
-    title: 'Auto Startup',
+    title: 'Ollama Auto Startup',
     body: `Auto startup is now ${newOpenAtLogin ? 'enabled' : 'disabled'}`,
   })
   notification.show()