diff --git a/.gitignore b/.gitignore index 4a2b411..a06488e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ yarn-debug.log* yarn-error.log* lerna-debug.log* .pnpm-debug.log* +.DS_Store +*.DS_Store # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json @@ -132,4 +134,4 @@ dist #angular .angular/ /.DS_Store -.vscode/ \ No newline at end of file +.vscode/ diff --git a/projects/ui/src/lib/icon/skirda/skirda.css b/projects/ui/src/lib/icon/skirda/skirda.css index 2026c14..1b37a70 100644 --- a/projects/ui/src/lib/icon/skirda/skirda.css +++ b/projects/ui/src/lib/icon/skirda/skirda.css @@ -39,3 +39,4 @@ .skirda-sign-out:before { content: '\e806'; } /* '' */ .skirda-favorite:before { content: '\e807'; } /* '' */ .skirda-library:before { content: '\e808'; } /* '' */ +.skirda-download:before { content: '\e809'; } /* '' */ diff --git a/projects/ui/src/lib/icon/skirda/skirda.eot b/projects/ui/src/lib/icon/skirda/skirda.eot index 2c77a64..3f81b6b 100644 Binary files a/projects/ui/src/lib/icon/skirda/skirda.eot and b/projects/ui/src/lib/icon/skirda/skirda.eot differ diff --git a/projects/ui/src/lib/icon/skirda/skirda.svg b/projects/ui/src/lib/icon/skirda/skirda.svg index 14344bd..e732458 100644 --- a/projects/ui/src/lib/icon/skirda/skirda.svg +++ b/projects/ui/src/lib/icon/skirda/skirda.svg @@ -23,6 +23,8 @@ + + diff --git a/projects/ui/src/lib/icon/skirda/skirda.ttf b/projects/ui/src/lib/icon/skirda/skirda.ttf index 2f5414f..4e11751 100644 Binary files a/projects/ui/src/lib/icon/skirda/skirda.ttf and b/projects/ui/src/lib/icon/skirda/skirda.ttf differ diff --git a/projects/ui/src/lib/icon/skirda/skirda.woff b/projects/ui/src/lib/icon/skirda/skirda.woff index cf30be8..be8bac3 100644 Binary files a/projects/ui/src/lib/icon/skirda/skirda.woff and b/projects/ui/src/lib/icon/skirda/skirda.woff differ diff --git a/projects/ui/src/lib/icon/skirda/skirda.woff2 b/projects/ui/src/lib/icon/skirda/skirda.woff2 index b9c4e11..d78d1e3 100644 Binary files a/projects/ui/src/lib/icon/skirda/skirda.woff2 and b/projects/ui/src/lib/icon/skirda/skirda.woff2 differ diff --git a/projects/ui/src/lib/section/section.component.scss b/projects/ui/src/lib/section/section.component.scss index caa6d0b..843402b 100644 --- a/projects/ui/src/lib/section/section.component.scss +++ b/projects/ui/src/lib/section/section.component.scss @@ -1,6 +1,5 @@ :host { display: block; - border-radius: var(--sk-br-m); overflow: hidden; position: relative; @@ -12,6 +11,7 @@ opacity: 0.5; transition: 0.1s ease; cursor: pointer; + border-radius: var(--sk-br-m); &:hover { opacity: 1; diff --git a/src/app/components/main/main-menu/main-menu.component.html b/src/app/components/main/main-menu/main-menu.component.html index bfc6767..f014069 100644 --- a/src/app/components/main/main-menu/main-menu.component.html +++ b/src/app/components/main/main-menu/main-menu.component.html @@ -22,6 +22,10 @@ Friends + + + Downloads + diff --git a/src/app/components/main/main-menu/main-menu.component.scss b/src/app/components/main/main-menu/main-menu.component.scss index 458e55e..8f745f4 100644 --- a/src/app/components/main/main-menu/main-menu.component.scss +++ b/src/app/components/main/main-menu/main-menu.component.scss @@ -13,6 +13,7 @@ padding: 2rem 0.5rem 0.5rem 0.5rem; box-sizing: border-box; backdrop-filter: blur(64px); + overflow-y: auto; gap: 1rem; .sk-search-panel { diff --git a/src/app/components/main/main-root/main-root.component.scss b/src/app/components/main/main-root/main-root.component.scss index 771d662..9758a66 100644 --- a/src/app/components/main/main-root/main-root.component.scss +++ b/src/app/components/main/main-root/main-root.component.scss @@ -17,7 +17,6 @@ display: flex; width: 100vw; height: 100vh; - // background-image: url('https://images.unsplash.com/photo-1580234811497-9df7fd2f357e?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2934&q=80'); background-size: cover; } @@ -26,5 +25,6 @@ background-color: rgba(0,0,0,0.05); display: flex; backdrop-filter: blur(1rem); + overflow-y: auto; } } diff --git a/src/app/components/main/main.module.ts b/src/app/components/main/main.module.ts index efabc60..035aec9 100644 --- a/src/app/components/main/main.module.ts +++ b/src/app/components/main/main.module.ts @@ -3,8 +3,7 @@ import { CommonModule } from '@angular/common'; import { MainRootComponent } from './main-root/main-root.component'; import { MainMenuComponent } from './main-menu/main-menu.component'; import { UiModule } from 'projects/ui/src/lib/ui.module'; -import { FormsModule, - ReactiveFormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MenuSessionsComponent } from './main-menu/menu-sessions/menu-sessions.component'; import { MenuGamesComponent } from './main-menu/menu-games/menu-games.component'; import { ServersPageComponent } from './sections/servers-page/servers-page.component'; @@ -12,10 +11,11 @@ import { FriendsPageComponent } from './sections/friends-page/friends-page.compo import { GamesPageComponent } from './sections/games-page/games-page.component'; import { SessionPageComponent } from './sections/session-page/session-page.component'; import { GamePageComponent } from './sections/game-page/game-page.component'; -import { MainRoutingModule } from './routing.module' -import { ButtonModule } from 'projects/ui/src/lib/button/button.module' -import { TypographyModule } from 'projects/ui/src/lib/typography/typography.module' -import { IconModule } from 'projects/ui/src/lib/icon/icon.module' +import { MainRoutingModule } from './routing.module'; +import { ButtonModule } from 'projects/ui/src/lib/button/button.module'; +import { TypographyModule } from 'projects/ui/src/lib/typography/typography.module'; +import { IconModule } from 'projects/ui/src/lib/icon/icon.module'; +import { DownloadsPageComponent } from './sections/downloads-page/downloads-page.component'; @NgModule({ declarations: [ @@ -27,7 +27,8 @@ import { IconModule } from 'projects/ui/src/lib/icon/icon.module' FriendsPageComponent, GamesPageComponent, SessionPageComponent, - GamePageComponent + GamePageComponent, + DownloadsPageComponent, ], imports: [ CommonModule, @@ -37,7 +38,7 @@ import { IconModule } from 'projects/ui/src/lib/icon/icon.module' MainRoutingModule, TypographyModule, ButtonModule, - IconModule + IconModule, ], exports: [ MainRootComponent, @@ -48,7 +49,8 @@ import { IconModule } from 'projects/ui/src/lib/icon/icon.module' FriendsPageComponent, GamesPageComponent, SessionPageComponent, - GamePageComponent - ] + GamePageComponent, + DownloadsPageComponent, + ], }) export class MainModule {} diff --git a/src/app/components/main/routing.module.ts b/src/app/components/main/routing.module.ts index fcb614d..21707e6 100644 --- a/src/app/components/main/routing.module.ts +++ b/src/app/components/main/routing.module.ts @@ -1,35 +1,48 @@ import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router' -import { MainRootComponent } from './main-root/main-root.component' -import { FriendsPageComponent } from './sections/friends-page/friends-page.component' -import { GamePageComponent } from './sections/game-page/game-page.component' -import { GamesPageComponent } from './sections/games-page/games-page.component' -import { ServersPageComponent } from './sections/servers-page/servers-page.component' -import { SessionPageComponent } from './sections/session-page/session-page.component' +import { RouterModule, Routes } from '@angular/router'; +import { MainRootComponent } from './main-root/main-root.component'; +import { DownloadsPageComponent } from './sections/downloads-page/downloads-page.component'; +import { FriendsPageComponent } from './sections/friends-page/friends-page.component'; +import { GamePageComponent } from './sections/game-page/game-page.component'; +import { GamesPageComponent } from './sections/games-page/games-page.component'; +import { ServersPageComponent } from './sections/servers-page/servers-page.component'; +import { SessionPageComponent } from './sections/session-page/session-page.component'; -const routes: Routes = [{ - path: '', - component: MainRootComponent, - children: [{ - path: 'servers', - component: ServersPageComponent - }, { - path: 'friends', - component: FriendsPageComponent - }, { - path: 'games', - component: GamesPageComponent - }, { - path: 'session/:id', - component: SessionPageComponent - }, { - path: 'game/:id', - component: GamePageComponent - }] -}] +const routes: Routes = [ + { + path: '', + component: MainRootComponent, + children: [ + { + path: 'servers', + component: ServersPageComponent, + }, + { + path: 'friends', + component: FriendsPageComponent, + }, + { + path: 'games', + component: GamesPageComponent, + }, + { + path: 'downloads', + component: DownloadsPageComponent, + }, + { + path: 'session/:id', + component: SessionPageComponent, + }, + { + path: 'game/:id', + component: GamePageComponent, + }, + ], + }, +]; @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule] + exports: [RouterModule], }) -export class MainRoutingModule { } +export class MainRoutingModule {} diff --git a/src/app/components/main/sections/downloads-page/downloads-page.component.html b/src/app/components/main/sections/downloads-page/downloads-page.component.html new file mode 100644 index 0000000..2101a95 --- /dev/null +++ b/src/app/components/main/sections/downloads-page/downloads-page.component.html @@ -0,0 +1,8 @@ +
+
+
+ Downloads +
+
Downloads page will be here
+
+
diff --git a/src/app/components/main/sections/downloads-page/downloads-page.component.scss b/src/app/components/main/sections/downloads-page/downloads-page.component.scss new file mode 100644 index 0000000..e61ca7a --- /dev/null +++ b/src/app/components/main/sections/downloads-page/downloads-page.component.scss @@ -0,0 +1,7 @@ +@use '../global'; + +:host { + display: block; + + @include global.page(); +} diff --git a/src/app/components/main/sections/downloads-page/downloads-page.component.spec.ts b/src/app/components/main/sections/downloads-page/downloads-page.component.spec.ts new file mode 100644 index 0000000..217ca14 --- /dev/null +++ b/src/app/components/main/sections/downloads-page/downloads-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DownloadsPageComponent } from './downloads-page.component'; + +describe('DownloadsPageComponent', () => { + let component: DownloadsPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DownloadsPageComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DownloadsPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/main/sections/downloads-page/downloads-page.component.ts b/src/app/components/main/sections/downloads-page/downloads-page.component.ts new file mode 100644 index 0000000..3a8764f --- /dev/null +++ b/src/app/components/main/sections/downloads-page/downloads-page.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-downloads-page', + templateUrl: './downloads-page.component.html', + styleUrls: ['./downloads-page.component.scss'] +}) +export class DownloadsPageComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/modules/app-routing.module.ts b/src/app/modules/app-routing.module.ts index 4493795..d1ee2ce 100644 --- a/src/app/modules/app-routing.module.ts +++ b/src/app/modules/app-routing.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { MainRootComponent } from '../components/main/main-root/main-root.component'; -import { MainRoutingModule } from '../components/main/routing.module' +import { MainRoutingModule } from '../components/main/routing.module'; import { PlaygroundComponent } from '../components/playground/playground.component'; import { SandboxComponent } from '../components/sandbox/sandbox.component'; import { SignInComponent } from '../components/sign-in/sign-in.component'; @@ -13,7 +12,7 @@ const routes: Routes = [ }, { path: '', - loadChildren: () => MainRoutingModule + loadChildren: () => MainRoutingModule, }, { path: 'sandbox',