diff --git a/database/mistox.sql b/database/mistox.sql index 1308b01..8490a77 100755 --- a/database/mistox.sql +++ b/database/mistox.sql @@ -201,7 +201,8 @@ INSERT INTO Account ( PasswordAttempts, CurrentPasswordAttempts, Role, - EmailToken + EmailToken, + DataServer ) VALUES ( 1, 'admin', diff --git a/src/Client/src/app/app.css b/src/Client/src/app/app.css index 9813ec3..1afe8cc 100644 --- a/src/Client/src/app/app.css +++ b/src/Client/src/app/app.css @@ -27,7 +27,7 @@ height: 15px; width: 150px; border-radius: 5px; - margin: 20px; + margin: 10px; text-align: center; padding: 15px 0; transition: 0.5s; @@ -38,22 +38,51 @@ } .nav-button:hover { - background-color: var(--Mistox-Black); + background-color: #00000044; + color: var(--Mistox-Light); } + .active { + background-color: #00000010; + color: var(--Mistox-Bright); + } + +.nav-button-login { + width: 100px; + padding: 10px 0; +} + .content { width: 100%; - min-height: calc(100vh - 400px); + min-height: calc(100vh - 300px); } .bottom-bar { display: flex; width: 100%; - height: 200px; + height: 100px; background: linear-gradient(180deg,#99999988, #000000FF); backdrop-filter: blur(2px); } +.bottom-bar-logo { + width: 80px; + height: 80px; + margin: 10px 50px; +} + +.bottom-bar-logo img { + width: 80px; + height: 80px; +} + +.bottom-bar-buttons { + display: flex; + width: calc(50% - 110px); + height: 80px; + margin: 10px; +} + .nav-button-bottom { height: 15px; width: 150px; @@ -65,17 +94,6 @@ text-decoration: none; } - .nav-button:hover { - color: var(--Mistox-Bright); - } - -.bottom-bar-logo { - width: 80px; - height: 80px; - padding: 0 50px; - padding-top: 100px; -} - .bottom-bar-float { align-items: end; color: var(--Mistox-White); diff --git a/src/Client/src/app/app.html b/src/Client/src/app/app.html index 818b487..17d70fc 100644 --- a/src/Client/src/app/app.html +++ b/src/Client/src/app/app.html @@ -1,33 +1,33 @@
- HOME - COMPANIES - JOB BOARD + HOME + COMPANIES + JOB BOARD
- {{ auth.loggedInUser.userName.toUpperCase() }} - LOGOUT + +
- LOGIN - REGISTER + +
-
+
CONTACT PRIVACY
- -
+
Mistox LLC
diff --git a/src/Client/src/app/app.routes.ts b/src/Client/src/app/app.routes.ts index 53efab3..0bfac0d 100644 --- a/src/Client/src/app/app.routes.ts +++ b/src/Client/src/app/app.routes.ts @@ -11,6 +11,7 @@ import { ResetPasswordComponent } from './pages/account/resetpassword/resetpassw import { VerifyEmailComponent } from './pages/account/verifyemail/verifyemail.component'; import { NewItemComponent } from './pages/store/admin/newitem/new.component'; import { EditItemComponent } from './pages/store/admin/edititem/edit.component'; +import { HomeComponent } from './pages/home/home.component'; export const routes: Routes = [ @@ -23,6 +24,8 @@ export const routes: Routes = [ { path: "account/register", component: RegisterComponent }, { path: "account/settings", component: SettingsComponent }, + { path: "", component: HomeComponent }, + // Projects { path: "project/mist", component: MistComponent }, diff --git a/src/Client/src/app/app.ts b/src/Client/src/app/app.ts index 2471b2e..021882b 100644 --- a/src/Client/src/app/app.ts +++ b/src/Client/src/app/app.ts @@ -12,14 +12,13 @@ import { CommonModule } from '@angular/common'; export class App { @ViewChild('homeLink') homeLink!: ElementRef; - @ViewChild('mistLink') mistLink!: ElementRef; - @ViewChild('storeLink') storeLink!: ElementRef; - @ViewChild('aboutLink') aboutLink!: ElementRef; + @ViewChild('companiesLink') companyLink!: ElementRef; + @ViewChild('jobsLink') jobLink!: ElementRef; constructor(public auth: Authentication, private router: Router){} ngAfterViewInit(){ - let ViewLinks = [ this.homeLink, this.mistLink, this.storeLink, this.aboutLink ]; + let ViewLinks = [ this.homeLink, this.companyLink, this.jobLink ]; ViewLinks.forEach(link => { if (new URL(link.nativeElement.href).pathname === new URL(window.location.href).pathname){ link.nativeElement.classList.add("active"); diff --git a/src/Client/src/app/pages/home/home.component.css b/src/Client/src/app/pages/home/home.component.css new file mode 100644 index 0000000..26081b8 --- /dev/null +++ b/src/Client/src/app/pages/home/home.component.css @@ -0,0 +1,15 @@ +.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/home/home.component.html b/src/Client/src/app/pages/home/home.component.html new file mode 100644 index 0000000..29da843 --- /dev/null +++ b/src/Client/src/app/pages/home/home.component.html @@ -0,0 +1,11 @@ +
+ +
+ +
+ +
+ +
+ +
\ No newline at end of file diff --git a/src/Client/src/app/pages/home/home.component.ts b/src/Client/src/app/pages/home/home.component.ts new file mode 100644 index 0000000..6d409fd --- /dev/null +++ b/src/Client/src/app/pages/home/home.component.ts @@ -0,0 +1,20 @@ +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: 'home', + templateUrl: './home.component.html', + styleUrls: [ './home.component.css' ], + imports: [ FormsModule, CommonModule ] +}) +export class HomeComponent { + + constructor( private http: HttpClient, private router: Router, private route: ActivatedRoute, private title: Title ) { + this.title.setTitle("Home | BoredCareers"); + }; + +} \ No newline at end of file diff --git a/src/Client/src/index.html b/src/Client/src/index.html index 2db1600..de33814 100644 --- a/src/Client/src/index.html +++ b/src/Client/src/index.html @@ -5,7 +5,7 @@ BoredCareers - + diff --git a/src/Client/src/styles.css b/src/Client/src/styles.css index d7f89d6..b37f794 100644 --- a/src/Client/src/styles.css +++ b/src/Client/src/styles.css @@ -13,7 +13,11 @@ font-family: Arial, Helvetica, sans-serif; } +html { + background-color: #000; +} + body { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='28' height='49' viewBox='0 0 28 49'%3E%3Cg fill-rule='evenodd'%3E%3Cg id='hexagons' fill='%23999999' fill-opacity='1' fill-rule='nonzero'%3E%3Cpath d='M13.99 9.25l13 7.5v15l-13 7.5L1 31.75v-15l12.99-7.5zM3 17.9v12.7l10.99 6.34 11-6.35V17.9l-11-6.34L3 17.9zM0 15l12.98-7.5V0h-2v6.35L0 12.69v2.3zm0 18.5L12.98 41v8h-2v-6.85L0 35.81v-2.3zM15 0v7.5L27.99 15H28v-2.31h-.01L17 6.35V0h-2zm0 49v-8l12.99-7.5H28v2.31h-.01L17 42.15V49h-2z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='28' height='49' viewBox='0 0 28 49'%3E%3Cg fill-rule='evenodd'%3E%3Cg id='hexagons' fill='%23999999' fill-opacity='0.2' fill-rule='nonzero'%3E%3Cpath d='M13.99 9.25l13 7.5v15l-13 7.5L1 31.75v-15l12.99-7.5zM3 17.9v12.7l10.99 6.34 11-6.35V17.9l-11-6.34L3 17.9zM0 15l12.98-7.5V0h-2v6.35L0 12.69v2.3zm0 18.5L12.98 41v8h-2v-6.85L0 35.81v-2.3zM15 0v7.5L27.99 15H28v-2.31h-.01L17 6.35V0h-2zm0 49v-8l12.99-7.5H28v2.31h-.01L17 42.15V49h-2z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); background-color: #fff; } \ No newline at end of file diff --git a/src/Server/wwwroot/img/logo-centered.png b/src/Server/wwwroot/img/logo-centered.png new file mode 100644 index 0000000..8905ea8 Binary files /dev/null and b/src/Server/wwwroot/img/logo-centered.png differ diff --git a/src/Server/wwwroot/img/logo-full.png b/src/Server/wwwroot/img/logo-full.png new file mode 100644 index 0000000..1efc4a2 Binary files /dev/null and b/src/Server/wwwroot/img/logo-full.png differ