Skip to content

Commit abfff79

Browse files
committed
better components names + data json fetch
1 parent 5201303 commit abfff79

31 files changed

+348
-211
lines changed

src/App.vue

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,28 @@
44
<transition appear mode="out-in" :css="false" @leave="leave" @enter="enter">
55
<router-view />
66
</transition>
7-
<Spine :isPlaying="isSpinePlaying" />
7+
<SpineLine :isPlaying="isSpinePlaying" />
88
<div class="tweenerElement"></div>
99

1010
<FooterSection />
1111
</div>
1212
</template>
1313

1414
<script>
15-
// GSAP + ScrollMagic
1615
import * as ScrollMagic from 'scrollmagic'
1716
import { TweenMax, TimelineMax, Power3 } from 'gsap'
1817
import { ScrollMagicPluginGsap } from 'scrollmagic-plugin-gsap'
19-
import HeaderSection from '@/components/Header.vue'
20-
import Spine from '@/components/Spine.vue'
21-
import FooterSection from './components/Footer.vue'
18+
import HeaderSection from './components/HeaderSection.vue'
19+
import FooterSection from './components/FooterSection.vue'
20+
import SpineLine from './components/SpineLine.vue'
2221
2322
ScrollMagicPluginGsap(ScrollMagic, TweenMax, TimelineMax)
2423
2524
export default {
2625
name: 'App',
2726
components: {
2827
HeaderSection,
29-
Spine,
28+
SpineLine,
3029
FooterSection,
3130
},
3231
data() {
@@ -134,16 +133,20 @@ html {
134133
word-break: normal;
135134
color: #888;
136135
}
136+
137137
body {
138138
min-height: 100vh;
139+
139140
&.locked {
140141
overflow: hidden;
141142
}
142143
}
144+
143145
#app {
144146
overflow: hidden;
145147
margin: 0 auto;
146148
}
149+
147150
.wrapper {
148151
position: relative;
149152
z-index: 1;
@@ -170,12 +173,15 @@ body {
170173
li {
171174
list-style: none;
172175
}
176+
173177
a {
174178
text-decoration: none;
175179
}
180+
176181
button {
177182
border: 0;
178183
}
184+
179185
svg {
180186
title,
181187
desc {
@@ -194,9 +200,11 @@ body {
194200
.header-nav-button .dots {
195201
background: #000;
196202
}
203+
197204
.header-nav a {
198205
color: #000;
199206
}
207+
200208
.header-nav a svg,
201209
.header-breadcrumb,
202210
.header-nav-close-button {
@@ -220,10 +228,13 @@ body {
220228
221229
&.-blank {
222230
vertical-align: middle;
223-
} // default
231+
}
232+
233+
// default
224234
&.-prev {
225235
transform: rotate(-180deg);
226236
}
237+
227238
&.-next {
228239
transform: rotate(90deg);
229240
}
@@ -253,6 +264,7 @@ body {
253264
.func {
254265
color: var(--purple);
255266
}
267+
256268
.params {
257269
color: var(--purple);
258270
font-weight: 400;
@@ -308,6 +320,7 @@ body {
308320
// NProgress custom CSS
309321
#nprogress {
310322
pointer-events: none;
323+
311324
.bar {
312325
background: var(--purple);
313326
position: fixed;
@@ -317,6 +330,7 @@ body {
317330
width: 100%;
318331
height: 2px;
319332
}
333+
320334
.peg {
321335
display: block;
322336
position: absolute;
@@ -331,6 +345,7 @@ body {
331345
.nprogress-custom-parent {
332346
overflow: hidden;
333347
position: relative;
348+
334349
#nprogress {
335350
.spinner,
336351
.bar {

src/components/Characters/ABiz/ABiz.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
</template>
66

77
<script>
8-
import { LOOP_EASE_IN_OUT } from '@/constants'
8+
import { LOOP_EASE_IN_OUT, LOOP_EASE_OUT } from '@/constants'
99
import { character } from '../character.mixin'
1010
import ABizSVG from './ABizSVG.vue'
11-
import { LOOP_EASE_OUT } from '../../../constants'
1211
1312
export default {
1413
name: 'BizCharacter',
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from './ABiz.vue'
1+
// export { default } from './ABiz.vue'

src/components/Characters/ET/ET.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
</template>
66

77
<script>
8-
import { LOOP_EASE_IN_OUT } from '@/constants'
8+
import { LOOP_EASE_IN_OUT, LOOP } from '@/constants'
99
import { random } from '@/utils'
10-
import { LOOP } from '../../../constants'
1110
import { character } from '../character.mixin'
1211
import ETSVG from './ETSVG.vue'
1312

src/components/Characters/HolwsCastle/HolwsCastle.vue

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@
5050

5151
<script>
5252
import { RoughEase, Power0 } from 'gsap'
53+
import { LOOP_EASE_IN_OUT, LOOP } from '@/constants'
5354
import { getNodes } from '@/utils'
54-
import { LOOP_EASE_IN_OUT } from '@/constants'
5555
import { character } from '../character.mixin'
56-
import { LOOP } from '../../../constants'
5756
5857
export default {
5958
name: 'HolwsCastleCharacter',
@@ -264,6 +263,7 @@ export default {
264263
width: 596px;
265264
height: 420px;
266265
}
266+
267267
.top-top {
268268
top: 0;
269269
left: 0;
@@ -272,6 +272,7 @@ export default {
272272
@include pieces-img;
273273
background-position: 0 0;
274274
}
275+
275276
.top-tower {
276277
top: -58px;
277278
left: 102px;
@@ -280,6 +281,7 @@ export default {
280281
@include pieces-img;
281282
background-position: -596px 0;
282283
}
284+
283285
.top-clothes {
284286
top: 36px;
285287
left: 500px;
@@ -303,6 +305,7 @@ export default {
303305
height: 54px;
304306
background: url('./assets/bucket.png') 0 0;
305307
}
308+
306309
.mouth {
307310
.back-lip {
308311
top: 550px;
@@ -312,6 +315,7 @@ export default {
312315
@include pieces-img;
313316
background-position: 0 -563px;
314317
}
318+
315319
.front-lip {
316320
top: 551px;
317321
left: 72px;
@@ -330,6 +334,7 @@ export default {
330334
@include pieces-img;
331335
background-position: -727px -140px;
332336
}
337+
333338
.r-leg {
334339
top: 668px;
335340
left: 462px;
@@ -338,6 +343,7 @@ export default {
338343
@include pieces-img;
339344
background-position: -300px -563px;
340345
}
346+
341347
.l-arm {
342348
top: 697px;
343349
left: 191px;
@@ -346,6 +352,7 @@ export default {
346352
@include pieces-img;
347353
background-position: -388px -420px;
348354
}
355+
349356
.body {
350357
top: 0;
351358
left: 0;
@@ -354,19 +361,22 @@ export default {
354361
background: url('./assets/body.png') no-repeat 0 0;
355362
background-size: 100% 100%;
356363
}
364+
357365
.fans {
358366
top: 0;
359367
left: 0;
360368
z-index: -1;
361369
width: 100%;
362370
height: 100%;
371+
363372
.fan2 {
364373
width: 100%;
365374
height: 100%;
366375
background: url('./assets/fan-2.png') 0 0 no-repeat;
367376
background-size: 2199px 824px;
368377
animation: fan1 0.3s steps(3) infinite;
369378
}
379+
370380
.fan1 {
371381
width: 100%;
372382
height: 100%;
@@ -380,6 +390,7 @@ export default {
380390
}
381391
}
382392
}
393+
383394
.fix-tail {
384395
top: 0;
385396
left: 0;
@@ -395,6 +406,7 @@ export default {
395406
left: 0;
396407
width: 100%;
397408
height: 100%;
409+
398410
.r-arm {
399411
top: 643px;
400412
left: 254px;
@@ -403,6 +415,7 @@ export default {
403415
@include pieces-img;
404416
background-position: 0 -420px;
405417
}
418+
406419
.fix-shoulder {
407420
top: 0;
408421
left: 0;
@@ -420,11 +433,13 @@ export default {
420433
height: 53px;
421434
background: url('./assets/ear.png') 0 0;
422435
}
436+
423437
.lower-foliage {
424438
top: 0;
425439
left: 0;
426440
width: 100%;
427441
height: 100%;
442+
428443
.foliage2 {
429444
top: 360px;
430445
left: 244px;
@@ -433,6 +448,7 @@ export default {
433448
@include pieces-img;
434449
background-position: -727px -250px;
435450
}
451+
436452
.foliage1 {
437453
top: 417px;
438454
left: 307px;
@@ -441,6 +457,7 @@ export default {
441457
@include pieces-img;
442458
background-position: -727px -349px;
443459
}
460+
444461
.fix-balcony {
445462
top: 0;
446463
left: 0;
@@ -466,11 +483,13 @@ export default {
466483
}
467484
}
468485
}
486+
469487
.higher-foliage {
470488
top: 0;
471489
left: 0;
472490
width: 100%;
473491
height: 100%;
492+
474493
.foliage3 {
475494
top: 183px;
476495
left: 290px;
@@ -479,6 +498,7 @@ export default {
479498
@include pieces-img;
480499
background-position: -727px 0;
481500
}
501+
482502
.foliage2 {
483503
top: 239px;
484504
left: 357px;
@@ -487,6 +507,7 @@ export default {
487507
@include pieces-img;
488508
background-position: -177px -420px;
489509
}
510+
490511
.foliage1 {
491512
top: 320px;
492513
left: 438px;
@@ -495,6 +516,7 @@ export default {
495516
@include pieces-img;
496517
background-position: -727px -411px;
497518
}
519+
498520
.fix-roof {
499521
top: 0;
500522
left: 0;

0 commit comments

Comments
 (0)