fix(web): remove leftover merge conflict markers in index.html - #118
Merged
Merged
Conversation
PR #117 left two unresolved conflict markers (=======) in data/web/index.html: - An unclosed settingsMenu div with a marker after it, breaking the DOM - A second marker inside the Sensors tab content These caused the browser to fail rendering any tab content — only the bottom navigation was visible. Remove the dead settingsMenu block (no JS toggle exists for it) and both conflict markers.
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
Contributor
Native Test Coverage
Report from native unit tests (ASan + gcov). |
switchTab() already closes the moreMenu at the end of the function. The extra toggleMoreMenu() calls in onclick handlers re-opened it immediately after the tab switch, forcing users to manually close the bottom sheet to see the selected view.
Contributor
Native Test Coverage
Report from native unit tests (ASan + gcov). |
…in password - Backend: verify current password via SHA-256 hash before allowing change - Backend: reject if new password and confirmation do not match - Frontend: add 'Current Password' and 'Confirm New Password' input fields - Frontend: validate all fields client-side before sending - Returns 403 if current password is wrong, 400 if mismatch or too short
Contributor
Native Test Coverage
Report from native unit tests (ASan + gcov). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
PR #117 left two unresolved conflict markers (
=======) indata/web/index.html. This caused the browser to fail rendering any tab content — only the bottom navigation bar was visible.settingsMenudiv with a=======marker after it, breaking the DOM=======marker inside the Sensors tab contentFix
settingsMenudiv (dead code — no JS toggle function exists for it)=======conflict markersVerification
grep -r '=======' data/web/returns no results