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.

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

Upgrade UI #14

Merged
merged 12 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview",
"build-only": "vite build",
"type-check": "vue-tsc --build --force",
"lint": "eslint pretty-metamask --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"lint": "eslint src --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"format": "prettier --write src"
},
"dependencies": {
Expand Down
167 changes: 83 additions & 84 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,58 +1,57 @@
<script setup lang="ts">
import VerticalNavbar from "./components/wallet/verticalNavbar.vue";
import transactions_container from "./components/transaction/transactions_container.vue";
import ERC from "./components/main/ERC/ERC.vue";
import { onMounted, ref, onUnmounted } from "vue";
import passwordPage from "./components/passwordPage.vue";
import HeaderMenu from "./components/wallet/headerMenu.vue"
import chainSwitcher from "./components/chainSwitcher.vue";
import { SwitchChain } from "./multichain";
import { useStore } from "vuex";
import VerticalNavbar from './components/wallet/verticalNavbar.vue'
import transactions_container from './components/transaction/transactions_container.vue'
import ERC from './components/main/ERC/ERC.vue'
import { onMounted, ref, onUnmounted } from 'vue'
import passwordPage from './components/passwordPage.vue'
import HeaderMenu from './components/wallet/headerMenu.vue'
import chainSwitcher from './components/chainSwitcher.vue'
import { useStore } from 'vuex'

const open = ref(false)
const store = useStore()
const open = ref(false)
const store = useStore()

onMounted(() => {
let isOpen: string | null;
if (sessionStorage.getItem('lock-wallet') && store.state.password) {
isOpen = localStorage.getItem('open-wallet')
if (isOpen === 'true') {
open.value = true
}
} else {
isOpen = "false";
open.value = false
onMounted(() => {
let isOpen: string | null
if (sessionStorage.getItem('lock-wallet') && store.state.password) {
isOpen = localStorage.getItem('open-wallet')
if (isOpen === 'true') {
open.value = true
}
// const store = useStore()
// SwitchChain(store)
} else {
isOpen = 'false'
open.value = false
}
// const store = useStore()
// SwitchChain(store)

setInterval(checkOpen, 5000);
setInterval(checkOpen, 5000)

const handleVisibilityChange = () => {
if (document.hidden) {
if (sessionStorage.getItem('lock-wallet') === 'true') {
open.value = false;
localStorage.setItem('open-wallet', 'false');
store.dispatch('clearPassword')
}
const handleVisibilityChange = () => {
if (document.hidden) {
if (sessionStorage.getItem('lock-wallet') === 'true') {
open.value = false
localStorage.setItem('open-wallet', 'false')
store.dispatch('clearPassword')
}
};
}
}

document.addEventListener('visibilitychange', handleVisibilityChange);
document.addEventListener('visibilitychange', handleVisibilityChange)

onUnmounted(() => {
document.removeEventListener('visibilitychange', handleVisibilityChange);
});
onUnmounted(() => {
document.removeEventListener('visibilitychange', handleVisibilityChange)
})
})

function checkOpen() {
const isOpen = localStorage.getItem('open-wallet')
if (isOpen === 'true') {
open.value = true
} else {
open.value = false
}
function checkOpen() {
const isOpen = localStorage.getItem('open-wallet')
if (isOpen === 'true') {
open.value = true
} else {
open.value = false
}
}
</script>

<template>
Expand All @@ -77,51 +76,51 @@
</main>
</div>
<div v-else>
<passwordPage @isOpen="checkOpen()"/>
<passwordPage @isOpen="checkOpen()" />
</div>
</template>

<style scoped>
#container {
height: 100vh;
background-color: rgb(3, 3, 3);
}
header {
height:10vh;
background-color: rgb(25, 25, 25);
color: white;
width: 100vw;
border-bottom: 1px solid rgb(3, 3, 3);
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 5vw;
}
#container {
height: 100vh;
background-color: rgb(3, 3, 3);
}
header {
height: 10vh;
background-color: rgb(25, 25, 25);
color: white;
width: 100vw;
border-bottom: 1px solid rgb(3, 3, 3);
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 5vw;
}

.headerBox {
display: flex;
}
.headerBox {
display: flex;
}

.logo {
font-size: 2.4rem;
}
main {
display: flex;
flex-direction: row;
width: 100vw;
height: 90vh;
}
#info {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
height: 100%;
}
#transactions {
width: 27.91vw;
height: 80vh;
background-color: rgb(25, 25, 25);
border-radius: 20px;
}
.logo {
font-size: 2.4rem;
}
main {
display: flex;
flex-direction: row;
width: 100vw;
height: 90vh;
}
#info {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
height: 100%;
}
#transactions {
width: 27.91vw;
height: 80vh;
background-color: rgb(25, 25, 25);
border-radius: 20px;
}
</style>
9 changes: 4 additions & 5 deletions src/LoadingPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ import VerticalNavbar from '@/components/main/VerticalNavbar.vue'

<template>
<div id="container">
<header>
</header>
<header></header>
<main>
<VerticalNavbar />
<div id="info">
<div id="ERC" >Please connect your wallet</div>
<div id="ERC">Please connect your wallet</div>
<div id="transactions" />
</div>
</main>
Expand All @@ -33,7 +32,7 @@ import VerticalNavbar from '@/components/main/VerticalNavbar.vue'
background-color: rgb(3, 3, 3);
}
header {
height:10vh;
height: 10vh;
background-color: rgb(25, 25, 25);
color: white;
width: 100vw;
Expand All @@ -58,4 +57,4 @@ main {
background-color: rgb(25, 25, 25);
border-radius: 20px;
}
</style>
</style>
Loading
Loading