Skip to content

Commit

Permalink
Merge pull request #5 from IceWhaleTech/dev
Browse files Browse the repository at this point in the history
🎈 perf: Optimize user experience
  • Loading branch information
jerrykuku committed Nov 9, 2021
2 parents 11d304e + 26c71ee commit 741aadb
Show file tree
Hide file tree
Showing 19 changed files with 556 additions and 95 deletions.
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
},
"dependencies": {
"@hscmap/vue-window": "^2.4.2",
"animate.css": "^4.1.1",
"apexcharts": "^3.28.3",
"axios": "^0.21.4",
"buefy": "^0.9.0",
Expand All @@ -22,13 +23,16 @@
"lottie-web-vue": "^1.2.0",
"nth-check": "^2.0.1",
"qs": "^6.10.1",
"ua-parser-js": "^1.0.2",
"v-animate-css": "^0.0.5",
"vee-validate": "^3.4.12",
"vue": "^2.6.11",
"vue-apexcharts": "^1.6.2",
"vue-custom-scrollbar": "^1.4.1",
"vue-fullscreen": "^2.5.2",
"vue-router": "^3.2.0",
"vue-slider-component": "^3.2.14",
"vue-smooth-reflow": "^0.1.12",
"vue-tour": "^2.0.0",
"vuex": "^3.4.0",
"vuex-persistedstate": "^4.0.0",
Expand Down
47 changes: 41 additions & 6 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,30 @@
* @Author: JerryK
* @Date: 2021-09-18 21:32:13
* @LastEditors: JerryK
* @LastEditTime: 2021-10-21 13:30:20
* @LastEditTime: 2021-11-09 16:43:29
* @Description: Main entry of application
* @FilePath: /CasaOS-UI/src/App.vue
-->

<template>
<div id="app" class="is-flex is-flex-direction-column" :style="{'background-image': 'url(' + require('./assets/background/bg.jpeg') + ')'}">
<div id="app" class="is-flex is-flex-direction-column" v-if="!isLoading">

<!-- Background Layer Start -->
<div v-if="isWelcome" id="background" v-animate-css="initAni" :style="{'background-image': 'url(' + require('./assets/background/bg3.jpg') + ')'}"></div>
<div v-if="!isWelcome" id="background" :style="{'background-image': 'url(' + require('./assets/background/bg3.jpg') + ')'}"></div>

<!-- Background Layer End -->

<!-- Router View Start -->
<router-view />
<!-- Router View End -->

<!-- BrandBar Start -->
<brand-bar></brand-bar>
<brand-bar v-animate-css="brandAni"></brand-bar>
<!-- BrandBar End -->

<!-- ContactBar Start -->
<contact-bar></contact-bar>
<contact-bar v-animate-css="contactAni"></contact-bar>
<!-- ContactBar End -->

<!-- <v-tour name="myTour" :steps="steps"></v-tour> -->
Expand All @@ -26,14 +35,18 @@
<script>
import BrandBar from './components/BrandBar.vue'
import ContactBar from './components/ContactBar.vue'
// import UAParser from 'ua-parser-js';
// const parser = new UAParser();
// console.log(parser.getResult());
export default {
components: {
BrandBar,
ContactBar,
},
data() {
return {
isLoading: true,
steps: [
// {
// target: '#v-step-0', // We're using document.querySelector() under the hood
Expand All @@ -44,11 +57,33 @@ export default {
// target: '#v-step-1', // We're using document.querySelector() under the hood
// content: `Add your first App!`
// }
]
],
isWelcome: false,
initAni: {
classes: 'zoomOutIn',
duration: 2500
},
brandAni: {
classes: "fadeInLeft",
duration: 700
},
contactAni: {
classes: "fadeInRight",
duration: 700
},
}
},
created() {
created() {
console.log(this.$router.history.current.path);
this.$api.info.guideCheck().then(res => {
this.isLoading = false
if (res.data.success == 200 && res.data.data.need_init_user) {
this.isWelcome = true
} else {
this.isWelcome = false
}
})
},
mounted() {
//this.$tours['myTour'].start()
Expand Down
Binary file removed src/assets/background/AbstractShapes.jpg
Binary file not shown.
Binary file added src/assets/background/bg3.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Account.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions src/assets/img/Account.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions src/assets/scss/_animate.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
@-webkit-keyframes zoomOutIn {
0% {
opacity: 0;
-webkit-transform: scale3d(1.2, 1.2, 1.2);
transform: scale3d(1.2, 1.2, 1.2);
}

70% {
opacity: 1;
}
}

@keyframes zoomOutIn {
0% {
opacity: 0;
-webkit-transform: scale3d(1.2, 1.2, 1.2);
transform: scale3d(1.2, 1.2, 1.2);
}

70% {
opacity: 1;
}
}

.zoomOutIn {
-webkit-animation-name: zoomOutIn;
animation-name: zoomOutIn;
}
24 changes: 12 additions & 12 deletions src/assets/scss/_scrollbars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
border-radius: 10px;
outline: none;
}
@media screen and (min-width: 769px) {
.contents::-webkit-scrollbar {
width: 8px;
}

.contents::-webkit-scrollbar {
width: 8px;
}
.contents::-webkit-scrollbar-track {
background: transparent;
}

.contents::-webkit-scrollbar-track {
background: transparent;
.contents::-webkit-scrollbar-thumb {
background-color: rgba(255, 255, 255, 0.4);
border-radius: 10px;
outline: none;
}
}

.contents::-webkit-scrollbar-thumb {
background-color: rgba(255, 255, 255, 0.4);
border-radius: 10px;
outline: none;
}

.scrollbars::-webkit-scrollbar {
width: 8px;
}
Expand Down

0 comments on commit 741aadb

Please sign in to comment.