Merge pull request #27 from devdanielsun/developer

Update Database connection with username and password
devdanielsun · Jan 10, 2024 · 4087037 · 4087037
2 parents fdd7957 + f7858c0
commit 4087037
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/pollor.Server/.env.example b/pollor.Server/.env.example
@@ -1,5 +1,7 @@
 ACCEPTED_CORS_DOMAINS=https://127.0.0.1:4200,https://localhost:4200
 DB_SERVER=localhost\MSSQLSERVERx
 DB_NAME=name
+DB_UID=
+DB_PASSWORD=
 DB_INTEGRATEDSECURITY=True
 DB_TRUSTSERVERCERT=True
diff --git a/pollor.Server/Services/DBConnection.cs b/pollor.Server/Services/DBConnection.cs
@@ -13,10 +13,13 @@ private DBConnection()
         {
             string dbServer = Environment.GetEnvironmentVariable("DB_SERVER")!;
             string dbName = Environment.GetEnvironmentVariable("DB_NAME")!;
+            string dbUID = Environment.GetEnvironmentVariable("DB_UID")!;
+            string dbPassword = Environment.GetEnvironmentVariable("DB_PASSWORD")!;
             string dbIntegratedSecurity = Environment.GetEnvironmentVariable("DB_INTEGRATEDSECURITY")!;
             string dbTrustServerCertificate = Environment.GetEnvironmentVariable("DB_TRUSTSERVERCERT")!;
 
-            connectionString = string.Format("Server={0};Initial Catalog={1};Integrated Security={2};TrustServerCertificate={3}", dbServer, dbName, dbIntegratedSecurity, dbTrustServerCertificate);
+            //connectionString = string.Format("Server={0};Initial Catalog={1};Integrated Security={2};TrustServerCertificate={3}", dbServer, dbName, dbIntegratedSecurity, dbTrustServerCertificate);
+            connectionString = string.Format("Server={0};Database={1};UID={2};PWD={3};Integrated Security={4};TrustServerCertificate={5}", dbServer, dbName, dbUID, dbPassword, dbIntegratedSecurity, dbTrustServerCertificate);
         }
 
         public static DBConnection Instance()

diff --git a/pollor.client/src/app/polls/component/polls.component.html b/pollor.client/src/app/polls/component/polls.component.html
@@ -2,9 +2,11 @@
 
 <h3 id="tableLabel" text-right>Polls</h3>
 
-<p *ngIf="!polls"><em>Loading POLLS...</em></p>
+<p *ngIf="!polls || polls == []"><em>Loading POLLS...</em></p>
 
-<table *ngIf="polls"  class="table">
+<p *ngIf="!polls || polls.length == 0"><em>no poll data found</em></p>
+
+<table *ngIf="polls && polls.length > 0" class="table">
   <thead>
     <tr>
       <th scope="col">Poll id</th>
@@ -28,9 +30,11 @@ <h3 id="tableLabel" text-right>Polls</h3>
 
 <h3 id="tableLabel" text-right>All unsorted Answers</h3>
 
-<p *ngIf="!answers"><em>Loading ANSWERS...</em></p>
+<p *ngIf="!answers || answers == []"><em>Loading ANSWERS...</em></p>
+
+<p *ngIf="!answers || answers.length == 0"><em>no ANSWERS found in database...</em></p>
 
-<table *ngIf="answers" class="table">
+<table *ngIf="answers && answers.length > 0" class="table">
   <thead>
     <tr>
       <th scope="col">Answers id</th>
@@ -53,9 +57,12 @@ <h3 id="tableLabel" text-right>All unsorted Answers</h3>
 
 <h3 id="tableLabel" text-right>All unsorted Votes</h3>
 
-<p *ngIf="!votes"><em>Loading VOTES...</em></p>
+<p *ngIf="!votes || votes == []"><em>Loading VOTES...</em></p>
+
+<p *ngIf="!votes || votes.length == 0"><em>no VOTES found in database...</em></p>
+
 
-<table *ngIf="votes"  class="table">
+<table *ngIf="votes && votes.length > 0" class="table">
   <thead>
     <tr>
       <th scope="col">Vote id</th>

diff --git a/pollor.client/src/app/polls/component/polls.component.ts b/pollor.client/src/app/polls/component/polls.component.ts
@@ -21,7 +21,6 @@ export class PollsComponent {
     this.getPolls();
     this.getAnswers();
     this.getVotes();
-
   }
 
   getPolls() {