Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.vscode/
.idea/
node_modules/
hooks/
*.js
*.js.map
*.esm.json
Expand All @@ -19,4 +20,6 @@ demo-vue/platforms/
/src/*.tgz
/publish/package/*.tgz
/publish/package/**/*
/publish/src/**/*
/publish/src/**/*

!webpack.config.js
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"singleQuote": true,
"semi": true,
"arrowParens": "avoid",
"trailingComma": "none"
}
2 changes: 1 addition & 1 deletion demo-angular/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
}
},
"defaultProject": "blank"
}
}
14 changes: 14 additions & 0 deletions demo-angular/nativescript.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { NativeScriptConfig } from '@nativescript/core';

export default {
id: 'org.nativescript.datetimepicker.demong',
appResourcesPath: 'App_Resources',
android: {
v8Flags: '--expose_gc',
markingMode: 'none',
requireModules: {
0: 'nativescript-datetimepicker'
}
},
appPath: 'src'
} as NativeScriptConfig;
4 changes: 0 additions & 4 deletions demo-angular/nsconfig.json

This file was deleted.

46 changes: 20 additions & 26 deletions demo-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"nativescript": {
"id": "org.nativescript.datetimepicker.demong",
"tns-android": {
"version": "6.2.0"
},
"tns-ios": {
"version": "6.2.0"
}
},
"description": "NativeScript DateTimePicker Demo NG",
"license": "SEE LICENSE IN LICENSE FILE",
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
Expand All @@ -18,29 +9,32 @@
"e2e-watch": "tsc -p e2e --watch"
},
"dependencies": {
"@angular/animations": "~8.2.0",
"@angular/common": "~8.2.0",
"@angular/compiler": "~8.2.0",
"@angular/core": "~8.2.0",
"@angular/forms": "~8.2.0",
"@angular/platform-browser": "~8.2.0",
"@angular/platform-browser-dynamic": "~8.2.0",
"@angular/router": "~8.2.0",
"nativescript-angular": "~8.20.0",
"@angular/animations": "~10.1.0",
"@angular/common": "~10.1.0",
"@angular/compiler": "~10.1.0",
"@angular/core": "~10.1.0",
"@angular/forms": "~10.1.0",
"@angular/platform-browser": "~10.1.0",
"@angular/platform-browser-dynamic": "~10.1.0",
"@angular/router": "~10.1.0",
"nativescript-datetimepicker": "file:../src",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.10",
"rxjs": "^6.4.0",
"tns-core-modules": "^6.0.0",
"zone.js": "^0.9.1"
"zone.js": "^0.9.1",
"@nativescript/core": "~7.0.13",
"@nativescript/angular": "~10.1.7"
},
"devDependencies": {
"@angular/compiler-cli": "~8.2.0",
"@ngtools/webpack": "~8.2.0",
"@angular/compiler-cli": "~10.1.0",
"@nativescript/android": "7.0.1",
"@nativescript/ios": "7.0.5",
"@nativescript/webpack": "~3.0.8",
"@ngtools/webpack": "~10.1.0",
"@types/node": "~10.12.18",
"nativescript-dev-webpack": "^1.3.0",
"tslint": "~5.11.0",
"typescript": "~3.5.3"
"tslint": "~6.1.3",
"typescript": "3.9.7"
},
"readme": "NativeScript DateTimePicker Demo NG"
"readme": "NativeScript DateTimePicker Demo NG",
"main": "main.js"
}
4 changes: 2 additions & 2 deletions demo-angular/src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ For example, the following CSS rule changes the font size of all UI
components that have the btn class name.
*/
.btn {
font-size: 18;
}
font-size: 18;
}
16 changes: 8 additions & 8 deletions demo-angular/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { NgModule } from "@angular/core";
import { Routes } from "@angular/router";
import { NativeScriptRouterModule } from "nativescript-angular/router";
import { NgModule } from '@angular/core';
import { Routes } from '@angular/router';
import { NativeScriptRouterModule } from '@nativescript/angular';

