Changeset 9e95498


Ignore:
Timestamp:
10/21/21 20:47:04 (3 years ago)
Author:
Sara Fazliu <67891916+sarafazliu@…>
Branches:
dev
Children:
0757d8f
Parents:
3bb1377
Message:

Added header component

Files:
10 added
11 edited

Legend:

Unmodified
Added
Removed

  • src/Clients/Angular/finki-chattery/angular.json

    r3bb1377 r9e95498  
    9898            "tsConfig": "tsconfig.spec.json",
    9999            "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            ],
    102108            "scripts": []
    103109          }
    … …  
    106112          "builder": "@angular-devkit/build-angular:tslint",
    107113          "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            ]
    110122          }
    111123        },
    … …  
    125137    }
    126138  },
    127   "defaultProject": "finki-chattery"
     139  "defaultProject": "finki-chattery",
     140  "cli": {
     141    "analytics": false
     142  }
    128143}

  • src/Clients/Angular/finki-chattery/src/app/app-routing.module.ts

    r3bb1377 r9e95498  
    11import { NgModule } from '@angular/core';
     2import { CommonModule } from '@angular/common';
    23import { Routes, RouterModule } from '@angular/router';
    34import { AuthorizedGuard } from './core/guards/authorized.guard';
    … …  
    1617
    1718@NgModule({
    18   imports: [RouterModule.forRoot(routes)],
     19  imports: [
     20    CommonModule,
     21    RouterModule.forRoot(routes)
     22  ],
    1923  exports: [RouterModule]
    2024})

  • 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
    216  <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar>
    317  <router-outlet></router-outlet>

  • src/Clients/Angular/finki-chattery/src/app/app.module.ts

    r3bb1377 r9e95498  
    1111import { translateConfiguration, TranslateFromJsonService } from './shared-app/services';
    1212import { SharedMaterialModule } from './shared-material/shared-material.module';
     13import { HeaderComponent } from './navigation/header/header.component';
    1314
    1415@NgModule({
    15   declarations: [AppComponent],
     16  declarations: [AppComponent, HeaderComponent],
    1617  imports: [
    1718    BrowserModule,

  • src/Clients/Angular/finki-chattery/src/styles.scss

    r3bb1377 r9e95498  
    11html,
    22body {
     3  margin: 0;
    34  height: 100%;
    45}
     6/*
    57body {
    6   margin: 0;
    78  font-family: Roboto, sans-serif;
    89}
    … …  
    285286  z-index: 1100 !important;
    286287}
     288*/

  • src/FinkiChattery/FinkiChattery.Api/appsettings.Development.json

    r3bb1377 r9e95498  
    3131  },
    3232  "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;"
    3535  }
    3636}

  • 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"?>
    22<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
    33  <PropertyGroup>
    … …  
    5555    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
    5656  </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" />
    5959  <ItemGroup>
    6060    <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"?>
    22<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
    33  <PropertyGroup>
    … …  
    5555    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
    5656  </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" />
    5959  <ItemGroup>
    6060    <Folder Include="Properties" />
    … …  
    8080    <None Include="FinkiChattery.HangfireDatabase.publish.xml" />
    8181  </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>
    8289</Project>

  • src/FinkiChattery/FinkiChattery.Identity/Properties/launchSettings.json

    r3bb1377 r9e95498  
    99  },
    1010  "profiles": {
     11    "FinkiChattery.Identity": {
     12      "commandName": "Project",
     13      "launchBrowser": true,
     14      "applicationUrl": "https://localhost:44301",
     15      "environmentVariables": {
     16        "ASPNETCORE_ENVIRONMENT": "Development"
     17      }
     18    },
    1119    "SelfHost": {
    1220      "commandName": "IISExpress",

  • src/FinkiChattery/FinkiChattery.Identity/appsettings.Development.json

    r3bb1377 r9e95498  
    1717        },
    1818        "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;"
    2020        }
    2121}
Note: See TracChangeset for help on using the changeset viewer.