From 91b3a56d6179302bc48d21a35e05e951f3cc014b Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Sun, 6 Feb 2022 13:45:31 +0300 Subject: [PATCH 1/4] feat(issue-188): recreate project pfr-app for ios and android --- src/Database/Prototype/migrate-old-data.sql | 46 + src/MobileApps/PFRApp/PFRApp/App.xaml.cs | 8 +- src/MobileApps/PFRApp/PFRApp/AppShell.xaml | 38 - src/MobileApps/PFRApp/PFRApp/AppShell.xaml.cs | 10 +- .../PFRApp/PFRApp/GettingStarted.txt | 34 - src/MobileApps/PFRApp/PFRApp/Models/Item.cs | 11 - .../PFRApp/PFRApp/Services/IDataStore.cs | 15 - .../PFRApp/PFRApp/Services/MockDataStore.cs | 60 - .../PFRApp/ViewModels/AboutViewModel.cs | 18 - .../PFRApp/PFRApp/ViewModels/BaseViewModel.cs | 56 - .../PFRApp/ViewModels/ItemDetailViewModel.cs | 57 - .../PFRApp/ViewModels/ItemsViewModel.cs | 86 - .../PFRApp/ViewModels/LoginViewModel.cs | 24 - .../PFRApp/ViewModels/NewItemViewModel.cs | 65 - .../PFRApp/PFRApp/Views/AboutPage.xaml | 52 - .../PFRApp/PFRApp/Views/AboutPage.xaml.cs | 15 - .../PFRApp/PFRApp/Views/ItemDetailPage.xaml | 14 - .../PFRApp/Views/ItemDetailPage.xaml.cs | 15 - .../PFRApp/PFRApp/Views/ItemsPage.xaml | 44 - .../PFRApp/PFRApp/Views/ItemsPage.xaml.cs | 33 - .../PFRApp/PFRApp/Views/LoginPage.xaml | 14 - .../PFRApp/PFRApp/Views/LoginPage.xaml.cs | 21 - .../PFRApp/PFRApp/Views/NewItemPage.xaml | 22 - .../PFRApp/PFRApp/Views/NewItemPage.xaml.cs | 22 - src/MobileApps/PFRApp/PFRApp/data-test.json | 4639 +++++++++++++++++ src/WebApps/pfr-app/pfr-app/dist/102.js | 1 + src/WebApps/pfr-app/pfr-app/dist/294.js | 2 + .../pfr-app/pfr-app/dist/294.js.LICENSE.txt | 14 + src/WebApps/pfr-app/pfr-app/dist/368.js | 1 + src/WebApps/pfr-app/pfr-app/dist/669.js | 1 + src/WebApps/pfr-app/pfr-app/dist/935.js | 2 + .../pfr-app/pfr-app/dist/935.js.LICENSE.txt | 23 + src/WebApps/pfr-app/pfr-app/dist/index.html | 1 + src/WebApps/pfr-app/pfr-app/dist/main.js | 1 + .../pfr-app/pfr-app/dist/remoteEntry.js | 1 + .../pfr-app/server/dist/app.controller.d.ts | 8 + .../pfr-app/server/dist/app.controller.js | 40 + .../pfr-app/server/dist/app.controller.js.map | 1 + .../pfr-app/server/dist/app.module.d.ts | 2 + src/WebApps/pfr-app/server/dist/app.module.js | 35 + .../pfr-app/server/dist/app.module.js.map | 1 + .../pfr-app/server/dist/auth/auth.module.d.ts | 2 + .../pfr-app/server/dist/auth/auth.module.js | 35 + .../server/dist/auth/auth.module.js.map | 1 + .../server/dist/auth/auth.service.d.ts | 11 + .../pfr-app/server/dist/auth/auth.service.js | 53 + .../server/dist/auth/auth.service.js.map | 1 + .../pfr-app/server/dist/auth/constants.d.ts | 3 + .../pfr-app/server/dist/auth/constants.js | 7 + .../pfr-app/server/dist/auth/constants.js.map | 1 + .../server/dist/auth/jwt-auth.guard.d.ts | 4 + .../server/dist/auth/jwt-auth.guard.js | 18 + .../server/dist/auth/jwt-auth.guard.js.map | 1 + .../server/dist/auth/jwt.strategy.d.ts | 10 + .../pfr-app/server/dist/auth/jwt.strategy.js | 34 + .../server/dist/auth/jwt.strategy.js.map | 1 + .../server/dist/auth/local-auth.guard.d.ts | 4 + .../server/dist/auth/local-auth.guard.js | 18 + .../server/dist/auth/local-auth.guard.js.map | 1 + .../server/dist/auth/local.strategy.d.ts | 9 + .../server/dist/auth/local.strategy.js | 35 + .../server/dist/auth/local.strategy.js.map | 1 + src/WebApps/pfr-app/server/dist/config.d.ts | 1 + src/WebApps/pfr-app/server/dist/config.js | 5 + src/WebApps/pfr-app/server/dist/config.js.map | 1 + src/WebApps/pfr-app/server/dist/main.d.ts | 1 + src/WebApps/pfr-app/server/dist/main.js | 11 + src/WebApps/pfr-app/server/dist/main.js.map | 1 + .../authorized/authorized.controller.d.ts | 6 + .../authorized/authorized.controller.js | 37 + .../authorized/authorized.controller.js.map | 1 + .../modules/authorized/authorized.module.d.ts | 2 + .../modules/authorized/authorized.module.js | 20 + .../authorized/authorized.module.js.map | 1 + .../unauthorized/unauthorized.controller.d.ts | 4 + .../unauthorized/unauthorized.controller.js | 31 + .../unauthorized.controller.js.map | 1 + .../unauthorized/unauthorized.module.d.ts | 2 + .../unauthorized/unauthorized.module.js | 20 + .../unauthorized/unauthorized.module.js.map | 1 + .../server/dist/tsconfig.build.tsbuildinfo | 1 + .../server/dist/users/users.module.d.ts | 2 + .../pfr-app/server/dist/users/users.module.js | 21 + .../server/dist/users/users.module.js.map | 1 + .../server/dist/users/users.service.d.ts | 9 + .../server/dist/users/users.service.js | 34 + .../server/dist/users/users.service.js.map | 1 + 87 files changed, 5287 insertions(+), 731 deletions(-) create mode 100644 src/Database/Prototype/migrate-old-data.sql delete mode 100644 src/MobileApps/PFRApp/PFRApp/GettingStarted.txt delete mode 100644 src/MobileApps/PFRApp/PFRApp/Models/Item.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Services/IDataStore.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Services/MockDataStore.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/ViewModels/AboutViewModel.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/ViewModels/BaseViewModel.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/ViewModels/ItemDetailViewModel.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/ViewModels/ItemsViewModel.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/ViewModels/LoginViewModel.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/ViewModels/NewItemViewModel.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/AboutPage.xaml delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/AboutPage.xaml.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/ItemDetailPage.xaml delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/ItemDetailPage.xaml.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/ItemsPage.xaml delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/ItemsPage.xaml.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/LoginPage.xaml delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/LoginPage.xaml.cs delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/NewItemPage.xaml delete mode 100644 src/MobileApps/PFRApp/PFRApp/Views/NewItemPage.xaml.cs create mode 100644 src/MobileApps/PFRApp/PFRApp/data-test.json create mode 100644 src/WebApps/pfr-app/pfr-app/dist/102.js create mode 100644 src/WebApps/pfr-app/pfr-app/dist/294.js create mode 100644 src/WebApps/pfr-app/pfr-app/dist/294.js.LICENSE.txt create mode 100644 src/WebApps/pfr-app/pfr-app/dist/368.js create mode 100644 src/WebApps/pfr-app/pfr-app/dist/669.js create mode 100644 src/WebApps/pfr-app/pfr-app/dist/935.js create mode 100644 src/WebApps/pfr-app/pfr-app/dist/935.js.LICENSE.txt create mode 100644 src/WebApps/pfr-app/pfr-app/dist/index.html create mode 100644 src/WebApps/pfr-app/pfr-app/dist/main.js create mode 100644 src/WebApps/pfr-app/pfr-app/dist/remoteEntry.js create mode 100644 src/WebApps/pfr-app/server/dist/app.controller.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/app.controller.js create mode 100644 src/WebApps/pfr-app/server/dist/app.controller.js.map create mode 100644 src/WebApps/pfr-app/server/dist/app.module.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/app.module.js create mode 100644 src/WebApps/pfr-app/server/dist/app.module.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/auth.module.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/auth.module.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/auth.module.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/auth.service.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/auth.service.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/auth.service.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/constants.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/constants.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/constants.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/jwt-auth.guard.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/jwt-auth.guard.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/jwt-auth.guard.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/jwt.strategy.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/jwt.strategy.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/jwt.strategy.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/local-auth.guard.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/local-auth.guard.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/local-auth.guard.js.map create mode 100644 src/WebApps/pfr-app/server/dist/auth/local.strategy.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/auth/local.strategy.js create mode 100644 src/WebApps/pfr-app/server/dist/auth/local.strategy.js.map create mode 100644 src/WebApps/pfr-app/server/dist/config.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/config.js create mode 100644 src/WebApps/pfr-app/server/dist/config.js.map create mode 100644 src/WebApps/pfr-app/server/dist/main.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/main.js create mode 100644 src/WebApps/pfr-app/server/dist/main.js.map create mode 100644 src/WebApps/pfr-app/server/dist/modules/authorized/authorized.controller.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/modules/authorized/authorized.controller.js create mode 100644 src/WebApps/pfr-app/server/dist/modules/authorized/authorized.controller.js.map create mode 100644 src/WebApps/pfr-app/server/dist/modules/authorized/authorized.module.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/modules/authorized/authorized.module.js create mode 100644 src/WebApps/pfr-app/server/dist/modules/authorized/authorized.module.js.map create mode 100644 src/WebApps/pfr-app/server/dist/modules/unauthorized/unauthorized.controller.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/modules/unauthorized/unauthorized.controller.js create mode 100644 src/WebApps/pfr-app/server/dist/modules/unauthorized/unauthorized.controller.js.map create mode 100644 src/WebApps/pfr-app/server/dist/modules/unauthorized/unauthorized.module.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/modules/unauthorized/unauthorized.module.js create mode 100644 src/WebApps/pfr-app/server/dist/modules/unauthorized/unauthorized.module.js.map create mode 100644 src/WebApps/pfr-app/server/dist/tsconfig.build.tsbuildinfo create mode 100644 src/WebApps/pfr-app/server/dist/users/users.module.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/users/users.module.js create mode 100644 src/WebApps/pfr-app/server/dist/users/users.module.js.map create mode 100644 src/WebApps/pfr-app/server/dist/users/users.service.d.ts create mode 100644 src/WebApps/pfr-app/server/dist/users/users.service.js create mode 100644 src/WebApps/pfr-app/server/dist/users/users.service.js.map diff --git a/src/Database/Prototype/migrate-old-data.sql b/src/Database/Prototype/migrate-old-data.sql new file mode 100644 index 00000000..c95e6b13 --- /dev/null +++ b/src/Database/Prototype/migrate-old-data.sql @@ -0,0 +1,46 @@ +-- Author: DENIS PROKHORCHIK +-- Date: 06/01/2022 + +-- Create temp table of Certificates +CREATE TABLE #TempCertificates +( + Id UNIQUEIDENTIFIER, + added_date bigint +); + +-- Create temp table of Users +CREATE TABLE #TempUsers +( + Id UNIQUEIDENTIFIER +) + +-- Select a data of old Certificate table +USE [O2Bionics.O2Platform.CertificateDB] +SELECT * FROM O2CCertificate + +-- Select a data of old Users table +USE [O2Bionics.O2Platform.IdentityDb] +SELECT * FROM AspNetUsers + +-- Merge tables + +-- Export file to JSON format + + + + + + +-- USE [O2Bionics.O2Platform.CertificateDB] +-- SELECT * FROM O2CCertificate +-- FOR JSON PATH + +-- USE [O2Bionics.O2Platform.IdentityDb] +-- SELECT * FROM AspNetUsers + +-- select * from Photos + + + + + diff --git a/src/MobileApps/PFRApp/PFRApp/App.xaml.cs b/src/MobileApps/PFRApp/PFRApp/App.xaml.cs index 90e9a80e..89473c85 100644 --- a/src/MobileApps/PFRApp/PFRApp/App.xaml.cs +++ b/src/MobileApps/PFRApp/PFRApp/App.xaml.cs @@ -1,8 +1,4 @@ -using System; -using Xamarin.Forms; -using Xamarin.Forms.Xaml; -using PFRApp.Services; -using PFRApp.Views; +using Xamarin.Forms; namespace PFRApp { @@ -13,7 +9,7 @@ public App() { InitializeComponent(); - DependencyService.Register(); + //DependencyService.Register(); MainPage = new AppShell(); } diff --git a/src/MobileApps/PFRApp/PFRApp/AppShell.xaml b/src/MobileApps/PFRApp/PFRApp/AppShell.xaml index c2b24673..7f24255f 100644 --- a/src/MobileApps/PFRApp/PFRApp/AppShell.xaml +++ b/src/MobileApps/PFRApp/PFRApp/AppShell.xaml @@ -5,42 +5,4 @@ Title="PFRApp" x:Class="PFRApp.AppShell"> - - - - - -