Skip to content

Ver 0.2 optimism #42

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

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

Ver 0.2 optimism #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34a93d6
Styles for video report
HabacucMX Mar 23, 2023
2d182d2
vue carousel
HabacucMX Mar 23, 2023
2b6453c
business types update
HabacucMX Mar 25, 2023
afd8008
3d assets update
HabacucMX Mar 31, 2023
7eb8f60
3dAssets change - Riki
Riki0923 Apr 3, 2023
296d4ed
Arbitrum aave changes - Riki
Riki0923 Apr 3, 2023
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
14 changes: 7 additions & 7 deletions assets/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ Input {

.inMatic {
@apply
absolute top-0 font-exo text-2xl
absolute top-0 font-lex text-2xl
}

.top-hud {
@apply
fixed grid items-center top-0 left-1/2 -translate-x-1/2
rounded-b-tf
font-exo
font-lex
text-white
text-sm
md:text-xl lg:text-2xl xl:text-2xl
Expand All @@ -37,7 +37,7 @@ Input {

.bottom-l-hud {
@apply
grid grid-cols-4 font-exo
grid grid-cols-4 font-lex
bg-glass-200 items-center xl:rounded-r-tf
fixed bottom-0 xl:grid-cols-1 xl:left-0 align-middle
w-full xl:w-20 xl:h-[85%] xl:grid-rows-4
Expand Down Expand Up @@ -238,7 +238,7 @@ Input {

.wButton {
@apply
hover:bg-glass-800 rounded-tf text-center font-exo text-xl pb-5
hover:bg-glass-800 rounded-tf text-center font-lex text-xl pb-5
cursor-pointer
}

Expand All @@ -259,23 +259,23 @@ Input {
@apply grid grid-cols-1 xl:grid-rows-4 xl:grid-cols-12
gap-5 xl:p-0
w-full xl:h-[54rem] qhd:h-[75rem] flex
font-exo
font-lex
text-2xl
}

.dBoard {
@apply grid grid-cols-1 3xl:grid-rows-6 2xl:grid-cols-12
gap-5 p-5 xl:p-0 pb-24
w-full xl:h-[54rem] qhd:h-[75rem] flex
font-exo
font-lex
text-2xl
}

.vBoard {
@apply grid grid-cols-1 grid-rows-6
fhd:grid-cols-12 gap-5 p-5 xl:p-0
w-full fhd:h-[54rem] qhd:h-[75rem] flex
font-exo
font-lex
text-2xl
}

Expand Down
2 changes: 1 addition & 1 deletion components/AaveModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-exo">
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-lex">
<div class="h-96 h-96 rounded-tf bg-white/60 m-auto grid items-center p-10 text-center">
<div>
<div class="text-8xl animate-bounce">
Expand Down
2 changes: 1 addition & 1 deletion components/BuyModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-exo">
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-lex">
<div class="h-96 h-96 rounded-tf bg-white/60 m-auto grid items-center p-10 text-center">
<div>
<div class="text-8xl animate-bounce">
Expand Down
65 changes: 65 additions & 0 deletions components/Carousel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<template>
<div class="carousel">
<carousel :per-page="1" :autoplay="false">
<slide v-for="(item, index) in items" :key="index">
<div class="bg-white px-4 py-2 shadow-lg">
<h3 class="font-bold text-lg">
{{ item.caption }}
</h3>
<p class="text-gray-600">
{{ item.description }}
</p>
</div>
</slide>
</carousel>
</div>
</template>

<script>
import { Carousel, Slide } from 'vue-carousel'

export default {
components: {
Carousel,
Slide
},
data () {
return {
items: [
{
caption: 'Slide 1',
description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam tincidunt faucibus enim, sed consectetur tortor feugiat vitae.'
},
{
caption: 'Slide 2',
description: 'Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam.'
},
{
caption: 'Slide 3',
description: 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.'
},
{
caption: 'Slide 4',
description: 'Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
},
{
caption: 'Slide 5',
description: 'Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione.'
}
]
}
}
}
</script>

<style>
.carousel {
.carousel__slide {
opacity: 0.8;
transition: opacity 0.25s ease-in-out;
&.carousel__slide--active {
opacity: 1;
}
}
}
</style>
2 changes: 1 addition & 1 deletion components/ItemModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-exo">
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-lex">
<div class="h-96 h-96 rounded-tf bg-white/60 m-auto grid items-center p-10 text-center">
<div>
<div class="text-8xl animate-bounce">
Expand Down
2 changes: 1 addition & 1 deletion components/MintModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-exo">
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-lex">
<div class="h-96 h-96 rounded-tf bg-white/60 m-auto grid items-center p-10 text-center">
<div>
<div class="text-8xl animate-bounce">
Expand Down
2 changes: 1 addition & 1 deletion components/OverlayLoader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="z-50 fixed top-0 bg-black/60 left-0 w-full h-full place-content-center backdrop-blur-md"
:class="{'flex justify-center items-center': loading, 'hidden': !loading}"
>
<div class="grid items-center text-center mx-auto font-exo gap-3">
<div class="grid items-center text-center mx-auto font-lex gap-3">
<div class="mx-auto animate-spin border-8 border-t-deco-200 border-deco-100 ease-linear rounded-full h-24 w-24" />
<div class="text-2xl text-white text-center text-solar-100 animate-pulse grid items-center">
Loading...
Expand Down
2 changes: 1 addition & 1 deletion components/VoteModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-exo">
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-lex">
<div class="h-96 h-96 rounded-tf bg-white/60 m-auto grid items-center p-10 text-center">
<div>
<div class="text-8xl animate-bounce">
Expand Down
2 changes: 1 addition & 1 deletion components/WithdrawModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-exo">
<div class="modal-overlay items-center bg-black/60 backdrop-blur-md font-lex">
<div class="h-96 h-96 rounded-tf bg-white/60 m-auto grid items-center p-10 text-center">
<div>
<div class="text-8xl animate-bounce">
Expand Down
4 changes: 2 additions & 2 deletions contracts/vault/aaveDeposit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default async function (address, buyerAddress, amount) {
type: 'erc20',
amount: Moralis.Units.ETH(amount),
receiver: address,
contractAddress: '0xF14f9596430931E177469715c591513308244e8F'
contractAddress: '0xf556C102F47d806E21E8E78438E58ac06A14A29E'
}

const options = {
Expand All @@ -19,7 +19,7 @@ export default async function (address, buyerAddress, amount) {
type: 'erc20',
_address: buyerAddress,
_amount: Moralis.Units.ETH(amount),
contractAddress: '0xF14f9596430931E177469715c591513308244e8F'
contractAddress: '0xf556C102F47d806E21E8E78438E58ac06A14A29E'
}
}

Expand Down
4 changes: 2 additions & 2 deletions contracts/vault/aaveWithdraw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default async function (address, amount) {
type: 'erc20',
amount: Moralis.Units.ETH(amount),
receiver: address,
contractAddress: '0xADD98B0342e4094Ec32f3b67Ccfd3242C876ff7a'
contractAddress: '0x951ce0CFd38b4ADd03272C458Cc2973D77E2C000'
}

const options = {
Expand All @@ -18,7 +18,7 @@ export default async function (address, amount) {
params: {
type: 'erc20',
_amount: Moralis.Units.ETH(amount),
contractAddress: '0xADD98B0342e4094Ec32f3b67Ccfd3242C876ff7a'
contractAddress: '0x951ce0CFd38b4ADd03272C458Cc2973D77E2C000'
// gasLimit: 100000000,
// gasPrice: 30000000
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/vault/directAaveSupply.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default async function (address, amount) {
type: 'erc20',
amount: Moralis.Units.ETH(amount),
receiver: address,
contractAddress: '0xBa8DCeD3512925e52FE67b1b5329187589072A55'
contractAddress: '0xf556C102F47d806E21E8E78438E58ac06A14A29E'
}

const options = {
Expand All @@ -18,7 +18,7 @@ export default async function (address, amount) {
params: {
type: 'erc20',
_amount: Moralis.Units.ETH(amount),
contractAddress: '0xBa8DCeD3512925e52FE67b1b5329187589072A55'
contractAddress: '0xf556C102F47d806E21E8E78438E58ac06A14A29E'
}
}

Expand Down
4 changes: 2 additions & 2 deletions layouts/default.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="relative py-10 bg-gradient-to-t from-deco-700 to-deco-700 h-screen overflow-y-auto">
<div class="relative py-10 bg-gradient-to-b from-deco-900 to-deco-800 h-screen overflow-y-auto">
<nav class="top-hud">
<div class="hud1">
<div v-if="!connectedAddress" class="object-fill px-10" @click="showConnectWalletModal = true">
Expand Down Expand Up @@ -57,7 +57,7 @@
</div>
</div>
<div class="text-center mt-10">
<button class="myVaultBT py-3 px-5 text-2xl font-exo" @click="showConnectWalletModal = false">
<button class="myVaultBT py-3 px-5 text-2xl font-lex" @click="showConnectWalletModal = false">
Cancel
</button>
</div>
Expand Down
33 changes: 33 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"nft.storage": "^6.2.0",
"nuxt": "^2.15.7",
"tw-elements": "^1.0.0-alpha12",
"vue-carousel": "^0.18.0",
"vue2-google-maps": "^0.10.7",
"web3": "^1.7.3"
},
Expand Down
4 changes: 2 additions & 2 deletions pages/dashboard/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{{ business.googleAddress }}
</div>
<div class="col-span-2 row-span-2 text-lg">
<img src="../../static/3dAssets/products-1.png" class="max-h-80" alt="">
<img src="../../static/3dAssets/1-store.png" class="max-h-80" alt="">
<!-- >>>>>>> Stashed changes -->
</div>
<!-- <div class="selDecoBG bg-glass-500">
Expand Down Expand Up @@ -109,7 +109,7 @@
<div class="grid md:grid-cols-4 lg:grid-cols-6 grid-cols-2 px-10 gap-5">
<div class="PlaceBG">
<div class="">
<img class="xl:h-32 qhd:h-43 h-32 mx-auto" src="/product.png">
<img class="xl:h-32 qhd:h-43 h-32 mx-auto" src="/1-store.png">
</div>
<div class="bg-night-100 rounded-b-tf grid grid-cols-3 text-center text-base py-2">
<div class="col-span-2">
Expand Down
Loading