Skip to content

Commit 155f245

Browse files
committed
test: demo vue update
1 parent b1f892b commit 155f245

File tree

12 files changed

+2202
-7520
lines changed

12 files changed

+2202
-7520
lines changed
File renamed without changes.

demo-vue/app/_app-variables.scss

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +0,0 @@
1-
// Import the theme’s variables. If you’re using a color scheme
2-
// other than “light”, switch the path to the alternative scheme,
3-
// for example '~nativescript-theme-core/scss/dark'.
4-
@import "~@nativescript/theme/scss/variables";
5-
6-
// Custom colors
7-
$background-dark: #F8F8F8 !default;
8-
$background-light: #FFFFFF !default;
9-
10-
$blue-dark: #022734 !default;
11-
$blue-light: #02556E !default;
12-
$blue-50: rgba($blue-dark, 0.5) !default;
13-
$blue-20: rgba($blue-dark, 0.2) !default;
14-
$blue-10: rgba($blue-dark, 0.1) !default;
15-
16-
$accent-dark: #3A53FF !default;
17-
$accent-light: #4781FE !default;
18-
19-
$success-dark: #06CE6A !default;
20-
$success-light: #00E676 !default;
21-
22-
$warning-dark: #f39c11 !default;
23-
$warning-light: #F2C112 !default;
24-
25-
$error-dark: #D84039 !default;
26-
$error-light: #ED473F !default;
27-
28-
$midnight-dark: #0F336D !default;
29-
$midnight-light: #14418B !default;
30-
31-
$night-dark: #023141 !default;
32-
$night-light: #01526C !default;
33-
34-
// Sizes
35-
$base-font-size: 11;
36-
37-
$border-width: 1;
38-
$border-radius: 3;
39-
40-
41-
/**
42-
* Theme variables overrides
43-
**/
44-
45-
// Colors
46-
$background: #fff;
47-
$primary: lighten(#000, 13%);
48-
$secondary: lighten(#000, 46%);
49-
$disabled: lighten(#000, 62%);
50-
$accent: $accent-dark;
51-
$error: $error-light;
52-
53-
// SideDrawer
54-
$item-color-android : #737373;
55-
$item-active-background: #F8F8F8;
56-
$item-active-color: $accent;
57-
$item-active-icon-color: $item-active-color;
58-
$item-color-ios: $blue-dark;
59-
$item-color-android: $blue-dark;
60-
61-
$side-drawer-header-background: #fafafa;
62-
$side-drawer-header-brand: #737373;
63-
$side-drawer-background: #FFFFFF;
64-
65-
// ActionBar
66-
$ab-background: $accent;
67-
$ab-color: $white;
68-
69-
// Buttons
70-
$btn-color-inverse: $white;
71-
$btn-color: $accent;
72-
$btn-color-secondary: darken($btn-color, 10%);
73-
$btn-color-outline-highlighted: lighten($btn-color, 10%);
74-
75-
//Text colors
76-
$headings-color: $blue-dark;
77-
$secondary: $blue-dark;
78-
$text-color: $blue-dark;

demo-vue/app/app.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
// Import app variables
2-
@import 'app-variables';
3-
42
// Import the theme’s main ruleset - both index and platform specific.
5-
@import "~@nativescript/theme/core";
6-
@import "~@nativescript/theme/default";
73
// Import common styles
84
@import 'app-common';

demo-vue/app/app.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import Home from './components/Home.vue';
44

55
// register LottieView component for the plugin
66
Vue.registerElement(
7-
'lottie-view',
8-
() => require('@nativescript-community/ui-lottie').LottieView
7+
'lottie-view',
8+
() => require('@nativescript-community/ui-lottie').LottieView
99
);
1010

1111
new Vue({
12-
template: `
12+
template: `
1313
<Frame>
1414
<Home />
1515
</Frame>`,
1616

17-
components: {
18-
Home
19-
}
17+
components: {
18+
Home
19+
}
2020
}).$start();

demo-vue/app/assets/LottieLogo1.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

demo-vue/app/components/Home.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function generateItems(count, offset = 0) {
2727
return new Array(count).fill().map((_, i) => ({
2828
name: `Item ${i}`,
2929
description: `Item ${i} description`,
30-
lottie: '~/assets/4803-weather-storm.json'
30+
lottie: '~/assets/LottieLogo1.json'
3131
}));
3232
}
3333
@@ -52,7 +52,7 @@ export default {
5252
5353
// Custom styles
5454
.fa {
55-
color: $accent-dark;
55+
color: blue;
5656
}
5757
5858
.info {

demo-vue/jsconfig.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

demo-vue/nativescript.config.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { NativeScriptConfig } from '@nativescript/core';
2+
3+
export default {
4+
id: 'org.nativescript.demovue',
5+
appPath: 'app',
6+
appResourcesPath: 'app/App_Resources',
7+
android: {
8+
v8Flags: '--expose_gc',
9+
markingMode: 'none',
10+
},
11+
} as NativeScriptConfig;

demo-vue/package.json

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,25 @@
11
{
2-
"nativescript": {
3-
"id": "org.nativescript.demovue",
4-
"tns-android": {
5-
"version": "6.0.0"
6-
},
7-
"tns-ios": {
8-
"version": "6.5.0-beta.2-v8-2020-02-05-153040-01"
9-
}
10-
},
112
"description": "NativeScript Application",
123
"license": "SEE LICENSE IN <your-license-filename>",
134
"repository": "<fill-your-repository-here>",
145
"dependencies": {
15-
"@nativescript/theme": "2.3.0",
16-
"@nativescript/core": "6.4.0",
176
"@nativescript-community/ui-lottie": "file:../plugin",
18-
"nativescript-vue": "2.4.0"
7+
"@nativescript/core": "~8.1.5",
8+
"nativescript-vue": "~2.9.0"
199
},
2010
"devDependencies": {
21-
"@babel/core": "~7.8.4",
22-
"@babel/preset-env": "~7.8.4",
23-
"ansi-styles": "^4.2.1",
24-
"babel-loader": "~8.0.6",
25-
"chalk": "^2.3.0",
26-
"del": "5.1.0",
27-
"nativescript-akylas-webpack-template": "^1.0.15",
28-
"nativescript-dev-webpack": "1.4.1",
29-
"nativescript-vue-template-compiler": "2.4.0",
30-
"node-sass": "4.13.1",
31-
"tslint": "~6.0.0",
32-
"typescript": "3.7.5",
33-
"vue-loader": "~15.8.3",
34-
"webpack": "4.41.5",
35-
"webpack-cli": "3.3.10"
11+
"@nativescript/android": "8.1.1",
12+
"@nativescript/ios": "8.1.0",
13+
"@nativescript/webpack": "5.0.0",
14+
"nativescript-vue-template-compiler": "~2.9.0",
15+
"typescript": "~4.4.4",
16+
"vue": "2.6.14"
3617
},
3718
"scripts": {
3819
"build.plugin": "cd ../src && npm run build",
3920
"ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/platforms/**'"
4021
},
4122
"gitHead": "59b6da006346fedb5bb201fcc9cd7d204a69a82f",
42-
"readme": "NativeScript Application"
43-
}
23+
"readme": "NativeScript Application",
24+
"main": "app/app"
25+
}

0 commit comments

Comments
 (0)