diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 57811cf..082531a 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -9,7 +9,7 @@ const routes: Routes = [
component: ArticleComponent
},
{
- path: "article",
+ path: "page",
component: RouterEmptyComponent,
children: [{
path: "**",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 0d8a198..f037997 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -34,7 +34,7 @@ import { environment } from '../environments/environment';
useFactory: markedOptionsFactory,
},
}),
- ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
+ ServiceWorkerModule.register("ngsw-worker.js", { enabled: environment.production }),
],
providers: [],
bootstrap: [AppComponent]
@@ -47,9 +47,6 @@ export function markedOptionsFactory(): MarkedOptions {
renderer.blockquote = (text: string) => {
return "" + text + "
";
};
- /*renderer.warning = (text: string) => {
- return "";
- };*/
return {
renderer,
@@ -60,5 +57,6 @@ export function markedOptionsFactory(): MarkedOptions {
sanitize: false,
smartLists: true,
smartypants: false,
+ headerIds: true,
};
}
diff --git a/src/app/article/article.component.scss b/src/app/article/article.component.scss
index 279bc52..2998eb0 100644
--- a/src/app/article/article.component.scss
+++ b/src/app/article/article.component.scss
@@ -3,4 +3,6 @@
overflow-x: hidden;
word-break: break-word;
padding: 0 0.5rem;
+ max-width: 1280px;
+ margin: auto;
}
\ No newline at end of file
diff --git a/src/app/gui/navbar/navbar.component.html b/src/app/gui/navbar/navbar.component.html
index 78412ee..9a42caf 100644
--- a/src/app/gui/navbar/navbar.component.html
+++ b/src/app/gui/navbar/navbar.component.html
@@ -14,7 +14,7 @@
[routerLink]="link.address"
[target]="link.newtab === true ? '_blank' : '_self'"
rel="noopener"
- [class.force-focus] = "'/article/' + (currentDocument.onDocumentChange() | async)?.id == link.address"
+ [class.force-focus] = "'/page/' + (currentDocument.onDocumentChange() | async)?.id == link.address"
>{{link.text}}
diff --git a/src/app/gui/navbar/navbar.component.ts b/src/app/gui/navbar/navbar.component.ts
index b1d2ed9..5b49e3e 100644
--- a/src/app/gui/navbar/navbar.component.ts
+++ b/src/app/gui/navbar/navbar.component.ts
@@ -12,17 +12,13 @@ import { CurrentDocumentService } from "src/app/services/current-document.servic
export class NavbarComponent implements OnInit, AfterViewInit {
public navigationLinks: NavigationLink[] = [
- {
- text: "Cardboard bug",
- address: "/article/software"
- },
{
text: "Midi23D",
- address: "/article/software/midi23d"
+ address: "/page/Midi23D"
},
{
- text: "Calculator",
- address: "/article/calculator",
+ text: "WarpPI Calculator",
+ address: "/page/WarpPI",
newtab: false
},
{
diff --git a/src/app/services/document-fetch.service.ts b/src/app/services/document-fetch.service.ts
index c37f0f9..59dd570 100644
--- a/src/app/services/document-fetch.service.ts
+++ b/src/app/services/document-fetch.service.ts
@@ -9,6 +9,13 @@ import { take } from "rxjs/operators";
export class DocumentFetchService {
private language: string;
+ private readonly replacements: {tag: string, replacement: string, single?: boolean}[] = [
+ {tag: "warning", replacement: "$1"},
+ {tag: "inverted", replacement: "$1"},
+ {tag: "u", replacement: "$1"},
+ {tag: "br", replacement: "
", single: true}
+ ];
+
constructor(private http: HttpClient) {
this.language = document.body.parentElement.lang;
}
@@ -37,7 +44,7 @@ export class DocumentFetchService {
return {
found: true,
id: encodedId,
- content: await response
+ content: this.format(await response)
};
}
@@ -46,7 +53,7 @@ export class DocumentFetchService {
try {
const response: string = await this.http.get("/documents/" + errorCode + "." + this.language + ".md", { responseType: "text" })
.pipe(take(1)).toPromise();
- return response;
+ return this.format(await response);
} catch (e) {
}
}
@@ -61,4 +68,25 @@ export class DocumentFetchService {
return "index";
}
}
+
+ private format(rawDocument: string): string {
+ let count: number;
+ do {
+ count = 0;
+ this.replacements.forEach(replacement => {
+ const replacementResult = this.replaceTagWith(rawDocument, replacement.tag, replacement.replacement,replacement.single);
+ count += replacementResult.count;
+ rawDocument = replacementResult.document;
+ });
+ } while (count > 0);
+ return rawDocument;
+ }
+
+ private replaceTagWith(document: string, tagName: string, tagResult: string, single?: boolean): {document: string, count: number} {
+ const newDocument = single === true ?
+ document.replace(new RegExp("\\[" + tagName + "\\]", "g"), tagResult)
+ :
+ document.replace(new RegExp("\\[" + tagName + "\\]([^[]+)\\[\\/" + tagName + "\\]", "g"), tagResult);
+ return {document: newDocument, count: newDocument !== document ? 1 : 0};
+ }
}
diff --git a/src/documents/android/g2cardboard.en.md b/src/documents/android/g2cardboard.en.md
new file mode 100644
index 0000000..b2eda02
--- /dev/null
+++ b/src/documents/android/g2cardboard.en.md
@@ -0,0 +1,59 @@
+# LG G2 Cardboard fix
+
+## Fixing the double vision on your LG G2 using Cardboard
+
+### When this problem occurs
+
+If you have installed a custom rom on your LG G2 probably the DPI setting has changed.
+The DPI setting is used to calculate the pixel density, and consequently the real measures of your screen. Google Cardboard calculates the distance between eyes using the DPI setting, and if it's wrong some apps using the old CardBoard SDK don't show properly.
+
+#### Here's an example
+
+With 480 DPI (CyanogenMod default setting)
+[inverted] *x* inches [/inverted]
+
+With 424 DPI (LG G2 real DPI)
+[inverted] *x* inches [/inverted]
+
+### How to fix it
+
+Please choose the method that you prefer
+
+#### Method 1
+
+***Fixing the problem for [u]some[/u] apps, keeping your current DPI setting.***
+
+1. Open Cardboard app
+2. Tap **Settings**
+3. Tap **Change**
+4. Scan with your camera this QR-Code:
+[warning]WARNING: If you do this you can't go back to the default settings![/warning]
+
+5. Enjoy your cardboard
+
+#### Method 2 A
+
+***Fixing the problem globally changing your current DPI setting.***
+
+This method is perfect for **LineageOS based ROMs**.
+
+1. Go to Settings
+2. Tap **Display & lights**
+3. Tap **LCD Density**
+4. Change the value to **424 DPI**
+[warning]WARNING: If you don't find this precise value, higher values are better than lower ones![/warning]
+5. Reboot or soft reboot your phone
+6. Enjoy your cardboard
+
+#### Method 2 B
+
+***Fixing the problem globally changing your current DPI setting through an app.*** **[warning]ROOT[/warning]**
+
+1. Open **Play Store**
+2. Find and install **Texdroider Dpi**
+3. Open it
+4. Grant root access to Texdroider Dpi
+5. Change the value to **424 DPI**
+6. Tap **Apply**
+7. Reboot or soft reboot your phone
+8. Enjoy your cardboard
diff --git a/src/documents/index.en.md b/src/documents/index.en.md
index 8731030..9b633dc 100644
--- a/src/documents/index.en.md
+++ b/src/documents/index.en.md
@@ -1,5 +1,20 @@
-# Welcome to Cavallium.it
+# Benvenuto in Cavallium.it
-This page is a test.
+**Cavallium.it** è il mio sito personale, in cui pubblico varie pagine riguardanti le mie creazioni nell'ambito informatico.
-**Bold.** *Cantami o diva del pelide achille l'ira funesta che infiniti addusse lutti agli achei.*
\ No newline at end of file
+Dato che mi piace creare siti web, Cavallium.it è stato fatto interamente da me nel 2019 utilizzando Angular 9.
+
+Oltre alle pagine web mi piace creare applicazioni, sia web che desktop.
+Nel 2016 ho iniziato ad avvicinarmi anche all'elettronica, iniziando a progettare la calcolatrice WarpPI.
+Negli ultimi tre anni mi sono focalizzato sullo sviluppo di **applicazioni web** e **progressive web apps** usando il framework **Angular** insieme a **RxJs** e **Firebase**, oltre a sviluppare software in **Java**. La maggior parte delle web app che ho sviluppato non possono essere mostrate pubblicamente qui, nonostante ciò le altre web app che ho sviluppato sono:
+
+* [ExtraDrone.it](https://extradrone.it)
+
+Il menù sottostante contiene solo i miei ultimi progetti più rilevanti (altrimenti avrei dovuto fare una lista infinitamente lunga piena di stupide prove e progetti sperimentali).
+Dacci un'occhiata 😉
+
+* [WarpPi Calculator](/page/WarpPI)
+* [Midi23D](/page/Midi23D)
+* [OpenRC Formula 1 Car](https://www.youtube.com/watch?v=EF921CLhXQg&vl=it&ab_channel=AndreaCavalli)
+
+Oltre a questo sito possiedo un [server locale al seguente indirizzo](https://rk3328.cc)
\ No newline at end of file
diff --git a/src/documents/index.it.md b/src/documents/index.it.md
index e7f1350..9b633dc 100644
--- a/src/documents/index.it.md
+++ b/src/documents/index.it.md
@@ -1,5 +1,20 @@
# Benvenuto in Cavallium.it
-Questa pagina è una prova.
+**Cavallium.it** è il mio sito personale, in cui pubblico varie pagine riguardanti le mie creazioni nell'ambito informatico.
-**Prova in grassetto.** *Cantami o diva del pelide achille l'ira funesta che infiniti addusse lutti agli achei.*
\ No newline at end of file
+Dato che mi piace creare siti web, Cavallium.it è stato fatto interamente da me nel 2019 utilizzando Angular 9.
+
+Oltre alle pagine web mi piace creare applicazioni, sia web che desktop.
+Nel 2016 ho iniziato ad avvicinarmi anche all'elettronica, iniziando a progettare la calcolatrice WarpPI.
+Negli ultimi tre anni mi sono focalizzato sullo sviluppo di **applicazioni web** e **progressive web apps** usando il framework **Angular** insieme a **RxJs** e **Firebase**, oltre a sviluppare software in **Java**. La maggior parte delle web app che ho sviluppato non possono essere mostrate pubblicamente qui, nonostante ciò le altre web app che ho sviluppato sono:
+
+* [ExtraDrone.it](https://extradrone.it)
+
+Il menù sottostante contiene solo i miei ultimi progetti più rilevanti (altrimenti avrei dovuto fare una lista infinitamente lunga piena di stupide prove e progetti sperimentali).
+Dacci un'occhiata 😉
+
+* [WarpPi Calculator](/page/WarpPI)
+* [Midi23D](/page/Midi23D)
+* [OpenRC Formula 1 Car](https://www.youtube.com/watch?v=EF921CLhXQg&vl=it&ab_channel=AndreaCavalli)
+
+Oltre a questo sito possiedo un [server locale al seguente indirizzo](https://rk3328.cc)
\ No newline at end of file
diff --git a/src/documents/software.en.md b/src/documents/software.en.md
deleted file mode 100644
index 281106d..0000000
--- a/src/documents/software.en.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# LG G2 Cardboard fix
-
-## Fixing the double vision on your LG G2 using Cardboard
-
-### When this problem occurs
-
-If you have installed a custom rom on your LG G2 probably the DPI setting has changed.
-The DPI setting is used to calculate the pixel density, and consequently the real measures of your screen. Google Cardboard calculates the distance between eyes using the DPI setting, and if it's wrong some apps using the old CardBoard SDK don't show properly.
-
-#### Here's an example
-
-With 480 DPI (CyanogenMod default setting)
-*same length in inches:* 4
-
-With 424 DPI (LG G2 real DPI)
-*same length in inches:* 3
-
-### How to fix it
-
-Please choose the method that you prefer
-
-#### Method 1
-
-***Fixing the problem for some apps, keeping your current DPI setting.***
-
-1. Open Cardboard app
-2. Tap **Settings**
-3. Tap **Change**
-4. Scan with your camera this QR-Code:
[warning]WARNING: If you do this you can't go back to the default settings![warning]
\ No newline at end of file
diff --git a/src/documents/software.it.md b/src/documents/software.it.md
deleted file mode 100644
index ce37eeb..0000000
--- a/src/documents/software.it.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# LG G2 Cardboard fix
-
-## Fixing the double vision on your LG G2 using Cardboard
-
-### When this problem occurs
-
-If you have installed a custom rom on your LG G2 probably the DPI setting has changed.
-The DPI setting is used to calculate the pixel density, and consequently the real measures of your screen. Google Cardboard calculates the distance between eyes using the DPI setting, and if it's wrong some apps using the old CardBoard SDK don't show properly.
-
-#### Here's an example
-
-With 480 DPI (CyanogenMod default setting)
-*same length in inches:* 4
-
-With 424 DPI (LG G2 real DPI)
-*same length in inches:* 3
-
-### How to fix it
-
-Please choose the method that you prefer
-
-#### Method 1
-
-***Fixing the problem for some apps, keeping your current DPI setting.***
-
-1. Open Cardboard app
-2. Tap **Settings**
-3. Tap **Change**
-4. Scan with your camera this QR-Code:
-[warning]WARNING: If you do this you can't go back to the default settings![warning]
-
-
-line
-break
-
-"Smart Quotations"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/styles-fonts.scss b/src/styles-fonts.scss
index 247e898..3f868af 100644
--- a/src/styles-fonts.scss
+++ b/src/styles-fonts.scss
@@ -1,75 +1,72 @@
-/* latin-ext */
-@font-face {
- font-family: 'Muli-custom';
- font-display: optional;
- font-style: italic;
- font-weight: 600;
- src: local('Muli SemiBold Italic'), local('Muli-SemiBoldItalic'), url(/assets/Muli-600i-latinext.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
/* latin */
@font-face {
font-family: 'Muli-custom';
- font-display: optional;
- font-style: italic;
- font-weight: 600;
- src: local('Muli SemiBold Italic'), local('Muli-SemiBoldItalic'), url(/assets/Muli-600i-latin.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin-ext */
-@font-face {
- font-family: 'Muli-custom';
- font-display: optional;
- font-style: italic;
- font-weight: 800;
- src: local('Muli ExtraBold Italic'), local('Muli-ExtraBoldItalic'), url(/assets/Muli-800i-latinext.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Muli-custom';
- font-display: optional;
- font-style: italic;
- font-weight: 800;
- src: local('Muli ExtraBold Italic'), local('Muli-ExtraBoldItalic'), url(/assets/Muli-800i-latin.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin-ext */
-@font-face {
- font-family: 'Muli-custom';
- font-display: optional;
+ font-display: swap;
font-style: normal;
- font-weight: 600;
- src: local('Muli SemiBold'), local('Muli-SemiBold'), url(/assets/Muli-600r-latinext.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Muli-custom';
- font-display: optional;
- font-style: normal;
- font-weight: 600;
+ font-weight: 400;
src: local('Muli SemiBold'), local('Muli-SemiBold'), url(/assets/Muli-600r-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
-
-/* latin-ext */
+/* latin */
@font-face {
font-family: 'Muli-custom';
- font-display: optional;
+ font-display: swap;
font-style: normal;
- font-weight: 800;
- src: local('Muli ExtraBold'), local('Muli-ExtraBold'), url(/assets/Muli-800r-latinext.woff2) format('woff2');
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+ font-weight: 700;
+ src: local('Muli ExtraBold'), local('Muli-ExtraBold'), url(/assets/Muli-800r-latin.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* latin */
@font-face {
font-family: 'Muli-custom';
- font-display: optional;
- font-style: normal;
- font-weight: 800;
- src: local('Muli ExtraBold'), local('Muli-ExtraBold'), url(/assets/Muli-800r-latin.woff2) format('woff2');
+ font-display: swap;
+ font-style: italic;
+ font-weight: 400;
+ src: local('Muli SemiBold Italic'), local('Muli-SemiBoldItalic'), url(/assets/Muli-600i-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+ font-family: 'Muli-custom';
+ font-display: swap;
+ font-style: italic;
+ font-weight: 700;
+ src: local('Muli ExtraBold Italic'), local('Muli-ExtraBoldItalic'), url(/assets/Muli-800i-latin.woff2) format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Muli-custom';
+ font-display: swap;
+ font-style: normal;
+ font-weight: 400;
+ src: local('Muli SemiBold'), local('Muli-SemiBold'), url(/assets/Muli-600r-latinext.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Muli-custom';
+ font-display: swap;
+ font-style: normal;
+ font-weight: 700;
+ src: local('Muli ExtraBold'), local('Muli-ExtraBold'), url(/assets/Muli-800r-latinext.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Muli-custom';
+ font-display: swap;
+ font-style: italic;
+ font-weight: 400;
+ src: local('Muli SemiBold Italic'), local('Muli-SemiBoldItalic'), url(/assets/Muli-600i-latinext.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Muli-custom';
+ font-display: swap;
+ font-style: italic;
+ font-weight: 700;
+ src: local('Muli ExtraBold Italic'), local('Muli-ExtraBoldItalic'), url(/assets/Muli-800i-latinext.woff2) format('woff2');
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index 461258b..907b56d 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,13 +1,22 @@
/* You can add global styles to this file, and also import other style files */
+
+@import "styles-variables.scss";
html, body, body, app-root {
height: 100%;
max-height: 100%;
}
body {
margin: 0;
- font-family: "Muli-custom", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
- font-weight: 600;
+ font-family: "Muli-custom", -apple-system, BlinkMacSystemFont, Roboto, 'Open Sans', Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
+ font-weight: 400;
}
strong, b, h1, h2, h3, h4, h5, h6, th {
- font-weight: 800;
+ font-weight: 700;
+}
+.document-style-inverted {
+ color: white;
+ background: $color-main;
+}
+.document-style-warning{
+ color: red;
}
\ No newline at end of file