Compare commits

..

No commits in common. "taiga" and "master" have entirely different histories.

32 changed files with 460 additions and 921 deletions

5
.idea/.gitignore vendored
View File

@ -1,5 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/

View File

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/skirda-launcher.iml" filepath="$PROJECT_DIR$/.idea/skirda-launcher.iml" />
</modules>
</component>
</project>

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
</project>

View File

@ -32,16 +32,9 @@
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
{
"glob": "**/*",
"input": "node_modules/@taiga-ui/icons/src",
"output": "assets/taiga-ui/icons"
}
"src/assets"
],
"styles": [
"node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
"node_modules/@taiga-ui/core/styles/taiga-ui-fonts.less",
"src/styles.scss"
],
"scripts": [],

1106
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -45,7 +45,6 @@
"lint": "ng lint"
},
"dependencies": {
"@angular/animations": "^14.2.1",
"@angular/common": "14.0.6",
"@angular/compiler": "14.0.6",
"@angular/core": "14.0.6",
@ -54,14 +53,8 @@
"@angular/platform-browser": "14.0.6",
"@angular/platform-browser-dynamic": "14.0.6",
"@angular/router": "14.0.6",
"@taiga-ui/cdk": "^3.2.0",
"@taiga-ui/core": "^3.2.0",
"@taiga-ui/icons": "^3.2.0",
"@taiga-ui/kit": "^3.2.0",
"@taiga-ui/styles": "^3.2.0",
"rxjs": "7.5.6",
"tslib": "^2.4.0",
"webpack": "^5.74.0",
"zone.js": "~0.11.6"
},
"devDependencies": {

View File

@ -1,23 +1 @@
<tui-root>
<app-games-bar></app-games-bar>
<!-- <app-generic-game></app-generic-game>-->
<!-- content of your app -->
<!--
If you need, you can add something between Taiga portal layers:
-->
<ng-container ngProjectAs="tuiOverContent">
<!-- Content over app content -->
</ng-container>
<ng-container ngProjectAs="tuiOverDialogs">
<!-- Content over dialogs -->
</ng-container>
<ng-container ngProjectAs="tuiOverAlerts">
<!-- Content over notifications -->
</ng-container>
<ng-container ngProjectAs="tuiOverPortals">
<!-- Content over dropdowns -->
</ng-container>
<ng-container ngProjectAs="tuiOverHints">
<!-- Content over hints -->
</ng-container>
</tui-root>
<router-outlet></router-outlet>

View File

@ -1,5 +1,3 @@
@import '~@taiga-ui/core/styles/taiga-ui-local';
:host {
}

View File

@ -8,13 +8,12 @@ import { APP_CONFIG } from '../environments/environment';
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
})
export class AppComponent {
constructor(
private electronService: ElectronService,
//private translate: TranslateService
private translate: TranslateService
) {
//this.translate.setDefaultLang('en');
this.translate.setDefaultLang('en');
console.log('APP_CONFIG', APP_CONFIG);
if (electronService.isElectron) {

View File

@ -1,23 +1,44 @@
import {NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {TuiAlertModule, TuiButtonModule, TuiDialogModule, TuiRootModule} from '@taiga-ui/core';
import {AppRoutingModule} from './app-routing.module';
import {AppComponent} from './app.component';
import {HomeModule} from "./home/home.module";
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpClientModule, HttpClient } from '@angular/common/http';
import { CoreModule } from './core/core.module';
import { SharedModule } from './shared/shared.module';
import { AppRoutingModule } from './app-routing.module';
// NG Translate
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { HomeModule } from './home/home.module';
import { DetailModule } from './detail/detail.module';
import { AppComponent } from './app.component';
// AoT requires an exported function for factories
const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new TranslateHttpLoader(http, './assets/i18n/', '.json');
@NgModule({
declarations: [AppComponent],
imports: [
BrowserModule,
BrowserAnimationsModule,
TuiRootModule,
TuiAlertModule,
TuiDialogModule,
AppRoutingModule,
TuiButtonModule,
HomeModule,
],
bootstrap: [AppComponent],
imports: [
BrowserModule,
FormsModule,
HttpClientModule,
CoreModule,
SharedModule,
HomeModule,
DetailModule,
AppRoutingModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: httpLoaderFactory,
deps: [HttpClient]
}
})
],
providers: [],
bootstrap: [AppComponent]
})
export class AppModule {}
export class AppModule {}

