diff --git a/.gitignore b/.gitignore index ecd055d..2f7ad6c 100644 --- a/.gitignore +++ b/.gitignore @@ -60,4 +60,5 @@ typings/ dist/ /package-lock.json /dist -/private/data +src/private/data +/nbproject/private/ \ No newline at end of file diff --git a/common/Email.js b/common/Email.js deleted file mode 100644 index b26b833..0000000 --- a/common/Email.js +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2018 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. - -module.exports = { - REGEX: /^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i -} diff --git a/package.json b/package.json index 82684c6..1175938 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,14 @@ { "name": "domsplace", - "version": "5.0.0", + "version": "6.0.0", "description": "Personal website for Dominic \"YouWish\" Masters.", - "main": "private/index.js", + "main": "dist/private/", "scripts": { - "start": "node private/index", - "serve": "webpack-serve --config ./webpack.config.js", - "watch": "nodemon --watch private private/index.js", - "test": "jest" + "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", @@ -26,52 +27,19 @@ }, "homepage": "https://github.com/YourWishes/domsPlaceNew#readme", "dependencies": { - "@babel/core": "^7.1.2", - "@babel/plugin-syntax-dynamic-import": "^7.0.0", - "@babel/polyfill": "^7.0.0", - "@babel/preset-env": "^7.1.0", - "@babel/preset-react": "^7.0.0", - "babel-loader": "^8.0.4", - "body-parser": "^1.18.3", - "compression-webpack-plugin": "^2.0.0", - "css-loader": "^1.0.0", - "express": "^4.16.4", - "file-loader": "^2.0.0", - "html-webpack-plugin": "^3.2.0", - "jimp": "^0.5.4", - "mini-css-extract-plugin": "^0.4.4", - "node-cache": "^4.2.0", - "node-sass": "^4.9.4", - "nodemailer": "^4.6.8", - "optimize-css-assets-webpack-plugin": "^5.0.1", - "pg-promise": "^8.5.1", - "query-string": "^6.2.0", - "react": "^16.5.2", - "react-dom": "^16.5.2", - "react-helmet": "^5.2.0", - "react-loadable": "^5.5.0", - "react-redux": "^5.0.7", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", - "react-tap-event-plugin": "^3.0.3", - "react-transition-group": "^2.5.0", - "redux": "^4.0.1", - "redux-logger": "^3.0.6", - "redux-promise-middleware": "^5.1.1", - "redux-promise-middleware-actions": "^2.1.0", - "responsive-loader": "^1.1.0", - "sanitize-html": "^1.19.1", - "sass-loader": "^7.1.0", - "sharp": "^0.21.0", - "style-loader": "^0.23.1", - "terser-webpack-plugin": "^1.1.0", - "url-loader": "^1.1.2", - "webpack": "^4.26.1" + "@types/animejs": "^2.0.2", + "@yourwishes/app-email": "^1.0.3", + "@yourwishes/app-simple-react": "^2.6.8", + "animejs": "^3.0.1", + "react-helmet": "^5.2.1" }, "devDependencies": { - "nodemon": "^1.18.4", - "react-hot-loader": "^4.3.11", - "webpack-cli": "^3.1.2", - "webpack-dev-server": "^3.1.9" + "@types/jest": "^24.0.9", + "cross-env": "^5.2.0", + "jest": "^24.1.0", + "typescript": "^3.3.3333", + "webpack-cli": "^3.2.3", + "webpack-dev-middleware": "^3.6.1", + "webpack-hot-middleware": "^2.24.3" } } diff --git a/private/app/App.js b/private/app/App.js deleted file mode 100644 index dca2cc6..0000000 --- a/private/app/App.js +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) 2018 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. - -//Imports -const - Configuration = require('./../config/Configuration'), - DatabaseConnection = require('./../database/DatabaseConnection'), - Server = require('./../server/Server'), - Email = require('./../email/Email'), - CacheStore = require('./../cache/CacheStore'), - - Articles = require('./../blog/Articles') -; - -class App { - constructor() { - this.config = new Configuration(this); - this.database = new DatabaseConnection(this); - - this.articles = new Articles(this); - - this.server = new Server(this); - this.email = new Email(this); - } - - getConfig() { return this.config; } - getDatabase() { return this.database; } - getEmail() {return this.email;} - getServer() {return this.server;} - - getArticles() {return this.articles;} - - async init() { - this.log('Starting App...'); - - //Load configuration... - this.log('Reading Configuration...'); - try { - await this.config.loadConfig(); - } catch(e) { - this.error('Failed to load configuration!'); - this.error(e); - return; - } - - //Connect to the Database - this.log('Connecting to the Database...'); - try { - await this.database.connect(); - } catch(e) { - this.error('Failed to connect to database!'); - this.error(e); - return; - } - - //Connect to Email - this.log('Connecting to Email...'); - try { - this.email.connect(); - } catch(e) { - this.error('Failed to connect to email!'); - this.error(e); - return; - } - - //Start the server - this.log('Starting Server...'); - try { - await this.server.init(); - } catch(e) { - this.error('Failed to start server!'); - this.error(e); - return; - } - - this.log('App ready'); - } - - // Common Functions // - createHandle(str) { - //Creates a human handle for the supplied string, this won't take any kind - //of existing checks into account, be sure to append a numeric value to the - //end of this string such as app.createHandle("test")+"-2"; - str = str.toLowerCase(); - ['"', "'", "\\", "(", ")", "[", "]"].forEach(e => str = str.replace(e, "")); - - str = str.replace(/\W+/g, "-"); - - if (str.charAt(str.length - 1) == "-") { - str = str.replace(/-+\z/, ""); - } - - if (str.charAt(0) == "-") { - str = str.replace(/\A-+/, ""); - } - - return str; - } - - // Logging Functions // - log(e) { - //Will allow for extra logging - console.log(e) - } - - error(e) { - console.error(e); - } -} - -module.exports = App; diff --git a/private/blog/Articles.js b/private/blog/Articles.js deleted file mode 100644 index 0edcdff..0000000 --- a/private/blog/Articles.js +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright (c) 2018 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. - -const DatabaseInterface = require('./../database/DatabaseInterface'); - -module.exports = class Articles extends DatabaseInterface { - constructor(app) { - super(app); - } - - async getArticlesCount() { - return (await this.store.getFromDatabase( - `getArticlesCount`, 'getArticlesCount', {}, 'one' - )).count; - } - - async getArticleById(id) { - return await this.store.getFromDatabase( - `getArticleById_${id}`, `getArticleById`, {id}, 'oneOrNone' - ); - } - - async getArticleByHandle(handle) { - return await this.store.getFromDatabase( - `getArticleByHandle_${handle}`, `getArticleByHandle`, {handle}, 'oneOrNone' - ); - } - - async getArticlesPageCount(perPage) { - if(!perPage) perPage = 10; - let count = await this.getArticlesCount(perPage); - return Math.ceil(count/perPage); - } - - async getArticlesByPage(page, perPage) { - if(!page) page = 1; - if(!perPage) perPage = 10; - - page = Math.max(0, page - 1) * perPage; - - return await this.store.getFromDatabase( - `getArticlesByPage_${page}_${perPage}`, `getArticlesByPage`, - { count:perPage, offset:page }, 'any' - ); - } - - - - async addArticle(handle, title, image, shortDescription, description, date) { - if(!date) date = new Date(); - let article = await this.getDatabase().one('addArticle', { - handle, title, image, shortDescription, description, date - }); - this.store.flush();//In future support my wildcard syntax to make this no longer necessary. - return article; - } - - - - async updateArticle(article) { - let newArticle = await this.getDatabase().one('updateArticle', article); - this.store.flush(); - return newArticle; - } -} diff --git a/private/cache/CacheStore.js b/private/cache/CacheStore.js deleted file mode 100644 index fa2e737..0000000 --- a/private/cache/CacheStore.js +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2018 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. - -const NodeCache = require('node-cache'); - -class CacheStore { - constructor(app, ttl) { - if(!ttl) ttl = 60*60; - - this.app = app; - this.store = new NodeCache({ - stdTTL: ttl, - checkperiod: ttl * 0.2, - useClones: false - }); - } - - getApp() {return this.app;} - getStore() {return this.store;} - getDatabase() {return this.app.getDatabase();} - - async get(key, prom) { - let value = this.store.get(key); - if(typeof value !== typeof undefined) return value; - - value = await prom(); - this.store.set(key, value); - return value; - } - - del(keysOrKey) { - let keys = keysOrKey; - if(!Array.isArray(keysOrKey)) keys = [keys]; - this.store.del(keys); - } - - flush() { - this.store.flushAll(); - } - - //Database related stores - async getFromDatabase(key, query, params, method) { - if(typeof params === typeof undefined) params = {}; - if(typeof method === typeof undefined) method = "any"; - - return await this.get(key, async () => { - return await this.getDatabase()[method](query, params); - }); - } -} - -module.exports = CacheStore; diff --git a/private/config/Configuration.js b/private/config/Configuration.js deleted file mode 100644 index 787402f..0000000 --- a/private/config/Configuration.js +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (c) 2018 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. - -const fs = require('fs'); -const CONFIG_PATH = './private/data/config.json';// TODO: Set this a... better way? - -class Configuration { - constructor(app) { - this.app = app; - this.data = {}; - this.isHeroku = false; - } - - getApp() { return this.app; } - - async loadConfig(path) { - //First we need to check if this is Heroku or not... - let processVariabels = process.env; - this.isHeroku = ( - processVariabels && processVariabels.NODE_HOME && - processVariabels.NODE_HOME.indexOf("heroku") !== -1 - ); - - //Read config data - if(this.isHeroku) { - this.data = processVariabels; - } else { - //TODO: Rather than use readSync, convert the whole function to async and use a library like fs-extra for async? - let dataRaw = fs.readFileSync(CONFIG_PATH, 'utf8'); - let data = JSON.parse(dataRaw); - if(!data) throw new Error("Failed to parse Config JSON! Check for an error and try again."); - this.data = data; - } - } - - has(key) { - let value = this.get(key); - if(typeof value === typeof undefined) return false; - if(!value) return false; - return value.length !== 0; - } - - get(key) { - if(this.isHeroku) { - key = key.replace(/\./g, '_').toUpperCase(); - if(typeof this.data[key] === typeof undefined) return null; - return this.data[key]; - } - return this.getRecursive(key.split(".")); - } - - getRecursive(key_array, data_obj) { - if(typeof data_obj === typeof undefined) data_obj = this.data; - if(typeof data_obj === typeof undefined) return null; - - let k = key_array[0]; - let o = data_obj[k]; - if(typeof o === typeof undefined) return null; - - //Awesome - if(key_array.length > 1) { - if(typeof o !== typeof {}) return null; - key_array.shift(); - return this.getRecursive(key_array, o); - } - return o; - } -} - -module.exports = Configuration; diff --git a/private/database/DatabaseConnection.js b/private/database/DatabaseConnection.js deleted file mode 100644 index e38beea..0000000 --- a/private/database/DatabaseConnection.js +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (c) 2018 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. - -const pgp = require('pg-promise')(); -const fs = require('fs'); - -const QUERIES_DIRECTORY = "queries"; - -class DatabaseConnection { - constructor(app) { - this.app = app; - } - - getApp() { return this.app; } - getConfig() {return this.getApp().getConfig();} - - isConnnected() { - return typeof this.db !== typeof undefined; - } - - async connect() { - //Check Configuration - if(!this.getConfig().has("database.connection") && !this.getConfig().has("database.url")) throw new Error("Missing Database Connection URL!"); - - //Load queries into cache - let queries = {}; - let queryDir = `${__dirname}/${QUERIES_DIRECTORY}` - let types = fs.readdirSync(queryDir); - for(let i = 0; i < types.length; i++) { - //Now Scan each file in this directory - let dir = `${queryDir}/${types[i]}`; - let dirContents = fs.readdirSync(dir); - for(let x = 0; x < dirContents.length; x++) { - //Now read each file within this dir.. - let filePath = `${dir}/${dirContents[x]}`; - let query = fs.readFileSync(filePath, 'utf8'); - //Now Save our query as filename minus extension. - queries[dirContents[x].split('.')[0]] = query; - } - } - - this.queries = queries; - - //Connect to Database - this.db = await pgp( this.getConfig().get("database.connection") || this.getConfig().get("database.url") ); - - //Now run any "Create" queries - let keys = Object.keys(queries); - for(let i = 0; i < keys.length; i++) { - let k = keys[i]; - if(!k.toLowerCase().startsWith("create")) continue; - await this.none(k); - }; - } - - getQuery(name) { - if(!this.queries[name]) throw new Error("No Query by that name exists"); - return this.queries[name]; - } - - //Database Shorthand functions - async none(queryName, data) { - let q = this.getQuery(queryName); - return await this.db.none(q, data); - } - - async any(queryName, data) { - let q = this.getQuery(queryName); - let x = await this.db.any(q, data); - return x; - } - - async one(queryName, data) { - let q = this.getQuery(queryName); - let x = await this.db.one(q, data); - return x; - } - - async oneOrNone(queryName, data) { - let q = this.getQuery(queryName); - let x = await this.db.oneOrNone(q, data); - return x; - } - - async query(queryName, data) { - let q = this.getQuery(queryName); - let x = await this.db.query(q, data); - return x; - } -} - -module.exports = DatabaseConnection; diff --git a/private/database/DatabaseInterface.js b/private/database/DatabaseInterface.js deleted file mode 100644 index e96ee15..0000000 --- a/private/database/DatabaseInterface.js +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2018 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. - -const CacheStore = require('./../cache/CacheStore'); - -module.exports = class DatabaseInterface { - constructor(app) { - this.app = app; - this.store = new CacheStore(app); - } - - getApp() {return this.app;} - getDatabase() {return this.app.getDatabase();} - getStore() {return this.store;} -} diff --git a/private/database/queries/blog/addArticle.sql b/private/database/queries/blog/addArticle.sql deleted file mode 100644 index 41508a3..0000000 --- a/private/database/queries/blog/addArticle.sql +++ /dev/null @@ -1,5 +0,0 @@ -INSERT INTO "BlogArticles" ( - "handle", "title", "image", "shortDescription", "description", "date" -) VALUES ( - ${handle}, ${title}, ${image}, ${shortDescription}, ${description}, ${date} -) RETURNING *; diff --git a/private/database/queries/blog/getArticleByHandle.sql b/private/database/queries/blog/getArticleByHandle.sql deleted file mode 100644 index f1ed300..0000000 --- a/private/database/queries/blog/getArticleByHandle.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT * FROM "BlogArticles" WHERE "handle"=${handle}; diff --git a/private/database/queries/blog/getArticleById.sql b/private/database/queries/blog/getArticleById.sql deleted file mode 100644 index d1b1d57..0000000 --- a/private/database/queries/blog/getArticleById.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT * FROM "BlogArticles" WHERE "id" = ${id}; diff --git a/private/database/queries/blog/getArticlesByPage.sql b/private/database/queries/blog/getArticlesByPage.sql deleted file mode 100644 index cd6c095..0000000 --- a/private/database/queries/blog/getArticlesByPage.sql +++ /dev/null @@ -1,11 +0,0 @@ -SELECT - * -FROM - "BlogArticles" -ORDER BY - "date" DESC -LIMIT - ${count} -OFFSET - ${offset} -; diff --git a/private/database/queries/blog/getArticlesCount.sql b/private/database/queries/blog/getArticlesCount.sql deleted file mode 100644 index ac0e81f..0000000 --- a/private/database/queries/blog/getArticlesCount.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT COUNT(*) FROM "BlogArticles"; diff --git a/private/database/queries/blog/updateArticle.sql b/private/database/queries/blog/updateArticle.sql deleted file mode 100644 index 9a364ea..0000000 --- a/private/database/queries/blog/updateArticle.sql +++ /dev/null @@ -1,12 +0,0 @@ -UPDATE - "BlogArticles" -SET - "title"=${title}, - "image"=${image}, - "shortDescription"=${shortDescription}, - "description"=${description} -WHERE - "id"=${id} -RETURNING - * -; diff --git a/private/database/queries/create/CreateBlogArticlesTable.sql b/private/database/queries/create/CreateBlogArticlesTable.sql deleted file mode 100644 index 2682a25..0000000 --- a/private/database/queries/create/CreateBlogArticlesTable.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE IF NOT EXISTS "BlogArticles" ( - "id" BIGSERIAL NOT NULL PRIMARY KEY, - "handle" TEXT NOT NULL UNIQUE, - "title" TEXT NOT NULL, - "image" TEXT NOT NULL, - "shortDescription" TEXT NULL, - "description" TEXT NOT NULL, - "date" TIMESTAMP NOT NULL -); diff --git a/private/email/Email.js b/private/email/Email.js deleted file mode 100644 index 6d5475b..0000000 --- a/private/email/Email.js +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright (c) 2018 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. - -const nodemailer = require('nodemailer'); - -class Email { - constructor(app) { - this.app = app; - } - - getApp() {return this.app;} - getConfig() {return this.getApp().getConfig();} - getTransporter() {return this.transport;} - - getDestinationName() {return this.getConfig().get("smtp.destination.name");} - getDestinationEmail() {return this.getConfig().get("smtp.destination.email");} - getSourceName() {return this.getConfig().get("smtp.source.name");} - getSourceEmail() {return this.getConfig().get("smtp.source.email");} - - connect() { - if(!this.getConfig().has("smtp.host")) throw new Error("Missing SMTP Host Config"); - if(!this.getConfig().has("smtp.username")) throw new Error("Missing SMTP Username Config"); - if(!this.getConfig().has("smtp.password")) throw new Error("Missing SMTP Password Config"); - - //We require some info about the person who handles the mailing. - if(!this.getConfig().has("smtp.destination.name")) throw new Error("Missing SMTP Destination Name Config"); - if(!this.getConfig().has("smtp.destination.email")) throw new Error("Missing SMTP Destination Email Config"); - if(!this.getConfig().has("smtp.source.name")) throw new Error("Missing SMTP Source Name Config"); - if(!this.getConfig().has("smtp.source.email")) throw new Error("Missing SMTP Source Email Config"); - - let ssl = false; - let port = 587; - - if(this.getConfig().get("smtp.ssl")) { - ssl = true - port = 465; - } - port = this.getConfig().get("smtp.port") || port; - - this.transport = nodemailer.createTransport({ - host: this.getConfig().get("smtp.host"), - port: port, - secure: ssl, - auth: { - user: this.getConfig().get("smtp.username"), - pass: this.getConfig().get("smtp.password") - } - }); - } - - async sendMail(options) { - let o = {}; - o.options = options; - o.email = this; - o.resolver = function(resolve, reject) { - this.resolve = resolve; - this.reject = reject; - console.log('Sending email to ' + this.options.to + '...'); - this.email.getTransporter().sendMail(this.options, this.onEmailCallback); - }.bind(o); - o.onEmailCallback = function(error, info) { - this.error = error; - this.info = info; - - if(error) { - return this.reject(error); - } - - console.log('Email sent to ' + this.options.to + '!'); - this.resolve(info); - }.bind(o); - - let x = new Promise(o.resolver); - return await x; - } - - async sendMailClean(tos, fromName, fromEmail, subject, html, text) { - //Create options - let options = {}; - - //TODO: Properly escape these emails & names, at the moment we're only using - //emails we assume to be safe (those in the config) - - //From - if(typeof fromName === "string" && fromName.length) { - options.from = '"' +fromName+ '" <'+fromEmail+'>'; - } else { - options.from = fromEmail; - } - - //To (and CC) - if(typeof tos === "string") tos = [tos]; - options.to = tos.join(', '); - - //Subject - options.subject = subject || "Untitled"; - - //HTML Formatted emails - if(typeof html === "string" && html.length) options.html = html; - if(typeof text === "string" && text.length) options.text = text; - - return await this.sendMail(options); - } -} - -module.exports = Email; diff --git a/private/server/Server.js b/private/server/Server.js deleted file mode 100644 index 7198d8f..0000000 --- a/private/server/Server.js +++ /dev/null @@ -1,128 +0,0 @@ -// Copyright (c) 2018 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. - -const - http = require('http'), - express = require('express'), - bodyParser = require('body-parser'), - fs = require('fs'), - path = require('path'), - webpack = require('webpack'), - WebpackCompiler = require('./../webpack/WebpackCompiler'), - API = require('./api/API') -; - -const SERVE_FOLDER = path.resolve(`${__dirname}/../../dist`); - -class Server { - constructor(app) { - this.app = app; - - //Server settings - this.ip = - app.getConfig().get("IP") || - app.getConfig().get("server.ip") || - process.env.ip || - process.env.IP || - null - ; - - this.port = - app.getConfig().get("PORT") || - app.getConfig().get("port") || - app.getConfig().get("server.port") || - process.env.port || - process.env.PORT || - 80 - ; - - //Setup the express wrapper. - this.express = express(); - - //Setup Express Middleware - this.express.use(bodyParser.json({ - type:'application/json' // to support JSON-encoded bodies - })); - - this.express.use(bodyParser.urlencoded({ - extended: true - })); - - //Serve Static Files - this.express.use(express.static(SERVE_FOLDER)); - - //Register API Handlers - this.api = new API(this); - this.api.loadHandlers(); - - //Setup fallback GET request - this.express.get('*', (req,res) => this.onGetRequest(req,res)); - - //Setup our webpack compiler - this.compiler = webpack(WebpackCompiler()); - } - - getExpress() {return this.express;} - getApp() {return this.app;} - getHTTP() {return this.http;} - - async init() { - //Create our HTTP and (if needed HTTPS) server(s) - this.http = http.createServer(this.express); - this.http.on('error', e => this.onServerError(e)); - - //Start the compiler watching - this.watcher = this.compiler.watch({}, (e,s) => this.onWatchChange(e,s)); - - //Start Listening - this.http.listen({ - host: this.ip, - port: this.port - }, e => this.onServerStart(e)); - } - - //Events - onServerStart(e) { - this.boundAddress = this.http.address(); - } - - onServerError(e) { - console.error('Error'); - console.error(e); - } - - onGetRequest(req, res) { - let file = path.resolve(`${SERVE_FOLDER}/index.html`); - res.sendFile(file); - } - - onWatchChange(error,stats) { - if(error || (stats.compilation.errors && stats.compilation.errors.length)) { - return this.app.error(error || stats.compilation.errors); - } - - this.app.log("Server Compiled!"); - } -} - -module.exports = Server; diff --git a/private/server/api/API.js b/private/server/api/API.js deleted file mode 100644 index 4658182..0000000 --- a/private/server/api/API.js +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) 2018 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. - -const - path = require('path'), - fs = require('fs') -; - -const API_BASE = path.resolve(__dirname, 'methods'); -const API_URL_BASE = '/api'; - -module.exports = class API { - constructor(server) { - this.server = server; - this.handlers = []; - } - - getHandlers() {return this.handlers;} - getServer() {return this.server;} - getApp() {return this.getServer().getApp();} - getExpress() {return this.getServer().getExpress();} - getConfig() {return this.getApp().getConfig();} - getEmail() {return this.getApp().getEmail();} - - addHandler(handler) {this.handlers.push(handler);} - - registerHandlers() { - this.handlers.forEach(handler => { - handler.getMethods().forEach(method => { - method = method.toLowerCase(); - - //For each method, there's perhaps multiple paths (e.g. post /test, get /test, post /ayy, get /ayy) - handler.getPaths().forEach(path => { - let url = API_URL_BASE; - if(!path.startsWith('/')) url += '/'; - url += path; - - this.getExpress()[method](url, handler.onMethod.bind(handler)); - console.log('Registering ' + url + '...'); - }); - }); - }); - } - - loadHandlers() { - this.loadHandlersInDirectory(API_BASE); - this.registerHandlers(); - } - - loadHandlersInDirectory(dir) { - let assets = fs.readdirSync(dir); - assets.forEach(asset => { - let assetPath = path.join(dir, asset); - let stats = fs.statSync(assetPath); - if(stats.isDirectory()) { - this.loadHandlersInDirectory(assetPath ); - return; - } - - let method = require(assetPath); - let instance = new method(this); - - this.addHandler(instance); - }); - } -} diff --git a/private/server/api/APIHandler.js b/private/server/api/APIHandler.js deleted file mode 100644 index c1fabff..0000000 --- a/private/server/api/APIHandler.js +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2018 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. - -const - API = require('./API'), - APIRequest = require('./APIRequest') -; - -class APIHandler { - constructor(api, methods, paths) { - if(!(api instanceof API)) throw new Error('Invalid API Supplied!'); - if(typeof methods === typeof undefined) methods = ['GET']; - if(typeof paths === typeof undefined) paths = []; - if(typeof methods === "string") methods = [ methods ]; - if(typeof paths === "string") paths = [ paths ]; - this.api = api; - this.methods = methods; - this.paths = paths; - } - - getAPI() {return this.api;} - getMethods() {return this.methods;} - getPaths() {return this.paths;} - - onMethod(req, res) { - //Now that we have a request we need to create a nice wrapper for it, pass - //it to our method, and then expect a nice JSON object to send back to the - //client. - let request = new APIRequest(this, req, res); - request.process(); - } -} - -module.exports = APIHandler; diff --git a/private/server/api/APIRequest.js b/private/server/api/APIRequest.js deleted file mode 100644 index ace8097..0000000 --- a/private/server/api/APIRequest.js +++ /dev/null @@ -1,232 +0,0 @@ -// Copyright (c) 2018 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. - -const Forms = require('./../../../common/Forms.js'); - -class APIRequest { - constructor(handler, req, res) { - this.handler = handler; - this.req = req; - this.res = res; - } - - getHandler() {return this.handler;} - getRequest() {return this.req;} - getResponse() {return this.res;} - getHandleFunction() {return this.getHandler().handle;} - getFormData(name) {return Forms[name];} - - //Some nice shorthands - getAPI() {return this.getHandler().getAPI();} - getConfig() {return this.getAPI().getConfig();} - getServer() {return this.getAPI().getServer();} - getExpress() {return this.getAPI().getExpress();} - getEmail() {return this.getAPI().getEmail();} - getApp() {return this.getAPI().getApp();} - - //Our process method - process() { - if(typeof this.processPromise !== typeof undefined) return;//Woops, already processing? - this.processPromise = this.processHandler(); - this.processPromise.then(this.onResult.bind(this)).catch(this.onError.bind(this)); - } - - async processHandler() { - //Awesome, now we have a nice async function! - let response = { ok: false }; - if(typeof this.getHandleFunction() === "function") { - try { - response = await this.getHandleFunction()(this); - } catch(e) { - console.error(e); - response = { ok: 500, data: "An unknown error occured" }; - } - } - - if(typeof response.data === typeof undefined || typeof response.ok === typeof undefined) { - throw new Error("Invalid response object."); - } - - if(response.ok !== true) { - response.code = typeof response.ok === "number" ? response.ok : 400; - } - - this.res.status(response.code || 200).json(response.data); - } - - onResult(result) { - } - - onError(error) { - this.res.status(500).json("An unexpected error occured"); - } - - //Some really nice API handlers - get(key) { - if(typeof this.req === typeof undefined) return null; - let data = this.req.body || {}; - if(this.req.method == "GET") { - data = this.req.query || {}; - } - if(typeof data === typeof undefined) return null; - if(typeof key === typeof undefined) return data; - - return this.getRecursive(key.split("."), data); - } - - getRecursive(key_array, data_obj) { - if(typeof data_obj === typeof undefined) return null; - - let k = key_array[0]; - let o = data_obj[k]; - if(typeof o === typeof undefined) return null; - - //Awesome - if(key_array.length > 1) { - if(typeof o !== typeof {}) return null; - key_array.shift(); - return this.getRecursive(key_array, o); - } - return o; - } - - getInteger(key) { - if(!this.hasInteger(key)) throw new Error("Invalid Data Type!"); - return parseInt(this.get(key)); - } - - getDouble(key) { - if(!this.hasDouble(key)) throw new Error("Invalid Data Type!"); - return parseFloat(this.get(key)); - } - - getBool(key) { - if(!this.hasBool(key)) throw new Error("Invalid Type"); - let t = this.get(key); - if(t === true || t === "true" || t === 1 || t === "1") return true; - return false; - } - - getString(key, maxLength, allowBlank) { - if(typeof allowBlank === typeof undefined) allowBlank = true; - if(!this.hasString(key, maxLength, allowBlank)) throw new Error("Missing Data"); - return this.get(key)+""; - } - - has(key) { - if(typeof this.req === typeof undefined) return false; - if(typeof this.req === typeof undefined) return false; - let data = this.req.body || {}; - if(this.req.method == "GET") { - data = this.req.query || {}; - } - if(typeof data === typeof undefined) return false; - if(typeof key === typeof undefined) return data; - return this.hasRecursive(key.split("."), data); - } - - hasRecursive(key_array, data_obj) { - if(typeof data_obj === typeof undefined) return false; - - let k = key_array[0]; - let o = data_obj[k]; - if(typeof o === typeof undefined) return false; - //Awesome - if(key_array.length > 1) { - if(typeof o !== typeof {}) return false; - key_array.shift(); - return this.hasRecursive(key_array, o); - } - return true; - } - - hasInteger(key) { - if(!this.has(key)) return false; - let t = parseInt(this.get(key)); - if(typeof t !== "number" || isNaN(t) || !isFinite(t)) return false; - let tf = parseFloat(this.get(key)); - if(tf !== t) return false; - return true; - } - - hasDouble(key) { - if(!this.has(key)) return false; - let t = parseFloat(this.get(key)); - return typeof t === typeof 1.00 && !isNaN(t) && isFinite(t); - } - - hasBool(bool) { - if(!this.has(bool)) return false; - let t = this.get(bool); - return ( - t === true || t === false || - t === "true" || t === "false" || - t === 1 || t === 0 || - t === "1" || t === "0" - ); - } - - hasString(str, maxLength, allowBlank) { - if(typeof maxLength === typeof undefined) throw new Error("MaxLength check missing."); - if(typeof allowBlank === typeof undefined) allowBlank = false; - if(!this.has(str)) return false; - let t = this.get(str); - let v = typeof t === typeof "" && t.length <= maxLength; - if(!v) return false; - if(!allowBlank) { - t = t.replace(/\s/g, ""); - if(!t.length) return false; - } - return typeof t === typeof "" && (t.length <= maxLength ? true : false); - } - - //Files (if supported) - hasFiles() { - if(typeof this.req === typeof undefined) return false; - if(typeof this.req.files === typeof undefined) return false; - if(!this.req || !this.req.files) return false; - return Object.keys(this.req.files).length ? true : false; - } - - hasFile(name) { - if(!this.hasFiles()) return false; - if(typeof this.req.files[name] === typeof undefined) return false; - return true; - } - - getFile(name) { - if(!this.hasFile(name)) return false; - return this.req.files[name]; - } - - //Headers - hasHeader(header) { - return this.req && typeof this.req.get(header) !== typeof undefined - } - - getHeader(header) { - return this.req.get(header); - } -} - -module.exports = APIRequest; diff --git a/private/server/api/methods/blog/CreateBlogPost.js b/private/server/api/methods/blog/CreateBlogPost.js deleted file mode 100644 index 331dc0c..0000000 --- a/private/server/api/methods/blog/CreateBlogPost.js +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) 2018 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. - -const APIHandler = require('./../../APIHandler'); - -const ERRORS = { - password: 'Missing, or invalid password', - title: 'Missing or invalid title', - image: 'Missing or invalid image', - shortDescription: 'Missing or invalid Short Description', - description: 'Missing or invalid description', - internal: 'An internal error occurred' -}; - -const LENGTHS = { - title: 128, - image: 512, - shortDescription: 2048, - description: 65536 -}; - -module.exports = class GetBlogArticle extends APIHandler { - constructor(api) { - super(api, ['POST'], '/blog/article'); - } - - async handle(request) { - //Until we have the server running passport or some other auth service... - if(!request.hasString('password', 128)) return { ok: 401, data: ERRORS.password }; - let password = request.getString('password', 128); - if(password !== request.getApp().getConfig().get('admin.password')) return { ok: 401, data: ERRORS.password }; - //Everything after this point should be fine to keep. - - if(!request.hasString('title', LENGTHS.title)) return { ok: false, data: ERRORS.title }; - if(!request.hasString('image', LENGTHS.image)) return { ok: false, data: ERRORS.image }; - if(!request.hasString('shortDescription', LENGTHS.shortDescription)) return { ok: false, data: ERRORS.shortDescription }; - if(!request.hasString('description', LENGTHS.description)) return { ok: false, data: ERRORS.description }; - - let title = request.getString('title', LENGTHS.title); - let image = request.getString('image', LENGTHS.image); - let shortDescription = request.getString('shortDescription', LENGTHS.shortDescription); - let description = request.getString('description', LENGTHS.description); - - //Generate a handle - let handle; - let iteration = -1; - while(!handle) { - let testingHandle = request.getApp().createHandle(`${title}${iteration>0?iteration:''}`); - iteration++; - let existingArticle = await request.getApp().getArticles().getArticleByHandle(testingHandle); - if(existingArticle) continue; - handle = testingHandle; - } - - //Create the article - let article; - try { - article = await request.getApp().getArticles().addArticle(handle, title, image, shortDescription, description); - } catch(e) { - console.error(e); - return { ok: 500, data: ERRORS.internal }; - } - - return { ok: 201, data: article }; - } -} diff --git a/private/server/api/methods/blog/UpdateBlogArticle.js b/private/server/api/methods/blog/UpdateBlogArticle.js deleted file mode 100644 index 439c6c5..0000000 --- a/private/server/api/methods/blog/UpdateBlogArticle.js +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) 2018 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. - -const APIHandler = require('./../../APIHandler'); - -const LENGTHS = { - title: 128, - image: 512, - shortDescription: 2048, - description: 65536 -}; - -const ERRORS = { - password: 'Missing, or invalid password', - missingHandle: "Missing article handle.", - notFound: "Cannot find that article.", - internal: 'An internal error occurred' -}; - -module.exports = class GetBlogArticle extends APIHandler { - constructor(api) { - super(api, ['PUT'], '/blog/article'); - } - - async handle(request) { - //Until we have the server running passport or some other auth service... - if(!request.hasString('password', 128)) return { ok: 401, data: ERRORS.password }; - let password = request.getString('password', 128); - if(password !== request.getApp().getConfig().get('admin.password')) return { ok: 401, data: ERRORS.password }; - //Everything after this point should be fine to keep. - - if(!request.hasString('article', 128)) return { ok: false, data: ERRORS.missingHandle }; - - let handle = request.getApp().createHandle(request.getString('article', 128)); - let article = await request.getApp().getArticles().getArticleByHandle(handle); - if(!article) return { ok: 404, data: ERRORS.notFound }; - - if(request.hasString('title', LENGTHS.title)) article.title = request.getString('title', LENGTHS.title); - if(request.hasString('image', LENGTHS.image)) article.image = request.getString('image', LENGTHS.image); - if(request.hasString('shortDescription', LENGTHS.shortDescription)) article.shortDescription = request.getString('shortDescription', LENGTHS.shortDescription); - if(request.hasString('description', LENGTHS.description)) article.description = request.getString('description', LENGTHS.description); - - try { - await request.getApp().getArticles().updateArticle(article); - } catch(e) { - console.error(e); - return { ok: 500, data: ERRORS.internal }; - } - - return { - ok: true, - data: article - }; - } -} diff --git a/private/server/api/methods/contact/send.js b/private/server/api/methods/contact/send.js deleted file mode 100644 index 283cf83..0000000 --- a/private/server/api/methods/contact/send.js +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2018 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. - -const - APIHandler = require('./../../APIHandler'), - sanitizeHtml = require('sanitize-html') -; - -const ERRORS = { - name: "Invalid name", - email: "Invalid email", - message: "Invalid message", - sending: "An unknown error occured" -}; - -module.exports = class Send extends APIHandler { - constructor(api) { - super(api, ['GET', 'POST'], '/contact/send'); - } - - async handle(request) { - let form = request.getFormData("contact"); - let name,email,message; - - if(form.name.required && !request.hasString('name', form.name.maxLength)) return {ok: false, data: ERRORS.name}; - name = request.getString('name', form.name.maxLength); - - if(form.email.required) { - if(!request.hasString('email', form.email.maxLength)) return { ok: false, data: ERRORS.email }; - email = request.getString('email', form.email.maxLength); - if(!form.email.regex.test(email)) return { ok: false, data: ERRORS.email }; - } - - if(form.message.required && !request.hasString('message', form.message.maxLength)) return {ok: false, data: ERRORS.message}; - message = request.getString('message', form.name.maxLength); - - //Now let's create our message, we're gonna have to do some rudementry HTML... - let textMessage = ''; - let htmlMessage = ''; - - //First the name - textMessage += 'Name: ' + name; - htmlMessage += '

Name: ' + sanitizeHtml(name) + '

'; - - //Now the response Email - textMessage += '\nEmail: ' + email; - htmlMessage += '

Email: ' + sanitizeHtml(email) + '

'; - - //Message! - textMessage += '\nMessage: ' + message; - htmlMessage += '

Message:

'; - htmlMessage += '

' + sanitizeHtml(message) + '

'; - - htmlMessage += '
'; - htmlMessage += '

Reply: '+email+'

'; - - //Now we can send it! - try { - await request.getEmail().sendMailClean( - request.getEmail().getDestinationEmail(), - request.getEmail().getSourceName(), - request.getEmail().getSourceEmail(), - "domsPlace Contact Enquiry", - htmlMessage, - textMessage - ); - - return { - ok: true, - data: true - }; - } catch(e) { - console.error('Failed to send contact message'); - console.error(e); - return { - ok: false, - data: ERRORS.sending - }; - } - } -} diff --git a/private/webpack/WebpackCompiler.js b/private/webpack/WebpackCompiler.js deleted file mode 100644 index a302eca..0000000 --- a/private/webpack/WebpackCompiler.js +++ /dev/null @@ -1,186 +0,0 @@ -// Copyright (c) 2018 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. - -const - path = require('path'), - fs = require('fs'), - - webpack = require('webpack'), - JimpLoader = require('responsive-loader/jimp'), - SharpLoader = require('responsive-loader/sharp'), - HtmlWebpackPlugin = require('html-webpack-plugin'), - TerserPlugin = require('terser-webpack-plugin'), - MiniCssExtractPlugin = require("mini-css-extract-plugin"), - OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin") -; - -const base = path.resolve(`${__dirname}/../..`); - -// export webpack config -module.exports = (isDev) => { - if(typeof isDev === typeof undefined) isDev = false; - - //Base (Production) Configuration. - let config = { - devtool: 'source-map', - entry: [ `${base}/public/index.jsx` ], - output: { path: `${base}/dist`, filename: "app.js", publicPath: '/' }, - mode: isDev ? 'development' : 'production', - resolve: { - modules: [`${base}/node_modules`, `${base}/public`], - extensions: ['.js', '.jsx', '.css', '.scss' ], - alias: { - '@public': `${base}/public`, - '@objects': `${base}/public/objects`, - '@components': `${base}/public/components`, - '@assets': `${base}/public/assets`, - '@pages': `${base}/public/pages`, - '@common': `${base}/common`, - '@styles': `${base}/public/styles`, - '@sections': `${base}/public/components/section` - } - }, - - module: { - rules: [ - { - test: /\.jsx?$/, - exclude: /node_modules/, - use: { - loader: 'babel-loader?cacheDirectory', - options: { - presets: [ - [ - "@babel/preset-env", - { - "targets": { - "node": "current", - "browsers": [ "Chrome >= 41", "FireFox >= 44", "Safari >= 7", "Explorer 11", "last 2 Edge versions" ] - }, - "useBuiltIns": false - } - ], - "@babel/preset-react" - ], - "plugins": [ '@babel/plugin-syntax-dynamic-import' ] - } - } - }, - - { - test: /\.scss$|\.css$/i, - exclude: /node_modules/, - use: isDev ? ( - [ "style-loader", "css-loader", 'sass-loader' ] - ) : ( - [ MiniCssExtractPlugin.loader, "css-loader", 'sass-loader' ] - ) - }, - - { - test: /\.svg$|\.webm$|\.mp4$/i, - exclude: /node_modules/, - use: [{ - loader: "file-loader", - options: { name: "[path][name].[ext]", context: 'public' } - }] - }, - - { - test: /\.jpe?g$|\.gif$|\.png$/i, - exclude: /node_modules/, - use: [{ - loader: "responsive-loader", - options: { - //adapter: SharpLoader, - sizes: [500, 1000, 2500], - name: "[path][name]_[width]x.[ext]", - context: 'public' - } - }] - }, - - { - test: /\.(eot|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/, - loader: 'url-loader' - } - ] - }, - - plugins: [] - }; - - //Setup the Plugins - let HTMLWebpackPluginConfig = new HtmlWebpackPlugin({ - template: `${base}/public/index.html`, - filename: 'index.html', - inject: true - }); - - config.plugins = [ - ...config.plugins, - HTMLWebpackPluginConfig - ] - - //Dev Setting Overrides - if(isDev) { - config = { - ...config, - devtool: 'cheap-module-eval-source-map', - plugins: [ - ...config.plugins, - new webpack.HotModuleReplacementPlugin() - ] - }; - } else { - let TerserPluginConfig = new TerserPlugin({ - test: /\.js($|\?)/i, - cache: true, - parallel: true, - }); - - let MiniCssExtractConfig = new MiniCssExtractPlugin({ - filename: "[name].css", - chunkFilename: "[id].css" - }); - - config = { - ...config, - plugins: [ - ...config.plugins, - MiniCssExtractConfig, - HTMLWebpackPluginConfig - ], - optimization: { - minimize: true, - minimizer: [ - TerserPluginConfig, - MiniCssExtractConfig, - new OptimizeCSSAssetsPlugin({}), - ] - } - }; - } - - return config; -}; diff --git a/public/assets/blogs/dombot-redevelopment/banner.jpg b/public/assets/blogs/dombot-redevelopment/banner.jpg deleted file mode 100644 index 1d69fbf..0000000 Binary files a/public/assets/blogs/dombot-redevelopment/banner.jpg and /dev/null differ diff --git a/public/assets/images/banners/about/glasses.svg b/public/assets/images/banners/about/glasses.svg deleted file mode 100644 index 90d107a..0000000 --- a/public/assets/images/banners/about/glasses.svg +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/banners/hills-night.svg b/public/assets/images/banners/hills-night.svg deleted file mode 100644 index 6fc7049..0000000 --- a/public/assets/images/banners/hills-night.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/banners/palms.svg b/public/assets/images/banners/palms.svg deleted file mode 100644 index 10731e3..0000000 --- a/public/assets/images/banners/palms.svg +++ /dev/null @@ -1,694 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/banners/sunset.svg b/public/assets/images/banners/sunset.svg deleted file mode 100644 index 451e0ce..0000000 --- a/public/assets/images/banners/sunset.svg +++ /dev/null @@ -1,414 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/banners/vhs-black.svg b/public/assets/images/banners/vhs-black.svg deleted file mode 100644 index d259645..0000000 --- a/public/assets/images/banners/vhs-black.svg +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/banners/vhs.svg b/public/assets/images/banners/vhs.svg deleted file mode 100644 index 8731d5d..0000000 --- a/public/assets/images/banners/vhs.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/public/assets/images/branding/csharp/logo.png b/public/assets/images/branding/csharp/logo.png deleted file mode 100644 index aa30538..0000000 Binary files a/public/assets/images/branding/csharp/logo.png and /dev/null differ diff --git a/public/assets/images/branding/discord/logo.png b/public/assets/images/branding/discord/logo.png deleted file mode 100644 index bf008fd..0000000 Binary files a/public/assets/images/branding/discord/logo.png and /dev/null differ diff --git a/public/assets/images/branding/google-cloud/logo.png b/public/assets/images/branding/google-cloud/logo.png deleted file mode 100644 index 28adc62..0000000 Binary files a/public/assets/images/branding/google-cloud/logo.png and /dev/null differ diff --git a/public/assets/images/branding/heroku/logo.png b/public/assets/images/branding/heroku/logo.png deleted file mode 100644 index 757fa4b..0000000 Binary files a/public/assets/images/branding/heroku/logo.png and /dev/null differ diff --git a/public/assets/images/branding/java/logo.png b/public/assets/images/branding/java/logo.png deleted file mode 100644 index 4bea6f6..0000000 Binary files a/public/assets/images/branding/java/logo.png and /dev/null differ diff --git a/public/assets/images/branding/monogame/logo.png b/public/assets/images/branding/monogame/logo.png deleted file mode 100644 index 096383a..0000000 Binary files a/public/assets/images/branding/monogame/logo.png and /dev/null differ diff --git a/public/assets/images/branding/mysql/logo.png b/public/assets/images/branding/mysql/logo.png deleted file mode 100644 index ee7382c..0000000 Binary files a/public/assets/images/branding/mysql/logo.png and /dev/null differ diff --git a/public/assets/images/branding/neto/logo.png b/public/assets/images/branding/neto/logo.png deleted file mode 100644 index 975b267..0000000 Binary files a/public/assets/images/branding/neto/logo.png and /dev/null differ diff --git a/public/assets/images/branding/nodejs/logo.png b/public/assets/images/branding/nodejs/logo.png deleted file mode 100644 index 180d00e..0000000 Binary files a/public/assets/images/branding/nodejs/logo.png and /dev/null differ diff --git a/public/assets/images/branding/opengl/logo.png b/public/assets/images/branding/opengl/logo.png deleted file mode 100644 index 1d4f24b..0000000 Binary files a/public/assets/images/branding/opengl/logo.png and /dev/null differ diff --git a/public/assets/images/branding/pgsql/logo.png b/public/assets/images/branding/pgsql/logo.png deleted file mode 100644 index c46b789..0000000 Binary files a/public/assets/images/branding/pgsql/logo.png and /dev/null differ diff --git a/public/assets/images/branding/php/logo.png b/public/assets/images/branding/php/logo.png deleted file mode 100644 index 33d5ce1..0000000 Binary files a/public/assets/images/branding/php/logo.png and /dev/null differ diff --git a/public/assets/images/branding/react/logo.png b/public/assets/images/branding/react/logo.png deleted file mode 100644 index 7dc4289..0000000 Binary files a/public/assets/images/branding/react/logo.png and /dev/null differ diff --git a/public/assets/images/branding/react/react-logo.svg b/public/assets/images/branding/react/react-logo.svg deleted file mode 100644 index e73b369..0000000 --- a/public/assets/images/branding/react/react-logo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/images/branding/shopify/logo.png b/public/assets/images/branding/shopify/logo.png deleted file mode 100644 index 59cdef8..0000000 Binary files a/public/assets/images/branding/shopify/logo.png and /dev/null differ diff --git a/public/assets/images/branding/shopify/shopify_logo_darkbg.svg b/public/assets/images/branding/shopify/shopify_logo_darkbg.svg deleted file mode 100644 index 92981a3..0000000 --- a/public/assets/images/branding/shopify/shopify_logo_darkbg.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/branding/shopify/shopify_logo_whitebg.svg b/public/assets/images/branding/shopify/shopify_logo_whitebg.svg deleted file mode 100644 index 481dd48..0000000 --- a/public/assets/images/branding/shopify/shopify_logo_whitebg.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/branding/twitch/logo.png b/public/assets/images/branding/twitch/logo.png deleted file mode 100644 index d0ce948..0000000 Binary files a/public/assets/images/branding/twitch/logo.png and /dev/null differ diff --git a/public/assets/images/branding/twitter/logo.png b/public/assets/images/branding/twitter/logo.png deleted file mode 100644 index 4f781bd..0000000 Binary files a/public/assets/images/branding/twitter/logo.png and /dev/null differ diff --git a/public/assets/images/branding/xna/xna-logo.svg b/public/assets/images/branding/xna/xna-logo.svg deleted file mode 100644 index 4ec040e..0000000 --- a/public/assets/images/branding/xna/xna-logo.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/images/favicon/android-icon-144x144.png b/public/assets/images/favicon/android-icon-144x144.png deleted file mode 100644 index 47e4490..0000000 Binary files a/public/assets/images/favicon/android-icon-144x144.png and /dev/null differ diff --git a/public/assets/images/favicon/android-icon-192x192.png b/public/assets/images/favicon/android-icon-192x192.png deleted file mode 100644 index 746543e..0000000 Binary files a/public/assets/images/favicon/android-icon-192x192.png and /dev/null differ diff --git a/public/assets/images/favicon/android-icon-36x36.png b/public/assets/images/favicon/android-icon-36x36.png deleted file mode 100644 index 8de632b..0000000 Binary files a/public/assets/images/favicon/android-icon-36x36.png and /dev/null differ diff --git a/public/assets/images/favicon/android-icon-48x48.png b/public/assets/images/favicon/android-icon-48x48.png deleted file mode 100644 index 4f45e7d..0000000 Binary files a/public/assets/images/favicon/android-icon-48x48.png and /dev/null differ diff --git a/public/assets/images/favicon/android-icon-72x72.png b/public/assets/images/favicon/android-icon-72x72.png deleted file mode 100644 index 055b735..0000000 Binary files a/public/assets/images/favicon/android-icon-72x72.png and /dev/null differ diff --git a/public/assets/images/favicon/android-icon-96x96.png b/public/assets/images/favicon/android-icon-96x96.png deleted file mode 100644 index a1e4e8c..0000000 Binary files a/public/assets/images/favicon/android-icon-96x96.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-114x114.png b/public/assets/images/favicon/apple-icon-114x114.png deleted file mode 100644 index eb05758..0000000 Binary files a/public/assets/images/favicon/apple-icon-114x114.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-120x120.png b/public/assets/images/favicon/apple-icon-120x120.png deleted file mode 100644 index 644432e..0000000 Binary files a/public/assets/images/favicon/apple-icon-120x120.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-144x144.png b/public/assets/images/favicon/apple-icon-144x144.png deleted file mode 100644 index 47e4490..0000000 Binary files a/public/assets/images/favicon/apple-icon-144x144.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-152x152.png b/public/assets/images/favicon/apple-icon-152x152.png deleted file mode 100644 index 4a15011..0000000 Binary files a/public/assets/images/favicon/apple-icon-152x152.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-180x180.png b/public/assets/images/favicon/apple-icon-180x180.png deleted file mode 100644 index 06857a9..0000000 Binary files a/public/assets/images/favicon/apple-icon-180x180.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-57x57.png b/public/assets/images/favicon/apple-icon-57x57.png deleted file mode 100644 index e03cf4d..0000000 Binary files a/public/assets/images/favicon/apple-icon-57x57.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-60x60.png b/public/assets/images/favicon/apple-icon-60x60.png deleted file mode 100644 index 5edcff8..0000000 Binary files a/public/assets/images/favicon/apple-icon-60x60.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-72x72.png b/public/assets/images/favicon/apple-icon-72x72.png deleted file mode 100644 index 055b735..0000000 Binary files a/public/assets/images/favicon/apple-icon-72x72.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-76x76.png b/public/assets/images/favicon/apple-icon-76x76.png deleted file mode 100644 index 2b32e22..0000000 Binary files a/public/assets/images/favicon/apple-icon-76x76.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon-precomposed.png b/public/assets/images/favicon/apple-icon-precomposed.png deleted file mode 100644 index 4eeb1b0..0000000 Binary files a/public/assets/images/favicon/apple-icon-precomposed.png and /dev/null differ diff --git a/public/assets/images/favicon/apple-icon.png b/public/assets/images/favicon/apple-icon.png deleted file mode 100644 index 4eeb1b0..0000000 Binary files a/public/assets/images/favicon/apple-icon.png and /dev/null differ diff --git a/public/assets/images/favicon/favicon-16x16.png b/public/assets/images/favicon/favicon-16x16.png deleted file mode 100644 index 8992de3..0000000 Binary files a/public/assets/images/favicon/favicon-16x16.png and /dev/null differ diff --git a/public/assets/images/favicon/favicon-32x32.png b/public/assets/images/favicon/favicon-32x32.png deleted file mode 100644 index b5adb3b..0000000 Binary files a/public/assets/images/favicon/favicon-32x32.png and /dev/null differ diff --git a/public/assets/images/favicon/favicon-96x96.png b/public/assets/images/favicon/favicon-96x96.png deleted file mode 100644 index a1e4e8c..0000000 Binary files a/public/assets/images/favicon/favicon-96x96.png and /dev/null differ diff --git a/public/assets/images/favicon/manifest.json b/public/assets/images/favicon/manifest.json deleted file mode 100644 index 013d4a6..0000000 --- a/public/assets/images/favicon/manifest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "App", - "icons": [ - { - "src": "\/android-icon-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": "0.75" - }, - { - "src": "\/android-icon-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": "1.0" - }, - { - "src": "\/android-icon-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": "1.5" - }, - { - "src": "\/android-icon-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": "2.0" - }, - { - "src": "\/android-icon-144x144.png", - "sizes": "144x144", - "type": "image\/png", - "density": "3.0" - }, - { - "src": "\/android-icon-192x192.png", - "sizes": "192x192", - "type": "image\/png", - "density": "4.0" - } - ] -} \ No newline at end of file diff --git a/public/assets/images/favicon/ms-icon-144x144.png b/public/assets/images/favicon/ms-icon-144x144.png deleted file mode 100644 index 47e4490..0000000 Binary files a/public/assets/images/favicon/ms-icon-144x144.png and /dev/null differ diff --git a/public/assets/images/favicon/ms-icon-150x150.png b/public/assets/images/favicon/ms-icon-150x150.png deleted file mode 100644 index 8cc4c93..0000000 Binary files a/public/assets/images/favicon/ms-icon-150x150.png and /dev/null differ diff --git a/public/assets/images/favicon/ms-icon-310x310.png b/public/assets/images/favicon/ms-icon-310x310.png deleted file mode 100644 index 43be233..0000000 Binary files a/public/assets/images/favicon/ms-icon-310x310.png and /dev/null differ diff --git a/public/assets/images/favicon/ms-icon-70x70.png b/public/assets/images/favicon/ms-icon-70x70.png deleted file mode 100644 index d6b62c0..0000000 Binary files a/public/assets/images/favicon/ms-icon-70x70.png and /dev/null differ diff --git a/public/assets/images/floppy.svg b/public/assets/images/floppy.svg deleted file mode 100644 index 2c7824a..0000000 --- a/public/assets/images/floppy.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - Asset 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/grain.png b/public/assets/images/grain.png deleted file mode 100644 index 4b13b79..0000000 Binary files a/public/assets/images/grain.png and /dev/null differ diff --git a/public/assets/images/hills-night.svg b/public/assets/images/hills-night.svg deleted file mode 100644 index ed87f4b..0000000 --- a/public/assets/images/hills-night.svg +++ /dev/null @@ -1,2335 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/hills.svg b/public/assets/images/hills.svg deleted file mode 100644 index 584564d..0000000 --- a/public/assets/images/hills.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 1 \ No newline at end of file diff --git a/public/assets/images/icons/hamburger.svg b/public/assets/images/icons/hamburger.svg deleted file mode 100644 index 57f5a45..0000000 --- a/public/assets/images/icons/hamburger.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/public/assets/images/logo.svg b/public/assets/images/logo.svg deleted file mode 100644 index 985f92e..0000000 --- a/public/assets/images/logo.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/palm.svg b/public/assets/images/palm.svg deleted file mode 100644 index 5baf7bf..0000000 --- a/public/assets/images/palm.svg +++ /dev/null @@ -1,466 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/arcade.svg b/public/assets/images/patterns/arcade.svg deleted file mode 100644 index e077c89..0000000 --- a/public/assets/images/patterns/arcade.svg +++ /dev/null @@ -1,1548 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/asteroids.svg b/public/assets/images/patterns/asteroids.svg deleted file mode 100644 index 5fdf734..0000000 --- a/public/assets/images/patterns/asteroids.svg +++ /dev/null @@ -1,1306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/cookies.svg b/public/assets/images/patterns/cookies.svg deleted file mode 100644 index 209c1e1..0000000 --- a/public/assets/images/patterns/cookies.svg +++ /dev/null @@ -1,1032 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/dots.svg b/public/assets/images/patterns/dots.svg deleted file mode 100644 index e7c5af8..0000000 --- a/public/assets/images/patterns/dots.svg +++ /dev/null @@ -1,392 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/florida.svg b/public/assets/images/patterns/florida.svg deleted file mode 100644 index 04eaf16..0000000 --- a/public/assets/images/patterns/florida.svg +++ /dev/null @@ -1,1197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/game-show.svg b/public/assets/images/patterns/game-show.svg deleted file mode 100644 index d133106..0000000 --- a/public/assets/images/patterns/game-show.svg +++ /dev/null @@ -1,993 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/lemon-triangle.svg b/public/assets/images/patterns/lemon-triangle.svg deleted file mode 100644 index c93e6fa..0000000 --- a/public/assets/images/patterns/lemon-triangle.svg +++ /dev/null @@ -1,1308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/poly.svg b/public/assets/images/patterns/poly.svg deleted file mode 100644 index 961791f..0000000 --- a/public/assets/images/patterns/poly.svg +++ /dev/null @@ -1,1252 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/rhythm-heaven.svg b/public/assets/images/patterns/rhythm-heaven.svg deleted file mode 100644 index 0dcc497..0000000 --- a/public/assets/images/patterns/rhythm-heaven.svg +++ /dev/null @@ -1,752 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/schoolbell.svg b/public/assets/images/patterns/schoolbell.svg deleted file mode 100644 index a311292..0000000 --- a/public/assets/images/patterns/schoolbell.svg +++ /dev/null @@ -1,826 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/third-dimension-squiggle.svg b/public/assets/images/patterns/third-dimension-squiggle.svg deleted file mode 100644 index d48d9a2..0000000 --- a/public/assets/images/patterns/third-dimension-squiggle.svg +++ /dev/null @@ -1,2015 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/patterns/vert.svg b/public/assets/images/patterns/vert.svg deleted file mode 100644 index 0d0a658..0000000 --- a/public/assets/images/patterns/vert.svg +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/window/button-inverted.svg b/public/assets/images/window/button-inverted.svg deleted file mode 100644 index 4977e58..0000000 --- a/public/assets/images/window/button-inverted.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/public/assets/images/window/button.svg b/public/assets/images/window/button.svg deleted file mode 100644 index 0163242..0000000 --- a/public/assets/images/window/button.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/public/assets/images/window/frame.svg b/public/assets/images/window/frame.svg deleted file mode 100644 index 4dd7dde..0000000 --- a/public/assets/images/window/frame.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/public/assets/images/window/icons.png b/public/assets/images/window/icons.png deleted file mode 100644 index 3fe10c0..0000000 Binary files a/public/assets/images/window/icons.png and /dev/null differ diff --git a/public/assets/images/window/window.svg b/public/assets/images/window/window.svg deleted file mode 100644 index 0810d36..0000000 --- a/public/assets/images/window/window.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/images/work-showcase/cocksox.png b/public/assets/images/work-showcase/cocksox.png deleted file mode 100644 index aa6e19d..0000000 Binary files a/public/assets/images/work-showcase/cocksox.png and /dev/null differ diff --git a/public/assets/images/work-showcase/kopalife.png b/public/assets/images/work-showcase/kopalife.png deleted file mode 100644 index f863ec7..0000000 Binary files a/public/assets/images/work-showcase/kopalife.png and /dev/null differ diff --git a/public/assets/images/work-showcase/ozhair.png b/public/assets/images/work-showcase/ozhair.png deleted file mode 100644 index 33f527d..0000000 Binary files a/public/assets/images/work-showcase/ozhair.png and /dev/null differ diff --git a/public/assets/images/work-showcase/smai.svg b/public/assets/images/work-showcase/smai.svg deleted file mode 100644 index d0ff1a9..0000000 --- a/public/assets/images/work-showcase/smai.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/videos/about/programming/programming.mp4 b/public/assets/videos/about/programming/programming.mp4 deleted file mode 100644 index 051fbbf..0000000 Binary files a/public/assets/videos/about/programming/programming.mp4 and /dev/null differ diff --git a/public/assets/videos/about/programming/programming.png b/public/assets/videos/about/programming/programming.png deleted file mode 100644 index fbef694..0000000 Binary files a/public/assets/videos/about/programming/programming.png and /dev/null differ diff --git a/public/assets/videos/about/programming/programming.webm b/public/assets/videos/about/programming/programming.webm deleted file mode 100644 index 070e296..0000000 Binary files a/public/assets/videos/about/programming/programming.webm and /dev/null differ diff --git a/public/assets/videos/bunny/big_buck_bunny.jpg b/public/assets/videos/bunny/big_buck_bunny.jpg deleted file mode 100644 index 3cd6550..0000000 Binary files a/public/assets/videos/bunny/big_buck_bunny.jpg and /dev/null differ diff --git a/public/assets/videos/bunny/big_buck_bunny.mp4 b/public/assets/videos/bunny/big_buck_bunny.mp4 deleted file mode 100644 index 81d11df..0000000 Binary files a/public/assets/videos/bunny/big_buck_bunny.mp4 and /dev/null differ diff --git a/public/assets/videos/bunny/big_buck_bunny.webm b/public/assets/videos/bunny/big_buck_bunny.webm deleted file mode 100644 index 42e2130..0000000 Binary files a/public/assets/videos/bunny/big_buck_bunny.webm and /dev/null differ diff --git a/public/blog/Blog.jsx b/public/blog/Blog.jsx deleted file mode 100644 index ae16764..0000000 --- a/public/blog/Blog.jsx +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { get } from '@public/api/api'; - -const TestBlogArticle = id => { - return { - id, handle: 'test-blog-article', title: 'My Title', - image: 'blogs/dombot-redevelopment/banner.jpg', - shortDescription: "Some short description that goes here too so let's write.", - description: "This is my longer example description lorem ipsum dolor sit amet.\nNewline\n\nNew Paragraph\n\nhttps://hyperlink.com" - } -}; - -const TestBlogs = { - pages: 20/7, - articles: [...Array(20).keys()].map(TestBlogArticle) -} - -//Functions for normalization -const NormalizeArticle = article => { - article.url = `/blog/article/${article.handle}`; - article.image = require(`@assets/${article.image}`); - return article; -}; - -//Template Wrappers -export const withBlogTemplate = WrappedComponent => { - return class extends React.Component { - constructor(props) { - super(props); - - this.state = { - pending: false, - error: undefined, - pages: undefined, - articles: undefined - }; - } - - componentDidMount() { - let { page, perPage } = this.props.match.params; - page = page || 1; - perPage = perPage || 7; - - this.setState({ pending: true, page, perPage }); - get('blog', { page, perPage }, TestBlogs).then(blog => { - let { articles, pages } = blog; - articles.forEach(NormalizeArticle); - this.setState({ pending: undefined, error: undefined, articles, pages }); - }).catch(e => { - console.error(e); - this.setState({ pending: undefined, error: e }); - }); - } - - render() { - return ; - } - } -}; - - -export const withArticleTemplate = WrappedComponent => { - return class extends React.Component { - constructor(props) { - super(props); - - this.state = { - pending: true, - error: undefined, - article: undefined - }; - } - - componentDidMount() { - let { article } = this.props.match.params; - this.setState({ pending: true }); - get('blog/article', { article }, TestBlogArticle(1)).then(article => { - NormalizeArticle(article); - this.setState({ pending: undefined, error: undefined, article }); - }).catch(error => { - console.error(error); - this.setState({ pending: undefined, error }); - }); - } - - render() { - return ; - } - } -} diff --git a/public/components/App.jsx b/public/components/App.jsx deleted file mode 100644 index cf203b8..0000000 --- a/public/components/App.jsx +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { connect } from 'react-redux'; -import { HashRouter, BrowserRouter } from 'react-router-dom'; - -import Styles from './App.scss'; - -import Header from './header/Header'; -import Footer from './footer/Footer'; -import Routes, { RouteWrapper } from './page/route/Routes'; -import Favicon from './Favicon'; - -//Routes Definitions -const AppRoutes = (props) => { - return ( - - import('@pages/home/HomePage') } /> - import ('@pages/contact/ContactPage') } /> - import('@pages/legal/privacy/PrivacyPolicyPage') } /> - - import('@pages/blog/BlogPage') } /> - import('@pages/blog/article/ArticlePage') } /> - - ); -}; - - -//Main App Wrapper -class App extends React.Component { - constructor(props) { - super(props); - } - - onEntering() { - this.refs.app.scroll({ - top: 0, - left: 0, - behavior: 'smooth' - }); - } - - render() { - let newProps= {...this.props}; - let { className, modal } = newProps; - ["dispatch"].forEach(e => delete newProps[e]); - - //Generate base clazzes - let clazz = "c-app"; - - //Append any other clazzes there may be. - if(modal.open) clazz += ' is-modal-open'; - if(className) clazz += ` ${className}`; - - //For testing you can switch the router type - let RouterType = BrowserRouter; - if(process.env.NODE_ENV === 'development') RouterType = HashRouter; - - return ( - -
- { modal.modal } - -
-
- this.onEntering() } /> -
-
-
- - ); - } -} - -export default connect(state => { - return { modal: state.modal }; -})(App); diff --git a/public/components/App.scss b/public/components/App.scss deleted file mode 100644 index 598e416..0000000 --- a/public/components/App.scss +++ /dev/null @@ -1,14 +0,0 @@ -/* - * App - * App styles for the app container. - * - * Version: - * 1.1.0 - 2018/10/30 - */ -@import '~@styles/global'; - -.c-app { - overflow-x: hidden;//Temporary until I find time to find the overflowing element - width: 100vw; - min-height: 100vh; -} diff --git a/public/components/Favicon.jsx b/public/components/Favicon.jsx deleted file mode 100644 index 816f163..0000000 --- a/public/components/Favicon.jsx +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import Helmet from 'react-helmet'; -const prefix = '@assets/images/favicon/'; - -export default (props) => { - return ( - - - - - - - - - - - - - - - - - - - - - - */} - - ); -}; diff --git a/public/components/error/ErrorPanel.scss b/public/components/error/ErrorPanel.scss deleted file mode 100644 index 0b56143..0000000 --- a/public/components/error/ErrorPanel.scss +++ /dev/null @@ -1,25 +0,0 @@ -@import '~@styles/global'; - -$c-error-panel--padding: 1em; - -.c-error-panel { - max-width: 750px; - border: $s-color--input-default__border; - - &__heading { - padding: $c-error-panel--padding; - background: $s-color--input-danger__top; - border-bottom: $s-color--input-default__border; - - &-title { - color: $s-color--input-primary__text; - margin: 0; - } - } - - &__body { - margin: 0; - background: $s-color--background; - padding: $c-error-panel--padding; - } -} diff --git a/public/components/footer/Footer.jsx b/public/components/footer/Footer.jsx deleted file mode 100644 index f47f04b..0000000 --- a/public/components/footer/Footer.jsx +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { connect } from 'react-redux'; -import { NavLink } from 'react-router-dom'; - -import { withLanguage } from '@public/language/Language'; - -import { PageBoundary } from '@components/page/Page'; -import ImageSection from '@sections/image/ImageSection'; - -import ContentBox from '@objects/content/box/ContentBox'; - -import FooterStyles from './Footer.scss'; - -const SITE_LAUNCH_TIMESTAMP = 1335830400000; - -const FooterLink = props => { - let { title, className } = props; - return ; -}; - -class Footer extends React.Component { - constructor(props) { - super(props); - } - - render() { - let { className, lang } = this.props; - - return ( -
- - - - - -
- © { new Date(SITE_LAUNCH_TIMESTAMP).getFullYear() } - ~ - { new Date().getFullYear() } Dominic Masters -
- - - -
- ); - } -} - -export default withLanguage(Footer); diff --git a/public/components/footer/Footer.scss b/public/components/footer/Footer.scss deleted file mode 100644 index 3bc586a..0000000 --- a/public/components/footer/Footer.scss +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Footer - * Site Footer! - * - * Dependencies: - * styles/settings/colors.scss - * styles/settings/typography.scss - * styles/tools/_box-shadow.scss - * - * Version: - * 1.1.0 - 2018/10/30 - */ -@import '~@styles/global'; - -.c-footer { - @extend %t-dp--shadow-3d; - - &__inner { - padding-top: 8em; - padding-bottom: 10em; - } - - &__copyright { - font-size: 1.2em; - font-family: $s-font--stack-headings; - } - - &__links { - padding-bottom: 1em; - } - - &__link { - color: $s-color--footer__link; - - &:hover { - color: $s-color--footer__link-hover; - } - - + #{&} { - display: inline-block; - margin-left: 1em; - } - } -} diff --git a/public/components/header/Header.jsx b/public/components/header/Header.jsx deleted file mode 100644 index c377649..0000000 --- a/public/components/header/Header.jsx +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import Navbar from '@components/nav/navbar/Navbar'; - -export default (props) => { - return ( -
- -
- ); -} diff --git a/public/components/nav/menu/HamburgerMenu.jsx b/public/components/nav/menu/HamburgerMenu.jsx deleted file mode 100644 index fd3b6da..0000000 --- a/public/components/nav/menu/HamburgerMenu.jsx +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { connect } from 'react-redux'; -import { NavLink } from 'react-router-dom'; -import { withLanguage } from '@public/language/Language'; -import * as MenuActions from '@public/actions/MenuActions'; - -import Styles from './HamburgerMenu.scss'; - -const HamburerMenuItem = props => { - let { lang, link, className } = props; - - return ( -
  • - { lang } - -
    • - ); -} - -const HamburgerMenu = props => { - let { open, className, toggleMenu, lang } = props; - - let clazz = "c-hamburger-menu"; - if(open) clazz += " is-open"; - if(className) clazz += ` ${className}`; - - return ( -
    - - - -
    - ); -} - - -const mapStateToProps = state => { - return { - open: state.menu.open - } -} - -const mapDispatchToProps = dispatch => { - return { - toggleMenu: function(theme) { - dispatch(MenuActions.toggleMenu()); - } - } -} - -export default connect(mapStateToProps, mapDispatchToProps)(withLanguage(HamburgerMenu)); diff --git a/public/components/nav/menu/HamburgerMenu.scss b/public/components/nav/menu/HamburgerMenu.scss deleted file mode 100644 index 58eaac7..0000000 --- a/public/components/nav/menu/HamburgerMenu.scss +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Hamburger Menu - * Mobile-Centric openable menu with a hamburger icon to toggle. - * - * Dependencies: - * styles/settings/animation.scss - * styles/settings/colors.scss - * styles/settings/z.scss - * - * Version: - * 1.1.0 - 2018/10/23 - */ -@import '~@styles/global'; - -$c-hamburger-menu--max: 200%; -$c-hamburger-menu--pos-x: 100%; -$c-hamburger-menu--pos-y: 0%; - -@include t-keyframes(c-hamburger-menu--open) { - from { clip-path: circle(0% at $c-hamburger-menu--pos-x $c-hamburger-menu--pos-y); } - to { clip-path: circle($c-hamburger-menu--max at $c-hamburger-menu--pos-x $c-hamburger-menu--pos-y); } -} - -@include t-keyframes(c-hamburger-menu--close) { - from { clip-path: circle($c-hamburger-menu--max at $c-hamburger-menu--pos-x $c-hamburger-menu--pos-y); } - to { clip-path: circle(0% at $c-hamburger-menu--pos-x $c-hamburger-menu--pos-y); } -} - -.c-hamburger-menu { - - &__menu { - display: none; - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: $s-color--menu__background; - transition: all 1s $s-animation--ease-out; - - z-index: $s-z--menu; - - @include t-animation-fill-mode(forwards); - @include t-animation-timing-function($s-animation--ease-out); - @include t-animation-duration(0.4s); - } - - &__links { - @extend %t-list-blank; - padding-top: 3em; - } - - &__link { - @extend %t-list-litem-blank; - display: block; - font-size: 1.25em; - width: 100%; - position: relative; - background-size: 150%; - - &-link { - position: relative; - display: block; - padding: 1.5em; - } - - &--home { - background-image: url('~@assets/images/patterns/game-show.svg'); - } - - &--contact { - background-image: url('~@assets/images/patterns/lemon-triangle.svg'); - } - - &:hover:before { - //@include t-translate-x(5%); Disabled due to not being needed on mobile - } - } - - &__button { - position: relative;//Helps us win the Z-Fight - width: 100%; - height: 100%; - padding: 0.5em; - cursor: pointer; - z-index: $s-z--menu-button; - } - - &__icon { - display: block; - } - - - &.is-open { - .c-hamburger-menu__menu { - display: block; - @include t-animation-name(c-hamburger-menu--open); - } - } - - &.is-closing { - .c-hamburger-menu__menu { - display: block; - @include t-animation-name(c-hamburger-menu--close); - } - } -} diff --git a/public/components/nav/navbar/Navbar.jsx b/public/components/nav/navbar/Navbar.jsx deleted file mode 100644 index be478c2..0000000 --- a/public/components/nav/navbar/Navbar.jsx +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { NavLink } from 'react-router-dom' - -import { withLanguage } from '@public/language/Language'; - -import Styles from './Navbar.scss'; - -import { PageBoundary } from '@components/page/Page'; -import HamburgerMenu from './../menu/HamburgerMenu'; - -import Image from '@objects/image/Image'; - -const NavbarLink = props => { - let { to, exact, title } = props; - - return ( - - { title } - - ); -}; - - -const Navbar = props => { - let { lang } = props; - - return ( -
    - - - -
    - ); -} - -export default withLanguage(Navbar); diff --git a/public/components/nav/navbar/Navbar.scss b/public/components/nav/navbar/Navbar.scss deleted file mode 100644 index 79b1587..0000000 --- a/public/components/nav/navbar/Navbar.scss +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Navbar - * Navigation bar at the top of the screen. - * - * Dependencies: - * styles/settings/colors.scss - * styles/settings/typography.scss - * styles/settings/z.scss - * styles/tool/list.scss - * - * Version: - * 1.1.0 - 2018/08/14 - */ -@import '~@styles/global'; - -$c-navbar--link-thickness: 5px; - -.c-navbar { - z-index: $s-z--navbar; - - &.is-stuck { - position: fixed; - width: 100%; - top: 0; - left: 0; - } - - - &__nav { - display: flex; - align-items: stretch; - @extend %t-dp--shadow; - background: $s-color--navbar; - color: white; - } - - //Logo - &__logo-container { - width: 100%; - padding: 0.5em; - } - - &__logo { - //To Allow the logo to go over the top of the menu!~ - position: relative; - z-index: $s-z--logo; - width: 7em; - } - - //Links - &__link { - align-items: center; - @extend %s-font--style-button; - display: none; - position: relative; - padding: 1em; - color: $s-color--navbar__text; - - &:after { - @extend %t-dp--shadow; - position: absolute; - width: 100%; - height: 0px; - left: 0; - bottom: 0px; - transform: translateY(100%); - transition: height 0.2s $s-animation--ease-out; - - content: ""; - } - - &.is-active:after { - background: $s-color--navbar__bar-hover; - height: $c-navbar--link-thickness; - } - - &:hover { - color: $s-color--navbar__text-hover; - - &:after { - background: $s-color--navbar__bar-hover; - height: $c-navbar--link-thickness; - } - } - } - - &__hamburger { - } - - @include t-media-query($s-xsmall-up) { - &__hamburger { - display: none; - } - - &__logo { - width: 10em; - } - - &__link { - display: flex; - } - } - - @include t-media-query($s-small-up) { - - &__logo { - width: 12em; - } - } - - @include t-media-query($s-medium-up) { - &.is-stuck { - top: 5%; - } - } -} diff --git a/public/components/page/Page.jsx b/public/components/page/Page.jsx deleted file mode 100644 index 978bf4d..0000000 --- a/public/components/page/Page.jsx +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { connect } from 'react-redux'; -import { Helmet } from "react-helmet"; -import { withLanguage } from '@public/language/Language'; - -import Image from '@objects/image/Image'; - -import PageBoundary from './boundary/PageBoundary'; - -import Styles from './Page.scss'; - -export default withLanguage(props => { - let { title, style, className, lang, children, background } = props; - - //Switch classes - let clazzes = `c-page ${className||""}`; - - //Setup page title - let titleHelmet; - if((!title || !title.length) && style != "home-page") { - console.exception(`This page (${style||className}) does not have a title!`); - } else { - titleHelmet = { title } - } - - //Extras - let bg; - if(background) { - bg = ; - clazzes += ' has-background'; - } - - return ( -
    - - { titleHelmet } - - { bg } - { children } -
    - ); -}); - -export { - PageBoundary -} diff --git a/public/components/page/Page.scss b/public/components/page/Page.scss deleted file mode 100644 index 4dbdef8..0000000 --- a/public/components/page/Page.scss +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Page - * Styles for the base Page elements. - * - * Dependencies: - * styles/settings/responsive.scss - * - * Version: - * 1.0.0 - 2018/05/05 - */ -@import '~@styles/global'; - -.c-page { - min-height: 80vh; - - &.has-background { - position: relative; - } - - &__boundary { - max-width: $s-screen-boundary; - margin: 0 auto; - - &.is-full { - position: relative; - height: 100%; - } - - &.is-small { - max-width: $s-screen-boundary / 2; - } - } - - &__background { - position: fixed; - z-index: -1; - width: 100%; - height: 100%; - object-fit: cover; - } -} diff --git a/public/components/page/boundary/PageBoundary.jsx b/public/components/page/boundary/PageBoundary.jsx deleted file mode 100644 index 667448c..0000000 --- a/public/components/page/boundary/PageBoundary.jsx +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './PageBoundary.scss'; - -export default (props) => { - let newProps = { ...props }; - let { full, small, className } = props; - - ["full","small"].forEach(e => delete newProps[e]); - - let clazzes = "c-page-boundary"; - if(full) clazzes += " is-full"; - if(small) clazzes += " is-small"; - if(className) clazzes += ` ${className}` - - return ( -
    - { props.children } -
    - ); -} diff --git a/public/components/page/boundary/PageBoundary.scss b/public/components/page/boundary/PageBoundary.scss deleted file mode 100644 index 8afdbca..0000000 --- a/public/components/page/boundary/PageBoundary.scss +++ /dev/null @@ -1,24 +0,0 @@ -/* - * PageBoundary - * Styles for the Page Boundaries - * - * Dependencies: - * - * Version: - * 1.0.0 - 2018/10/23 - */ -@import '~@styles/global'; - -.c-page-boundary { - max-width: $s-screen-boundary; - margin: 0 auto; - - &.is-full { - position: relative; - height: 100%; - } - - &.is-small { - max-width: $s-screen-boundary / 2; - } -} diff --git a/public/components/page/route/Routes.jsx b/public/components/page/route/Routes.jsx deleted file mode 100644 index 6e03542..0000000 --- a/public/components/page/route/Routes.jsx +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import PropTypes from 'prop-types' -import Loadable from 'react-loadable'; -import { withRouter } from 'react-router'; -import { HashRouter, Route, Switch } from 'react-router-dom'; -import { CSSTransition, TransitionGroup } from 'react-transition-group'; - -import ErrorPage from '@pages/error/ErrorPage'; -import LoadingPage from '@pages/loading/LoadingPage'; - -const PageLoading = (props) => { - let { error, pastDelay } = props; - if(error) return ; - if(pastDelay) return ; - return null; -}; - -export const RouteWrapper = (props) => { - let render = subProps => { - let CustomLoadable = Loadable({ - loader: props.page, - loading: PageLoading - }); - return - }; - - return ; -}; - -export default withRouter((props) => { - const { match, location, history, children } = props; - - return ; -}); diff --git a/public/components/section/Section.jsx b/public/components/section/Section.jsx deleted file mode 100644 index e678162..0000000 --- a/public/components/section/Section.jsx +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './Section.scss'; - -export default props => { - let newProps = {...props}; - let { full, className, children } = props; - - ["full"].forEach(e => delete newProps[e]); - - let clazz = "c-section"; - if(full) clazz += " is-full"; - if(className) clazz += ` ${className}`; - - return
    ; -} diff --git a/public/components/section/Section.scss b/public/components/section/Section.scss deleted file mode 100644 index 95574f4..0000000 --- a/public/components/section/Section.scss +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Section - * Styles for the base section component. - * - * Dependencies: - * - * Version: - * 1.0.0 - 2018/05/07 - */ -@import '~@styles/global'; - -.c-section { - //border: 1px solid red; - width: 100%; - - &.is-full { - height: 100vh; - } -} diff --git a/public/components/section/banner/BannerSection.scss b/public/components/section/banner/BannerSection.scss deleted file mode 100644 index f7553af..0000000 --- a/public/components/section/banner/BannerSection.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import '~@styles/global'; - -.c-banner-section { - position: relative; - - &__sizer { - &.for-desktop {display: none;} - - @include t-media-query($s-small-up) { - &.for-mobile {display: none;} - &.for-desktop {display: block;} - } - } -} diff --git a/public/components/section/blog/article/ArticleGridSection.scss b/public/components/section/blog/article/ArticleGridSection.scss deleted file mode 100644 index 789fa18..0000000 --- a/public/components/section/blog/article/ArticleGridSection.scss +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Article Grid Section - * Styles for the Article Grid Section, aligns sets of articles out in a nice - * grid with some additional styling depending on the count etc. - * - * Version: - * 1.0.0 - 2018/10/31 - */ -@import '~@styles/global'; - -.c-article-grid { - - &__grid { - display: flex; - flex-wrap: wrap; - align-items: stretch; - } - - &__article { - width: 100%; - } - - @include t-media-query($s-small-up) { - &__grid { - padding: 1em 0; - } - - &__article { - width: 50%; - padding: 1em 2em; - - &:nth-child(odd) { - padding-right: 1em; - } - - &:nth-child(even) { - padding-left: 1em; - } - } - } -} diff --git a/public/components/section/blog/article/FeaturedArticleSection.jsx b/public/components/section/blog/article/FeaturedArticleSection.jsx deleted file mode 100644 index e5e1fbe..0000000 --- a/public/components/section/blog/article/FeaturedArticleSection.jsx +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { NavLink } from 'react-router-dom'; - -import { withLanguage } from '@public/language/Language'; -import Section from '@sections/Section'; -import { PageBoundary } from '@components/page/Page'; - -import Image from '@objects/image/Image'; -import Button from '@objects/input/button/Button'; -import ContentBox from '@objects/content/box/ContentBox'; -import { Title, Paragraph } from '@objects/typography/Typography'; - -import Styles from './FeaturedArticleSection.scss'; - -export default withLanguage(props => { - let { article, lang } = props; - - return ( -
    - -
    - - - - - -
    - - - - { article.title } - - - - - - -
    -     -
    -     -
    - ); -}); diff --git a/public/components/section/blog/article/FeaturedArticleSection.scss b/public/components/section/blog/article/FeaturedArticleSection.scss deleted file mode 100644 index 2787afd..0000000 --- a/public/components/section/blog/article/FeaturedArticleSection.scss +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Featured Blog Section - * Section for featuring a large blog item. - * - * Version: - * 1.0.0 - 2018/10/30 - */ -@import '~@styles/global'; - -.c-featured-article { - display: block; - width: 100%; - - &__content {width: 100%;} - - &__box {} - - &__image { - display: block; - width: 100%; - } - - &__heading { - transform: translateY(-60%); - margin-bottom: -2em; - overflow: visible; - } - - &__title { - margin: 0; - } - - @include t-media-query($s-small-up) { - padding: 1em; - - &__content { display: flex; } - - &__heading { - transform: translate(-10%, -60%); - } - - &__box { - width: 40%; - padding: 0.5em; - - &.is-image{order:2;width: 60%;} - } - } - - @include t-media-query($s-medium-up) { - padding: 2em; - &__box { - width: 50%; - &.is-image {width: 50%;} - padding: 2em; - } - } -} diff --git a/public/components/section/body/BodySection.scss b/public/components/section/body/BodySection.scss deleted file mode 100644 index f8f30f6..0000000 --- a/public/components/section/body/BodySection.scss +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Body Section - * Body Section. - * - * Dependencies: - * styles/settings/colors.scss - * styles/tools/_shadow.scss - * - * Version: - * 1.0.0 - 2018/05/13 - */ -@import '~@styles/global'; - -$c-body-section--padding: 1em; - -.c-body-section { - @extend %t-dp--shadow; - background: $s-color--background; - padding: $c-body-section--padding; -} diff --git a/public/components/section/error/ErrorSection.scss b/public/components/section/error/ErrorSection.scss deleted file mode 100644 index eb4f7e5..0000000 --- a/public/components/section/error/ErrorSection.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '~@styles/global'; - -.c-error-section { - &__panel { - margin: 2em auto; - } -} diff --git a/public/components/section/image/ImageSection.jsx b/public/components/section/image/ImageSection.jsx deleted file mode 100644 index b74a1b0..0000000 --- a/public/components/section/image/ImageSection.jsx +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { NavLink } from 'react-router-dom'; - -import Section from './../Section'; -import Image from '@objects/image/Image'; - -import Styles from './ImageSection.scss'; - -export default props => { - let sectionProps = {...props}; - let imageProps = {...props}; - - let { image, background, children, className, imageClassName } = props; - - ["children", "background", "loadable", "imageClassName"].forEach(e => delete sectionProps[e]); - - ["image", "full", "children", "background", "imageClassName"].forEach(e => delete imageProps[e]); - - let clazz = "c-image-section"; - let imageClazz = `c-image-section__image ${imageClassName||""}`; - image = image || ; - - if(className) clazz += ` ${className}`; - if(background) clazz += " is-background"; - - return ( -
    - { image } - -
    - ); -} diff --git a/public/components/section/image/ImageSection.scss b/public/components/section/image/ImageSection.scss deleted file mode 100644 index 9b96c12..0000000 --- a/public/components/section/image/ImageSection.scss +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Image Section - * Styles for Image Sections, usually contains videos (hmmmm). - * - * Dependencies: - * - * Version: - * 1.1.0 - 2018/08/14 - */ -@import '~@styles/global'; - -.c-image-section { - - &__image { - display: block; - width: 100%; - } - - &.is-full { - position: relative; - - .c-image-section__image { - @include t-absolute-fill(); - object-fit: cover; - object-position: bottom center; - } - } - - &__content { - @include t-absolute-fill(); - - &-inner { - position: relative; - height: 100%; - width: 100%; - } - } - - //Background Image - &.is-background { - position: relative; - - .c-image-section { - &__image { - @include t-absolute-fill(); - object-fit: cover; - object-position: bottom center; - } - - &__content { - position: relative; - - &-inner { - position: relative; - height: 100%; - width: 100%; - } - } - } - } - -} diff --git a/public/components/section/image/banner/BannerImageSection.jsx b/public/components/section/image/banner/BannerImageSection.jsx deleted file mode 100644 index f46ed48..0000000 --- a/public/components/section/image/banner/BannerImageSection.jsx +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import ImageSection from './../ImageSection'; -import Styles from './BannerImageSection.scss'; - -export default props => { - let { className, imageClassName } = props; - - return ; -}; diff --git a/public/components/section/image/banner/BannerImageSection.scss b/public/components/section/image/banner/BannerImageSection.scss deleted file mode 100644 index fb3080c..0000000 --- a/public/components/section/image/banner/BannerImageSection.scss +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Banner Image Section - * Section that adjusts the image to better suit a banner, rather than using - * the annoying image size. - * - * Version: - * 1.0.0 - 2018/10/30 - */ -@import '~@styles/global'; - -.c-banner-section { - &__image { - display: block; - width: 100%; - height: 80vh; - object-fit: cover; - } -} diff --git a/public/components/section/layout/ClearSection.jsx b/public/components/section/layout/ClearSection.jsx deleted file mode 100644 index 6c074f6..0000000 --- a/public/components/section/layout/ClearSection.jsx +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './ClearSection.scss'; - -import Section from './../Section'; - -export default props =>
    ; diff --git a/public/components/section/layout/ClearSection.scss b/public/components/section/layout/ClearSection.scss deleted file mode 100644 index 3a4f8cd..0000000 --- a/public/components/section/layout/ClearSection.scss +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Clear section - * Simple section that is designed to clear pass the navbar (and some). - * Can also be used to add spacing between sections. - * - * Dependencies: - * - * Version: - * 1.0.0 - 2018/06/05 - */ -@import '~@styles/global'; - -.c-clear-section { - width: 100%; - padding-bottom: 15%; - position: relative; -} diff --git a/public/components/section/layout/SplitSection.scss b/public/components/section/layout/SplitSection.scss deleted file mode 100644 index decb7d1..0000000 --- a/public/components/section/layout/SplitSection.scss +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Split section - * Simple Section that is split into multiple columns - * - * Version: - * 1.0.0 - 2018/05/28 - */ -@import '~@styles/global.scss'; - -$c-split-section__split--padding: 1em; - -.c-split-section { - display: flex; - flex-wrap: wrap; - - &.is-stretched { - align-items: stretch; - } - - &.is-center { - align-items: center; - } - - &__split { - width: 100%; - - &.is-padded { - padding: $c-split-section__split--padding; - } - } - - @include t-media-query($s-small-up) { - flex-wrap: nowrap; - } -} diff --git a/public/components/section/video/VideoSection.jsx b/public/components/section/video/VideoSection.jsx deleted file mode 100644 index 4dd29ed..0000000 --- a/public/components/section/video/VideoSection.jsx +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './VideoSection.scss'; - -import Section from './../Section'; - -import Video from '@objects/video/Video'; -import Loader from '@objects/loading/Loader'; - -export default (props) => { - let { full, className, sources, children } = props; - let videoProps = {...props}; - let sectionProps = {...props}; - - [ "autoPlay", "fill", "loop", "sources" ].forEach(e => delete sectionProps[e]); - [ "children" ].forEach(e => delete videoProps[e]); - - if(typeof props.autoPlay === typeof undefined) props.autoPlay = true; - if(typeof props.loop === typeof undefined) props.loop = true; - if(typeof props.fill === typeof undefined) props.fill = true; - - return ( -
    -
    - ); -} diff --git a/public/components/section/video/VideoSection.scss b/public/components/section/video/VideoSection.scss deleted file mode 100644 index 4fb0d13..0000000 --- a/public/components/section/video/VideoSection.scss +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Video Section - * Styles for Video Sections, usually contains videos. - * - * Dependencies: - * styles/tools/_absolute-centering.scss - * - * Version: - * 1.0.0 - 2018/05/03 - */ -@import '~@styles/global'; - -.c-video-section { - position: relative; - - &__video { - @include t-absolute-fill(); - object-fit: cover; - object-position: center; - } -} diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 3fb68e2..0000000 --- a/public/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - domsPlace - Personal Site of Dominic Masters - - - - - - - - - - - - - - - - -
    - -
    - - diff --git a/public/index.jsx b/public/index.jsx deleted file mode 100644 index 38f090f..0000000 --- a/public/index.jsx +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2018 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. - -'use strict'; -import '@babel/polyfill'; - -import React from 'react'; -import ReactDOM from 'react-dom'; -import { createStore, applyMiddleware } from 'redux'; -import { createLogger } from 'redux-logger'; -import { Provider } from 'react-redux'; -import RootReducer from './reducers/RootReducer'; -import promiseMiddleware from 'redux-promise-middleware'; -import Keyboard from './keyboard/Keyboard'; - - -//Import Common Elements Stylesheet -import Styles from './styles/common.scss'; - -//Import Base Component -import App from './components/App'; - -//Create our redux middleware -const store = createStore(RootReducer, applyMiddleware( - promiseMiddleware(), - createLogger({ collapsed: true }) -)); - -//Start listening for key events -Keyboard.register(); - -ReactDOM.render(( - - - -),document.getElementById('app')); diff --git a/public/keyboard/Keyboard.jsx b/public/keyboard/Keyboard.jsx deleted file mode 100644 index 6002cb9..0000000 --- a/public/keyboard/Keyboard.jsx +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) 2018 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. - -const KEY_ESCAPE = 27; -const KEY_CTRL = 17; -const KEY_ENTER = 13; - -class Keyboard { - constructor(){ - //Bound events - this.onKeyUpBound = this.onKeyUp.bind(this); - this.onKeyDownBound = this.onKeyDown.bind(this); - - this.listeners = []; - - this.states = {}; - } - - isRegistered() {return this.registered === true;} - - register() { - if(this.isRegistered()) return; - this.registered = true; - document.addEventListener('keyup', this.onKeyUpBound); - document.addEventListener('keydown', this.onKeyDownBound); - } - - unregister() { - this.registered = false; - document.removeEventListener('keyup', this.onKeyUpBound); - document.removeEventListener('keydown', this.onKeyDownBound); - } - - addListener(listener) { - this.listeners.push(listener); - } - - removeListener(listener) { - let index = this.listeners.indexOf(listener); - if(index === -1) return; - this.listeners.splice(index,1); - } - - tellListeners(keyCode, event) { - for(let i = 0; i < this.listeners.length; i++) { - let l = this.listeners[i]; - if(typeof l[event] !== "function") continue; - l[event](keyCode, this); - } - } - - onKeyUp(e) { - //console.log("Key " + e.keyCode); // FOR TESTING KEY COMBOS - this.tellListeners(e.keyCode, "onKeyUp"); - this.states[e.keyCode] = false; - this.tellListeners(e.keyCode, "onKeyRelease"); - } - - onKeyDown(e) { - this.tellListeners(e.keyCode, "onKeyPress"); - this.states[e.keyCode] = true; - this.tellListeners(e.keyCode, "onKeyRelease"); - } - - isKey(key) { - return typeof this.states[key] !== typeof undefined && this.states[key] === true; - } - - //Now the submits - isEscape() { - return this.isKey(KEY_ESCAPE); - } - - isSubmit() { - return this.isKey(KEY_CTRL) && this.isKey(KEY_ENTER); - } -} - -export default new Keyboard(); diff --git a/public/language/Language.jsx b/public/language/Language.jsx deleted file mode 100644 index 6e911bd..0000000 --- a/public/language/Language.jsx +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { connect } from 'react-redux'; -import * as LanguageActions from './../actions/LanguageActions'; - -import enAU from './en-AU.jsx'; - -export const LANGUAGES = { - 'en-AU': enAU -} - -class Language { - constructor() { - this.setLanguage("en-AU"); - } - - setLanguage(lang) { - this.langName = lang; - this.dataRaw = LANGUAGES[lang]; - - //Now parse - this.data = this.parseRecursive(this.dataRaw); - } - - getLanguage() { - return this.langName; - } - - parseRecursive(o) { - let keys = Object.keys(o); - let p = {}; - keys.forEach(key => { - let d = o[key]; - if(typeof d === typeof undefined) d = null; - if(typeof d === 'function') { - p[key] = d(); - return; - } - if(typeof d === 'string') { - p[key] = d; - return; - } - p[key] = this.parseRecursive(d); - }); - return p; - } - - getLanguages() { - return Object.keys(LANGUAGES); - } -} -const lang = new Language(); -export default lang; - -export const LanguageTools = { - random: function(someArray) { - return someArray[Math.floor(Math.random() * someArray.length)]; - } -} - -export const withLanguage = Wrapped => { - let LanguageWrapper = props => { - return ; - }; - - return connect(state => { - return { - language: state.language.code, - lang: lang.data - } - }, dispatch => { - return { - setLanguage: language => { - dispatch(LanguageActions.setLanguage(language)); - } - }; - })(LanguageWrapper); -}; diff --git a/public/language/en-AU.jsx b/public/language/en-AU.jsx deleted file mode 100644 index d7cc5d9..0000000 --- a/public/language/en-AU.jsx +++ /dev/null @@ -1,253 +0,0 @@ -import React, { Fragment } from 'react'; -import { LanguageTools } from './Language'; - -import Policy from './policy-english'; - -export default { - "site": { - "name": "domsPlace", - "title": "domsPlace - Personal Site of Dominic Masters", - "titleTemplate": "%s - domsPlace" - }, - - "navbar": { - "home": "Home", - "blog": "Blog", - "contact": "Contact" - }, - - "footer": { - "links": { - "home": "Home", - "contact": "Contact Me", - "privacy": "Privacy Policy" - } - }, - - "blog": { - "article": { - "readMore": "Read More" - } - }, - - "error": { - "title": "An error occured.", - "body": "An error occured, please try again later." - }, - - "pages": { - "home": { - "banner": { - "title": "About Dominic Masters", - "subtitle": "Developer, Nerd, Occasionally Funny." - }, - "video": { - "heading": "Learn about me", - "paragraph": "Watch this short video about me, made by.. me!" - }, - "programming": { - "heading": "Programmer", - "paragraph": () => { - return ( -

    - I am a programmer, it's my job, as well as my passion. I have been - doing programming in some form for as long as I can remember, and - continue to learn and enhance my knowledge in the field. -

    -

    - With over { new Date().getFullYear() - 2004 } years of experience, - and countless lines of code written, there isn't much I can't - develop. Whether you're looking to build a web project, create a - game engine, convert data from one format to another, or maintain - an old legacy system, I can do it all. -

    -     ); - } - }, - "platforms": { - "heading": "Platforms I work with", - "footer": "... And many more!", - "shopify": "Shopify", - "react": "React", - "monogame": "MonoGame", - "nodejs": "NodeJS", - "csharp": "C#", - "php": "PHP", - "java": "Java", - "neto": "neto", - "pgsql": "PostgreSQL", - "mysql": "MySQL", - "heroku": "Heroku", - "opengl": "OpenGL", - "discord": "Discord", - "twitch": "Twitch", - "twitter": "Twitter", - "googlecloud": "Google Cloud Platform" - }, - "work": { - "heading": "Some of my work", - "paragraph": "Interested to see what I can do? Check out some of my personal favourite projects that I have built!", - "kopa": { - "heading": "KOPA Life", - "description": () => { return ( - -

    - KOPA Life is a modern modular furniture designer in Australia. - Since 2016 they have created many modern design pieces, including - their signature KUBE, a modular couch available in removable and - attachable components. -

    -

    - The website features a modern minimalistic design, with a focus - on great imagery, and a fully fledged in-site 3D Couch builder, - which allows you to design your perfect couch and hit one button - to purchase the couch you've designed. -

    -

    - I built this website using the Shopify Slate framework, as well - as an internal custom framework I built while working at - Process Creative - -

    - - ); } - }, - "smai": { - "heading": "SMAI", - "description": () => { return ( - -

    - Sport Master Athletics International (SMAI) are producers and - sellers of athletic and martial art goods. They have been - operating since 1985 and have grown to now sell over 3000 - different products. -

    -

    - I have worked on both their front-end website and design, as - well as creating many custom integrations, and primarily an - integration with the StarTrack courier service to offer live - rates for their website shipping. This project was completed - while I was working at - Process Creative - -

    -     - ); } - }, - "cocksox": { - "heading": "Cocksox", - "description": () => { return ( - -

    - Cocksox is a male fashion focused underwear company, with a sexy - product requiring an equally sexy site to boast its pride. -

    -

    - Requiring a strong and versitile mobile browsing experience, as - well as many fast and easy to use filtering systems to help - search through their range to find the perfect fit for each pair - of underpants. I built on Shopify while working at - Process Creative - -

    -     - ); } - }, - "ozhair": { - "heading": "Oz Hair & Beauty", - "description": () => { return ( -

    - Oz Hair and Beauty is an online hair and beauty retail store from - Sydney, Australia with a focus on selling the best brands at an - affordable price. -

    - -

    - With a large inventory and constantly changing marketing campaigns, - the website was built by to be fast, easily filtered and searched, - and flexible enough to feature any single group of products at a - given time. This was another project I worked on while performing - my daily job at - Process Creative - -

    -     ); } - }, - "footer": "Want to get in touch?", - "footerButton": "Contact Me" - } - }, - - "contact": { - "title": "Contact Me", - "heading": "Contact Me", - "paragraph": "\ - Want to get in touch with me? Fill out this easy form and I should be \ - in touch shortly to chat! More of a phone person? Leave a number \ - and we can chat.\ - ", - "name": { - "label": "Name", - "placeholder": "Enter your name." - }, - - "email": { - "label": "Email Address", - "placeholder": "Email Address." - }, - - "message": { - "label": "Message", - "placeholder": "Message." - }, - - "send": "Send", - "reset": "Reset", - - "error": "An error has occured!", - "success": { - "heading": "Message sent!", - "paragraph": "Your email was sent! I should respond shortly, thanks for your patience!" - } - }, - - "privacy": { - "title": "Privacy Policy", - "heading": "Privacy Policy", - "policy": Policy - }, - - "error": { - "title": "Uh-Oh!", - "body": "An error occured! Try again later." - }, - - "loading": { - "title": "Please Wait..." - }, - - "blog": { - "title": "Blog", - "error": { - "title": "Failed to get the blog", - "body": "Failed to get the blogs and articles from the server, please try again later or refresh your browser." - } - }, - - "article": { - "title": "Article", - "error": { - "title": "Failed to get article", - "body": "Failed to get the article from the server, please try again later or refresh your browser." - } - } - }, - - "modal": { - "close": "Close" - }, - - "window": { - "address": "Address:" - } -} diff --git a/public/language/policy-english.jsx b/public/language/policy-english.jsx deleted file mode 100644 index 540fcd1..0000000 --- a/public/language/policy-english.jsx +++ /dev/null @@ -1,185 +0,0 @@ -// Copyright (c) 2018 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 React, { Fragment } from 'react'; - -export default() => { - return ( - -

    Effective date: June 27, 2018

    - -

    - domsPlace ("us", "we", or "our") operates the - https://domsplace.com website - - (the "Service"). -

    - -

    - This page informs you of our policies regarding the collection, use, and - disclosure of personal data when you use our Service and the choices you - have associated with that data. -

    - -

    - We use your data to provide and improve the Service. By using the - Service, you agree to the collection and use of information in - accordance with this policy. Unless otherwise defined in this Privacy - Policy, terms used in this Privacy Policy have the same meanings as in - our Terms and Conditions, accessible from - https://domsplace.com - -

    - - -

    Information Collection And Use

    -

    - We collect several different types of information for various purposes - to provide and improve our Service to you. -

    - -

    Types of Data Collected

    -

    Personal Data

    -

    - While using our Service, we may ask you to provide us with certain - personally identifiable information that can be used to contact or - identify you ("Personal Data"). Personally identifiable information may - include, but is not limited to: -

    -
      -
    • Email address
      • -
    • First name and last name
      • -
    • Phone number
      • -
    • Cookies and Usage Data
      • -
    - -

    Usage Data

    -

    - We may also collect information how the Service is accessed and used = - ("Usage Data"). This Usage Data may include information such as your - computer's Internet Protocol address (e.g. IP address), browser type, - browser version, the pages of our Service that you visit, the time and - date of your visit, the time spent on those pages, unique device - identifiers and other diagnostic data. -

    - -

    Tracking & Cookies Data

    -

    - We use cookies and similar tracking technologies to track the activity - on our Service and hold certain information. -

    -

    - Cookies are files with small amount of data which may include an - anonymous unique identifier. Cookies are sent to your browser from a - website and stored on your device. Tracking technologies also used are - beacons, tags, and scripts to collect and track information and to - improve and analyze our Service. -

    -

    - You can instruct your browser to refuse all cookies or to indicate when - a cookie is being sent. However, if you do not accept cookies, you may - not be able to use some portions of our Service. -

    -

    Examples of Cookies we use:

    -
      -
    • Session Cookies. We use Session Cookies to operate our Service.
      • -
    • Preference Cookies. We use Preference Cookies to remember your preferences and various settings.
      • -
    • Security Cookies. We use Security Cookies for security purposes.
      • -
    - -

    Use of Data

    -

    domsPlace uses the collected data for various purposes:

    -
      -
    • To provide and maintain the Service
      • -
    • To notify you about changes to our Service
      • -
    • To allow you to participate in interactive features of our Service when you choose to do so
      • -
    • To provide customer care and support
      • -
    • To provide analysis or valuable information so that we can improve the Service
      • -
    • To monitor the usage of the Service
      • -
    • To detect, prevent and address technical issues
      • -
    - -

    Transfer Of Data

    -

    Your information, including Personal Data, may be transferred to — and maintained on — computers located outside of your state, province, country or other governmental jurisdiction where the data protection laws may differ than those from your jurisdiction.

    -

    If you are located outside Australia and choose to provide information to us, please note that we transfer the data, including Personal Data, to Australia and process it there.

    -

    Your consent to this Privacy Policy followed by your submission of such information represents your agreement to that transfer.

    -

    domsPlace will take all steps reasonably necessary to ensure that your data is treated securely and in accordance with this Privacy Policy and no transfer of your Personal Data will take place to an organization or a country unless there are adequate controls in place including the security of your data and other personal information.

    - -

    Disclosure Of Data

    - -

    Legal Requirements

    -

    domsPlace may disclose your Personal Data in the good faith belief that such action is necessary to:

    -
      -
    • To comply with a legal obligation
      • -
    • To protect and defend the rights or property of domsPlace
      • -
    • To prevent or investigate possible wrongdoing in connection with the Service
      • -
    • To protect the personal safety of users of the Service or the public
      • -
    • To protect against legal liability
      • -
    - -

    Security Of Data

    -

    The security of your data is important to us, but remember that no method of transmission over the Internet, or method of electronic storage is 100% secure. While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.

    - -

    Service Providers

    -

    We may employ third party companies and individuals to facilitate our Service ("Service Providers"), to provide the Service on our behalf, to perform Service-related services or to assist us in analyzing how our Service is used.

    -

    These third parties have access to your Personal Data only to perform these tasks on our behalf and are obligated not to disclose or use it for any other purpose.

    - -

    Analytics

    -

    We may use third-party Service Providers to monitor and analyze the use of our Service.

    -
      -
    • -

      Google Analytics

      -

      Google Analytics is a web analytics service offered by Google that tracks and reports website traffic. Google uses the data collected to track and monitor the use of our Service. This data is shared with other Google services. Google may use the collected data to contextualize and personalize the ads of its own advertising network.

      -

      You can opt-out of having made your activity on the Service available to Google Analytics by installing the Google Analytics opt-out browser add-on. The add-on prevents the Google Analytics JavaScript (ga.js, analytics.js, and dc.js) from sharing information with Google Analytics about visits activity.

      -

      For more information on the privacy practices of Google, please visit the Google Privacy & Terms web page: https://policies.google.com/privacy?hl=en -

      -
      • -
    - - -

    Links To Other Sites

    -

    Our Service may contain links to other sites that are not operated by us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.

    -

    We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.

    - - -

    Children's Privacy

    -

    Our Service does not address anyone under the age of 18 ("Children").

    -

    We do not knowingly collect personally identifiable information from anyone under the age of 18. If you are a parent or guardian and you are aware that your Children has provided us with Personal Data, please contact us. If we become aware that we have collected Personal Data from children without verification of parental consent, we take steps to remove that information from our servers.

    - - -

    Changes To This Privacy Policy

    -

    We may update our Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on this page.

    -

    We will let you know via email and/or a prominent notice on our Service, prior to the change becoming effective and update the "effective date" at the top of this Privacy Policy.

    -

    You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page.

    - - -

    Contact Us

    -

    If you have any questions about this Privacy Policy, please contact us:

    - -     - ); -} diff --git a/public/objects/animation/fade/ElementScrollFader.jsx b/public/objects/animation/fade/ElementScrollFader.jsx deleted file mode 100644 index f3d515c..0000000 --- a/public/objects/animation/fade/ElementScrollFader.jsx +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './ElementScrollFader.scss'; - -export default class ElementScrollFader extends React.Component { - constructor(props) { - super(props); - - this.state = { - waiting: true, - visible: false - }; - - this.onScrollBound = this.onScroll.bind(this); - this.checkEffectBound = this.checkEffect.bind(this); - - this.rect = null; - } - - componentDidMount() { - document.addEventListener('scroll', this.onScrollBound, true); - } - - componentWillUnmount() { - this.detachListener(); - } - - //Used for rect calculation - updateRectangle() { - if(!this.refs.fader) return; - this.rect = this.refs.fader.getBoundingClientRect(); - } - - onScroll(e) { - this.checkEffect(); - } - - //Common functions - detachListener() { - document.removeEventListener('scroll', this.onScrollBound); - } - - checkEffect() { - let { waiting, visible } = this.state; - let { onVisible } = this.props; - if(!this.refs.fader) return; - - if(waiting) { - this.setState({ - waiting: false - }); - } - if(visible) return this.detachListener(); - - let rect = this.refs.fader.getBoundingClientRect() - - //If our top is at least half way UP the page, show - if(rect.y > (window.innerHeight*0.75)) return; - - this.setState({ - visible: true - }); - - this.detachListener();//stop Listening - - if(onVisible) onVisible(this.refs.fader); - return true; - } - - render() { - let newProps = {...this.props}; - let { from, className } = this.props; - let { visible, waiting } = this.state; - - from = from || "top"; - - ["from"].forEach(e => delete newProps[e]); - - let clazz = `o-element-scroll-fader from-${from}`; - if(visible || waiting) clazz += " is-visible"; - if(className) clazz += ` ${className}`; - - return
    - } -} diff --git a/public/objects/animation/fade/ElementScrollFader.scss b/public/objects/animation/fade/ElementScrollFader.scss deleted file mode 100644 index a427e90..0000000 --- a/public/objects/animation/fade/ElementScrollFader.scss +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Element Scroll Fader - * Simple fade in animation that's activated when a user scrolls down far - * enough to see the element. - * - * Dependencies: - * styles/settings/animation.scss - * styles/tools/_transform.scss - * - * Version: - * 1.0.0 - 2018/06/08 - */ -@import '~@styles/global'; - -$o-element-scroll-fader--speed: 0.75s; -$o-element-scroll-fader--amount: 15%; - -.o-element-scroll-fader { - opacity: 0; - transition: all $o-element-scroll-fader--speed $s-animation--ease-out; - will-change: transform; - - $amt: $o-element-scroll-fader--amount;//Shorthand - &.from-top { @include t-translate-y(-$amt); } - &.from-bottom { @include t-translate-y( $amt); } - &.from-left { @include t-translate-x(-$amt); } - &.from-right { @include t-translate-x( $amt); } - - &.is-visible { - opacity: 1; - @include t-translate(0, 0); - } -} diff --git a/public/objects/blog/article/ArticleThumbnail.jsx b/public/objects/blog/article/ArticleThumbnail.jsx deleted file mode 100644 index 6a3dd04..0000000 --- a/public/objects/blog/article/ArticleThumbnail.jsx +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import { NavLink } from 'react-router-dom'; - -import { withLanguage } from '@public/language/Language'; - -import Image from '@objects/image/Image'; -import ContentBox from '@objects/content/box/ContentBox'; -import FloatingContentBox from '@objects/content/box/FloatingContentBox'; -import { Heading2, Paragraph } from '@objects/typography/Typography'; - -import Styles from './ArticleThumbnail.scss'; - -export default withLanguage(props => { - let { className, article, lang, index } = props; - index = (index || 0)%4; - - let pos = ""; - if(index/2.0 == Math.round(index/2)) { - pos += "top"; - pos += index == 2 ? " left" : " right"; - } else { - pos += "bottom"; - pos += index == 1 ? " left" : " right"; - } - - return ( -
    - - - {/* Image */} - {article.title} - - {/* Title */} - - - { article.title } - - - - -
    - - { article.shortDescription } - - - - { lang.blog.article.readMore } - -
    -     -
    - ); -}); diff --git a/public/objects/blog/article/ArticleThumbnail.scss b/public/objects/blog/article/ArticleThumbnail.scss deleted file mode 100644 index 3afb64a..0000000 --- a/public/objects/blog/article/ArticleThumbnail.scss +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Article Thumbnail - * Styles for displaying an article in a short thumbnail object that can be - * put in the usual places. - * - * Version: - * 1.0.0 - 2018/10/31 - */ -@import '~@styles/global'; - -.o-article-thumbnail { - padding-bottom: 1.5em; - - &__header { - display: block; - position: relative; - } - - &__image { - display: block; - width: 100%; - } - - &__title { - margin: 0; - width: 100%; - - &-box { - transition: all 0.3s $s-animation--ease-out; - - .o-article-thumbnail__header:hover & { - transform: translateY(-7.5%); - } - } - } - - &__content { - padding: 0 0.5em; - } -} diff --git a/public/objects/content/Content.jsx b/public/objects/content/Content.jsx deleted file mode 100644 index d4de545..0000000 --- a/public/objects/content/Content.jsx +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2018 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 React, { Fragment } from 'react'; -import { Paragraph } from './../typography/Typography'; - -const DoLine = content => { - //TODO: Support things like hyperlinks etc. - let parts = []; - let currentBuffer = ``; - let bits = content.split(' '); - for(let i = 0; i < bits.length; i++) { - let s = bits[i]; - if(s.startsWith('https://') || s.startsWith('http://')) { - parts.push({ s }); - } else { - parts.push(s); - } - if(i < (bits.length-1)) parts.push(' '); - } - return { parts } -}; - -const DoParagraph = content => { - return { DoLine(e) }
     -})} />; - -export default props => { - let { content, children } = props; - content = content || children || ""; - - return ( - - { content.split('\n\n').map(e => { - return { DoParagraph(e) } - }) } - - ); -}; diff --git a/public/objects/content/box/ContentBox.jsx b/public/objects/content/box/ContentBox.jsx deleted file mode 100644 index 942235e..0000000 --- a/public/objects/content/box/ContentBox.jsx +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Content from './../Content'; -import Styles from './ContentBox.scss'; - -export default (props) => { - let newProps = {...props}; - let { className, box, content } = props; - - ["box","content"].forEach(e => delete newProps[e]); - - let clazz = "o-content-box"; - if(box) clazz += " is-box" - if(className) clazz += ` ${className}`; - if(content) newProps.children = - - return
    ; -}; diff --git a/public/objects/content/box/ContentBox.scss b/public/objects/content/box/ContentBox.scss deleted file mode 100644 index 15b85d7..0000000 --- a/public/objects/content/box/ContentBox.scss +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Content Box - * Simple box to hold content, comes with great settings! - * - * Dependencies: - * styles/settings/colors.scss - * styles/tools/_shadow.scss - * - * Version: - * 1.0.0 - 2018/06/19 - */ -@import '~@styles/global'; -$o-content-box--padding: 1em; - -.o-content-box { - position: relative; - - &.is-box { - @extend %t-dp--shadow; - background: $s-color--background; - padding: $o-content-box--padding; - } -} diff --git a/public/objects/content/box/FloatingContentBox.scss b/public/objects/content/box/FloatingContentBox.scss deleted file mode 100644 index 0f13a68..0000000 --- a/public/objects/content/box/FloatingContentBox.scss +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Floating Content Box - * Simple Floating Box, designed to sit content inside it. - * - * Dependencies: - * styles/settings/responsive.scss - * styles/tools/_absolute-centering.scss - * styles/tools/_responsive.scss - * - * Version: - * 1.0.0 - 2018/05/11 - */ -@import '~@styles/global'; - -$o-floating--inset: 5%; - -.o-floating-content-box { - @include t-absolute-position-options($o-floating--inset); - max-width: 100% - ($o-floating--inset * 2); - - &.is-medium,&.is-large { - width: 100%; - } - - &__inner { - position: relative; - } - - //Media Queries - @include t-media-query($s-xsmall-up) { - &.is-medium { - width: 450px; - } - } - - @include t-media-query($s-small-up) { - &.is-large { - width: 700px; - } - } - - @include t-media-query($s-large-up) { - &.is-medium { - width: 550px; - } - - &.is-large { - width: 750px; - } - } -} diff --git a/public/objects/image/Image.jsx b/public/objects/image/Image.jsx deleted file mode 100644 index 3f874b7..0000000 --- a/public/objects/image/Image.jsx +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; -import LoadableImage from './LoadableImage'; - -const DPI_RATIOS = [1,2,4]; - -export default (props) => { - let newProps = {...props}; - - //Local Scope props - let { - loadable, image, src, alt, width, height, sources, onLoad, onError, - maxWidth, maxHeight, images - } = props; - - //Delete bad props - [ - "loadable", "image", "src", "alt", "width", "height", "sources", "onLoad", - "onError", "maxWidth", "maxHeight", "images" - ].forEach(e => delete newProps[e]); - - width = parseInt(width) || undefined; - maxWidth = parseInt(maxWidth) || undefined; - height = parseInt(height) || undefined; - maxHeight = parseInt(maxHeight) || undefined; - - if(loadable) return ; - - //Has image prop? Image prop may be either an array of sources of a image. - if(image) { - if(Array.isArray(image)) { - sources = sources || image; - } else { - src = src || image; - } - } - - if(src) { - if(src.images) sources = sources || src.images; - if(src.width) width = width || src.width; - if(src.height) height = height || src.height; - } - - //Image - sources = sources || []; - - //Sort the sources by their size - sources.sort((l,r) => { - return (l.size||l.width) - (r.size||r.width); - }); - - let sourcesByWidth = {}; - let sourceElements = []; - - let defaultSrc = src; - let defaultAlt = alt; - let defaultWidth = width; - let defaultHeight = height; - - //Iterate over supplied sources - for(let i = 0; i < sources.length; i++) { - let source = sources[i]; - let width = source.size || source.width; - - //Thanks to maxWidth prop we need to check if this iteration is the last. - let maxWidthBreak = false; - if(maxWidth && i > 0) { - if(width >= maxWidth) maxWidthBreak = true; - } - - - DPI_RATIOS.forEach(ratio => { - let scaledWidth = Math.round(width / ratio); - - //Don't scale less than the smallest image (i.e. 200px@1x shouldn't be 50@4x) - if(scaledWidth < (sources[0].size||sources[0].width)) return false; - - let o = {...source}; - o.scale = ratio;//Inject scale (DPI ratio) - - //Create an array for this screen width - let widthKey = `${scaledWidth}`; - sourcesByWidth[widthKey] = sourcesByWidth[widthKey] || []; - sourcesByWidth[widthKey].push(o);//Add this source - }); - - //Was this the last iteration? - if(maxWidthBreak) break; - } - - //Sort by size in ascending order - let keys = Object.keys(sourcesByWidth); - keys.sort((l, r) => { - return parseInt(l) - parseInt(r); - }); - - //let breakNext = false; - for(let i = 0; i < keys.length; i++) { - let k = keys[i];//The pixel size - - let ss = sourcesByWidth[k];//Sources at this pixel resolution (array of sources) - if(!ss.length) continue; - - let mediaQuery;//Media query - let sss = []; - - //Try and make this media query be max width by the next key - if(i+1 < keys.length) { - let nextKey = keys[i+1]; - mediaQuery = `(max-width:${nextKey}px)`; - } else { - mediaQuery = `(min-width:${k}px)`; - } - - for(let x = 0; x < ss.length; x++) { - let scale = ss[x]; - let source = scale.src || scale.path; - sss.push( source + (scale.scale && scale.scale!=1 ? " "+scale.scale+"x" : "") ); - } - - sourceElements.push(); - } - - return ( - - { sourceElements } - { - - ); -} diff --git a/public/objects/image/LoadableImage.jsx b/public/objects/image/LoadableImage.jsx deleted file mode 100644 index 957ab0e..0000000 --- a/public/objects/image/LoadableImage.jsx +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './LoadableImage.scss'; - -import Image from './Image'; -import Loader from './../loading/Loader'; -import BoxSizer from './../layout/BoxSizer'; - -export default class LoadableImage extends React.Component { - constructor(props) { - super(props); - - this.state = { - loading: true - }; - } - - componentDidMount() {} - componentWillUnmount() {} - - onLoad() { - let { onLoad } = this.props; - if(onLoad) onLoad(); - - this.setState({ - loading: false - }); - } - - onError() { - let { onError } = this.props; - if(onError) onError(); - - this.setState({ - loading: false - }); - } - - render() { - let newProps = {...this.props}; - let { loading } = this.state; - let { className, width, height } = this.props; - - ["loadable"].forEach(e => delete newProps[e]); - - let loader,imageSizer; - let image = this.onLoad()} - onError={() => this.onError()} - />; - - let clazz = "o-loadable-image"; - - if(loading) { - clazz += " is-loading"; - loader = ; - if(width && height) { - imageSizer = - } - } else { - clazz += " is-loaded"; - } - - if(className) clazz += ` ${className}`; - - return ( -
    - { loader } - { imageSizer } -
    - { image } -
    -
    - ); - } -} diff --git a/public/objects/image/LoadableImage.scss b/public/objects/image/LoadableImage.scss deleted file mode 100644 index 91359c0..0000000 --- a/public/objects/image/LoadableImage.scss +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Loadable Image - * Image that gets loaded in the background - * - * Dependencies: - * - * Version: - * 1.0.0 - 2018/07/11 - */ -@import '~@styles/global'; - -@include t-keyframes(o-loadable-image--load-flash) { - from { - background: transparent; - } - - 50% { - background: #DDD; - } - - to { - background: transparent; - } -} - -.o-loadable-image { - - &__image-container { - opacity: 1; - transition: all 1s $s-animation--ease-out; - transition-delay: 0.5s; - } - - &.is-loading { - position: relative; - - @include t-animation-name(o-loadable-image--load-flash); - @include t-animation-timing-function(linear); - @include t-animation-duration(2s); - @include t-animation-iteration-count(infinite); - - .o-loadable-image__image-container { - opacity: 0; - } - } -} diff --git a/public/objects/input/Input.jsx b/public/objects/input/Input.jsx deleted file mode 100644 index 78be290..0000000 --- a/public/objects/input/Input.jsx +++ /dev/null @@ -1,162 +0,0 @@ -// Copyright (c) 2018 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 React from 'react'; - -import Styles from './Input.scss'; - -import Keyboard from '@public/keyboard/Keyboard'; - -import Button from './button/Button'; -import ButtonGroup from './button/ButtonGroup'; -import Form, { FormManager, FormGroup } from './form/Form'; -import Label from './label/Label'; - -export default class Input extends React.Component { - constructor(props) { - super(props); - - this.state = { - value: props.value || props.children || "", - focused: false - }; - } - - isFocused() { - return this.state && this.state.focused === true; - } - - componentDidMount() { - let { manager } = this.props; - if(manager) manager.addInput(this); - Keyboard.addListener(this); - } - - componentWillUnmount() { - if(this.props.manager) this.props.manager.removeInput(this); - Keyboard.removeListener(this); - } - - onKeyUp(e, k) { - if(!this.props.manager) return; - if(!this.isFocused()) return; - if(!k.isSubmit()) return; - this.props.manager.submit(); - } - - onChange(e, a, b) { - //Try my props - if(this.props.onChange && this.props.onChange(e) === false) return false; - - //Try the form manager - if(this.props.manager && this.props.manager.onChange(this, e) === false) { - return false; - } - - //Try something else? - this.setState({ - value: e.target.value - }); - } - - onFocus() { - this.setState({ focused: true }); - } - - onBlur() { - this.setState({ focused: false }); - } - - render() { - let newProps = {...this.props}; - let { - className, type, children, style, error, danger, primary, - warning, manager - } = newProps; - - //Clear bad props - [ - "error", "danger", "primary", "warning", "manager", "style", "children", - "value" - ].forEach(e => delete newProps[e]); - - //Prop defaults - type = type || "text"; - - //Gen classes - let clazzes = "o-input"; - let innerClazzes = "o-input__inner"; - - //Style - if(primary) style = "primary"; - if(warning) style = "warning"; - if(error || danger) style = "danger"; - - //Classes - clazzes += ` is-${type}`; - - if(style) { - clazzes += ` o-input--style-${style}`; - innerClazzes += ` o-input--style-${style}__inner`; - } - - if(className) { - clazzes += ` ${className}`; - innerClazzes += ` ${className}-element`; - } - - //Now create the element - //First we need to switch things like submit and reset - if(["submit","reset","button"].indexOf(type) !== -1) { - return