- Timestamp:
- 10/21/21 20:47:04 (3 years ago)
- Branches:
- dev
- Children:
- 0757d8f
- Parents:
- 3bb1377
- Location:
- src
- Files:
-
- 9 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Clients/Angular/finki-chattery/angular.json
r3bb1377 r9e95498 98 98 "tsConfig": "tsconfig.spec.json", 99 99 "karmaConfig": "karma.conf.js", 100 "assets": ["src/favicon.ico", "src/assets"], 101 "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"], 100 "assets": [ 101 "src/favicon.ico", 102 "src/assets" 103 ], 104 "styles": [ 105 "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", 106 "src/styles.scss" 107 ], 102 108 "scripts": [] 103 109 } … … 106 112 "builder": "@angular-devkit/build-angular:tslint", 107 113 "options": { 108 "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"], 109 "exclude": ["**/node_modules/**"] 114 "tsConfig": [ 115 "tsconfig.app.json", 116 "tsconfig.spec.json", 117 "e2e/tsconfig.json" 118 ], 119 "exclude": [ 120 "**/node_modules/**" 121 ] 110 122 } 111 123 }, … … 125 137 } 126 138 }, 127 "defaultProject": "finki-chattery" 139 "defaultProject": "finki-chattery", 140 "cli": { 141 "analytics": false 142 } 128 143 } -
src/Clients/Angular/finki-chattery/src/app/app-routing.module.ts
r3bb1377 r9e95498 1 1 import { NgModule } from '@angular/core'; 2 import { CommonModule } from '@angular/common'; 2 3 import { Routes, RouterModule } from '@angular/router'; 3 4 import { AuthorizedGuard } from './core/guards/authorized.guard'; … … 16 17 17 18 @NgModule({ 18 imports: [RouterModule.forRoot(routes)], 19 imports: [ 20 CommonModule, 21 RouterModule.forRoot(routes) 22 ], 19 23 exports: [RouterModule] 20 24 }) -
src/Clients/Angular/finki-chattery/src/app/app.component.html
r3bb1377 r9e95498 1 <main> 1 2 <mat-sidenav-container> 3 <mat-sidenav #sidenav role="navigation"> 4 <!--this is a place for us to add side-nav code--> 5 </mat-sidenav> 6 <mat-sidenav-content> 7 <!--in here all the content must reside. We will add a navigation header as well--> 8 <app-header></app-header> 9 <main> 10 <router-outlet></router-outlet> 11 </main> 12 </mat-sidenav-content> 13 </mat-sidenav-container> 14 15 2 16 <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar> 3 17 <router-outlet></router-outlet> -
src/Clients/Angular/finki-chattery/src/app/app.module.ts
r3bb1377 r9e95498 11 11 import { translateConfiguration, TranslateFromJsonService } from './shared-app/services'; 12 12 import { SharedMaterialModule } from './shared-material/shared-material.module'; 13 import { HeaderComponent } from './navigation/header/header.component'; 13 14 14 15 @NgModule({ 15 declarations: [AppComponent ],16 declarations: [AppComponent, HeaderComponent], 16 17 imports: [ 17 18 BrowserModule, -
src/Clients/Angular/finki-chattery/src/styles.scss
r3bb1377 r9e95498 1 1 html, 2 2 body { 3 margin: 0; 3 4 height: 100%; 4 5 } 6 /* 5 7 body { 6 margin: 0;7 8 font-family: Roboto, sans-serif; 8 9 } … … 285 286 z-index: 1100 !important; 286 287 } 288 */ -
src/FinkiChattery/FinkiChattery.Api/appsettings.Development.json
r3bb1377 r9e95498 31 31 }, 32 32 "ConnectionStrings": { 33 "DefaultConnection": " data source=.;initial catalog=FinkiChattery;integrated security=True;application name=FinkiChattery Base App;Pooling=true;Min Pool Size=5;Max Pool Size=30;",34 "HangfireConnection": " data source=.;initial catalog=FinkiChatteryHangfire;integrated security=True;application name=FinkiChattery Hangfire App;Pooling=true;Min Pool Size=5;Max Pool Size=30;"33 "DefaultConnection": "Data Source=localhost;Initial Catalog=FinkiChattery;User ID=sa;Password=Asfa+032;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Pooling=true;Min Pool Size=5;Max Pool Size=30;", 34 "HangfireConnection": "Data Source=localhost;Initial Catalog=FinkiChatteryHangfire;User ID=sa;Password=Asfa+032;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Pooling=true;Min Pool Size=5;Max Pool Size=30;" 35 35 } 36 36 } -
src/FinkiChattery/FinkiChattery.Database/FinkiChattery.Database.sqlproj
r3bb1377 r9e95498 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 3 3 <PropertyGroup> … … 55 55 <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion> 56 56 </PropertyGroup> 57 <Import Condition="'$( SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />58 <Import Condition="'$( SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />57 <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> 58 <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> 59 59 <ItemGroup> 60 60 <Folder Include="Properties" /> -
src/FinkiChattery/FinkiChattery.HangfireDatabase/FinkiChattery.HangfireDatabase.sqlproj
r3bb1377 r9e95498 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 3 3 <PropertyGroup> … … 55 55 <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion> 56 56 </PropertyGroup> 57 <Import Condition="'$( SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />58 <Import Condition="'$( SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />57 <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> 58 <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> 59 59 <ItemGroup> 60 60 <Folder Include="Properties" /> … … 80 80 <None Include="FinkiChattery.HangfireDatabase.publish.xml" /> 81 81 </ItemGroup> 82 <Import Condition="'$(NetCoreBuild)' == 'true'" Project="$(NETCoreTargetsPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> 83 <ItemGroup> 84 <PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" /> 85 </ItemGroup> 86 <Target Name="BeforeBuild"> 87 <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> 88 </Target> 82 89 </Project> -
src/FinkiChattery/FinkiChattery.Identity/Properties/launchSettings.json
r3bb1377 r9e95498 9 9 }, 10 10 "profiles": { 11 "FinkiChattery.Identity": { 12 "commandName": "Project", 13 "launchBrowser": true, 14 "applicationUrl": "https://localhost:44301", 15 "environmentVariables": { 16 "ASPNETCORE_ENVIRONMENT": "Development" 17 } 18 }, 11 19 "SelfHost": { 12 20 "commandName": "IISExpress", -
src/FinkiChattery/FinkiChattery.Identity/appsettings.Development.json
r3bb1377 r9e95498 17 17 }, 18 18 "ConnectionStrings": { 19 "DefaultConnection": " data source=.;initial catalog=FinkiChattery;integrated security=True;application name=FinkiChattery Base App;Pooling=true;Min Pool Size=5;Max Pool Size=30;"19 "DefaultConnection": "Data Source=localhost;Initial Catalog=FinkiChattery;User ID=sa;Password=Asfa+032;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Pooling=true;Min Pool Size=5;Max Pool Size=30;" 20 20 } 21 21 }
Note:
See TracChangeset
for help on using the changeset viewer.