diff --git a/dist/assets/logo.ico b/dist/assets/logo.ico new file mode 100644 index 00000000..0580a497 Binary files /dev/null and b/dist/assets/logo.ico differ diff --git a/dist/assets/open-ayanova-app.bat b/dist/assets/open-ayanova-app.bat new file mode 100644 index 00000000..d97dc5bf --- /dev/null +++ b/dist/assets/open-ayanova-app.bat @@ -0,0 +1 @@ +start "" "http://localhost:7575/api/v8/" \ No newline at end of file diff --git a/dist/install/windows/x64/lan.iss b/dist/install/windows/x64/lan.iss index 31b8bb8c..d93d70fd 100644 --- a/dist/install/windows/x64/lan.iss +++ b/dist/install/windows/x64/lan.iss @@ -1,6 +1,6 @@ ; LAN install for internal network use only -#define MyAppName "AyaNova" +#define MyAppName "AyaNova server" #define MyAppVersion "8.0.0-beta.1" #define MyAppPublisher "Ground Zero Tech-Works, Inc." #define MyAppURL "https://ayanova.com/" @@ -23,7 +23,7 @@ DisableProgramGroupPage=yes LicenseFile=C:\data\code\raven\dist\assets\license.rtf OutputDir=C:\data\code\raven\dist\install\windows\x64\output OutputBaseFilename=ayanova-lan-setup -SetupIconFile=C:\data\code\raven\graphics\logo.ico +SetupIconFile=C:\data\code\raven\dist\assets\logo.ico Compression=lzma SolidCompression=yes WizardStyle=modern @@ -32,13 +32,16 @@ ArchitecturesAllowed=x64 [Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "StartMenuEntry" ; Description: "Start AyaNova when Windows starts" ; GroupDescription: "Windows Startup"; [Files] Source: "C:\data\code\raven\dist\win-x64\ayanova\framework-dependent\*"; DestDir: "{app}";Flags: ignoreversion recursesubdirs createallsubdirs Source: "C:\data\code\raven\dist\assets\lan-install-config.json"; DestDir: "{app}";DestName: "config.json"; Flags: ignoreversion confirmoverwrite +Source: "C:\data\code\raven\dist\assets\logo.ico"; DestDir: "{app}";DestName: "ayanova-app-logo.ico"; Flags: ignoreversion +Source: "C:\data\code\raven\dist\assets\open-ayanova-app.bat"; DestDir: "{app}";Flags: ignoreversion + [Dirs] Name: "{app}\.local-chromium";Permissions: users-modify;Flags: uninsalwaysuninstall @@ -50,9 +53,12 @@ Name: "{commonappdata}\ayanova\logs";Permissions: users-modify; Type: filesandordirs; Name: "{app}\.local-chromium\*" [Icons] -Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\AyaNova.exe"; -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\AyaNova.exe"; Tasks: desktopicon +Name: "{autoprograms}\AyaNova server\{#MyAppName}"; Filename: "{app}\AyaNova.exe";IconFilename: "{app}\AyaNova.exe"; +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\AyaNova.exe";IconFilename: "{app}\AyaNova.exe"; Name: "{commonstartup}\{#MyAppName}"; Filename: "{app}\AyaNova.exe"; Tasks:StartMenuEntry; +Name: "{autoprograms}\AyaNova server\AyaNova App";Filename: "{app}\open-ayanova-app.bat";IconFilename: "{app}\ayanova-app-logo.ico"; +Name: "{autodesktop}\AyaNova App";Filename: "{app}\open-ayanova-app.bat";IconFilename: "{app}\ayanova-app-logo.ico"; + [Code] procedure CurStepChanged(CurStep: TSetupStep); @@ -61,11 +67,11 @@ var begin if (CurStep=ssInstall) then begin - if MsgBox('AyaNova depends on the "ASP.NET Core Runtime Hosting bundle" 6.0.0 or newer.%nOpen the download web page now?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then + if MsgBox('AyaNova depends on the "ASP.NET Core Runtime Hosting bundle" 6.0.0 or newer.' + #13#10 +'Open the download web page now?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then begin ShellExec('open', 'https://dotnet.microsoft.com/download', '', '', SW_SHOW, ewNoWait, ErrCode); end; - if MsgBox('AyaNova requires a PostgreSQL db server.%nOpen the PostgreSQL installation instructions web page now?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then + if MsgBox('AyaNova requires a PostgreSQL db server.' + #13#10 +'Open the PostgreSQL installation instructions web page now?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then begin ShellExec('open', 'https://www.postgresqltutorial.com/install-postgresql/', '', '', SW_SHOW, ewNoWait, ErrCode); end; diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index b45c98de..4ec479a9 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -675,7 +675,7 @@ namespace AyaNova Console.WriteLine("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); Console.WriteLine("BOOT: COMPLETED - SERVER OPEN"); Console.WriteLine($"AYANOVA_USE_URLS setting: \"{ServerBootConfig.AYANOVA_USE_URLS}\""); - Console.WriteLine("Controlled shutdown: AyaNova -> \"Operations\" -> \"ServerState\" -> \"Shut down server\" from menu"); + Console.WriteLine("Controlled shutdown: AyaNova APP -> \"Operations\" -> \"ServerState\" -> \"Shut down server\" from menu"); Console.WriteLine("Forced shutdown: Ctrl+C keyboard shortcut"); Console.WriteLine("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); diff --git a/server/AyaNova/ayanova.ico b/server/AyaNova/ayanova.ico index 0580a497..46709197 100644 Binary files a/server/AyaNova/ayanova.ico and b/server/AyaNova/ayanova.ico differ