domsPlace();
- -My personal website, written in Javascript, HTML, CSS using Node, React, SCSS, Webpack and Babel. - -Yet another redesign after many, the site is permanently stuck in limbo as I don't have as much time to work on it as I would like. - -## Roadmap -Plans to add are: - - - ~~Favicon~~ - - Short Blog Page - - Featured Video (Code is ready, video needs to be made) - - More Social integration and show off my social pages - - Faster loading (SVG Backgrounds are quite large) - - ~~Responsive Image Loading~~ - - ~~Async Image/Video loading for content (no point just yet)~~ - - ~~Async page offsetting,~~ as well as proper loading templates - - Improved SEO - - Reduce Divitis - - Restore previously removed page transitions - - ~~Convert some of the SVGs into responsive PNGs~~ Unsure if I'll stick with this permanently - - Work on Async Sections - - Proper Server - - Adjust the order import order so to help CSS Overrides. diff --git a/package.json b/package.json deleted file mode 100644 index 44eb900..0000000 --- a/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "domsplace", - "version": "6.0.1", - "description": "Personal website for Dominic \"YouWish\" Masters.", - "main": "dist/private/", - "scripts": { - "test": "jest", - "start": "node dist/private/", - "build": "tsc -p . && webpack -p --env.production", - "watch": "cross-env NODE_ENV=DEVELOPMENT npm run start", - "heroku-postbuild": "tsc -p . && webpack -p --env.production" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/YourWishes/domsPlaceNew.git" - }, - "keywords": [ - "domsplace", - "personal", - "portfolio", - "website" - ], - "author": "Dominic Masters", - "license": "MIT", - "bugs": { - "url": "https://github.com/YourWishes/domsPlaceNew/issues" - }, - "homepage": "https://github.com/YourWishes/domsPlaceNew#readme", - "dependencies": { - "@types/animejs": "^2.0.2", - "@yourwishes/app-email": "^1.0.3", - "@yourwishes/app-simple-react": "^2.8.7", - "animejs": "^3.0.1", - "react-helmet": "^5.2.1" - }, - "devDependencies": { - "@types/jest": "^24.0.15", - "cross-env": "^5.2.0", - "jest": "^24.1.0", - "typescript": "^3.5.3", - "webpack-cli": "^3.3.5", - "webpack-dev-middleware": "^3.6.1", - "webpack-hot-middleware": "^2.24.3" - } -} diff --git a/src/private/.gitignore b/src/private/.gitignore new file mode 100644 index 0000000..f770a93 --- /dev/null +++ b/src/private/.gitignore @@ -0,0 +1,3 @@ +dist/ +*.log +*.lock \ No newline at end of file diff --git a/src/private/api/contact/index.ts b/src/private/api/contact/index.ts deleted file mode 100644 index 4bf68ce..0000000 --- a/src/private/api/contact/index.ts +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) 2019 Dominic Masters -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicen se, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import { RESPONSE_OK, RESPONSE_BAD_REQUEST, RESPONSE_INTERNAL_ERROR } from '@yourwishes/app-api'; -import { ServerAPIRequest, ServerAPIResponse, ServerAPIHandler } from '@yourwishes/app-server'; -import { isValidEmail } from '@yourwishes/app-email'; -import { domsPlaceApp } from './../../app/'; - -export const EMAIL_MAXLENGTH = 256; -export const NAME_MAXLENGTH = 128; -export const MESSAGE_MAXLENGTH = 8192; - -export class sendContact extends ServerAPIHandler { - constructor() { - super('POST', '/contact/send'); - } - - async onRequest(request:ServerAPIRequest):PromiseContact Message received from ${email} who wrote:
-
- ${ message.replace(//g, '>').replace(/\n/g, '
') }
-
Contact Message Sent! Thanks for reaching out. If this was not you then ignore this email.
- `); - if(!clientRes) return { code: RESPONSE_INTERNAL_ERROR, data: false }; - request.owner.logger.debug(`...Done`); - - //OK! - return { code: RESPONSE_OK, data: true }; - } -} diff --git a/src/private/api/index.ts b/src/private/api/index.ts deleted file mode 100644 index 371663a..0000000 --- a/src/private/api/index.ts +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 2019 Dominic Masters -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -export * from './contact/'; diff --git a/src/private/app/index.ts b/src/private/app/index.ts deleted file mode 100644 index 37992ce..0000000 --- a/src/private/app/index.ts +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2019 Dominic Masters -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import { App } from '@yourwishes/app-base'; -import { ServerModule } from '@yourwishes/app-server'; -import { ReactModule } from '@yourwishes/app-react'; -import { ISimpleReactApp, SimpleReactModule } from '@yourwishes/app-simple-react'; -import { IEmailApp, EmailModule } from '@yourwishes/app-email'; -import { domsPlaceModule } from './../module/'; - -import { domsPlaceCompiler } from './../compiler/'; - -export class domsPlaceApp extends App implements ISimpleReactApp, IEmailApp { - server:ServerModule; - email:EmailModule; - react:ReactModule; - simpleReact:SimpleReactModule; - domsPlace:domsPlaceModule; - - constructor() { - super(); - - this.server = new ServerModule(this); - this.email = new EmailModule(this); - this.react = new ReactModule(this); - this.simpleReact = new SimpleReactModule(this); - this.domsPlace = new domsPlaceModule(this); - - [ - this.server, this.email, this.react, this.simpleReact, this.domsPlace - ].forEach(e => this.modules.addModule(e)); - } - - getCompiler() { - return new domsPlaceCompiler(); - } -} diff --git a/src/private/compiler/index.ts b/src/private/compiler/index.ts deleted file mode 100644 index 67a2a89..0000000 --- a/src/private/compiler/index.ts +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2019 Dominic Masters -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import { SimpleReactCompiler } from '@yourwishes/app-simple-react'; - -const gtag = ` -`; - -const content = ` - Please Wait... -`; - -export class domsPlaceCompiler extends SimpleReactCompiler { - constructor() { - super({ - title: 'domsPlace - Personal Site of Dominic Masters', - keywords: 'domsplace, programming, gaming, shopify, livestreaming, dominic, masters, dom', - description: 'domsPlace is the home of programmer and developer Dominic Masters, specialising in eCommerce and full-stack development solutions for a wide range of platforms, primarily Shopify.', - app_handle: 'domsPlace', - language: 'en-AU', - gtag, - page_content: content - }); - } -} diff --git a/src/private/index.ts b/src/private/index.ts deleted file mode 100644 index 84a2ad8..0000000 --- a/src/private/index.ts +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2019 Dominic Masters -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import { domsPlaceApp } from './app/'; - -const app = new domsPlaceApp(); - -app.init().catch(e => app.logger.error(e)); diff --git a/src/private/jest.config.js b/src/private/jest.config.js new file mode 100644 index 0000000..af3e56e --- /dev/null +++ b/src/private/jest.config.js @@ -0,0 +1,14 @@ +module.exports = { + "roots": [ + "You have received a contact message from ${escapeHTML(name)} - ${escapeHTML(email)} who wrote:
++ ${escapeHTML(message)} +
+ Time: ${new Date().toLocaleString()} + ` + }); + return { statusCode: 200, body: x && x.accepted && x.accepted.length ? true : false } +}); \ No newline at end of file diff --git a/src/private/src/functions/ping/__tests__/ping.test.ts b/src/private/src/functions/ping/__tests__/ping.test.ts new file mode 100644 index 0000000..e143b7a --- /dev/null +++ b/src/private/src/functions/ping/__tests__/ping.test.ts @@ -0,0 +1,8 @@ +import { ping } from './../ping'; + +describe('ping', () => { + it('shold return a hello world and a 200 code', async () => { + await expect(ping()).resolves.toHaveProperty('body', 'Thank funk!'); + await expect(ping()).resolves.toHaveProperty('statusCode', 200); + }) +}) \ No newline at end of file diff --git a/src/private/src/functions/ping/ping.ts b/src/private/src/functions/ping/ping.ts new file mode 100644 index 0000000..d95417c --- /dev/null +++ b/src/private/src/functions/ping/ping.ts @@ -0,0 +1,5 @@ +import { withHandler } from "../../handler/handler"; + +export const ping = withHandler(async () => { + return { statusCode: 200, body: 'Thank funk!' }; +}); \ No newline at end of file diff --git a/src/private/src/handler/__tests__/handler.test.ts b/src/private/src/handler/__tests__/handler.test.ts new file mode 100644 index 0000000..a2fcd41 --- /dev/null +++ b/src/private/src/handler/__tests__/handler.test.ts @@ -0,0 +1,43 @@ +import { withHandler, APICallable, DEFAULT_HEADERS } from './../handler'; + +describe('withHandler', () => { + it('should wrap an async function into a serverless callbackable function', () => { + let callbackable = jest.fn(async () => ({ body: 'Hello World', statusCode: 200 })); + let x = withHandler(callbackable); + expect(typeof x).toBe('function'); + }); + + it('should call the promise and pass the result to the callback', async () => { + let callbackable = async () => ({ body: 'Hello World', statusCode: 200 }); + let x = withHandler(callbackable); + let fn = jest.fn(); + + x({} as any, null, fn); + + await new Promise(resolve => setImmediate(resolve)); + + expect(fn).toHaveBeenCalled(); + }); + + it('should set the content type', async () => { + let x = withHandler(async () => ({ body: 'Hello World', statusCode: 200 })); + let fn = jest.fn(); + + x({} as any, null, fn); + + await new Promise(resolve => setImmediate(resolve)); + + expect(fn).toHaveBeenCalledWith(null, { body: '"Hello World"', statusCode: 200, + headers: DEFAULT_HEADERS + }); + }); + + it('should return the invoked functions returned promise', async () => { + let x = withHandler(async () => ({ body: 'Hello World', statusCode: 200 })); + let fn = jest.fn(); + let prom = x({} as any, null, fn); + + let result = await prom; + expect(result).toStrictEqual({ body: 'Hello World', statusCode: 200 }); + }) +}) \ No newline at end of file diff --git a/src/private/src/handler/handler.ts b/src/private/src/handler/handler.ts new file mode 100644 index 0000000..04a99c8 --- /dev/null +++ b/src/private/src/handler/handler.ts @@ -0,0 +1,71 @@ +export const DEFAULT_HEADERS = { + 'Content-Type': 'application/json', + 'Access-Control-Allow-Origin': '*', + 'Access-Control-Allow-Credentials': true +} + +export type APIResponse = { + statusCode?:number; + body:any; + headers?:{ + [key:string]:string, + "Content-Type"?:string + }; +} + +export type APICallable