Skip to content

Commit ad437df

Browse files
Merge pull request #64 from nullinside-development-group/feature/desktop2
feat: adding landing page for desktop application
2 parents 84c554a + fcd1483 commit ad437df

File tree

56 files changed

+437
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+437
-298
lines changed

src/src/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div class="app-root-container">
2-
<router-outlet />
2+
<router-outlet/>
33
</div>

src/src/app/app.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { TestBed } from '@angular/core/testing';
2-
import { AppComponent } from './app.component';
1+
import {TestBed} from '@angular/core/testing';
2+
import {AppComponent} from './app.component';
33

44
describe('AppComponent', () => {
55
beforeEach(async () => {

src/src/app/app.component.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { Component } from '@angular/core';
2-
import { RouterOutlet } from '@angular/router';
1+
import {Component} from '@angular/core';
2+
import {RouterOutlet} from '@angular/router';
33

4-
@Component({
5-
selector: 'app-root',
6-
imports: [RouterOutlet],
7-
templateUrl: './app.component.html',
8-
styleUrl: './app.component.scss'
4+
@Component({
5+
selector: 'app-root',
6+
imports: [RouterOutlet],
7+
templateUrl: './app.component.html',
8+
styleUrl: './app.component.scss'
99
})
1010
export class AppComponent {
1111
title = 'nullinside';

src/src/app/app.config.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { ApplicationConfig, Provider } from '@angular/core';
2-
import { provideRouter } from '@angular/router';
1+
import {ApplicationConfig, Provider} from '@angular/core';
2+
import {provideRouter} from '@angular/router';
33

4-
import { routes } from './app.routes';
5-
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
6-
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
7-
import { BearerTokenInterceptor } from "./middleware/bearer-token-interceptor";
4+
import {routes} from './app.routes';
5+
import {provideAnimationsAsync} from '@angular/platform-browser/animations/async';
6+
import {HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi} from "@angular/common/http";
7+
import {BearerTokenInterceptor} from "./middleware/bearer-token-interceptor";
88
import {MAT_SNACK_BAR_DEFAULT_OPTIONS} from "@angular/material/snack-bar";
99

1010
export const noopInterceptorProvider: Provider =

src/src/app/app.routes.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ import {TwitchBotIndexComponent} from './view/twitch/twitch-bot-index/twitch-bot
99
import {TwitchBotConfigComponent} from './view/twitch/twitch-bot-config/twitch-bot-config.component';
1010
import {ImdbSearchComponent} from './view/imdb-search/imdb-search.component';
1111
import {BackgroundWebglExampleComponent} from "./view/background-webgl-example/background-webgl-example.component";
12+
import {LoginLandingDesktopComponent} from "./view/login-landing-desktop/login-landing-desktop.component";
1213

1314
export const routes: Routes = [
1415
{path: '', component: HomeComponent},
1516
{path: 'background', component: BackgroundWebglExampleComponent},
1617
{path: 'user/auth', component: LoginComponent},
1718
{path: 'user/login', component: LoginLandingComponent},
19+
{path: 'user/login/desktop', component: LoginLandingDesktopComponent},
1820
{path: 'home', component: HomeComponent},
1921
{path: 'vm-admin', component: VmManagerComponent, canActivate: [authGuard]},
2022
{path: 'twitch-bot', component: TwitchBotIndexComponent},

src/src/app/common/components/loading-icon/loading-icon.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from="0 67 67"
99
to="-360 67 67"
1010
dur="2.5s"
11-
repeatCount="indefinite" />
11+
repeatCount="indefinite"/>
1212
</path>
1313
<path
1414
d="M28.19 40.31c6.627 0 12-5.374 12-12 0-6.628-5.373-12-12-12-6.628 0-12 5.372-12 12 0 6.626 5.372 12 12 12zm30.72-19.825c4.686 4.687 12.284 4.687 16.97 0 4.686-4.686 4.686-12.284 0-16.97-4.686-4.687-12.284-4.687-16.97 0-4.687 4.686-4.687 12.284 0 16.97zm35.74 7.705c0 6.627 5.37 12 12 12 6.626 0 12-5.373 12-12 0-6.628-5.374-12-12-12-6.63 0-12 5.372-12 12zm19.822 30.72c-4.686 4.686-4.686 12.284 0 16.97 4.687 4.686 12.285 4.686 16.97 0 4.687-4.686 4.687-12.284 0-16.97-4.685-4.687-12.283-4.687-16.97 0zm-7.704 35.74c-6.627 0-12 5.37-12 12 0 6.626 5.373 12 12 12s12-5.374 12-12c0-6.63-5.373-12-12-12zm-30.72 19.822c-4.686-4.686-12.284-4.686-16.97 0-4.686 4.687-4.686 12.285 0 16.97 4.686 4.687 12.284 4.687 16.97 0 4.687-4.685 4.687-12.283 0-16.97zm-35.74-7.704c0-6.627-5.372-12-12-12-6.626 0-12 5.373-12 12s5.374 12 12 12c6.628 0 12-5.373 12-12zm-19.823-30.72c4.687-4.686 4.687-12.284 0-16.97-4.686-4.686-12.284-4.686-16.97 0-4.687 4.686-4.687 12.284 0 16.97 4.686 4.687 12.284 4.687 16.97 0z">
@@ -18,7 +18,7 @@
1818
from="0 67 67"
1919
to="360 67 67"
2020
dur="8s"
21-
repeatCount="indefinite" />
21+
repeatCount="indefinite"/>
2222
</path>
2323
</svg>
2424
<div class="text-area" [style.font-size]="fontSize">

src/src/app/common/components/loading-icon/loading-icon.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ComponentFixture, TestBed } from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22

3-
import { LoadingIconComponent } from './loading-icon.component';
3+
import {LoadingIconComponent} from './loading-icon.component';
44

55
describe('LoadingIconComponent', () => {
66
let component: LoadingIconComponent;

src/src/app/common/components/loading-icon/loading-icon.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Component, Input } from '@angular/core';
1+
import {Component, Input} from '@angular/core';
22

3-
@Component({
4-
selector: 'app-loading-icon',
5-
imports: [],
6-
templateUrl: './loading-icon.component.html',
7-
styleUrl: './loading-icon.component.scss'
3+
@Component({
4+
selector: 'app-loading-icon',
5+
imports: [],
6+
templateUrl: './loading-icon.component.html',
7+
styleUrl: './loading-icon.component.scss'
88
})
99
export class LoadingIconComponent {
1010
@Input() width = '100%';

src/src/app/common/components/logo/logo.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ComponentFixture, TestBed } from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22

3-
import { LogoComponent } from './logo.component';
3+
import {LogoComponent} from './logo.component';
44

55
describe('LogoComponent', () => {
66
let component: LogoComponent;

src/src/app/common/components/logo/logo.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {Component, Input} from '@angular/core';
22
import {Router} from '@angular/router';
33

4-
@Component({
5-
selector: 'app-logo',
6-
imports: [],
7-
templateUrl: './logo.component.html',
8-
styleUrl: './logo.component.scss'
4+
@Component({
5+
selector: 'app-logo',
6+
imports: [],
7+
templateUrl: './logo.component.html',
8+
styleUrl: './logo.component.scss'
99
})
1010
export class LogoComponent {
1111
@Input() height: number = 50;

0 commit comments

Comments
 (0)