From 8f70977a27fe549a49390119eb869bcaf5460f5e Mon Sep 17 00:00:00 2001
From: Derek Holloway <derek@mistox.com>
Date: Thu, 7 Aug 2025 17:44:28 -0700
Subject: [PATCH 1/2] Update all pages to new angular format

---
 ToDo.yaml                                     |   4 +-
 .../pages/main/company/company.component.html | 126 +++++++++++-------
 .../main/company/editor/editor.component.html |   8 +-
 .../main/jobs/editor/jobeditor.component.html |  50 +++----
 .../app/pages/main/jobs/jobs.component.html   |  38 +++---
 .../main/jobs/viewer/jobviewer.component.html |  88 ++++++------
 .../pages/main/resumes/resumes.component.html |   6 +-
 7 files changed, 183 insertions(+), 137 deletions(-)

diff --git a/ToDo.yaml b/ToDo.yaml
index 011281a..35c717a 100755
--- a/ToDo.yaml
+++ b/ToDo.yaml
@@ -46,7 +46,9 @@ Client:
         Edit employees not implimented yet
 
     Company:
-        No employees for table yet
+        Need to impliment Add employee
+        Need to impliment Remove employee
+        Edit Company -> Dont allow edit of company email due to it being verified
 
 
 database:
diff --git a/src/Client/src/app/pages/main/company/company.component.html b/src/Client/src/app/pages/main/company/company.component.html
index 086f32e..f033da4 100644
--- a/src/Client/src/app/pages/main/company/company.component.html
+++ b/src/Client/src/app/pages/main/company/company.component.html
@@ -1,58 +1,84 @@
 <div class="top-bar">
-    <button *ngFor="let company of Employers" (click)="changeSelectedCompany(company.company.id!)">{{ company.company.name.toUpperCase() }}</button>
-    <button routerLink="/company/editor" >CONNECT A COMPANY</button>
+    @for(company of Employers; track company.accountID){
+        <button (click)="changeSelectedCompany(company.company.id!)">{{ company.company.name.toUpperCase() }}</button>
+        <button routerLink="/company/editor" >CONNECT A COMPANY</button>
+    }
 </div>
 <div class="content-frame">
