diff --git a/.dockerignore b/.dockerignore index ac38bfb2..06fae233 100644 --- a/.dockerignore +++ b/.dockerignore @@ -34,7 +34,7 @@ README.md CONTRIBUTING.md LICENSE -repo-images/ +docs/repo-images/ uploads/ diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index a465c2fb..411e3839 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -299,9 +299,9 @@ jobs: CHECKSUM_ARM64=$(sha256sum "release/termix_linux_arm64_appimage.AppImage" | awk '{print $1}') mkdir -p flatpak-build - cp flatpak/com.karmaa.termix.yml flatpak-build/ - cp flatpak/com.karmaa.termix.desktop flatpak-build/ - cp flatpak/com.karmaa.termix.metainfo.xml flatpak-build/ + cp packaging/flatpak/com.karmaa.termix.yml flatpak-build/ + cp packaging/flatpak/com.karmaa.termix.desktop flatpak-build/ + cp packaging/flatpak/com.karmaa.termix.metainfo.xml flatpak-build/ cp public/icon.svg flatpak-build/com.karmaa.termix.svg convert public/icon.png -resize 256x256 flatpak-build/icon-256.png convert public/icon.png -resize 128x128 flatpak-build/icon-128.png @@ -333,7 +333,7 @@ jobs: - name: Create flatpakref file run: | VERSION="${{ steps.flatpak-version.outputs.version }}" - cp flatpak/com.karmaa.termix.flatpakref release/ + cp packaging/flatpak/com.karmaa.termix.flatpakref release/ sed -i "s|VERSION_PLACEHOLDER|release-${VERSION}-tag|g" release/com.karmaa.termix.flatpakref - name: Upload Flatpak bundle @@ -545,7 +545,7 @@ jobs: CHECKSUM=$(shasum -a 256 "$DMG_PATH" | awk '{print $1}') mkdir -p homebrew-generated - cp Casks/termix.rb homebrew-generated/termix.rb + cp packaging/Casks/termix.rb homebrew-generated/termix.rb sed -i '' "s/VERSION_PLACEHOLDER/$VERSION/g" homebrew-generated/termix.rb sed -i '' "s/CHECKSUM_PLACEHOLDER/$CHECKSUM/g" homebrew-generated/termix.rb @@ -632,7 +632,7 @@ jobs: $DOWNLOAD_URL = "https://github.com/Termix-SSH/Termix/releases/download/release-$VERSION-tag/$MSI_NAME" New-Item -ItemType Directory -Force -Path "choco-build" - Copy-Item -Path "chocolatey\*" -Destination "choco-build" -Recurse -Force + Copy-Item -Path "packaging\chocolatey\*" -Destination "choco-build" -Recurse -Force $installScript = Get-Content "choco-build\tools\chocolateyinstall.ps1" -Raw -Encoding UTF8 $installScript = $installScript -replace 'DOWNLOAD_URL_PLACEHOLDER', $DOWNLOAD_URL @@ -751,10 +751,10 @@ jobs: mkdir -p flatpak-submission - cp flatpak/com.karmaa.termix.yml flatpak-submission/ - cp flatpak/com.karmaa.termix.desktop flatpak-submission/ - cp flatpak/com.karmaa.termix.metainfo.xml flatpak-submission/ - cp flatpak/flathub.json flatpak-submission/ + cp packaging/flatpak/com.karmaa.termix.yml flatpak-submission/ + cp packaging/flatpak/com.karmaa.termix.desktop flatpak-submission/ + cp packaging/flatpak/com.karmaa.termix.metainfo.xml flatpak-submission/ + cp packaging/flatpak/flathub.json flatpak-submission/ cp public/icon.svg flatpak-submission/com.karmaa.termix.svg convert public/icon.png -resize 256x256 flatpak-submission/icon-256.png @@ -880,7 +880,7 @@ jobs: mkdir -p homebrew-submission/Casks/t - cp Casks/termix.rb homebrew-submission/Casks/t/termix.rb + cp packaging/Casks/termix.rb homebrew-submission/Casks/t/termix.rb sed -i '' "s/VERSION_PLACEHOLDER/$VERSION/g" homebrew-submission/Casks/t/termix.rb sed -i '' "s/CHECKSUM_PLACEHOLDER/$CHECKSUM/g" homebrew-submission/Casks/t/termix.rb diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 65479b41..f1a99545 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -389,17 +389,17 @@ jobs: exit 0 fi - sed -i "s|version \".*\"|version \"$VERSION\"|g" Casks/termix.rb - sed -i "s|sha256 \".*\"|sha256 \"$DMG_SHA256\"|g" Casks/termix.rb + sed -i "s|version \".*\"|version \"$VERSION\"|g" packaging/Casks/termix.rb + sed -i "s|sha256 \".*\"|sha256 \"$DMG_SHA256\"|g" packaging/Casks/termix.rb - if git diff --quiet Casks/termix.rb; then + if git diff --quiet packaging/Casks/termix.rb; then echo "Cask already up to date." exit 0 fi git config user.name "LukeGus" git config user.email "bugattiguy527@gmail.com" - git add Casks/termix.rb + git add packaging/Casks/termix.rb git stash git pull --rebase origin main git stash pop diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 6975ffb1..00000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,128 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity -and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -- Demonstrating empathy and kindness toward other people -- Being respectful of differing opinions, viewpoints, and experiences -- Giving and gracefully accepting constructive feedback -- Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -- Focusing on what is best not just for us as individuals, but for the - overall community - -Examples of unacceptable behavior include: - -- The use of sexualized language or imagery, and sexual attention or - advances of any kind -- Trolling, insulting or derogatory comments, and personal or political attacks -- Public or private harassment -- Publishing others' private information, such as a physical or email - address, without their explicit permission -- Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -mail@termix.site. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series -of actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or -permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within -the community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.0, available at -https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. - -Community Impact Guidelines were inspired by [Mozilla's code of conduct -enforcement ladder](https://github.com/mozilla/diversity). - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. diff --git a/README.md b/README.md index 4e75ff40..0cfadcd6 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,19 @@

English · - 中文 · - 日本語 · - 한국어 · - Français · - Deutsch · - Español · - Português · - Русский · - العربية · - हिन्दी · - Türkçe · - Tiếng Việt · - Italiano + 中文 · + 日本語 · + 한국어 · + Français · + Deutsch · + Español · + Português · + Русский · + العربية · + हिन्दी · + Türkçe · + Tiếng Việt · + Italiano

@@ -41,13 +41,13 @@ Termix is free and open source. If you find it useful, consider [donating](https
-Termix Banner +Termix Banner

- Repo of the Day Achievement + Repo of the Day Achievement
Achieved on September 1st, 2025

@@ -307,7 +307,7 @@ Termix is free and open source with no subscriptions or paid plans. If you find
-[![YouTube](./repo-images/YouTube.png)](https://www.youtube.com/@TermixSSH/videos) +[![YouTube](./docs/repo-images/YouTube.png)](https://www.youtube.com/@TermixSSH/videos) Watch update overviews on YouTube @@ -316,36 +316,36 @@ Termix is free and open source with no subscriptions or paid plans. If you find - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
Termix Screenshot 1Termix Screenshot 2Termix Screenshot 1Termix Screenshot 2
Termix Screenshot 3Termix Screenshot 4Termix Screenshot 3Termix Screenshot 4
Termix Screenshot 5Termix Screenshot 6Termix Screenshot 5Termix Screenshot 6
Termix Screenshot 7Termix Screenshot 8Termix Screenshot 7Termix Screenshot 8
Termix Screenshot 9Termix Screenshot 10Termix Screenshot 9Termix Screenshot 10
Termix Screenshot 11Termix Screenshot 12Termix Screenshot 11Termix Screenshot 12
Termix Screenshot 13Termix Screenshot 14Termix Screenshot 13Termix Screenshot 14
Termix Screenshot 15Termix Screenshot 16Termix Screenshot 15Termix Screenshot 16
diff --git a/readme/README-AR.md b/docs/readme/README-AR.md similarity index 100% rename from readme/README-AR.md rename to docs/readme/README-AR.md diff --git a/readme/README-CN.md b/docs/readme/README-CN.md similarity index 100% rename from readme/README-CN.md rename to docs/readme/README-CN.md diff --git a/readme/README-DE.md b/docs/readme/README-DE.md similarity index 100% rename from readme/README-DE.md rename to docs/readme/README-DE.md diff --git a/readme/README-ES.md b/docs/readme/README-ES.md similarity index 100% rename from readme/README-ES.md rename to docs/readme/README-ES.md diff --git a/readme/README-FR.md b/docs/readme/README-FR.md similarity index 100% rename from readme/README-FR.md rename to docs/readme/README-FR.md diff --git a/readme/README-HI.md b/docs/readme/README-HI.md similarity index 100% rename from readme/README-HI.md rename to docs/readme/README-HI.md diff --git a/readme/README-IT.md b/docs/readme/README-IT.md similarity index 100% rename from readme/README-IT.md rename to docs/readme/README-IT.md diff --git a/readme/README-JA.md b/docs/readme/README-JA.md similarity index 100% rename from readme/README-JA.md rename to docs/readme/README-JA.md diff --git a/readme/README-KO.md b/docs/readme/README-KO.md similarity index 100% rename from readme/README-KO.md rename to docs/readme/README-KO.md diff --git a/readme/README-PT.md b/docs/readme/README-PT.md similarity index 100% rename from readme/README-PT.md rename to docs/readme/README-PT.md diff --git a/readme/README-RU.md b/docs/readme/README-RU.md similarity index 100% rename from readme/README-RU.md rename to docs/readme/README-RU.md diff --git a/readme/README-TR.md b/docs/readme/README-TR.md similarity index 100% rename from readme/README-TR.md rename to docs/readme/README-TR.md diff --git a/readme/README-VI.md b/docs/readme/README-VI.md similarity index 100% rename from readme/README-VI.md rename to docs/readme/README-VI.md diff --git a/repo-images/Image 1.png b/docs/repo-images/Image 1.png similarity index 100% rename from repo-images/Image 1.png rename to docs/repo-images/Image 1.png diff --git a/repo-images/Image 10.png b/docs/repo-images/Image 10.png similarity index 100% rename from repo-images/Image 10.png rename to docs/repo-images/Image 10.png diff --git a/repo-images/Image 11.png b/docs/repo-images/Image 11.png similarity index 100% rename from repo-images/Image 11.png rename to docs/repo-images/Image 11.png diff --git a/repo-images/Image 12.png b/docs/repo-images/Image 12.png similarity index 100% rename from repo-images/Image 12.png rename to docs/repo-images/Image 12.png diff --git a/repo-images/Image 13.png b/docs/repo-images/Image 13.png similarity index 100% rename from repo-images/Image 13.png rename to docs/repo-images/Image 13.png diff --git a/repo-images/Image 14.png b/docs/repo-images/Image 14.png similarity index 100% rename from repo-images/Image 14.png rename to docs/repo-images/Image 14.png diff --git a/repo-images/Image 15.png b/docs/repo-images/Image 15.png similarity index 100% rename from repo-images/Image 15.png rename to docs/repo-images/Image 15.png diff --git a/repo-images/Image 16.png b/docs/repo-images/Image 16.png similarity index 100% rename from repo-images/Image 16.png rename to docs/repo-images/Image 16.png diff --git a/repo-images/Image 2.png b/docs/repo-images/Image 2.png similarity index 100% rename from repo-images/Image 2.png rename to docs/repo-images/Image 2.png diff --git a/repo-images/Image 3.png b/docs/repo-images/Image 3.png similarity index 100% rename from repo-images/Image 3.png rename to docs/repo-images/Image 3.png diff --git a/repo-images/Image 4.png b/docs/repo-images/Image 4.png similarity index 100% rename from repo-images/Image 4.png rename to docs/repo-images/Image 4.png diff --git a/repo-images/Image 5.png b/docs/repo-images/Image 5.png similarity index 100% rename from repo-images/Image 5.png rename to docs/repo-images/Image 5.png diff --git a/repo-images/Image 6.png b/docs/repo-images/Image 6.png similarity index 100% rename from repo-images/Image 6.png rename to docs/repo-images/Image 6.png diff --git a/repo-images/Image 7.png b/docs/repo-images/Image 7.png similarity index 100% rename from repo-images/Image 7.png rename to docs/repo-images/Image 7.png diff --git a/repo-images/Image 8.png b/docs/repo-images/Image 8.png similarity index 100% rename from repo-images/Image 8.png rename to docs/repo-images/Image 8.png diff --git a/repo-images/Image 9.png b/docs/repo-images/Image 9.png similarity index 100% rename from repo-images/Image 9.png rename to docs/repo-images/Image 9.png diff --git a/repo-images/Repo of the Day.png b/docs/repo-images/Repo of the Day.png similarity index 100% rename from repo-images/Repo of the Day.png rename to docs/repo-images/Repo of the Day.png diff --git a/repo-images/Termix Header.png b/docs/repo-images/Termix Header.png similarity index 100% rename from repo-images/Termix Header.png rename to docs/repo-images/Termix Header.png diff --git a/repo-images/YouTube.png b/docs/repo-images/YouTube.png similarity index 100% rename from repo-images/YouTube.png rename to docs/repo-images/YouTube.png diff --git a/electron-builder.json b/electron-builder.json index 81106b0b..1386153c 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -117,8 +117,8 @@ "category": "public.app-category.developer-tools", "hardenedRuntime": true, "gatekeeperAssess": false, - "entitlements": "build/entitlements.mac.plist", - "entitlementsInherit": "build/entitlements.mac.inherit.plist", + "entitlements": "packaging/build/entitlements.mac.plist", + "entitlementsInherit": "packaging/build/entitlements.mac.inherit.plist", "type": "distribution", "minimumSystemVersion": "10.15", "mergeASARs": false, @@ -129,12 +129,12 @@ "artifactName": "termix_macos_${arch}_dmg.${ext}", "sign": true }, - "afterPack": "build/after-pack.cjs", - "afterSign": "build/notarize.cjs", + "afterPack": "packaging/build/after-pack.cjs", + "afterSign": "packaging/build/notarize.cjs", "mas": { - "provisioningProfile": "build/Termix_Mac_App_Store.provisionprofile", - "entitlements": "build/entitlements.mas.plist", - "entitlementsInherit": "build/entitlements.mas.inherit.plist", + "provisioningProfile": "packaging/build/Termix_Mac_App_Store.provisionprofile", + "entitlements": "packaging/build/entitlements.mas.plist", + "entitlementsInherit": "packaging/build/entitlements.mas.inherit.plist", "hardenedRuntime": false, "gatekeeperAssess": false, "type": "distribution", diff --git a/Casks/termix.rb b/packaging/Casks/termix.rb similarity index 100% rename from Casks/termix.rb rename to packaging/Casks/termix.rb diff --git a/build/Termix_Mac_App_Store.provisionprofile b/packaging/build/Termix_Mac_App_Store.provisionprofile similarity index 100% rename from build/Termix_Mac_App_Store.provisionprofile rename to packaging/build/Termix_Mac_App_Store.provisionprofile diff --git a/build/after-pack.cjs b/packaging/build/after-pack.cjs similarity index 100% rename from build/after-pack.cjs rename to packaging/build/after-pack.cjs diff --git a/build/entitlements.mac.inherit.plist b/packaging/build/entitlements.mac.inherit.plist similarity index 100% rename from build/entitlements.mac.inherit.plist rename to packaging/build/entitlements.mac.inherit.plist diff --git a/build/entitlements.mac.plist b/packaging/build/entitlements.mac.plist similarity index 100% rename from build/entitlements.mac.plist rename to packaging/build/entitlements.mac.plist diff --git a/build/entitlements.mas.inherit.plist b/packaging/build/entitlements.mas.inherit.plist similarity index 100% rename from build/entitlements.mas.inherit.plist rename to packaging/build/entitlements.mas.inherit.plist diff --git a/build/entitlements.mas.plist b/packaging/build/entitlements.mas.plist similarity index 100% rename from build/entitlements.mas.plist rename to packaging/build/entitlements.mas.plist diff --git a/build/notarize.cjs b/packaging/build/notarize.cjs similarity index 100% rename from build/notarize.cjs rename to packaging/build/notarize.cjs diff --git a/chocolatey/termix-ssh.nuspec b/packaging/chocolatey/termix-ssh.nuspec similarity index 100% rename from chocolatey/termix-ssh.nuspec rename to packaging/chocolatey/termix-ssh.nuspec diff --git a/chocolatey/tools/chocolateyinstall.ps1 b/packaging/chocolatey/tools/chocolateyinstall.ps1 similarity index 100% rename from chocolatey/tools/chocolateyinstall.ps1 rename to packaging/chocolatey/tools/chocolateyinstall.ps1 diff --git a/chocolatey/tools/chocolateyuninstall.ps1 b/packaging/chocolatey/tools/chocolateyuninstall.ps1 similarity index 100% rename from chocolatey/tools/chocolateyuninstall.ps1 rename to packaging/chocolatey/tools/chocolateyuninstall.ps1 diff --git a/flatpak/com.karmaa.termix.desktop b/packaging/flatpak/com.karmaa.termix.desktop similarity index 100% rename from flatpak/com.karmaa.termix.desktop rename to packaging/flatpak/com.karmaa.termix.desktop diff --git a/flatpak/com.karmaa.termix.flatpakref b/packaging/flatpak/com.karmaa.termix.flatpakref similarity index 100% rename from flatpak/com.karmaa.termix.flatpakref rename to packaging/flatpak/com.karmaa.termix.flatpakref diff --git a/flatpak/com.karmaa.termix.metainfo.xml b/packaging/flatpak/com.karmaa.termix.metainfo.xml similarity index 100% rename from flatpak/com.karmaa.termix.metainfo.xml rename to packaging/flatpak/com.karmaa.termix.metainfo.xml diff --git a/flatpak/com.karmaa.termix.yml b/packaging/flatpak/com.karmaa.termix.yml similarity index 100% rename from flatpak/com.karmaa.termix.yml rename to packaging/flatpak/com.karmaa.termix.yml diff --git a/flatpak/flathub.json b/packaging/flatpak/flathub.json similarity index 100% rename from flatpak/flathub.json rename to packaging/flatpak/flathub.json diff --git a/scripts/generate-release-body.cjs b/scripts/generate-release-body.cjs index d213015b..dd502130 100644 --- a/scripts/generate-release-body.cjs +++ b/scripts/generate-release-body.cjs @@ -95,7 +95,7 @@ function main() { const videoId = youtubeId(youtube); const embed = [ ``, - ` YouTube`, + ` YouTube`, ``, ].join("\n"); diff --git a/src/ui/lib/terminal-syntax-highlighter.ts b/src/ui/lib/terminal-syntax-highlighter.ts index 7e6489d7..b576514e 100644 --- a/src/ui/lib/terminal-syntax-highlighter.ts +++ b/src/ui/lib/terminal-syntax-highlighter.ts @@ -378,6 +378,7 @@ function highlightLine( const bare = cr ? line.slice(0, -1) : line; if (!bare.trim()) return line; + if (bare.length > MAX_LINE_LENGTH) return line; if (isShellPromptLine(bare)) return line; const segments = parseAnsiSegments(bare); diff --git a/vitest.setup.ts b/vitest.setup.ts index b2bb5a4b..c030928c 100644 --- a/vitest.setup.ts +++ b/vitest.setup.ts @@ -1,8 +1,5 @@ import { afterEach, vi } from "vitest"; -// jsdom does not implement matchMedia; provide a minimal stub so hooks that -// read media queries (e.g. useIsMobile) can run. Individual tests override -// window.innerWidth / matchMedia as needed. if (typeof window !== "undefined" && !window.matchMedia) { window.matchMedia = vi.fn().mockImplementation((query: string) => ({ matches: false,