const routes: Routes = [
{ path: "", redirectTo: "/home", pathMatch: "full" },
{ path: "home", loadChildren: "~/app/home/home.module#HomeModule" }
{ path: '', redirectTo: '/home', pathMatch: 'full' },
{ path: 'home', loadChildren: '~/app/home/home.module#HomeModule' }
];

@NgModule({
imports: [NativeScriptRouterModule.forRoot(routes)],
exports: [NativeScriptRouterModule]
imports: [NativeScriptRouterModule.forRoot(routes)],
exports: [NativeScriptRouterModule]
})
export class AppRoutingModule { }
export class AppRoutingModule {}
10 changes: 5 additions & 5 deletions demo-angular/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component } from "@angular/core";
import { Component } from '@angular/core';

@Component({
moduleId: module.id,
selector: "ns-app",
templateUrl: "app.component.html"
moduleId: module.id,
selector: 'ns-app',
templateUrl: 'app.component.html'
})
export class AppComponent { }
export class AppComponent {}
28 changes: 9 additions & 19 deletions demo-angular/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
import { NativeScriptModule } from "nativescript-angular/nativescript.module";

import { AppRoutingModule } from "./app-routing.module";
import { AppComponent } from "./app.component";
import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
import { NativeScriptModule } from '@nativescript/angular';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';

@NgModule({
bootstrap: [
AppComponent
],
imports: [
NativeScriptModule,
AppRoutingModule
],
declarations: [
AppComponent
],
schemas: [
NO_ERRORS_SCHEMA
]
bootstrap: [AppComponent],
imports: [NativeScriptModule, AppRoutingModule],
declarations: [AppComponent],
schemas: [NO_ERRORS_SCHEMA]
})
export class AppModule { }
export class AppModule {}
19 changes: 8 additions & 11 deletions demo-angular/src/app/home/home-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { NgModule } from "@angular/core";
import { Routes } from "@angular/router";
import { NativeScriptRouterModule } from "nativescript-angular/router";
import { NgModule } from '@angular/core';
import { Routes } from '@angular/router';
import { NativeScriptRouterModule } from '@nativescript/angular';
import { HomeComponent } from './home.component';

import { HomeComponent } from "./home.component";

const routes: Routes = [
{ path: "", component: HomeComponent }
];
const routes: Routes = [{ path: '', component: HomeComponent }];

@NgModule({
imports: [NativeScriptRouterModule.forChild(routes)],
exports: [NativeScriptRouterModule]
imports: [NativeScriptRouterModule.forChild(routes)],
exports: [NativeScriptRouterModule]
})
export class HomeRoutingModule { }
export class HomeRoutingModule {}
48 changes: 24 additions & 24 deletions demo-angular/src/app/home/home.component.css
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
.content {
font-size: 16;
font-weight: bold;
margin-top: 12;
margin-bottom: 6;
color: #303F9F;
font-size: 16;
font-weight: bold;
margin-top: 12;
margin-bottom: 6;
color: #303f9f;
}

.header {
font-size: 16;
margin-top: 12;
margin-bottom: 6;
color: white;
background-color: #2196F3;
text-align: center;
font-size: 16;
margin-top: 12;
margin-bottom: 6;
color: white;
background-color: #2196f3;
text-align: center;
}

label {
padding: 6 4;
padding: 6 4;
}

timepickerfield,
datepickerfield {
padding: 12 4;
padding: 12 4;
}

timepickerfield.apply-css,
datepickerfield.apply-css {
color: #CDDC39;
background-color: #00796B;
font-size: 20;
font-weight: bold;
padding: 20;
color: #cddc39;
background-color: #00796b;
font-size: 20;
font-weight: bold;
padding: 20;
}

.date-time-picker.apply-css {
color: #00796B;
background-color: #CDDC39;
color: #00796b;
background-color: #cddc39;
}

.date-time-picker-spinners.apply-css {
color: #CDDC39;
background-color: #00796B;
color: #cddc39;
background-color: #00796b;
}

.date-time-picker-buttons.apply-css {
color: #00796B;
}
color: #00796b;
}
Loading