Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(circuit): Added labels for circuit elements in Simulator #405

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(circuit): Added labels for circuit elements in Simulator #405

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ef15d2
feat(circuit): add labels for circuit elements
nickhil-verma Jan 13, 2025
d23d0b6
fix: extra pop up after creating new project #399
nickhil-verma Jan 15, 2025
42aef0f
fix: extra pop up after creating new project #399
nickhil-verma Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/Panels/ElementsPanel/ElementsPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
@mouseleave="tooltipText = 'null'"
>
<img :src="element.imgURL" :alt="element.name" />

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add element name div to search results for consistency

The element names are only shown in the expansion panels but not in the search results. This creates an inconsistent user experience. To align with the PR objective of enhancing clarity, add the same name display structure here.

Add this after the img element:

     <img :src="element.imgURL" :alt="element.name" />
+    <div class="overflow-hidden text-nowrap position-relative">
+        <p class="d-inline-block">{{ element.name }}</p>
+    </div>

Committable suggestion skipped: line range outside the PR's diff.

</div>
</div>
<v-expansion-panels
Expand Down Expand Up @@ -77,6 +78,7 @@
:src="element.imgURL"
:alt="element.name"
/>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add element name div to category search results for consistency

The element names are missing in the category search results as well. This should be consistent with the main panel view.

Add this after the img element:

     <img :src="element.imgURL" :alt="element.name" />
+    <div class="overflow-hidden text-nowrap position-relative">
+        <p class="d-inline-block">{{ element.name }}</p>
+    </div>

Committable suggestion skipped: line range outside the PR's diff.

</div>
</div>
</v-expansion-panel-text>
Expand Down Expand Up @@ -123,6 +125,10 @@
:src="element.imgURL"
:alt="element.name"
/>
<div class="overflow-hidden text-nowrap position-relative">
<p class=" d-inline-block">{{ element.name }}</p>
</div>

</div>
</div>
</v-expansion-panel-text>
Expand Down
58 changes: 31 additions & 27 deletions src/simulator/src/data/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,23 +120,23 @@ function checkToSave() {
* Prompt user to save data if unsaved
* @category data
*/
window.onbeforeunload = async function () {
if (projectSaved || embed) return
// window.onbeforeunload = async function () {
// if (projectSaved || embed) return

if (!checkToSave()) return
// if (!checkToSave()) return

alert(
'You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?'
)
// await confirmSingleOption(
// 'You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?'
// )
const data = await generateSaveData('Untitled')
const stringData = JSON.stringify(data)
localStorage.setItem('recover', stringData)
// eslint-disable-next-line consistent-return
return 'Are u sure u want to leave? Any unsaved changes may not be recoverable'
}
// alert(
// 'You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?'
// )
// // await confirmSingleOption(
// // 'You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?'
// // )
// const data = await generateSaveData('Untitled')
// const stringData = JSON.stringify(data)
// localStorage.setItem('recover', stringData)
// // eslint-disable-next-line consistent-return
// return 'Are u sure u want to leave? Any unsaved changes may not be recoverable'
// }

/**
* Function to clear project
Expand All @@ -155,21 +155,25 @@ export async function clearProject() {
Function used to start a new project while prompting confirmation from the user
*/
export async function newProject(verify: boolean) {
// Check if verification is not required and unsaved changes exist
if (
verify ||
projectSaved ||
!checkToSave() ||
(await confirmOption(
!verify &&
(!projectSaved && checkToSave()) &&
!(await confirmOption(
'What you like to start a new project? Any unsaved changes will be lost.'
))
) {
clearProject()
localStorage.removeItem('recover')
const baseUrl = window.location.origin !== 'null' ? window.location.origin : 'http://localhost:4000';
window.location.assign(`${baseUrl}/simulatorvue/`);

setProjectName(undefined)
projectId = generateId()
showMessage('New Project has been created!')
return // Abort if user does not confirm
}

// Proceed to clear project and create a new one if confirmed or conditions met
await clearProject()
localStorage.removeItem('recover')

const baseUrl = window.location.origin !== 'null' ? window.location.origin : 'http://localhost:4000'
window.location.assign(`${baseUrl}/simulatorvue/`)

setProjectName(undefined)
projectId = generateId()
showMessage('New Project has been created!')
}