diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 0c79b6f..0213191 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -2,6 +2,8 @@ \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a400a07..5b962e5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,68 @@ - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29,6 +84,9 @@ + + + @@ -62,11 +120,11 @@ + + + + - - - - @@ -124,7 +182,8 @@ - + + @@ -147,4 +206,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index f74053b..8d10556 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ An easily configurable portfolio. ## Configuration - The actual content is in [portfolio.ts](src/portfolio.ts). -- The assets referenced by this file should be located in [src/static](src/static). - +- The assets referenced by that file should be located in [src/static](src/static). +Creative Commons License
This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 2.5 Hungary License. diff --git a/custom.d.ts b/custom.d.ts index 8c6550d..04a1036 100644 --- a/custom.d.ts +++ b/custom.d.ts @@ -1,47 +1,47 @@ -declare module "*.svg" { - import { url } from "src/model/misc"; +declare module '*.svg' { + import { url } from 'src/framework/model/misc'; const content: url; export default content; } -declare module "*.png" { - import { ResponsiveImage } from "src/model/misc"; +declare module '*.png' { + import { ResponsiveImage } from 'src/framework/model/misc'; const content: ResponsiveImage; export default content; } -declare module "*.jpg" { - import { ResponsiveImage } from "src/model/misc"; +declare module '*.jpg' { + import { ResponsiveImage } from 'src/framework/model/misc'; const content: ResponsiveImage; export default content; } -declare module "*.jpeg" { - import { ResponsiveImage } from "src/model/misc"; +declare module '*.jpeg' { + import { ResponsiveImage } from 'src/framework/model/misc'; const content: ResponsiveImage; export default content; } -declare module "*.gif" { - import { url } from "src/model/misc"; +declare module '*.gif' { + import { url } from 'src/framework/model/misc'; const content: url; export default content; } -declare module "*.mp4" { - import { url } from "src/model/misc"; +declare module '*.mp4' { + import { url } from 'src/framework/model/misc'; const content: url; export default content; } -declare module "*.webm" { - import { url } from "src/model/misc"; +declare module '*.webm' { + import { url } from 'src/framework/model/misc'; const content: url; export default content; } -declare module "*.pdf" { - import { url } from "src/model/misc"; +declare module '*.pdf' { + import { url } from 'src/framework/model/misc'; const content: url; export default content; } diff --git a/package.json b/package.json index a94840e..f28fae1 100644 --- a/package.json +++ b/package.json @@ -55,9 +55,7 @@ "typescript": "^3.7.3", "webpack": "^4.41.4", "webpack-cli": "^3.3.10", - "webpack-dev-server": "^3.10.1" - }, - "dependencies": { - "sass": "latest" + "webpack-dev-server": "^3.10.1", + "cssnano": "latest" } } diff --git a/src/framework/container-page.ts b/src/framework/container-page.ts index 7521a04..5753365 100644 --- a/src/framework/container-page.ts +++ b/src/framework/container-page.ts @@ -1,5 +1,5 @@ import { PageElement } from './page-element'; -import { PageEventType } from './page-event'; +import { PageEventType } from './events/page-event'; export class ContainerPage extends PageElement { public constructor(rootElement: HTMLElement, children: Array) { diff --git a/src/framework/event-broadcaster.ts b/src/framework/events/event-broadcaster.ts similarity index 100% rename from src/framework/event-broadcaster.ts rename to src/framework/events/event-broadcaster.ts diff --git a/src/framework/page-event.ts b/src/framework/events/page-event.ts similarity index 100% rename from src/framework/page-event.ts rename to src/framework/events/page-event.ts diff --git a/src/framework/framework.scss b/src/framework/framework.scss new file mode 100644 index 0000000..5f1962b --- /dev/null +++ b/src/framework/framework.scss @@ -0,0 +1 @@ +@forward "styles/index"; diff --git a/src/framework/helper/create-element.ts b/src/framework/helper/create-element.ts index 3337cea..c5978e2 100644 --- a/src/framework/helper/create-element.ts +++ b/src/framework/helper/create-element.ts @@ -1,4 +1,4 @@ -import { html } from '../../model/misc'; +import { html } from '../model/misc'; export const createElement = (from: html): HTMLElement => { // won't work for all elements, eg.: diff --git a/src/framework/index.scss b/src/framework/index.scss deleted file mode 100644 index 2e194d3..0000000 --- a/src/framework/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import 'primitives/primitives'; -@import 'helper/animations/animations'; diff --git a/src/model/misc.ts b/src/framework/model/misc.ts similarity index 100% rename from src/model/misc.ts rename to src/framework/model/misc.ts diff --git a/src/framework/page-element.ts b/src/framework/page-element.ts index e18c9d9..160c892 100644 --- a/src/framework/page-element.ts +++ b/src/framework/page-element.ts @@ -1,5 +1,5 @@ -import { PageEvent, PageEventType } from './page-event'; -import { EventBroadcaster } from './event-broadcaster'; +import { PageEvent, PageEventType } from './events/page-event'; +import { EventBroadcaster } from './events/event-broadcaster'; export abstract class PageElement implements EventBroadcaster { protected eventBroadcaster: EventBroadcaster; diff --git a/src/framework/primitives/implementations/anchor.ts b/src/framework/primitives/implementations/anchor.ts index b7ce2f7..e885a76 100644 --- a/src/framework/primitives/implementations/anchor.ts +++ b/src/framework/primitives/implementations/anchor.ts @@ -1,5 +1,5 @@ import { Primitive } from '../primitive'; -import { html, url } from '../../../model/misc'; +import { html, url } from '../../model/misc'; export class Anchor implements Primitive { public constructor( @@ -8,10 +8,12 @@ export class Anchor implements Primitive { ) {} public toHTML(): html { - return `${this.text}`; + return ` + ${this.text} + `; } } diff --git a/src/framework/primitives/implementations/image.ts b/src/framework/primitives/implementations/image.ts index 57f1d87..e7ac759 100644 --- a/src/framework/primitives/implementations/image.ts +++ b/src/framework/primitives/implementations/image.ts @@ -1,5 +1,5 @@ import { Primitive } from '../primitive'; -import { html, ResponsiveImage } from '../../../model/misc'; +import { html, ResponsiveImage } from '../../model/misc'; import { last } from '../../helper/last'; export class Image implements Primitive { @@ -11,7 +11,7 @@ export class Image implements Primitive { public toHTML(disableInnerShadow = false): html { return ` ${!disableInnerShadow ? `
` : ''} - ${this.alt}` : ''} -