diff --git a/capacitor.config.json b/capacitor.config.json index b798ad9..2487ca0 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -1,6 +1,6 @@ { - "appId": "io.ionic.starter", - "appName": "Blackface2020", + "appId": "com.theblackfaces.users", + "appName": "theBlackFace", "bundledWebRuntime": false, "npmClient": "npm", "webDir": "www", diff --git a/package-lock.json b/package-lock.json index e41e646..c367b4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1929,6 +1929,14 @@ "@types/cordova": "^0.0.34" } }, + "@ionic-native/http": { + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.28.0.tgz", + "integrity": "sha512-b8mmUw8GIAMdbH3Ycnz8tp2vFcVO59u1a3pVcJQ2l1fttFxsAGHTM8xSyeeZPvG+tiMoSCRGCiVelG3vvVltXA==", + "requires": { + "@types/cordova": "^0.0.34" + } + }, "@ionic-native/splash-screen": { "version": "5.28.0", "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.28.0.tgz", @@ -4078,6 +4086,11 @@ } } }, + "cordova-plugin-advanced-http": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.0.1.tgz", + "integrity": "sha512-7P3ZoSvxvYZXNYsygkxrUIw+pnzsCVvQgRsm26XhymNqqmD9yZIcF878p6wfFVQfLzf5iRHQRwgAMcrcm+cnow==" + }, "core-js": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", diff --git a/package.json b/package.json index 71e8580..163381f 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,11 @@ "@angular/router": "~10.0.0", "@capacitor/core": "2.4.0", "@ionic-native/core": "^5.0.0", + "@ionic-native/http": "^5.28.0", "@ionic-native/splash-screen": "^5.0.0", "@ionic-native/status-bar": "^5.0.0", "@ionic/angular": "^5.0.0", + "cordova-plugin-advanced-http": "^3.0.1", "rxjs": "~6.5.5", "tslib": "^2.0.0", "zone.js": "~0.10.3" diff --git a/src/app/api/black-connect.service.ts b/src/app/api/black-connect.service.ts index da37113..ba0c308 100644 --- a/src/app/api/black-connect.service.ts +++ b/src/app/api/black-connect.service.ts @@ -1,9 +1,27 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Injector } from '@angular/core'; +import { HTTP } from '@ionic-native/http/ngx'; + +//import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' +//import 'rxjs/add/operator/map' +//import { Observable, from } from 'rxjs' + + +/* +import { FloatSessionProvider } from '../float-session/float-session' +import { LocationTrackerProvider } from '../location-tracker/location-tracker' +import { FloatEventsService } from '../float-events/float-events'; +import { CONFIG } from '../app-config' +*/ @Injectable({ providedIn: 'root' }) export class BlackConnectService { + // data source - https://www.theblackfaces.com/feed/ + constructor( + public http: HTTP + ) { - constructor() { } + + } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 48fc28d..2dfe191 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,7 +4,16 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { path: '', - loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule) + loadChildren: () => import('./home/home.module').then(m => m.HomePageModule) + }, + { + path: 'home', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + } + , + { + path: 'member', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) } ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f111814..2390854 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,3 +1,4 @@ +import { BlackConnectService } from './api/black-connect.service'; import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { RouteReuseStrategy } from '@angular/router'; @@ -9,6 +10,8 @@ import { StatusBar } from '@ionic-native/status-bar/ngx'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; + + @NgModule({ declarations: [AppComponent], entryComponents: [], @@ -16,8 +19,9 @@ import { AppComponent } from './app.component'; providers: [ StatusBar, SplashScreen, + BlackConnectService, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy } ], bootstrap: [AppComponent] }) -export class AppModule {} +export class AppModule { } diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 97a4e61..8cf746f 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,9 +1,9 @@ - + - + diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index e69de29..0f654e7 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -0,0 +1,13 @@ +.home_style{ + display: flex; + flex-direction: column; + --padding-top: constant(safe-area-inset-top); //for iOS 11.2; + --padding-top: env(safe-area-inset-top); //for iOS 11.1 + --padding-bottom: 40px; + --padding-start: 0; + --padding-end: 0; + --background: #ECECFF; + --background-image: url('/assets/imgs/black_home.png'); + background-size: cover; +} + diff --git a/src/app/tab1/tab1.page.html b/src/app/tab1/tab1.page.html index 22e11e4..cba2daf 100644 --- a/src/app/tab1/tab1.page.html +++ b/src/app/tab1/tab1.page.html @@ -1,7 +1,7 @@ - Tab 1 + BlackFaces diff --git a/src/app/tab1/tab1.page.ts b/src/app/tab1/tab1.page.ts index 3deefc3..cbdeb1b 100644 --- a/src/app/tab1/tab1.page.ts +++ b/src/app/tab1/tab1.page.ts @@ -1,4 +1,6 @@ import { Component } from '@angular/core'; +import { BlackConnectService } from '../api/black-connect.service'; + @Component({ selector: 'app-tab1', @@ -9,4 +11,9 @@ export class Tab1Page { constructor() {} + + + + + }