Changeset eb21f00


Ignore:
Timestamp:
10/21/21 21:10:01 (3 years ago)
Author:
Стојков Марко <mst@…>
Branches:
dev
Children:
68a1d2f
Parents:
6a65994
Message:

Fix

Location:
src
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r6a65994 reb21f00  
    11import { NgModule } from '@angular/core';
    2 import { CommonModule } from '@angular/common';
    32import { Routes, RouterModule } from '@angular/router';
    43import { AuthorizedGuard } from './core/guards/authorized.guard';
    … …  
    1716
    1817@NgModule({
    19   imports: [
    20     CommonModule,
    21     RouterModule.forRoot(routes)
    22   ],
     18  imports: [RouterModule.forRoot(routes)],
    2319  exports: [RouterModule]
    2420})

  • src/Clients/Angular/finki-chattery/src/app/app.component.html

    r6a65994 reb21f00  
    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 
     1<main>
    162  <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar>
    173  <router-outlet></router-outlet>

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

    r6a65994 reb21f00  
    1111import { translateConfiguration, TranslateFromJsonService } from './shared-app/services';
    1212import { SharedMaterialModule } from './shared-material/shared-material.module';
    13 import { HeaderComponent } from './navigation/header/header.component';
    1413
    1514@NgModule({
    16   declarations: [AppComponent, HeaderComponent],
     15  declarations: [AppComponent],
    1716  imports: [
    1817    BrowserModule,

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

    r6a65994 reb21f00  
    11html,
    22body {
     3  height: 100%;
     4}
     5body {
    36  margin: 0;
    4   height: 100%;
    5 }
    6 /*
    7 body {
    87  font-family: Roboto, sans-serif;
    98}
    … …  
    286285  z-index: 1100 !important;
    287286}
    288 */

  • src/FinkiChattery/FinkiChattery.Api/FinkiChattery.Api.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.Api/Services/RegisterServices.cs

    r6a65994 reb21f00  
    3636        public static void AddHangfireService(this IServiceCollection services, IConfiguration configuration)
    3737        {
     38            string connectionString = "HangfireConnection";
     39
     40#if DEBUG_DOCKER
     41            connectionString = "HangfireConnectionDocker";
     42#endif
     43
    3844            services.AddHangfire(x =>
    3945            {
    40                 x.UseSqlServerStorage(configuration.GetConnectionString("HangfireConnection"), new SqlServerStorageOptions
     46                x.UseSqlServerStorage(configuration.GetConnectionString(connectionString), new SqlServerStorageOptions
    4147                {
    4248                    CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),

  • src/FinkiChattery/FinkiChattery.Api/Startup.cs

    r6a65994 reb21f00  
    3939            services.AddHangfireService(Configuration);
    4040
     41            string connectionString = "DefaultConnection";
     42
     43#if DEBUG_DOCKER
     44            connectionString = "DefaultConnectionDocker";
     45#endif
     46
    4147            services.AddDbContext<ApplicationDbContext>(options =>
    42                 options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
     48                options.UseSqlServer(Configuration.GetConnectionString(connectionString)));
    4349
    4450            services.AddControllers()

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

    r6a65994 reb21f00  
    2525    },
    2626    "corsSettings": {
    27       "allowedCorsOrigins": [
    28         "http://localhost:4200"
    29       ]
     27      "allowedCorsOrigins": ["http://localhost:4200"]
    3028    }
    3129  },
    3230  "ConnectionStrings": {
    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;"
     31    "DefaultConnection": "data source=.;initial catalog=FinkiChattery;integrated security=True;application name=FinkiChattery Base App;Pooling=true;Min Pool Size=5;Max Pool Size=30;",
     32    "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    "DefaultConnectionDocker": "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    "HangfireConnectionDocker": "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.Commands/FinkiChattery.Commands.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.Common/FinkiChattery.Common.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.Contracts/FinkiChattery.Contracts.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.Identity/FinkiChattery.Identity.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.Identity/Startup.cs

    r6a65994 reb21f00  
    2828            services.AddControllersWithViews();
    2929
     30
     31            string connectionString = "DefaultConnection";
     32
     33#if DEBUG_DOCKER
     34            connectionString = "DefaultConnectionDocker";
     35#endif
     36
    3037            services.AddDbContextPool<ApplicationDbContext<ApplicationUser>>(options =>
    31                 options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
     38                options.UseSqlServer(Configuration.GetConnectionString(connectionString)));
    3239
    3340            services.AddIdentityServerAndIdentityProvider(AppSettings);

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

    r6a65994 reb21f00  
    1717        },
    1818        "ConnectionStrings": {
    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;"
     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;",
     20                "DefaultConnectionDocker": "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;"
    2021        }
    2122}

  • src/FinkiChattery/FinkiChattery.Persistence/FinkiChattery.Persistence.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.Queries/FinkiChattery.Queries.csproj

    r6a65994 reb21f00  
    33  <PropertyGroup>
    44    <TargetFramework>netcoreapp3.1</TargetFramework>
     5    <Configurations>Debug;Release;Debug_Docker</Configurations>
    56  </PropertyGroup>
    67

  • src/FinkiChattery/FinkiChattery.sln

    r6a65994 reb21f00  
    2222Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "FinkiChattery.HangfireDatabase", "FinkiChattery.HangfireDatabase\FinkiChattery.HangfireDatabase.sqlproj", "{C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}"
    2323EndProject
    24 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinkiChattery.Commands", "FinkiChattery.Commands\FinkiChattery.Commands.csproj", "{7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}"
     24Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FinkiChattery.Commands", "FinkiChattery.Commands\FinkiChattery.Commands.csproj", "{7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}"
    2525EndProject
    26 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinkiChattery.Queries", "FinkiChattery.Queries\FinkiChattery.Queries.csproj", "{D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}"
     26Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FinkiChattery.Queries", "FinkiChattery.Queries\FinkiChattery.Queries.csproj", "{D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}"
    2727EndProject
    2828Global
    2929        GlobalSection(SolutionConfigurationPlatforms) = preSolution
     30                Debug_Docker|Any CPU = Debug_Docker|Any CPU
    3031                Debug|Any CPU = Debug|Any CPU
    3132                Release|Any CPU = Release|Any CPU
    3233        EndGlobalSection
    3334        GlobalSection(ProjectConfigurationPlatforms) = postSolution
     35                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     36                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    3437                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3538                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Debug|Any CPU.Build.0 = Debug|Any CPU
    3639                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3740                {8CD7796E-5DC1-413D-8D04-3C95E89BB214}.Release|Any CPU.Build.0 = Release|Any CPU
     41                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     42                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    3843                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3944                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
    4045                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    4146                {D2EADD50-983E-48EE-8B36-7CF088DCF8AE}.Release|Any CPU.Build.0 = Release|Any CPU
     47                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     48                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    4249                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    4350                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Debug|Any CPU.Build.0 = Debug|Any CPU
    4451                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Release|Any CPU.ActiveCfg = Release|Any CPU
    4552                {1BA385FA-32FC-4237-85D2-705EEBCAFD06}.Release|Any CPU.Build.0 = Release|Any CPU
     53                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     54                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    4655                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    4756                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
    4857                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    4958                {4D2F08BF-44F0-427D-B5B8-079233500FA8}.Release|Any CPU.Build.0 = Release|Any CPU
     59                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     60                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    5061                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5162                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
    5263                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
    5364                {E69CDEE7-B2F5-42F4-81F0-11DCDC1C8CC9}.Release|Any CPU.Build.0 = Release|Any CPU
     65                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     66                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
     67                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug_Docker|Any CPU.Deploy.0 = Debug_Docker|Any CPU
    5468                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5569                {5E1219F5-FC7D-4138-811D-26934E946D30}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    5872                {5E1219F5-FC7D-4138-811D-26934E946D30}.Release|Any CPU.Build.0 = Release|Any CPU
    5973                {5E1219F5-FC7D-4138-811D-26934E946D30}.Release|Any CPU.Deploy.0 = Release|Any CPU
     74                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     75                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
     76                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug_Docker|Any CPU.Deploy.0 = Debug_Docker|Any CPU
    6077                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    6178                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    6481                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Release|Any CPU.Build.0 = Release|Any CPU
    6582                {C4CB8596-3F3A-4B4E-BEC5-0720FF7CD532}.Release|Any CPU.Deploy.0 = Release|Any CPU
     83                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     84                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    6685                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    6786                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
    6887                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
    6988                {7AD9C86F-46FF-442A-B134-3CE2E82CE0D0}.Release|Any CPU.Build.0 = Release|Any CPU
     89                {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug_Docker|Any CPU.ActiveCfg = Debug_Docker|Any CPU
     90                {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug_Docker|Any CPU.Build.0 = Debug_Docker|Any CPU
    7091                {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    7192                {D19820A3-E6E6-4B1C-927A-C8B8B4B16D25}.Debug|Any CPU.Build.0 = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.