Skip to content

Commit c9a1bf2

Browse files
run prettier
1 parent 0d49f2d commit c9a1bf2

25 files changed

+213
-236
lines changed

angular.json

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@
2020
"outputPath": "dist/slacker-news",
2121
"index": "src/index.html",
2222
"browser": "src/main.ts",
23-
"polyfills": [
24-
"zone.js"
25-
],
23+
"polyfills": ["zone.js"],
2624
"tsConfig": "tsconfig.app.json",
2725
"inlineStyleLanguage": "scss",
28-
"assets": [
29-
"src/favicon.ico",
30-
"src/assets"
31-
],
26+
"assets": ["src/favicon.ico", "src/assets"],
3227
"styles": [
3328
"src/styles.scss",
3429
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
@@ -84,19 +79,11 @@
8479
"test": {
8580
"builder": "@angular-devkit/build-angular:karma",
8681
"options": {
87-
"polyfills": [
88-
"zone.js",
89-
"zone.js/testing"
90-
],
82+
"polyfills": ["zone.js", "zone.js/testing"],
9183
"tsConfig": "tsconfig.spec.json",
9284
"inlineStyleLanguage": "scss",
93-
"assets": [
94-
"src/favicon.ico",
95-
"src/assets"
96-
],
97-
"styles": [
98-
"src/styles.scss"
99-
],
85+
"assets": ["src/favicon.ico", "src/assets"],
86+
"styles": ["src/styles.scss"],
10087
"scripts": []
10188
}
10289
}

server.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
import { APP_BASE_HREF } from '@angular/common';
2-
import { CommonEngine } from '@angular/ssr';
3-
import express from 'express';
4-
import { fileURLToPath } from 'node:url';
5-
import { dirname, join, resolve } from 'node:path';
6-
import bootstrap from './src/main.server';
1+
import { APP_BASE_HREF } from "@angular/common";
2+
import { CommonEngine } from "@angular/ssr";
3+
import express from "express";
4+
import { fileURLToPath } from "node:url";
5+
import { dirname, join, resolve } from "node:path";
6+
import bootstrap from "./src/main.server";
77

88
// The Express app is exported so that it can be used by serverless Functions.
99
export function app(): express.Express {
1010
const server = express();
1111
const serverDistFolder = dirname(fileURLToPath(import.meta.url));
12-
const browserDistFolder = resolve(serverDistFolder, '../browser');
13-
const indexHtml = join(serverDistFolder, 'index.server.html');
12+
const browserDistFolder = resolve(serverDistFolder, "../browser");
13+
const indexHtml = join(serverDistFolder, "index.server.html");
1414

1515
const commonEngine = new CommonEngine();
1616

17-
server.set('view engine', 'html');
18-
server.set('views', browserDistFolder);
17+
server.set("view engine", "html");
18+
server.set("views", browserDistFolder);
1919

2020
// Example Express Rest API endpoints
2121
// server.get('/api/**', (req, res) => { });
2222
// Serve static files from /browser
2323
server.get(
24-
'*.*',
24+
"*.*",
2525
express.static(browserDistFolder, {
26-
maxAge: '1y',
27-
})
26+
maxAge: "1y",
27+
}),
2828
);
2929

