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

Desktom 105 106 107 nov v2 merge nov 264 #24

Open
wants to merge 2 commits into
base: Desktop_105_106_107_Nov-v2_merge_Nov
Choose a base branch
from
Open

Desktom 105 106 107 nov v2 merge nov 264 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc76a76
set data
mohitnimavatgh Dec 13, 2024
dfa0a3b
when we go in navigation mode assets should be clear
mohitnimavatgh Dec 13, 2024
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
744 changes: 706 additions & 38 deletions dist/Vxg.common.js
View file
Open in desktop

Large diffs are not rendered by default.

754 changes: 711 additions & 43 deletions dist/Vxg.umd.js
View file
Open in desktop

Large diffs are not rendered by default.

754 changes: 711 additions & 43 deletions dist/Vxg.umd.min.js
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 0 additions & 28 deletions src/components/BasicNavStages.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,11 @@
</template>

<script>
<<<<<<< Updated upstream
=======
import axios from 'axios';
>>>>>>> Stashed changes
export default {
name: 'BasicNavStages',
data() {
return {
<<<<<<< Updated upstream
showNav: true,
=======
>>>>>>> Stashed changes
isExpanded: false,
iconSrc: 'nav_in.svg', // Initial icon
publicPath: process.env.BASE_URL || '/',
Expand All @@ -60,9 +53,6 @@ export default {
this.toggleIcon();
},
},
<<<<<<< Updated upstream
methods: {
=======


methods: {
Expand All @@ -73,29 +63,12 @@ export default {



>>>>>>> Stashed changes
toggleIcon() {
this.iconSrc = this.isExpanded ? 'nav_in.svg' : 'nav_out.svg';
},
clearState() {
this.isExpanded = false;
this.iconSrc = 'nav_in.svg';
<<<<<<< Updated upstream
},
toggleshowNav() {
this.showNav = !this.showNav;
},

},
mounted() {
this.$root.$on('clear-nav-stages', this.toggleshowNav);
},
beforeDestroy() {
this.$root.$off('clear-nav-stages', this.toggleshowNav);
},
computed: {
// Your computed properties go here
=======
}
},

Expand All @@ -104,7 +77,6 @@ export default {
},
mounted() {

>>>>>>> Stashed changes
}
};
</script>
Expand Down
6 changes: 3 additions & 3 deletions src/components/BasicSide.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<div v-if="!showSearch2">
<img :src="`${publicPath}Layer_5.svg`" alt="Layer_5" class="Layer_5"
style="position:absolute; z-index:1; margin:10px 0; margin-left:16px"
@click="handleNavigationMode"
@click="handleNavigationClick"

/>

Expand Down Expand Up @@ -502,9 +502,9 @@ export default {
this.search2 = temp;
},

handleNavigationMode(){
handleNavigationClick(){
this.showSearch2 = true
this.$store.dispatch('vxg_trigger_clear');
this.$store.dispatch('vxg_trigger_assets_clear');
},


Expand Down