Merge pull request #267 from benfl3713/fix_UI

Fixed UI Formatting

DepartureBoardWeb/ClientApp/package.json

@@ -25,20 +25,19 @@
     "@angular/compiler": "12.0.3",
     "@angular/core": "^12.0.3",
     "@angular/fire": "^6.1.5",
-    "@angular/flex-layout": "^11.0.0-beta.33",
+    "@angular/flex-layout": "^12.0.0-beta.35",
     "@angular/forms": "12.0.3",
     "@angular/material": "^12.0.3",
     "@angular/platform-browser": "12.0.3",
     "@angular/platform-browser-dynamic": "12.0.3",
     "@angular/platform-server": "12.0.3",
     "@angular/router": "12.0.3",
     "@angular/service-worker": "^12.0.3",
-    "@benfl3713/angular-components": "0.0.2",
     "@popperjs/core": "^2.11.6",
     "ajv": "^6.12.2",
-    "angular-notifier": "^6.0.2",
+    "angular-notifier": "^10.0.0",
     "aspnet-prerendering": "^3.0.1",
-    "bootstrap": "^5.2.2",
+    "bootstrap": "^4.4.1",
     "core-js": "^3.6.5",
     "dynamic-marquee": "^1.2.2",
     "firebase": "^7.14.3",

DepartureBoardWeb/ClientApp/src/app/footer/footer.component.html

@@ -4,7 +4,7 @@
       <li class="list-inline-item"><a [routerLink]="['/']">Home</a></li>
       <li class="list-inline-item"><a [routerLink]="['/search']">Search</a></li>
       <li class="list-inline-item">
-        <a [routerLink]="['/']" fragment="contact">Contact Us</a>
+        <a [routerLink]="['/contact']">Contact Us</a>
       </li>
       <li class="list-inline-item">
         <a href="https://leddepartureboard.statuspage.io/" target="_blank">Status</a>

DepartureBoardWeb/ClientApp/src/app/routes.ts

@@ -1,4 +1,5 @@
 import { Route } from "@angular/router";
+import { ContactUsComponent } from "./Components/contact-us/contact-us.component";
 import { AboutDepartureboardAdminComponent } from "./Pages/about/about-departureboard-admin/about-departureboard-admin.component";
 import { AboutComponent } from "./Pages/about/about.component";
 import { BoardsComponent } from "./Pages/boards/boards.component";
@@ -14,6 +15,7 @@ import { SettingsComponent } from "./settings/settings.component";
 export const ROUTES: Route[] = [
   { path: "", component: HomeComponent, pathMatch: "full" },
   { path: "search", component: SearchComponent, pathMatch: "full" },
+  { path: "contact", component: ContactUsComponent, pathMatch: "full" },
   { path: "examples", component: ExamplesComponent, pathMatch: "full" },
   {
     path: "settings",
@@ -35,7 +37,7 @@ export const ROUTES: Route[] = [
     component: AddCustomDepartureComponent,
     pathMatch: "full",
   },
-  //About
+  // About
   {
     path: "about",
     component: AboutComponent,
@@ -51,7 +53,7 @@ export const ROUTES: Route[] = [
     component: AboutDepartureboardAdminComponent,
     pathMatch: "full",
   },
-  //Boards
+  // Boards
   {
       path: "arrivals/:station/to/:toCrsCode/:displays",
       component: BoardsComponent,

Dockerfile

@@ -5,9 +5,10 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
 	&& apt install -y nodejs
 WORKDIR /app
 
-# Copy csproj and restore
+ENV CYPRESS_INSTALL_BINARY=0
 ARG RTT_Token=[INSERT_REALTIMETRAINS_TOKEN_HERE]
 
+# Copy csproj and restore
 COPY ./ ./
 WORKDIR /app/DepartureBoardWeb/
 RUN dotnet restore