View File

@ -1,13 +0,0 @@
<div id="GamesBar">
<app-user-info></app-user-info>
<button
tuiButton
type="button"
class="tui-space_right-3 tui-space_bottom-3"
[icon]="icon"
(click)="onClick($event)"
>
Game
</button>
<ng-template #viewContainerRef></ng-template>
</div>

View File

@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { GamesBarComponent } from './games-bar.component';
describe('GamesBarComponent', () => {
let component: GamesBarComponent;
let fixture: ComponentFixture<GamesBarComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ GamesBarComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(GamesBarComponent);
component = fixture.componentInstance;
fixture.detectChanges()
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -1,12 +0,0 @@
import {Component, ComponentRef, Inject, OnInit, ViewChild, ViewContainerRef} from '@angular/core';
import {GameButtonComponent} from "./game-button/game-button.component";
@Component({
selector: 'app-games-bar',
templateUrl: './games-bar.component.html',
styleUrls: ['./games-bar.component.scss']
})
export class GamesBarComponent implements OnInit {
constructor() { }
ngOnInit(): void { }
}

View File

@ -0,0 +1,4 @@
<div id="LeftBar">
<app-user-info></app-user-info>
<app-game-button></app-game-button>
</div>

View File

@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { GameBarComponent } from './game-bar.component';
describe('GameBarComponent', () => {
let component: GameBarComponent;
let fixture: ComponentFixture<GameBarComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ GameBarComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(GameBarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-game-bar',
templateUrl: './game-bar.component.html',
styleUrls: ['./game-bar.component.scss']
})
export class GameBarComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

View File

@ -1,6 +1,6 @@
<div class="ProfileBar">
<div class="img rounded" id="ProfilePicture">
<img src="../../../assets/avatar.jpeg" height="45px" width="45px">
<img src="./assets/avatar.jpeg" height="45px" width="45px">
</div>
<div class="two-lines-centered">
<div class="first-line">

View File

@ -5,17 +5,13 @@ import { HomeRoutingModule } from './home-routing.module';
import { HomeComponent } from './home.component';
import { SharedModule } from '../shared/shared.module';
import { GamesBarComponent } from '../games-bar/games-bar.component';
import { GameBarComponent } from './game-bar/game-bar.component';
import { GenericGameComponent } from './generic-game/generic-game.component';
import { GameButtonComponent } from '../games-bar/game-button/game-button.component';
import { UserInfoComponent } from '../games-bar/user-info/user-info.component';
import {TuiButtonModule} from "@taiga-ui/core";
import { GameButtonComponent } from './game-bar/game-button/game-button.component';
import { UserInfoComponent } from './game-bar/user-info/user-info.component';
@NgModule({
declarations: [HomeComponent, GamesBarComponent, GenericGameComponent, GameButtonComponent, UserInfoComponent],
exports: [
GamesBarComponent
],
imports: [CommonModule, SharedModule, HomeRoutingModule, TuiButtonModule]
declarations: [HomeComponent, GameBarComponent, GenericGameComponent, GameButtonComponent, UserInfoComponent],
imports: [CommonModule, SharedModule, HomeRoutingModule]
})
export class HomeModule {}

View File

@ -7,10 +7,9 @@ import { APP_CONFIG } from './environments/environment';
if (APP_CONFIG.production) {
enableProdMode();
}
platformBrowserDynamic().bootstrapModule(AppModule).then(ref => {})
platformBrowserDynamic()
.bootstrapModule(AppModule, {
preserveWhitespaces: false
})
.catch(err => console.error(err));
// function getGames(){
//
// }

View File

@ -1,4 +0,0 @@
//Distribrutus
export class Game{
public
}

View File

@ -1,6 +1,4 @@
/* You can add global styles to this file, and also import other style files */
// my other global styles
html, body {
margin: 0;
background: url("./assets/6.png") no-repeat center center fixed;
@ -45,7 +43,7 @@ html, body {
display: flex;
height: 100%;
}
#GamesBar {
#LeftBar {
width: 30%;
display: inline-block;
-webkit-backdrop-filter: blur(8px);