3030
// All regular routes use the Angular engine
31-
server.get('*', (req, res, next) => {
31+
server.get("*", (req, res, next) => {
3232
const { protocol, originalUrl, baseUrl, headers } = req;
3333

3434
commonEngine
@@ -47,7 +47,7 @@ export function app(): express.Express {
4747
}
4848

4949
function run(): void {
50-
const port = process.env['PORT'] || 10000;
50+
const port = process.env["PORT"] || 10000;
5151

5252
// Start up the Node server
5353
const server = app();

src/app/app.component.html

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
<main class="main">
2-
<div class="content">
3-
<div *ngIf="isSmallScreen; else elseBlock">
4-
<div id="title-text" [style]="{ padding: '10px' }">Slacker News</div>
5-
<app-timeline-viewer
6-
id="#timeline-small"
7-
style="padding: 20px"
8-
></app-timeline-viewer>
9-
</div>
10-
<ng-template #elseBlock>
11-
<p-splitter id="p-splitter" [panelSizes]="[15, 85]">
12-
<ng-template pTemplate>
13-
<div id="title-text" [style]="{ padding: '10px' }">
14-
Slacker News
15-
</div>
16-
</ng-template>
17-
<ng-template id="summariesParent" pTemplate>
18-
<div id="summaries">
19-
<app-timeline-viewer id="#timeline-split"></app-timeline-viewer>
20-
</div>
21-
</ng-template>
22-
</p-splitter>
23-
</ng-template>
2+
<div class="content">
3+
<div *ngIf="isSmallScreen; else elseBlock">
4+
<div id="title-text" [style]="{ padding: '10px' }">Slacker News</div>
5+
<app-timeline-viewer
6+
id="#timeline-small"
7+
style="padding: 20px"
8+
></app-timeline-viewer>
249
</div>
10+
<ng-template #elseBlock>
11+
<p-splitter id="p-splitter" [panelSizes]="[15, 85]">
12+
<ng-template pTemplate>
13+
<div id="title-text" [style]="{ padding: '10px' }">Slacker News</div>
14+
</ng-template>
15+
<ng-template id="summariesParent" pTemplate>
16+
<div id="summaries">
17+
<app-timeline-viewer id="#timeline-split"></app-timeline-viewer>
18+
</div>
19+
</ng-template>
20+
</p-splitter>
21+
</ng-template>
22+
</div>
2523
</main>

src/app/app.component.scss

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212
#p-splitter {
13-
background-color:brown;
13+
background-color: brown;
1414
height: 100%;
1515
fill: true;
1616
}
@@ -26,7 +26,6 @@
2626
align-content: center;
2727
}
2828

29-
3029
#timeline-small {
3130
padding: 20px;
3231
align-content: center;
@@ -37,14 +36,12 @@
3736
align-content: center;
3837
}
3938

40-
#title-text
41-
{
42-
text-align: left;
39+
#title-text {
40+
text-align: left;
4341
}
4442

4543
.p-timeline-event {
46-
47-
display: flex;
48-
position: relative;
49-
min-height: 70px;
44+
display: flex;
45+
position: relative;
46+
min-height: 70px;
5047
}

src/app/app.component.spec.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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

4-
describe('AppComponent', () => {
4+
describe("AppComponent", () => {
55
beforeEach(async () => {
66
await TestBed.configureTestingModule({
77
imports: [AppComponent],
88
}).compileComponents();
99
});
1010

11-
it('should create the app', () => {
11+
it("should create the app", () => {
1212
const fixture = TestBed.createComponent(AppComponent);
1313
const app = fixture.componentInstance;
1414
expect(app).toBeTruthy();
@@ -17,13 +17,15 @@ describe('AppComponent', () => {
1717
it(`should have the 'slacker-news' title`, () => {
1818
const fixture = TestBed.createComponent(AppComponent);
1919
const app = fixture.componentInstance;
20-
expect(app.title).toEqual('slacker-news');
20+
expect(app.title).toEqual("slacker-news");
2121
});
2222

23-
it('should render title', () => {
23+
it("should render title", () => {
2424
const fixture = TestBed.createComponent(AppComponent);
2525
fixture.detectChanges();
2626
const compiled = fixture.nativeElement as HTMLElement;
27-
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, slacker-news');
27+
expect(compiled.querySelector("h1")?.textContent).toContain(
28+
"Hello, slacker-news",
29+
);
2830
});
2931
});

src/app/app.component.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Component, HostListener, OnInit } from '@angular/core';
2-
import { RouterOutlet } from '@angular/router';
3-
import { SplitterModule } from 'primeng/splitter';
4-
import { TimelineModule } from 'primeng/timeline';
5-
import { TimelineViewerComponent } from './timeline-viewer/timeline-viewer.component';
6-
import { CommonModule, NgIf, isPlatformBrowser } from '@angular/common';
7-
import { WindowSizeService } from './window-size.service';
8-
import { Subscription } from 'rxjs';
1+
import { Component, HostListener, OnInit } from "@angular/core";
2+
import { RouterOutlet } from "@angular/router";
3+
import { SplitterModule } from "primeng/splitter";
4+
import { TimelineModule } from "primeng/timeline";
5+
import { TimelineViewerComponent } from "./timeline-viewer/timeline-viewer.component";
6+
import { CommonModule, NgIf, isPlatformBrowser } from "@angular/common";
7+
import { WindowSizeService } from "./window-size.service";
8+
import { Subscription } from "rxjs";
99

1010
@Component({
11-
selector: 'app-root',
11+
selector: "app-root",
1212
standalone: true,
1313
imports: [
1414
RouterOutlet,
@@ -18,21 +18,21 @@ import { Subscription } from 'rxjs';
1818
NgIf,
1919
CommonModule,
2020
],
21-
templateUrl: './app.component.html',
22-
styleUrl: './app.component.scss',
21+
templateUrl: "./app.component.html",
22+
styleUrl: "./app.component.scss",
2323
})
2424
export class AppComponent {
2525
private sizeSubscription: Subscription;
2626
isSmallScreen = false;
27-
title = 'slacker-news';
27+
title = "slacker-news";
2828
constructor(private windowSizeService: WindowSizeService) {
2929
this.isSmallScreen = window.innerWidth < 768;
3030
this.sizeSubscription = this.windowSizeService.onResize$.subscribe(() => {
31-
console.log('Window resized');
31+
console.log("Window resized");
3232
});
3333
}
3434

35-
@HostListener('window:resize', ['$event'])
35+
@HostListener("window:resize", ["$event"])
3636
onResize(event: any) {
3737
this.isSmallScreen = window.innerWidth < 768;
3838
}

src/app/app.config.server.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
2-
import { provideServerRendering } from '@angular/platform-server';
3-
import { appConfig } from './app.config';
1+
import { mergeApplicationConfig, ApplicationConfig } from "@angular/core";
2+
import { provideServerRendering } from "@angular/platform-server";
3+
import { appConfig } from "./app.config";
44

55
const serverConfig: ApplicationConfig = {
6-
providers: [
7-
provideServerRendering()
8-
]
6+
providers: [provideServerRendering()],
97
};
108

119
export const config = mergeApplicationConfig(appConfig, serverConfig);

src/app/app.config.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
2-
import { provideRouter } from '@angular/router';
3-
import { HttpClientModule } from '@angular/common/http';
1+
import { ApplicationConfig, importProvidersFrom } from "@angular/core";
2+
import { provideRouter } from "@angular/router";
3+
import { HttpClientModule } from "@angular/common/http";
44

5-
import { routes } from './app.routes';
6-
import { provideClientHydration } from '@angular/platform-browser';
5+
import { routes } from "./app.routes";
6+
import { provideClientHydration } from "@angular/platform-browser";
77

88
export const appConfig: ApplicationConfig = {
9-
providers: [provideRouter(routes), provideClientHydration(), importProvidersFrom(HttpClientModule)]
9+
providers: [
10+
provideRouter(routes),
11+
provideClientHydration(),
12+
importProvidersFrom(HttpClientModule),
13+
],
1014
};

src/app/app.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { NgModule } from '@angular/core';
2-
import { BrowserModule } from '@angular/platform-browser';
3-
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
4-
import { AppComponent } from './app.component';
1+
import { NgModule } from "@angular/core";
2+
import { BrowserModule } from "@angular/platform-browser";
3+
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
4+
import { AppComponent } from "./app.component";
55

66
@NgModule({
77
imports: [BrowserModule, BrowserAnimationsModule, AppComponent],

src/app/app.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { Routes } from '@angular/router';
1+
import { Routes } from "@angular/router";
22

33
export const routes: Routes = [];
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { TestBed } from '@angular/core/testing';
1+
import { TestBed } from "@angular/core/testing";
22

3-
import { SlackerNewsApiService } from './slacker-news-api.service';
3+
import { SlackerNewsApiService } from "./slacker-news-api.service";
44

5-
describe('SlackerNewsApiService', () => {
5+
describe("SlackerNewsApiService", () => {
66
let service: SlackerNewsApiService;
77

88
beforeEach(() => {
99
TestBed.configureTestingModule({});
1010
service = TestBed.inject(SlackerNewsApiService);
1111
});
1212

13-
it('should be created', () => {
13+
it("should be created", () => {
1414
expect(service).toBeTruthy();
1515
});
1616
});

src/app/slacker-news-api.service.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { Injectable } from '@angular/core';
2-
import axios from 'axios';
1+
import { Injectable } from "@angular/core";
2+
import axios from "axios";
33
@Injectable({
4-
providedIn: 'root',
4+
providedIn: "root",
55
})
66
export class SlackerNewsApiService {
77
constructor() {}
88
getStories() {
9-
return axios.get('https://slacker-news-server.onrender.com/stories');
9+
return axios.get("https://slacker-news-server.onrender.com/stories");
1010
}
1111
}

0 commit comments

Comments
 (0)