Skip to content

Commit

Permalink
fix(website): fix ssr, remove some pages
Browse files Browse the repository at this point in the history
  • Loading branch information
marcj committed Mar 19, 2024
1 parent 0dceb54 commit 51b9b36
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 30 deletions.
7 changes: 3 additions & 4 deletions website/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@ You are looking to change documentation? Go to ./src/pages/documentation
Requires node v20.

```sh
npm ci

# frontend watcher
npm run app:start

# server watcher
npm run server:watch
```

Or just `npm run dev`.

## SSR build

```
npm run app:build
npm run ssr:build
npm run server
``
```

## Build Docker image

Expand Down
8 changes: 4 additions & 4 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
"@deepkit/desktop-ui": "^1.0.1-alpha.143",
"@deepkit/event": "^1.0.1-alpha.143",
"@deepkit/filesystem": "^1.0.1-alpha.143",
"@deepkit/framework": "^1.0.1-alpha.143",
"@deepkit/framework": "^1.0.1-alpha.144",
"@deepkit/http": "^1.0.1-alpha.143",
"@deepkit/injector": "^1.0.1-alpha.143",
"@deepkit/logger": "^1.0.1-alpha.143",
"@deepkit/mongo": "^1.0.1-alpha.143",
"@deepkit/mongo": "^1.0.1-alpha.144",
"@deepkit/orm": "^1.0.1-alpha.143",
"@deepkit/postgres": "^1.0.1-alpha.143",
"@deepkit/postgres": "^1.0.1-alpha.144",
"@deepkit/rpc": "^1.0.1-alpha.143",
"@deepkit/rpc-tcp": "^1.0.1-alpha.143",
"@deepkit/sql": "^1.0.1-alpha.143",
"@deepkit/sql": "^1.0.1-alpha.144",
"@deepkit/stopwatch": "^1.0.1-alpha.143",
"@deepkit/template": "^1.0.1-alpha.143",
"@deepkit/type": "^1.0.1-alpha.143",
Expand Down
24 changes: 12 additions & 12 deletions website/src/app/pages/documentation.component.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { AfterViewInit, Component, ElementRef, OnDestroy, ViewChild } from "@angular/core";
import { Router, RouterLink, RouterLinkActive, RouterOutlet } from "@angular/router";
import { AppDescription, AppTitle } from "@app/app/components/title";
import { ContentRenderComponent } from "@app/app/components/content-render.component";
import { NgForOf, NgIf } from "@angular/common";
import { FormsModule } from "@angular/forms";
import { LoadingComponent } from "@app/app/components/loading";
import { AskComponent } from "@app/app/components/ask.component";
import { Subscription } from "rxjs";
import { PlatformHelper } from "@app/app/utils";
import { AfterViewInit, Component, ElementRef, OnDestroy, ViewChild } from '@angular/core';
import { Router, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
import { AppDescription, AppTitle } from '@app/app/components/title';
import { ContentRenderComponent } from '@app/app/components/content-render.component';
import { NgForOf, NgIf } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { LoadingComponent } from '@app/app/components/loading';
import { AskComponent } from '@app/app/components/ask.component';
import { Subscription } from 'rxjs';
import { PlatformHelper } from '@app/app/utils';

@Component({
standalone: true,
Expand Down Expand Up @@ -37,10 +37,10 @@ import { PlatformHelper } from "@app/app/utils";
<nav [class.showMenu]="showMenu" #nav (scrollend)="setScroll($event)">
<div style="margin-bottom: 25px;">
<a routerLinkActive="active" routerLink="/documentation/introduction">Introduction</a>
<a routerLinkActive="active" routerLink="/documentation/questions">Questions & Answers</a>
<!-- <a routerLinkActive="active" routerLink="/documentation/questions">Questions & Answers</a>-->
<a routerLinkActive="active" routerLink="/documentation/examples">Examples</a>
<a href="https://discord.com/invite/PtfVf7B8UU" target="_blank">Join Discord</a>
<a routerLinkActive="active" routerLink="/documentation/learn-typescript">Learn TypeScript</a>
<!-- <a routerLinkActive="active" routerLink="/documentation/learn-typescript">Learn TypeScript</a>-->
</div>
<div class="category">
Expand Down
16 changes: 14 additions & 2 deletions website/src/app/zone.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
import { ApplicationRef, EventEmitter, importProvidersFrom, inject, Injectable, Injector, ModuleWithProviders, NgModule, NgZone, Optional, RendererFactory2 } from '@angular/core';
import {
ApplicationRef,
EventEmitter,
importProvidersFrom,
inject,
Injectable,
Injector,
ModuleWithProviders,
NgModule,
NgZone,
Optional,
RendererFactory2,
} from '@angular/core';
import { clearTick, nextTick } from '@deepkit/core';
import { ActivationEnd, NavigationEnd, Router } from '@angular/router';

Expand Down Expand Up @@ -119,7 +131,7 @@ NgZone.assertNotInAngularZone = () => undefined;
export class AsyncNgZone implements NgZone {
hasPendingMicrotasks = false;
hasPendingMacrotasks = false;
isStable = true;
isStable = false;
readonly onUnstable = new EventEmitter<any>();

// this triggers applicationRef.tick()
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3223,7 +3223,7 @@ __metadata:
languageName: unknown
linkType: soft

"@deepkit/framework@npm:^1.0.1-alpha.0, @deepkit/framework@npm:^1.0.1-alpha.143, @deepkit/framework@npm:^1.0.1-alpha.144, @deepkit/framework@workspace:packages/framework":
"@deepkit/framework@npm:^1.0.1-alpha.0, @deepkit/framework@npm:^1.0.1-alpha.144, @deepkit/framework@workspace:packages/framework":
version: 0.0.0-use.local
resolution: "@deepkit/framework@workspace:packages/framework"
dependencies:
Expand Down Expand Up @@ -3350,7 +3350,7 @@ __metadata:
languageName: unknown
linkType: soft

"@deepkit/mongo@npm:^1.0.1-alpha.0, @deepkit/mongo@npm:^1.0.1-alpha.143, @deepkit/mongo@workspace:packages/mongo":
"@deepkit/mongo@npm:^1.0.1-alpha.0, @deepkit/mongo@npm:^1.0.1-alpha.144, @deepkit/mongo@workspace:packages/mongo":
version: 0.0.0-use.local
resolution: "@deepkit/mongo@workspace:packages/mongo"
dependencies:
Expand Down Expand Up @@ -3531,7 +3531,7 @@ __metadata:
languageName: unknown
linkType: soft

"@deepkit/postgres@npm:^1.0.1-alpha.143, @deepkit/postgres@workspace:packages/postgres":
"@deepkit/postgres@npm:^1.0.1-alpha.144, @deepkit/postgres@workspace:packages/postgres":
version: 0.0.0-use.local
resolution: "@deepkit/postgres@workspace:packages/postgres"
dependencies:
Expand Down Expand Up @@ -3603,7 +3603,7 @@ __metadata:
languageName: unknown
linkType: soft

"@deepkit/sql@npm:^1.0.1-alpha.0, @deepkit/sql@npm:^1.0.1-alpha.143, @deepkit/sql@npm:^1.0.1-alpha.144, @deepkit/sql@workspace:packages/sql":
"@deepkit/sql@npm:^1.0.1-alpha.0, @deepkit/sql@npm:^1.0.1-alpha.144, @deepkit/sql@workspace:packages/sql":
version: 0.0.0-use.local
resolution: "@deepkit/sql@workspace:packages/sql"
dependencies:
Expand Down Expand Up @@ -23531,16 +23531,16 @@ __metadata:
"@deepkit/desktop-ui": "npm:^1.0.1-alpha.143"
"@deepkit/event": "npm:^1.0.1-alpha.143"
"@deepkit/filesystem": "npm:^1.0.1-alpha.143"
"@deepkit/framework": "npm:^1.0.1-alpha.143"
"@deepkit/framework": "npm:^1.0.1-alpha.144"
"@deepkit/http": "npm:^1.0.1-alpha.143"
"@deepkit/injector": "npm:^1.0.1-alpha.143"
"@deepkit/logger": "npm:^1.0.1-alpha.143"
"@deepkit/mongo": "npm:^1.0.1-alpha.143"
"@deepkit/mongo": "npm:^1.0.1-alpha.144"
"@deepkit/orm": "npm:^1.0.1-alpha.143"
"@deepkit/postgres": "npm:^1.0.1-alpha.143"
"@deepkit/postgres": "npm:^1.0.1-alpha.144"
"@deepkit/rpc": "npm:^1.0.1-alpha.143"
"@deepkit/rpc-tcp": "npm:^1.0.1-alpha.143"
"@deepkit/sql": "npm:^1.0.1-alpha.143"
"@deepkit/sql": "npm:^1.0.1-alpha.144"
"@deepkit/stopwatch": "npm:^1.0.1-alpha.143"
"@deepkit/template": "npm:^1.0.1-alpha.143"
"@deepkit/type": "npm:^1.0.1-alpha.143"
Expand Down

0 comments on commit 51b9b36

Please sign in to comment.