-    <div *ngIf="Comp != null">
-        <button class="content-edit" style="color: #fff; border-color: #fff;" routerLink="/company/editor" [queryParams]="{ CompanyID: Comp.id }" >EDIT COMPANY</button>
-        <div class="center-item">
-            <a [href]="Comp.websiteURL">
-                <img [src]="Comp.logo" />
-            </a>
-        </div>
-        <div class="center-item">
-            <div class="content-link"><a [href]="'mailto:' + Comp.email" >{{ Comp.email }}</a></div>
-            <div class="content-name"><h1>{{ Comp.name }}</h1></div>
-            <div class="content-link"><a [href]="'tel:' + Comp.phone">{{ Comp.phone }}</a></div>
-        </div>
-        <div class="center-item">
-            <h1>{{ Comp.city }}, {{ Comp.stateOrRegion }} {{ Comp.postalCode }}</h1>
-        </div>
-        <div class="content-desc">
-            <h1 *ngFor="let line of Desc">{{ line }}</h1>
-        </div>
-        <div class="content-button" *ngIf="Comp.emailVerified">
-            <button style="color: #fff; border-color: #fff;" routerLink="/jobs/editor" [queryParams]="{ CompanyID: Comp.id }" >POST JOB</button>
-        </div>
-        <div class="content-button" *ngIf="!Comp.emailVerified">
-            <a style="color: #fff; border-color: #fff;" [href]="'/api/company/sendverifyemail?CompanyID=' + Comp.id" >VERIFY EMAIL></a>
-            <span>You must verify your company email before you can post job listings.</span>
-        </div>
-        <hr />
-        <div class="split-frame">
-            <div class="half-frame">
-                <h2>Active Job Listings</h2>
-                <div class="job-tile" *ngFor="let listing of List">
-                    <div class="center-text">
-                        <h1>{{ listing.title }}</h1>
-                    </div>
-                    <button [routerLink]="['/jobs/viewer']" [queryParams]="{ JobID: listing.id }" >VIEW LISTING</button>
-                    <button [routerLink]="['/jobs/editor']" [queryParams]="{ JobID: listing.id }" >EDIT LISTING</button>
-                    <button (click)="RemoveJobListing(listing.id!)">DELETE LISTING</button>
-                </div>
+    @if(Comp != null){
+        <div>
+            <button class="content-edit" style="color: #fff; border-color: #fff;" routerLink="/company/editor" [queryParams]="{ CompanyID: Comp.id }" >EDIT COMPANY</button>
+            <div class="center-item">
+                <a [href]="Comp.websiteURL">
+                    <img [src]="Comp.logo" />
+                </a>
             </div>
-            <div class="half-frame">
-                <h2>Employees</h2>
-                @for (listing of CompEmployees; track listing.id) {
-                    <div class="job-tile">
-                        <div class="center-text">
-                            <h1>{{ listing.accountName }}</h1>
-                        </div>
-                        <button [routerLink]="['/']" [queryParams]="{ JobID: listing.id }" >REMOVE</button>
-                        <button (click)="RemoveJobListing(listing.id!)">DELETE LISTING</button>
-                    </div>
+            <div class="center-item">
+                <div class="content-link"><a [href]="'mailto:' + Comp.email" >{{ Comp.email }}</a></div>
+                <div class="content-name"><h1>{{ Comp.name }}</h1></div>
+                <div class="content-link"><a [href]="'tel:' + Comp.phone">{{ Comp.phone }}</a></div>
+            </div>
+            <div class="center-item">
+                <h1>{{ Comp.city }}, {{ Comp.stateOrRegion }} {{ Comp.postalCode }}</h1>
+            </div>
+            <div class="content-desc">
+                @for (line of Desc; track line.length){
+                    <h1>{{ line }}</h1>
                 }
             </div>
+            <hr />
+            <div class="split-frame">
+                <div class="half-frame">
+                    @if (Comp.emailVerified){
+                        <div class="content-button">
+                            <button style="color: #fff; border-color: #fff;" routerLink="/jobs/editor" [queryParams]="{ CompanyID: Comp.id }" >POST JOB</button>
+                        </div>
+                    } @else {
+                        <div class="content-button">
+                            <a style="color: #fff; border-color: #fff;" [href]="'/api/company/sendverifyemail?CompanyID=' + Comp.id" >VERIFY EMAIL></a>
+                            <span>You must verify your company email before you can post job listings.</span>
+                        </div>
+                    }
+                    <hr />
+                    <h2>Active Job Listings</h2>
+                    @for (listing of List; track listing.id) {
+                        <div class="job-tile">
+                            <div class="center-text">
+                                <h1>{{ listing.title }}</h1>
+                            </div>
+                            <button [routerLink]="['/jobs/viewer']" [queryParams]="{ JobID: listing.id }" >VIEW LISTING</button>
+                            <button [routerLink]="['/jobs/editor']" [queryParams]="{ JobID: listing.id }" >EDIT LISTING</button>
+                            <button (click)="RemoveJobListing(listing.id!)">DELETE LISTING</button>
+                        </div>
+                    }
+                </div>
+                <div class="half-frame">
+                    @if (Comp.emailVerified){
+                        <div class="content-button">
+                            <button style="color: #fff; border-color: #fff;" routerLink="/jobs/editor" [queryParams]="{ CompanyID: Comp.id }" >ADD EMPLOYEE</button>
+                        </div>
+                    } @else {
+                        <div class="content-button">
+                            <a style="color: #fff; border-color: #fff;" [href]="'/api/company/sendverifyemail?CompanyID=' + Comp.id" >VERIFY EMAIL></a>
+                            <span>You must verify your company email before you can post job listings.</span>
+                        </div>
+                    }
+                    <hr />
+                    <h2>Employees</h2>
+                    @for (listing of CompEmployees; track listing.id) {
+                        <div class="job-tile">
+                            <div class="center-text">
+                                <h1>{{ listing.accountName }}</h1>
+                            </div>
+                            @if (listing.accountID != auth.loggedInUser.id){
+                                <button (click)="RemoveJobListing(listing.id!)">Remove</button>
+                            } @else {
+                                <button disabled>SELF</button>
+                            }
+                        </div>
+                    }
+                </div>
+            </div>
         </div>
-    </div>
+    }
 </div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/main/company/editor/editor.component.html b/src/Client/src/app/pages/main/company/editor/editor.component.html
index bbca485..7f99919 100644
--- a/src/Client/src/app/pages/main/company/editor/editor.component.html
+++ b/src/Client/src/app/pages/main/company/editor/editor.component.html
@@ -148,9 +148,11 @@
                         <span>postal code: {{ newListing.postalCode }}</span>
                     </div>
                 </div>
-                <div *ngFor="let descLine of newListing.description.split('\n')">
-                    <span>{{ descLine }}</span><br />
-                </div>
+                @for(descLine of newListing.description.split('\n'); track descLine.length){
+                    <div>
+                        <span>{{ descLine }}</span><br />
+                    </div>
+                }
             </div>
             <div class="content-frame">
                 <button type="button" (click)="prevStep()">Back</button>
diff --git a/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.html b/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.html
index e60b47f..2b85627 100644
--- a/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.html
+++ b/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.html
@@ -40,35 +40,37 @@
     </div>
 
     <!-- Location -->
-    <div #step *ngIf="!Listing.remote" class="sub-frame">
-        <div class="center">
-            <h2>Job Location</h2>
-            <div>
-                <div class="content-frame split" style="border-radius: 10px 10px 0 0;">
-                    <div class="half-frame">
-                        <label>City</label>
-                        <input name="city" [(ngModel)]="Listing.city" type="text" />
+    @if(!Listing.remote){
+        <div #step class="sub-frame">
+            <div class="center">
+                <h2>Job Location</h2>
+                <div>
+                    <div class="content-frame split" style="border-radius: 10px 10px 0 0;">
+                        <div class="half-frame">
+                            <label>City</label>
+                            <input name="city" [(ngModel)]="Listing.city" type="text" />
+                        </div>
+                        <div class="half-frame">
+                            <label>2 Letter State/Region</label>
+                            <input name="stateOrRegion" maxlength="2" minlength="2" [(ngModel)]="Listing.stateOrRegion" type="text" />
+                        </div>
                     </div>
-                    <div class="half-frame">
-                        <label>2 Letter State/Region</label>
-                        <input name="stateOrRegion" maxlength="2" minlength="2" [(ngModel)]="Listing.stateOrRegion" type="text" />
+                    <div class="content-frame split" style="border-radius: 0 0 10px 10px;">
+                        <div class="half-frame">
+                            <label>2 Letter Country</label>
+                            <input name="country" maxlength="2" minlength="2" [(ngModel)]="Listing.country" type="text" />
+                        </div>
+                        <div class="half-frame">
+                            <label>Postal Code</label>
+                            <input name="postalCode" [(ngModel)]="Listing.postalCode" type="text" />
+                        </div>
                     </div>
+                    <button type="button" (click)="prevStep()">Back</button>
+                    <button type="button" (click)="nextStep()">Next</button>
                 </div>
-                <div class="content-frame split" style="border-radius: 0 0 10px 10px;">
-                    <div class="half-frame">
-                        <label>2 Letter Country</label>
-                        <input name="country" maxlength="2" minlength="2" [(ngModel)]="Listing.country" type="text" />
-                    </div>
-                    <div class="half-frame">
-                        <label>Postal Code</label>
-                        <input name="postalCode" [(ngModel)]="Listing.postalCode" type="text" />
-                    </div>
-                </div>
-                <button type="button" (click)="prevStep()">Back</button>
-                <button type="button" (click)="nextStep()">Next</button>
             </div>
         </div>
-    </div>
+    }
 
     <!-- Salary Range -->
     <div #step class="sub-frame">
diff --git a/src/Client/src/app/pages/main/jobs/jobs.component.html b/src/Client/src/app/pages/main/jobs/jobs.component.html
index a92934d..c3faab1 100644
--- a/src/Client/src/app/pages/main/jobs/jobs.component.html
+++ b/src/Client/src/app/pages/main/jobs/jobs.component.html
@@ -1,20 +1,24 @@
 <!-- Avaliable Jobs -->
-<div class="tile-frame" *ngFor="let cur of JobListingPage">
-    <div class="tile">
-        <div class="tile-title">
-            <h1>{{ cur.title }}</h1>
-            <h2>${{ cur.salaryMin }} - ${{ cur.salaryMax }}</h2>
-        </div>
-        <div class="tile-split">
-            <h1>{{ cur.jobType }}</h1>
-            <h1 *ngIf="cur.remote" >Remote</h1>
-        </div>
-        <div class="tile-split">
-            <h1>{{ cur.city }}</h1>
-            <h1>{{ cur.stateOrRegion }}</h1>
-        </div>
-        <div class="tile-button">
-            <button [routerLink]="['/jobs/viewer']"  [queryParams]="{ JobID: cur.id }" >VIEW LISTING</button>
+ @for (cur of JobListingPage; track cur.id){
+    <div class="tile-frame">
+        <div class="tile">
+            <div class="tile-title">
+                <h1>{{ cur.title }}</h1>
+                <h2>${{ cur.salaryMin }} - ${{ cur.salaryMax }}</h2>
+            </div>
+            <div class="tile-split">
+                <h1>{{ cur.jobType }}</h1>
+                @if(cur.remote){
+                    <h1>Remote</h1>
+                }
+            </div>
+            <div class="tile-split">
+                <h1>{{ cur.city }}</h1>
+                <h1>{{ cur.stateOrRegion }}</h1>
+            </div>
+            <div class="tile-button">
+                <button [routerLink]="['/jobs/viewer']"  [queryParams]="{ JobID: cur.id }" >VIEW LISTING</button>
+            </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+ }
\ No newline at end of file
diff --git a/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.html b/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.html
index 3da246a..00c1332 100644
--- a/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.html
+++ b/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.html
@@ -1,45 +1,53 @@
 <div class="job-frame">
-    <div class="company-details" *ngIf="jobsCompany != null" >
-        <div class="center-item">
-            <a [href]="jobsCompany.websiteURL">
-                <img [src]="jobsCompany.logo" />
-            </a>
-        </div>
-        <div class="center-item">
-            <div class="content-link"><a [href]="'mailto:' + jobsCompany.email" >{{ jobsCompany.email }}</a></div>
-            <div class="content-name"><h1>{{ jobsCompany.name }}</h1></div>
-            <div class="content-link"><a [href]="'tel:' + jobsCompany.phone">{{ jobsCompany.phone }}</a></div>
-        </div>
-        <div class="center-item">
-            <h1>{{ jobsCompany.city }}, {{ jobsCompany.stateOrRegion }} {{ jobsCompany.postalCode }}</h1>
-        </div>
-        <div class="content-desc">
-            <h1 *ngFor="let line of jobsCompany.description.split('\n')">{{ line }}</h1>
-        </div>
-    </div>
-    <div class="job-details" *ngIf="selectedJob != null" >
-        <div class="job-timestamp">
-            <h1>Opened: {{ selectedJob.createdTime }}</h1>
-            <h1>Modified: {{ selectedJob.modifiedTime }}</h1>
+    @if (jobsCompany != null){
+        <div class="company-details">
+            <div class="center-item">
+                <a [href]="jobsCompany.websiteURL">
+                    <img [src]="jobsCompany.logo" />
+                </a>
+            </div>
+            <div class="center-item">
+                <div class="content-link"><a [href]="'mailto:' + jobsCompany.email" >{{ jobsCompany.email }}</a></div>
+                <div class="content-name"><h1>{{ jobsCompany.name }}</h1></div>
+                <div class="content-link"><a [href]="'tel:' + jobsCompany.phone">{{ jobsCompany.phone }}</a></div>
+            </div>
+            <div class="center-item">
+                <h1>{{ jobsCompany.city }}, {{ jobsCompany.stateOrRegion }} {{ jobsCompany.postalCode }}</h1>
+            </div>
+            <div class="content-desc">
+                @for(line of jobsCompany.description.split('\n'); track line.length){
+                    <h1>{{ line }}</h1>
+                }
+            </div>
         </div>
+    }
+    @if (selectedJob != null) {
+        <div class="job-details">
+            <div class="job-timestamp">
+                <h1>Opened: {{ selectedJob.createdTime }}</h1>
+                <h1>Modified: {{ selectedJob.modifiedTime }}</h1>
+            </div>
 
-        <div class="job-warning" *ngIf="selectedJob.isDeleted" >
-            <h2>THIS JOB POSTING IS CLOSED</h2>
+            @if (selectedJob.isDeleted){
+                <div class="job-warning">
+                    <h2>THIS JOB POSTING IS CLOSED</h2>
+                </div>
+            }
+
+            <h1>{{ selectedJob.title }}</h1>
+
+            <h1>{{ selectedJob.jobType }}</h1>
+            <h1>{{ selectedJob.remote }}</h1>
+
+            <h1>{{ selectedJob.salaryMin }}</h1>
+            <h1>{{ selectedJob.salaryMax }}</h1>
+            
+            <h1>{{ selectedJob.city }}</h1>
+            <h1>{{ selectedJob.stateOrRegion }}</h1>
+            <h1>{{ selectedJob.country }}</h1>
+            <h1>{{ selectedJob.postalCode }}</h1>
+
+            <h1>{{ selectedJob.description }}</h1>
         </div>
-
-        <h1>{{ selectedJob.title }}</h1>
-
-        <h1>{{ selectedJob.jobType }}</h1>
-        <h1>{{ selectedJob.remote }}</h1>
-
-        <h1>{{ selectedJob.salaryMin }}</h1>
-        <h1>{{ selectedJob.salaryMax }}</h1>
-        
-        <h1>{{ selectedJob.city }}</h1>
-        <h1>{{ selectedJob.stateOrRegion }}</h1>
-        <h1>{{ selectedJob.country }}</h1>
-        <h1>{{ selectedJob.postalCode }}</h1>
-
-        <h1>{{ selectedJob.description }}</h1>
-    </div>
+    }
 </div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/main/resumes/resumes.component.html b/src/Client/src/app/pages/main/resumes/resumes.component.html
index dad91d6..9039ec8 100644
--- a/src/Client/src/app/pages/main/resumes/resumes.component.html
+++ b/src/Client/src/app/pages/main/resumes/resumes.component.html
@@ -1,4 +1,6 @@
 <!-- My Resumes -->
-<div *ngIf="auth.isLoggedIn" class="jobs-frame">
+ @if (auth.isLoggedIn){
+    <div class="jobs-frame">
     
-</div>
\ No newline at end of file
+    </div>
+ }
\ No newline at end of file

From 3b00b3d6671eb414d8798a300f1a31ea28dd5747 Mon Sep 17 00:00:00 2001
From: Derek Holloway <derek@mistox.com>
Date: Thu, 7 Aug 2025 22:54:48 -0700
Subject: [PATCH 2/2] Sort file structure

---
 src/Client/src/app/app.html                   |  6 ++---
 src/Client/src/app/app.routes.ts              | 23 ++++++-----------
 .../{main => }/company/company.component.css  |  0
 .../{main => }/company/company.component.html |  0
 .../{main => }/company/company.component.ts   |  0
 .../company/editor/editor.component.css       |  0
 .../company/editor/editor.component.html      |  0
 .../company/editor/editor.component.ts        |  0
 .../pages/{main => }/home/home.component.css  |  0
 .../pages/{main => }/home/home.component.html |  0
 .../pages/{main => }/home/home.component.ts   |  0
 .../jobs/editor/jobeditor.component.css       |  0
 .../jobs/editor/jobeditor.component.html      |  0
 .../jobs/editor/jobeditor.component.ts        |  0
 .../pages/{main => }/jobs/jobs.component.css  |  0
 .../pages/{main => }/jobs/jobs.component.html |  0
 .../pages/{main => }/jobs/jobs.component.ts   |  0
 .../jobs/viewer/jobviewer.component.css       |  0
 .../jobs/viewer/jobviewer.component.html      |  0
 .../jobs/viewer/jobviewer.component.ts        |  0
 .../app/pages/legal/about/about.component.css | 16 ------------
 .../pages/legal/about/about.component.html    | 25 -------------------
 .../app/pages/legal/about/about.component.ts  | 20 ---------------
 .../pages/legal/contact/contact.component.css | 15 -----------
 .../legal/contact/contact.component.html      | 11 --------
 .../pages/legal/contact/contact.component.ts  | 20 ---------------
 .../pages/legal/privacy/privacy.component.css | 15 -----------
 .../legal/privacy/privacy.component.html      | 11 --------
 .../pages/legal/privacy/privacy.component.ts  | 20 ---------------
 .../{main => }/resumes/resumes.component.css  |  0
 .../{main => }/resumes/resumes.component.html |  0
 .../{main => }/resumes/resumes.component.ts   |  0
 32 files changed, 11 insertions(+), 171 deletions(-)
 rename src/Client/src/app/pages/{main => }/company/company.component.css (100%)
 rename src/Client/src/app/pages/{main => }/company/company.component.html (100%)
 rename src/Client/src/app/pages/{main => }/company/company.component.ts (100%)
 rename src/Client/src/app/pages/{main => }/company/editor/editor.component.css (100%)
 rename src/Client/src/app/pages/{main => }/company/editor/editor.component.html (100%)
 rename src/Client/src/app/pages/{main => }/company/editor/editor.component.ts (100%)
 rename src/Client/src/app/pages/{main => }/home/home.component.css (100%)
 rename src/Client/src/app/pages/{main => }/home/home.component.html (100%)
 rename src/Client/src/app/pages/{main => }/home/home.component.ts (100%)
 rename src/Client/src/app/pages/{main => }/jobs/editor/jobeditor.component.css (100%)
 rename src/Client/src/app/pages/{main => }/jobs/editor/jobeditor.component.html (100%)
 rename src/Client/src/app/pages/{main => }/jobs/editor/jobeditor.component.ts (100%)
 rename src/Client/src/app/pages/{main => }/jobs/jobs.component.css (100%)
 rename src/Client/src/app/pages/{main => }/jobs/jobs.component.html (100%)
 rename src/Client/src/app/pages/{main => }/jobs/jobs.component.ts (100%)
 rename src/Client/src/app/pages/{main => }/jobs/viewer/jobviewer.component.css (100%)
 rename src/Client/src/app/pages/{main => }/jobs/viewer/jobviewer.component.html (100%)
 rename src/Client/src/app/pages/{main => }/jobs/viewer/jobviewer.component.ts (100%)
 delete mode 100644 src/Client/src/app/pages/legal/about/about.component.css
 delete mode 100644 src/Client/src/app/pages/legal/about/about.component.html
 delete mode 100644 src/Client/src/app/pages/legal/about/about.component.ts
 delete mode 100644 src/Client/src/app/pages/legal/contact/contact.component.css
 delete mode 100644 src/Client/src/app/pages/legal/contact/contact.component.html
 delete mode 100644 src/Client/src/app/pages/legal/contact/contact.component.ts
 delete mode 100644 src/Client/src/app/pages/legal/privacy/privacy.component.css
 delete mode 100644 src/Client/src/app/pages/legal/privacy/privacy.component.html
 delete mode 100644 src/Client/src/app/pages/legal/privacy/privacy.component.ts
 rename src/Client/src/app/pages/{main => }/resumes/resumes.component.css (100%)
 rename src/Client/src/app/pages/{main => }/resumes/resumes.component.html (100%)
 rename src/Client/src/app/pages/{main => }/resumes/resumes.component.ts (100%)

diff --git a/src/Client/src/app/app.html b/src/Client/src/app/app.html
index c02f3a9..cc27886 100644
--- a/src/Client/src/app/app.html
+++ b/src/Client/src/app/app.html
@@ -26,9 +26,9 @@
 </div>
 <div class="bottom-bar">
   <div class="bottom-bar-buttons bottom-bar-float">
-    <a class="nav-button-bottom bottom-bar-padding" routerLink="/contact">CONTACT</a>
-    <a class="nav-button-bottom bottom-bar-padding" routerLink="/privacy">PRIVACY</a>
-    <a class="nav-button-bottom bottom-bar-padding" routerLink="/about">ABOUT</a>
+    <a class="nav-button-bottom bottom-bar-padding" href="https://auth.mistox.com/contact">CONTACT</a>
+    <a class="nav-button-bottom bottom-bar-padding" href="https://auth.mistox.com/privacy">PRIVACY</a>
+    <a class="nav-button-bottom bottom-bar-padding" href="https://auth.mistox.com/about">ABOUT</a>
   </div>
   <a class="bottom-bar-logo" href="https://mistox.com">
     <img src="img/mistox-logo.png" />
diff --git a/src/Client/src/app/app.routes.ts b/src/Client/src/app/app.routes.ts
index 742e20a..df088d1 100644
--- a/src/Client/src/app/app.routes.ts
+++ b/src/Client/src/app/app.routes.ts
@@ -1,14 +1,12 @@
 import { Routes } from '@angular/router';
-import { AboutComponent } from './pages/legal/about/about.component';
-import { HomeComponent } from './pages/main/home/home.component';
-import { ContactComponent } from './pages/legal/contact/contact.component';
-import { PrivacyComponent } from './pages/legal/privacy/privacy.component';
-import { JobsComponent } from './pages/main/jobs/jobs.component';
-import { ResumesComponent } from './pages/main/resumes/resumes.component';
-import { JobEditorComponent } from './pages/main/jobs/editor/jobeditor.component';
-import { CompanyEditorComponent } from './pages/main/company/editor/editor.component';
-import { JobViewerComponent } from './pages/main/jobs/viewer/jobviewer.component';
-import { CompanyComponent } from './pages/main/company/company.component';
+
+import { HomeComponent } from './pages/home/home.component';
+import { JobsComponent } from './pages/jobs/jobs.component';
+import { ResumesComponent } from './pages/resumes/resumes.component';
+import { JobEditorComponent } from './pages/jobs/editor/jobeditor.component';
+import { CompanyEditorComponent } from './pages/company/editor/editor.component';
+import { JobViewerComponent } from './pages/jobs/viewer/jobviewer.component';
+import { CompanyComponent } from './pages/company/company.component';
 
 export const routes: Routes = [
 
@@ -26,10 +24,5 @@ export const routes: Routes = [
     // Company
     { path: "company", component: CompanyComponent },
     { path: "company/editor", component: CompanyEditorComponent },
-
-    // Legal
-    { path: "about", component: AboutComponent },
-    { path: "contact", component: ContactComponent },
-    { path: "privacy", component: PrivacyComponent }
     
 ]
\ No newline at end of file
diff --git a/src/Client/src/app/pages/main/company/company.component.css b/src/Client/src/app/pages/company/company.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/company/company.component.css
rename to src/Client/src/app/pages/company/company.component.css
diff --git a/src/Client/src/app/pages/main/company/company.component.html b/src/Client/src/app/pages/company/company.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/company/company.component.html
rename to src/Client/src/app/pages/company/company.component.html
diff --git a/src/Client/src/app/pages/main/company/company.component.ts b/src/Client/src/app/pages/company/company.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/company/company.component.ts
rename to src/Client/src/app/pages/company/company.component.ts
diff --git a/src/Client/src/app/pages/main/company/editor/editor.component.css b/src/Client/src/app/pages/company/editor/editor.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/company/editor/editor.component.css
rename to src/Client/src/app/pages/company/editor/editor.component.css
diff --git a/src/Client/src/app/pages/main/company/editor/editor.component.html b/src/Client/src/app/pages/company/editor/editor.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/company/editor/editor.component.html
rename to src/Client/src/app/pages/company/editor/editor.component.html
diff --git a/src/Client/src/app/pages/main/company/editor/editor.component.ts b/src/Client/src/app/pages/company/editor/editor.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/company/editor/editor.component.ts
rename to src/Client/src/app/pages/company/editor/editor.component.ts
diff --git a/src/Client/src/app/pages/main/home/home.component.css b/src/Client/src/app/pages/home/home.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/home/home.component.css
rename to src/Client/src/app/pages/home/home.component.css
diff --git a/src/Client/src/app/pages/main/home/home.component.html b/src/Client/src/app/pages/home/home.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/home/home.component.html
rename to src/Client/src/app/pages/home/home.component.html
diff --git a/src/Client/src/app/pages/main/home/home.component.ts b/src/Client/src/app/pages/home/home.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/home/home.component.ts
rename to src/Client/src/app/pages/home/home.component.ts
diff --git a/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.css b/src/Client/src/app/pages/jobs/editor/jobeditor.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/editor/jobeditor.component.css
rename to src/Client/src/app/pages/jobs/editor/jobeditor.component.css
diff --git a/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.html b/src/Client/src/app/pages/jobs/editor/jobeditor.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/editor/jobeditor.component.html
rename to src/Client/src/app/pages/jobs/editor/jobeditor.component.html
diff --git a/src/Client/src/app/pages/main/jobs/editor/jobeditor.component.ts b/src/Client/src/app/pages/jobs/editor/jobeditor.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/editor/jobeditor.component.ts
rename to src/Client/src/app/pages/jobs/editor/jobeditor.component.ts
diff --git a/src/Client/src/app/pages/main/jobs/jobs.component.css b/src/Client/src/app/pages/jobs/jobs.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/jobs.component.css
rename to src/Client/src/app/pages/jobs/jobs.component.css
diff --git a/src/Client/src/app/pages/main/jobs/jobs.component.html b/src/Client/src/app/pages/jobs/jobs.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/jobs.component.html
rename to src/Client/src/app/pages/jobs/jobs.component.html
diff --git a/src/Client/src/app/pages/main/jobs/jobs.component.ts b/src/Client/src/app/pages/jobs/jobs.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/jobs.component.ts
rename to src/Client/src/app/pages/jobs/jobs.component.ts
diff --git a/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.css b/src/Client/src/app/pages/jobs/viewer/jobviewer.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.css
rename to src/Client/src/app/pages/jobs/viewer/jobviewer.component.css
diff --git a/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.html b/src/Client/src/app/pages/jobs/viewer/jobviewer.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.html
rename to src/Client/src/app/pages/jobs/viewer/jobviewer.component.html
diff --git a/src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.ts b/src/Client/src/app/pages/jobs/viewer/jobviewer.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/jobs/viewer/jobviewer.component.ts
rename to src/Client/src/app/pages/jobs/viewer/jobviewer.component.ts
diff --git a/src/Client/src/app/pages/legal/about/about.component.css b/src/Client/src/app/pages/legal/about/about.component.css
deleted file mode 100644
index a1852bc..0000000
--- a/src/Client/src/app/pages/legal/about/about.component.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.center {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-}
-
-.frame {
-    background-color: #000;
-    padding: 20px;
-    margin: 20px 0;
-    border-radius: 10px;
-}
-
-.center p {
-    color: #FFF;
-}
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/about/about.component.html b/src/Client/src/app/pages/legal/about/about.component.html
deleted file mode 100644
index bc0fcf3..0000000
--- a/src/Client/src/app/pages/legal/about/about.component.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="center">
-    <div class="frame">
-        <p>Welcome to Mistox LLC. A project and hobby of Derek Holloway.</p>
-        <br />
-        <p>I am an indi-developer who has been making small projects since I was 13. I originally learned lua and spent 4 years mastering it. Then I moved onto C# which is my preferred language</p>
-        <p>My programming catalog consist of C#, Lua, SQL, C++, C, and JavaScript in the order of knowledge from best to passiable.</p>
-        <p>Im currently in college for computer sciences and should honestly be doing that instead of this but I find working on this website and hobby games to be way more enjoyable.</p>
-        <br />
-        <p>I would love to learn how to use Blender in order to make all the models for my games but with the amount of work ive already made for myself im going to hold off for now.</p>
-        <p>This website and everything on it are the long countless hours of my time and motivation to create something that I can be proud of and share that with the world.</p>
-        <p>So if you would like to support me as a small creator please feel free to leave a donation from on the store page. It would means a lot to me.</p>
-        <br />
-        <p>For the nerds out there, this website is a blazor webassembly app, hosted on an ubuntu webserver, with a mysql backend.</p>
-        <p>All the passwords are encrypted using bcrypt for your safety and all the data is only allowed through SSL.</p>
-        <p>After you make your account. All the data in the database is easily accessable through the account settings and</p>
-        <p>you can delete your account at any time. Including all your data with it so there is no risk.</p>
-        <p>I wont show ads and never will and I refuse to use trackers on this site.</p>
-
-        <div class="center">
-            <a href='https://ko-fi.com/A0A3TSI2D' target='_blank'>
-                <img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi6.png?v=6' alt='Buy Me a Coffee at ko-fi.com' />
-            </a>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/about/about.component.ts b/src/Client/src/app/pages/legal/about/about.component.ts
deleted file mode 100644
index 24cb909..0000000
--- a/src/Client/src/app/pages/legal/about/about.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { FormsModule } from '@angular/forms';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Title } from '@angular/platform-browser';
-import { CommonModule } from '@angular/common';
-
-@Component({
-  selector: 'legal-about',
-  templateUrl: './about.component.html',
-    styleUrls: [ './about.component.css' ],
-  imports: [ FormsModule, CommonModule ]
-})
-export class AboutComponent {
-
-  constructor( private http: HttpClient, private router: Router, private route: ActivatedRoute, private title: Title ) {
-    this.title.setTitle("About | Mistox");
-  };
-
-}
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/contact/contact.component.css b/src/Client/src/app/pages/legal/contact/contact.component.css
deleted file mode 100644
index 26081b8..0000000
--- a/src/Client/src/app/pages/legal/contact/contact.component.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.center {
-    background-color: green;
-}
-
-.tile-frame {
-    column-count: 4;
-    column-gap: 20px;
-    padding: 20px;
-    width: calc(100% - 40px);
-}
-
-.tile{
-    background-color: aqua;
-    height: 40px;
-}
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/contact/contact.component.html b/src/Client/src/app/pages/legal/contact/contact.component.html
deleted file mode 100644
index 29da843..0000000
--- a/src/Client/src/app/pages/legal/contact/contact.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="tile-frame">
-
-    <div class="tile">
-
-    </div>
-
-    <div class="tile">
-        
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/contact/contact.component.ts b/src/Client/src/app/pages/legal/contact/contact.component.ts
deleted file mode 100644
index eaa44cf..0000000
--- a/src/Client/src/app/pages/legal/contact/contact.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { FormsModule } from '@angular/forms';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Title } from '@angular/platform-browser';
-import { CommonModule } from '@angular/common';
-
-@Component({
-  selector: 'legal-contact',
-  templateUrl: './contact.component.html',
-  styleUrls: [ './contact.component.css' ],
-  imports: [ FormsModule, CommonModule ]
-})
-export class ContactComponent {
-
-  constructor( private http: HttpClient, private router: Router, private route: ActivatedRoute, private title: Title ) {
-    this.title.setTitle("Contact | BoredCareers");
-  };
-
-}
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/privacy/privacy.component.css b/src/Client/src/app/pages/legal/privacy/privacy.component.css
deleted file mode 100644
index 26081b8..0000000
--- a/src/Client/src/app/pages/legal/privacy/privacy.component.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.center {
-    background-color: green;
-}
-
-.tile-frame {
-    column-count: 4;
-    column-gap: 20px;
-    padding: 20px;
-    width: calc(100% - 40px);
-}
-
-.tile{
-    background-color: aqua;
-    height: 40px;
-}
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/privacy/privacy.component.html b/src/Client/src/app/pages/legal/privacy/privacy.component.html
deleted file mode 100644
index 29da843..0000000
--- a/src/Client/src/app/pages/legal/privacy/privacy.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="tile-frame">
-
-    <div class="tile">
-
-    </div>
-
-    <div class="tile">
-        
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Client/src/app/pages/legal/privacy/privacy.component.ts b/src/Client/src/app/pages/legal/privacy/privacy.component.ts
deleted file mode 100644
index 9543545..0000000
--- a/src/Client/src/app/pages/legal/privacy/privacy.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { FormsModule } from '@angular/forms';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Title } from '@angular/platform-browser';
-import { CommonModule } from '@angular/common';
-
-@Component({
-  selector: 'legal-privacy',
-  templateUrl: './privacy.component.html',
-  styleUrls: [ './privacy.component.css' ],
-  imports: [ FormsModule, CommonModule ]
-})
-export class PrivacyComponent {
-
-  constructor( private http: HttpClient, private router: Router, private route: ActivatedRoute, private title: Title ) {
-    this.title.setTitle("Privacy | BoredCareers");
-  };
-
-}
\ No newline at end of file
diff --git a/src/Client/src/app/pages/main/resumes/resumes.component.css b/src/Client/src/app/pages/resumes/resumes.component.css
similarity index 100%
rename from src/Client/src/app/pages/main/resumes/resumes.component.css
rename to src/Client/src/app/pages/resumes/resumes.component.css
diff --git a/src/Client/src/app/pages/main/resumes/resumes.component.html b/src/Client/src/app/pages/resumes/resumes.component.html
similarity index 100%
rename from src/Client/src/app/pages/main/resumes/resumes.component.html
rename to src/Client/src/app/pages/resumes/resumes.component.html
diff --git a/src/Client/src/app/pages/main/resumes/resumes.component.ts b/src/Client/src/app/pages/resumes/resumes.component.ts
similarity index 100%
rename from src/Client/src/app/pages/main/resumes/resumes.component.ts
rename to src/Client/src/app/pages/resumes/resumes.component.ts