torbjorn/antigravity-claude-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main into PR #221 to resolve conflicts

Browse Source 
Resolved merge conflicts in public/views/settings.html:
- Fixed HTML entity escaping for quote characters in presetHint text
- Fixed HTML entity escaping for pendingPresetName text
This commit is contained in:
Badri Narayanan S
2026-02-01 16:20:55 +05:30
parent 7985524d49 793b20db59
commit 02f8e2e323
9 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/index.html
View File

@@ -77,8 +77,12 @@
<div class="flex flex-col">
<span class="text-sm font-bold tracking-wide text-white"
x-text="$store.global.t('systemName')">ANTIGRAVITY</span>
<span class="text-[10px] text-gray-500 font-mono tracking-wider"
x-text="$store.global.t('systemDesc')">CLAUDE PROXY SYSTEM</span>
<div class="flex items-center gap-1.5">
<span class="text-[10px] text-gray-500 font-mono tracking-wider"
x-text="$store.global.t('systemDesc')">CLAUDE PROXY SYSTEM</span>
<span class="text-[10px] text-gray-500 font-mono tracking-wider"
x-text="'v' + $store.global.version">v1.0.0</span>
</div>
</div>
</div>
@@ -211,11 +215,15 @@
</nav>
<!-- Footer Info -->
<div class="mt-auto px-6 text-[10px] text-gray-700 font-mono">
<div class="flex justify-between">
<span x-text="'V ' + $store.global.version">V 1.0.0</span>
<div class="mt-auto px-6 text-xs text-gray-400 font-mono">
<div class="flex justify-center">
<a href="https://github.com/badri-s2001/antigravity-claude-proxy" target="_blank" rel="noopener noreferrer"
class="hover:text-neon-purple transition-colors" x-text="$store.global.t('github')">GitHub</a>
class="flex items-center gap-1.5 hover:text-neon-purple transition-colors">
<svg class="w-4 h-4" fill="currentColor" viewBox="0 0 24 24">
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
</svg>
<span x-text="$store.global.t('github')">GitHub</span>
</a>
</div>
</div>
</div>

15
public/js/components/models.js
View File

@@ -6,6 +6,21 @@
window.Components = window.Components || {};
window.Components.models = () => ({
editingModelId: null,
newMapping: '',
isEditing(modelId) {
return this.editingModelId === modelId;
},
startEditing(modelId) {
this.editingModelId = modelId;
},
stopEditing() {
this.editingModelId = null;
},
init() {
// Ensure data is fetched when this tab becomes active (skip initial trigger)
this.$watch('$store.global.activeTab', (val, oldVal) => {

10
public/views/settings.html
View File

@@ -301,10 +301,7 @@
<span x-show="deletingPreset" class="loading loading-spinner loading-xs"></span>
</button>
</div>
<p class="text-[10px] text-gray-600 mt-2"
x-text="$store.global.t('presetHint') || 'Select a preset to load it. Click \" Apply to Claude
CLI\" to save changes.'">Select a preset to load it. Click "Apply to Claude CLI" to save
changes.</p>
<p class="text-[10px] text-gray-600 mt-2" x-text="$store.global.t('presetHint') || 'Select a preset to load it. Click &quot;Apply to Claude CLI&quot; to save changes.'">Select a preset to load it. Click "Apply to Claude CLI" to save changes.</p>
</div>
<!-- Base URL -->
@@ -700,8 +697,7 @@
x-text="$store.global.t('unsavedChangesMessage') || 'Your current configuration doesn\'t match any saved preset.'">Your
current configuration doesn't match any saved preset.</span>
<br><br>
<span class="text-yellow-400/80" x-text="'Load \"' + pendingPresetName + ' \" and lose
current changes?'"></span>
<span class="text-yellow-400/80" x-text="'Load &quot;' + pendingPresetName + '&quot; and lose current changes?'"></span>
</p>
<div class="modal-action">
<button class="btn btn-ghost text-gray-400" @click="cancelLoadPreset()"
@@ -762,7 +758,7 @@
</div>
<!-- Tab 3: Models Configuration -->
<div x-show="activeTab === 'models'" x-data="window.Components.modelManager()"
<div x-show="activeTab === 'models'" x-data="window.Components.models()"
class="space-y-6 max-w-3xl animate-fade-in">
<div class="flex items-center justify-between">