Skip to content

Open source personal finance application

update login page

ilkome5e1914207802
diff --git a/assets/stylus/variables/colors-dark.styl b/assets/stylus/variables/colors-dark.styl
index b4ea83c4..6ee98c7d 100644
--- a/assets/stylus/variables/colors-dark.styl
+++ b/assets/stylus/variables/colors-dark.styl
@@ -9,6 +9,8 @@ html.dark-mode
--c-red-3 rgba(69, 23, 25, 1)
--c-blue-1 #3a7dff
--c-blue-2 rgba(40, 60, 120, .8)
+ --c-blue-3 #2c74ff
+ --c-blue-4 #2156bb
--c-incomes-1 rgba(44, 173, 34, 1)
--c-expenses-1 rgba(249, 33, 52, 1)
// --c-expenses-1 rgb(244, 60, 117)
@@ -38,3 +40,7 @@ html.dark-mode
--c-font-base var(--c-font-1)
+
+ --color-bg-canvas #06090f
+ --color-text-link #58a6ff
+ --color-link-bg #1c1f24
diff --git a/assets/stylus/variables/colors-light.styl b/assets/stylus/variables/colors-light.styl
index e422dc19..ffb855a0 100644
--- a/assets/stylus/variables/colors-light.styl
+++ b/assets/stylus/variables/colors-light.styl
@@ -9,6 +9,8 @@ html
--c-red-3 rgba(255, 200, 200, 1)
--c-blue-1 #3a7dff
--c-blue-2 rgba(40, 60, 120, .8)
+ --c-blue-3 #2c74ff
+ --c-blue-4 #2156bb
--c-incomes-1 rgba(44, 173, 34, 1)
--c-expenses-1 rgba(249, 33, 52, 1)
@@ -40,3 +42,8 @@ html
--c-font-5 rgba(150, 150, 150, 1)
--c-font-base var(--c-font-2)
+
+
+ --color-bg-canvas #fff
+ --color-text-link #0366d6
+ --color-link-bg #eaeaea
diff --git a/components/layout/LayoutMobile.vue b/components/layout/LayoutMobile.vue
index 15a64f31..b6d12b17 100644
--- a/components/layout/LayoutMobile.vue
+++ b/components/layout/LayoutMobile.vue
@@ -692,7 +692,9 @@ export default {
//---------------------------------------------------------------------------
CategoryModal(:slider="slider")
CurrencyModal
- TrnForm(v-if="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories']")
+ TrnForm(
+ v-if="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories']"
+ )
TrnModal
WalletModal(:slider="slider")
diff --git a/components/shared/appName/AppName.vue b/components/shared/appName/AppName.vue
index f5bf6429..45a2a38a 100644
--- a/components/shared/appName/AppName.vue
+++ b/components/shared/appName/AppName.vue
@@ -16,7 +16,7 @@
text-align center
&:first-letter
- color var(--c-blue-1)
+ color var(--c-blue-3)
&:not(:first-child)
margin-top $m9
diff --git a/layouts/default.vue b/layouts/default.vue
index eed1f83e..0a103317 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -108,7 +108,7 @@ body
font-size 14px
line-height 1
letter-spacing 0
- background var(--c-bg-1)
+ background var(--color-bg-canvas)
user-select none
</style>
@@ -118,6 +118,7 @@ body
.finapp
display flex
flex-flow column
+ min-height 100vh
min-width 320px
anim()
</style>
diff --git a/pages/hey4.vue b/pages/hey4.vue
new file mode 100644
index 00000000..323efacc
--- /dev/null
+++ b/pages/hey4.vue
@@ -0,0 +1,44 @@
+<script>
+import { ref } from '@nuxtjs/composition-api'
+
+export default {
+ name: 'HeyPage',
+
+ setup () {
+ const isShowActive = ref(false)
+ const isShowLazy = ref(false)
+
+ return {
+ isShowActive,
+ isShowLazy
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.p
+ div
+ h1 hello
+ div(@click="isShowActive = !isShowActive") isShowActiveLazy {{ isShowActive }}
+ div(@click="isShowLazy = !isShowLazy") isShowLazy {{ isShowLazy }}
+
+ //- Modal(
+ //- :isShow="isShowActive"
+ //- @afterClose="isShowActive = false"
+ //- )
+
+ LazyModal(
+ v-if="isShowLazy"
+ isShow
+ @afterClose="isShowLazy = false"
+ )
+</template>
+
+<style lang="stylus" scoped>
+.p
+ position relative
+ display grid
+ height 100vh
+ padding 16px
+</style>
diff --git a/pages/login.vue b/pages/login.vue
index 72a0c2e6..cf000f6a 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -15,7 +15,7 @@ export default {
setTimeout(() => {
isLoading.value = false
- }, 5000)
+ }, 6000)
return {
isLoading
@@ -60,16 +60,17 @@ export default {
.tab
.tab__top
.langChanger
- .langChanger__item(
+ .linkItem(
@click="changeLang('ru')"
:class="{ _active: $store.state.lang.lang === 'ru' }"
) RU
- .langChanger__item(
+ .linkItem(
@click="changeLang('en')"
:class="{ _active: $store.state.lang.lang === 'en' }"
) EN
- .themeChanger(@click="$store.dispatch('ui/changeTheme')") {{ $t('changeTheme') }}
+ .themeChanger
+ .linkItem(@click="$store.dispatch('ui/changeTheme')") {{ $t('changeTheme') }}
.tab__content
AppName
@@ -85,16 +86,6 @@ export default {
.loginButton__text {{ $t('loginWithGoogle') }}
</template>
-<style lang="stylus">
-html
- --link-active var(--c-font-2)
- --link var(--c-blue-1)
-
- &.dark-mode
- --link-active var(--c-font-2)
- --link var(--c-blue-1)
-</style>
-
<style lang="stylus" scoped>
@import '~assets/stylus/variables/animations'
@import '~assets/stylus/variables/fonts'
@@ -141,36 +132,34 @@ html
top $mn1
left $m9
- &__item
- cursor pointer
- padding 10px
- color var(--link)
-
- +media-hover()
- text-decoration underline
-
- &._active
- cursor default
- color var(--link-active)
-
- +media-hover()
- text-decoration none
-
.themeChanger
cursor pointer
position absolute
top $m7
right $m7
- padding 10px
- color var(--c-blue-1)
-
- +media-hover()
- text-decoration underline
@media $media-laptop
top $mn1
right $m9
+.linkItem
+ cursor pointer
+ padding 8px 10px
+ color var(--color-text-link)
+ text-decoration none
+
+ +media-hover()
+ &:not(._active)
+ background var(--color-link-bg)
+ border-radius 4px
+
+ &._active
+ cursor default
+ color var(--color-text-link-active)
+
+ +media-hover()
+ text-decoration none
+
.loginButton
overflow hidden
cursor pointer
@@ -180,12 +169,12 @@ html
color var(--c-font-1)
font-size 16px
text-align center
- background #0094ff
+ background var(--c-blue-3)
border-radius 36px
anim()
&:hover
- background #067ab4
+ background var(--c-blue-4)
&._loading
pointer-events none