signal-works/ice
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts between feature/css-optimization and main

Browse source 
- Resolved conflicts in admin.html to keep CSS optimization changes
- Regenerated package-lock.json after merge
- All features from both branches are now integrated
This commit is contained in:
Deco Vander 2025-07-04 14:28:50 -04:00
commit 9628da957b
18 changed files with 5638 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

58
public/admin.html
View file

@ -91,20 +91,40 @@
</div>
<!-- Profanity Filter Tab -->
<div id="profanity-tab" class="tab-content profanity-management">
<div class="management-section">
<h4>🔒 Custom Profanity Words</h4>
<form id="add-profanity-form" class="profanity-form">
<input type="text" id="new-word" placeholder="Enter word to filter" required>
<select id="new-severity">
<option value="low">Low</option>
<option value="medium" selected>Medium</option>
<option value="high">High</option>
</select>
<input type="text" id="new-category" placeholder="Category" value="custom">
<button type="submit">Add Word</button>
</form>
<div id="profanity-tab" class="tab-content">
<div class="form-section">
<h3>Custom Profanity Words</h3>
<!-- Add new word form -->
<div class="profanity-add-form">
<h4>Add Custom Word</h4>
<form id="add-profanity-form">
<div class="form-row">
<input type="text" id="new-word" placeholder="Enter word or phrase" required>
<select id="new-severity">
<option value="low">Low Severity</option>
<option value="medium" selected>Medium Severity</option>
<option value="high">High Severity</option>
</select>
<input type="text" id="new-category" placeholder="Category (optional)" value="custom">
<button type="submit">Add Word</button>
</div>
</form>
</div>
<!-- Test profanity filter -->
<div class="profanity-test-form">
<h4>Test Profanity Filter</h4>
<form id="test-profanity-form">
<div class="form-row">
<input type="text" id="test-text" placeholder="Enter text to test" required>
<button type="submit">Test Filter</button>
</div>
<div id="test-results" class="test-results"></div>
</form>
</div>
<!-- Custom words table -->
<table class="locations-table">
<thead>
<tr>
@ -123,15 +143,6 @@
</tbody>
</table>
</div>
<div class="management-section test-section">
<h4>🧪 Test Profanity Filter</h4>
<form id="test-profanity-form" class="test-form">
<textarea id="test-text" placeholder="Enter text to test for profanity..."></textarea>
<button type="submit">Test Text</button>
</form>
<div id="test-results" class="test-results empty">Enter text above to test profanity detection</div>
</div>
</div>
</div>
</div>
@ -144,6 +155,7 @@
</div>
</footer>
<script src="https://iceymi.b-cdn.net/admin.js"></script>
<script src="utils.js"></script>
<script src="admin.js"></script>
</body>
</html>