Skip to content

Commit 21d047c

Browse files
gcclinuxgcclinux
committed
BUG tauri git pull and fetch and push multi files
1 parent c422463 commit 21d047c

10 files changed

Lines changed: 678 additions & 286 deletions

File tree

‎build-tauri.bat‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,19 @@ echo Setting up build environment...
44
REM Add Rust to PATH
55
set PATH=%PATH%;%USERPROFILE%\.cargo\bin
66

7-
@REM REM Try to find Visual Studio installation
8-
@REM if exist "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
9-
@REM call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
10-
@REM goto :build
11-
@REM )
7+
if "%1"=="" goto usage
8+
if "%1"=="dev" goto dev
9+
if "%1"=="--dev" goto dev
10+
if "%1"=="build" goto build
11+
if "%1"=="--build" goto build
1212

13-
@REM if exist "C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat" (
14-
@REM call "C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat"
15-
@REM goto :build
16-
@REM )
17-
18-
@REM if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" (
19-
@REM call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
20-
@REM goto :build
21-
@REM )
22-
23-
@REM echo Visual Studio not found. Please install Visual Studio Build Tools.
24-
@REM echo Download from: https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022
25-
@REM pause
26-
@REM exit /b 1
13+
:usage
14+
echo Usage: build-tauri.bat [command]
15+
echo.
16+
echo Commands:
17+
echo build, --build Build the Tauri application
18+
echo dev, --dev Start Tauri development server
19+
goto :eof
2720

2821
:build
2922
@echo off
@@ -33,4 +26,14 @@ set WEBKIT_DISABLE_COMPOSITING_MODE=1
3326
echo Building Tauri application for Windows...
3427
npm run tauri build
3528
endlocal
36-
echo Build finished.
29+
echo Build finished.
30+
goto :eof
31+
32+
:dev
33+
@echo off
34+
setlocal
35+
set WEBKIT_DISABLE_DMABUF_RENDERER=1
36+
set WEBKIT_DISABLE_COMPOSITING_MODE=1
37+
echo Starting Tauri development server...
38+
npm run tauri dev
39+
endlocal

‎src-tauri/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ pub fn run() {
4747
.plugin(tauri_plugin_shell::init())
4848
.plugin(tauri_plugin_fs::init())
4949
.plugin(tauri_plugin_dialog::init())
50-
.plugin(tauri_plugin_dialog::init())
5150
.manage(OAuthManagerState::default())
5251
.invoke_handler(tauri::generate_handler![
5352
greet,

‎src/App.css‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,4 +743,105 @@ html,
743743

744744
.context-menu-item:hover {
745745
background-color: var(--context-menu-hover);
746+
}
747+
748+
/* Modals */
749+
.modal-overlay {
750+
position: fixed;
751+
top: 0;
752+
left: 0;
753+
right: 0;
754+
bottom: 0;
755+
background-color: var(--bg-modal-overlay);
756+
display: flex;
757+
justify-content: center;
758+
align-items: center;
759+
z-index: 10000;
760+
backdrop-filter: blur(4px);
761+
animation: fadeIn 0.2s ease-out;
762+
}
763+
764+
.modal-dialog,
765+
.modal-content {
766+
background-color: var(--bg-modal);
767+
color: var(--color-text-modal);
768+
padding: 28px;
769+
border-radius: 12px;
770+
box-shadow: 0 15px 35px var(--shadow-xl);
771+
max-width: 500px;
772+
width: 90%;
773+
border: 1px solid var(--border-card);
774+
animation: slideIn 0.3s cubic-bezier(0.16, 1, 0.3, 1);
775+
}
776+
777+
.modal-dialog h2,
778+
.modal-content h2 {
779+
margin-top: 0;
780+
margin-bottom: 16px;
781+
font-size: 1.5rem;
782+
color: var(--color-text-primary);
783+
}
784+
785+
.modal-dialog p,
786+
.modal-content p {
787+
line-height: 1.6;
788+
opacity: 0.9;
789+
margin-bottom: 24px;
790+
}
791+
792+
.modal-actions {
793+
display: flex;
794+
justify-content: flex-end;
795+
gap: 12px;
796+
margin-top: 8px;
797+
}
798+
799+
.modal-button {
800+
padding: 10px 22px;
801+
border-radius: 8px;
802+
font-weight: 500;
803+
font-size: 0.95rem;
804+
cursor: pointer;
805+
transition: all 0.2s ease;
806+
border: none;
807+
}
808+
809+
.modal-button.primary,
810+
.modal-button.submit-button {
811+
background: linear-gradient(135deg, var(--btn-mermaid-gradient-start) 0%, var(--btn-mermaid-gradient-end) 100%);
812+
color: white;
813+
}
814+
815+
.modal-button.primary:hover,
816+
.modal-button.submit-button:hover {
817+
background: linear-gradient(135deg, var(--btn-mermaid-hover-gradient-start) 0%, var(--btn-mermaid-hover-gradient-end) 100%);
818+
transform: translateY(-1px);
819+
}
820+
821+
.modal-button.cancel,
822+
.modal-button.cancel-button {
823+
background-color: rgba(255, 255, 255, 0.05);
824+
color: var(--color-text-modal);
825+
border: 1px solid var(--border-secondary);
826+
}
827+
828+
.modal-button.cancel:hover,
829+
.modal-button.cancel-button:hover {
830+
background-color: rgba(255, 255, 255, 0.1);
831+
}
832+
833+
@keyframes fadeIn {
834+
from { opacity: 0; }
835+
to { opacity: 1; }
836+
}
837+
838+
@keyframes slideIn {
839+
from {
840+
opacity: 0;
841+
transform: translateY(20px);
842+
}
843+
to {
844+
opacity: 1;
845+
transform: translateY(0);
846+
}
746847
}

0 commit comments

Comments
 (0)