diff --git a/jenkins/deploy.sh b/jenkins/deploy.sh old mode 100755 new mode 100644 diff --git a/simon987/build/webpack.dev.conf.js b/simon987/build/webpack.dev.conf.js old mode 100755 new mode 100644 diff --git a/simon987/index.html b/simon987/index.html index 1b57065..adba335 100644 --- a/simon987/index.html +++ b/simon987/index.html @@ -3,7 +3,7 @@ - + simon987.net diff --git a/simon987/package-lock.json b/simon987/package-lock.json index a4527f9..2297f6b 100644 --- a/simon987/package-lock.json +++ b/simon987/package-lock.json @@ -5552,9 +5552,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.camelcase": { "version": "4.3.0", @@ -5951,9 +5951,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -9824,9 +9824,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -10738,38 +10738,15 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "uniq": { diff --git a/simon987/package.json b/simon987/package.json index 0d666bd..643c3e3 100644 --- a/simon987/package.json +++ b/simon987/package.json @@ -1,7 +1,7 @@ { "name": "simon987.net", - "version": "1.0.0", - "description": "A Vue.js project", + "version": "1.2.0", + "description": "My personal website", "author": "simon987 ", "private": true, "scripts": { @@ -11,7 +11,7 @@ }, "dependencies": { "d3": "^5.9.2", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "pixi.js": "^4.8.7", "vue": "^2.6.10", "vue-material": "^1.0.0-beta-11", diff --git a/simon987/src/App.vue b/simon987/src/App.vue index 3780981..ff7c537 100644 --- a/simon987/src/App.vue +++ b/simon987/src/App.vue @@ -5,6 +5,9 @@ + + diff --git a/simon987/src/components/Grid.vue b/simon987/src/components/Grid.vue index 99a7c36..6859bf0 100644 --- a/simon987/src/components/Grid.vue +++ b/simon987/src/components/Grid.vue @@ -9,17 +9,48 @@ import Grid from '../Grid'; import Jumbotron from "./Jumbotron"; -let lightTheme = { - c1: 0xf9989f, - c2: 0xfccb8f, - c3: 0xc5f8c8 -}; - -let darkTheme = { - c1: 0x3a3b52, - c2: 0x33284b, - c3: 0x2c2332 -}; +let themes = [ + { + c1: 0xf9989f, + c2: 0xfccb8f, + c3: 0xc5f8c8 + }, + { + c1: 0x3a3b52, + c2: 0x33284b, + c3: 0x2c2332 + }, + { + c1: 0x547d59, + c2: 0xa0b97b, + c3: 0xbdc17c + }, + { + c1: 0xd9bf68, + c2: 0xe05b7c, + c3: 0x811143 + }, + { + c1: 0x70ce9a, + c2: 0xf2f1c7, + c3: 0xc15b41 + }, + { + c1: 0xEAEBD7, + c2: 0x74645F, + c3: 0xF3876A + }, + { + c1: 0xADBCB9, + c2: 0xC184E9, + c3: 0xD8C5C3 + }, + { + c1: 0xFA520B, + c2: 0xFCB20C, + c3: 0xE5E113 + }, +]; const urlParams = new URLSearchParams(window.location.search); const size = urlParams.get('size'); @@ -34,8 +65,7 @@ export default { let grid = new Grid( size ? size : window.innerWidth < 1000 ? 15 : 25, window.innerWidth < 1000 ? 80 : 40, - // darkTheme - lightTheme + themes ); grid.setup(); grid.resize(); diff --git a/simon987/src/components/Jumbotron.vue b/simon987/src/components/Jumbotron.vue index 88af325..9082bd6 100644 --- a/simon987/src/components/Jumbotron.vue +++ b/simon987/src/components/Jumbotron.vue @@ -1,52 +1,33 @@