From c8d61a08b77dbef1f929a93289df81d6156ea3ed Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 19 May 2024 10:11:30 +0200 Subject: [PATCH] Create windows release, improve styling --- README.md | 10 ++++----- g4f/gui/client/static/css/style.css | 35 ++++++++++++++++------------- projects/windows/copy.sh | 2 +- projects/windows/main.py | 9 +++----- projects/windows/main.spec | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 970206f7..65baf7ad 100644 --- a/README.md +++ b/README.md @@ -104,12 +104,10 @@ docker run -p 8080:8080 -p 1337:1337 -p 7900:7900 --shm-size="2g" -v ${PWD}/har_ #### Installation Guide for Windows (.exe) To ensure the seamless operation of our application, please follow the instructions below. These steps are designed to guide you through the installation process on Windows operating systems. -##### Prerequisites -1. **WebView2 Runtime**: Our application requires the *WebView2 Runtime* to be installed on your system. If you do not have it installed, please download and install it from the [Microsoft Developer Website](https://developer.microsoft.com/en-us/microsoft-edge/webview2/). If you already have *WebView2 Runtime* installed but are encountering issues, navigate to *Installed Windows Apps*, select *WebView2*, and opt for the repair option. -##### Installation Steps -2. **Download the Application**: Visit our [latest releases page](https://github.com/xtekky/gpt4free/releases/latest) and download the most recent version of the application, named `g4f.webview.*.exe`. -3. **File Placement**: Once downloaded, transfer the `.exe` file from your downloads folder to a directory of your choice on your system, and then execute it to run the app. -##### Post-Installation Adjustment +### Installation Steps +1. **Download the Application**: Visit our [latest releases page](https://github.com/xtekky/gpt4free/releases/latest) and download the most recent version of the application, named `g4f.exe.zip`. +2. **File Placement**: After downloading, locate the `.zip` file in your Downloads folder. Unpack it to a directory of your choice on your system, then execute the `g4f.exe` file to run the app. +3. **Open GUI**: The app starts a web server with the GUI. Open your favorite browser and navigate to `http://localhost:8080/chat/` to access the application interface. 4. **Firewall Configuration (Hotfix)**: Upon installation, it may be necessary to adjust your Windows Firewall settings to allow the application to operate correctly. To do this, access your Windows Firewall settings and allow the application. By following these steps, you should be able to successfully install and run the application on your Windows system. If you encounter any issues during the installation process, please refer to our Issue Tracker or try to get contact over Discord for assistance. diff --git a/g4f/gui/client/static/css/style.css b/g4f/gui/client/static/css/style.css index c07eb930..200a79d4 100644 --- a/g4f/gui/client/static/css/style.css +++ b/g4f/gui/client/static/css/style.css @@ -61,6 +61,8 @@ --user-input: #ac87bb; --conversations: #c7a2ff; --conversations-hover: #c7a2ff4d; + --scrollbar: var(--colour-3); + --scrollbar-thumb: var(--blur-bg); } :root { @@ -379,7 +381,10 @@ body { z-index: 1000; display: none; cursor: pointer; - filter: grayscale(1) invert(1); +} + +.message .user .fa-xmark { + color: var(--colour-1); } .message .count .fa-clipboard, @@ -389,10 +394,6 @@ body { cursor: pointer; } -.message .user .fa-xmark { - color: var(--colour-1); -} - .message .count .fa-clipboard { color: var(--colour-3); } @@ -697,6 +698,7 @@ select { background: transparent; cursor: pointer; height: 49px; + color: var(--colour-3); } @media only screen and (min-width: 40em) { @@ -1003,6 +1005,16 @@ a:-webkit-any-link { --conversations: #0062cc; --colour-1: #ffffff; --colour-3: #212529; + --scrollbar: var(--colour-1); + --scrollbar-thumb: var(--gradient); +} + +.white .message .assistant .fa-xmark { + color: var(--colour-1); +} + +.white .message .user .fa-xmark { + color: var(--colour-3); } #send-button { @@ -1072,15 +1084,12 @@ a:-webkit-any-link { white-space:nowrap; } -::-webkit-scrollbar { - width: 10px; -} ::-webkit-scrollbar-track { - background: var(--colour-3); + background: var(--scrollbar); } ::-webkit-scrollbar-thumb { - background: var(--blur-bg); - border-radius: 5px; + background: var(--scrollbar-thumb); + border-radius: 2px; } ::-webkit-scrollbar-thumb:hover { background: var(--accent); @@ -1100,10 +1109,6 @@ a:-webkit-any-link { max-height: 200px; } -#message-input::-webkit-scrollbar { - width: 5px; -} - .hidden { display: none; } diff --git a/projects/windows/copy.sh b/projects/windows/copy.sh index 58faadd5..257790ef 100755 --- a/projects/windows/copy.sh +++ b/projects/windows/copy.sh @@ -1,5 +1,5 @@ cp -r * /var/win/shared/ -cp -r windows/* /var/win/shared/ +cp -r projects/windows/* /var/win/shared/ cp setup.py /var/win/shared/ cp README.md /var/win/shared/ #git clone https://github.com/pyinstaller/pyinstaller/ /var/win/shared/pyinstaller \ No newline at end of file diff --git a/projects/windows/main.py b/projects/windows/main.py index 11a3f902..05042715 100644 --- a/projects/windows/main.py +++ b/projects/windows/main.py @@ -8,15 +8,12 @@ ssl.create_default_context = partial( cafile=certifi.where() ) -from g4f.gui.webview import run_webview -from g4f.gui.run import gui_parser +from g4f.gui.run import run_gui_args, gui_parser import g4f.debug g4f.debug.version_check = False -g4f.debug.version = "0.2.8.0" +g4f.debug.version = "0.3.1.7" if __name__ == "__main__": parser = gui_parser() args = parser.parse_args() - if args.debug: - g4f.debug.logging = True - run_webview(args.debug) \ No newline at end of file + run_gui_args(args) \ No newline at end of file diff --git a/projects/windows/main.spec b/projects/windows/main.spec index 35f6d3ac..31cc2bd9 100644 --- a/projects/windows/main.spec +++ b/projects/windows/main.spec @@ -6,7 +6,7 @@ a = Analysis( pathex=[], binaries=[], datas=[], - hiddenimports=['plyer.platforms.linux.filechooser', 'plyer.platforms.win.filechooser'], + hiddenimports=[], hookspath=[], hooksconfig={}, runtime_hooks=[], @@ -42,4 +42,4 @@ coll = COLLECT( upx=True, upx_exclude=[], name='g4f', -) \ No newline at end of file +)