diff --git a/package-lock.json b/package-lock.json index 86697bc..08bc155 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,8 @@ "momentjs": "^2.0.0", "vue": "^3.2.13", "vue-router": "^4.0.3", - "vuex": "^4.0.0" + "vuex": "^4.0.0", + "webmix": "^1.0.13" }, "devDependencies": { "@babel/core": "^7.12.16", @@ -31,7 +32,9 @@ "babel-jest": "^27.0.6", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", - "jest": "^27.0.5" + "jest": "^27.0.5", + "sass": "^1.52.1", + "sass-loader": "^13.0.0" } }, "node_modules/@achrinza/node-ipc": { @@ -8253,6 +8256,12 @@ "node": ">= 4" } }, + "node_modules/immutable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", + "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", + "dev": true + }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -8744,6 +8753,11 @@ "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==", "dev": true }, + "node_modules/jbecool": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/jbecool/-/jbecool-1.0.17.tgz", + "integrity": "sha512-FAAwHn6t9Y5AJNNmDZRhrR+6GhujIl3tItBexsfuYbkJz6gvwfHZgtQ2jXaIf8g8iCxEUNd+/9zb7jDHS+Vqng==" + }, "node_modules/jest": { "version": "27.5.1", "resolved": "https://registry.npmmirror.com/jest/-/jest-27.5.1.tgz", @@ -13775,6 +13789,61 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "node_modules/sass": { + "version": "1.52.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", + "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/sass-loader": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz", + "integrity": "sha512-IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q==", + "dev": true, + "dependencies": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + }, + "engines": { + "node": ">= 14.15.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "sass": "^1.3.0", + "sass-embedded": "*", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + } + } + }, "node_modules/saxes": { "version": "5.0.1", "resolved": "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz", @@ -15413,6 +15482,14 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", "dev": true }, + "node_modules/webmix": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/webmix/-/webmix-1.0.13.tgz", + "integrity": "sha512-H5siSXijYX4p5kb/mWrC38jhhkMejKqc7BY8zkj4Ih/oOoZt23cjaXAIR0cKPBqJZtdOPNVoQqID6BFpOzt/FQ==", + "dependencies": { + "jbecool": "^*" + } + }, "node_modules/webpack": { "version": "5.70.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz", @@ -18710,7 +18787,8 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.1.tgz", "integrity": "sha512-5J/n+Ht4r2eVuncwCXcZPHzYCz/2haktle4WcggWiKeg3jSQVUJbjviPBs6sOo3y/LG3CEfZMP9bPJjVDbexpQ==", - "dev": true + "dev": true, + "requires": {} }, "@vue/cli-service": { "version": "5.0.1", @@ -19040,7 +19118,8 @@ "version": "2.0.0", "resolved": "https://registry.npmmirror.com/@vue/test-utils/-/test-utils-2.0.0.tgz", "integrity": "sha512-zL5kygNq7hONrO1CzaUGprEAklAX+pH8J1MPMCU3Rd2xtSYkZ+PmKU3oEDRg8VAGdL5lNJHzDgrud5amFPtirw==", - "dev": true + "dev": true, + "requires": {} }, "@vue/vue-loader-v15": { "version": "npm:vue-loader@15.9.8", @@ -19321,13 +19400,15 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true + "dev": true, + "requires": {} }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "8.2.0", @@ -19405,7 +19486,8 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "requires": {} }, "ansi-colors": { "version": "4.1.1", @@ -20639,7 +20721,8 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "dev": true + "dev": true, + "requires": {} }, "csso": { "version": "4.2.0", @@ -22389,7 +22472,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true + "dev": true, + "requires": {} }, "ieee754": { "version": "1.2.1", @@ -22403,6 +22487,12 @@ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, + "immutable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", + "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", + "dev": true + }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -22763,6 +22853,11 @@ "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==", "dev": true }, + "jbecool": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/jbecool/-/jbecool-1.0.17.tgz", + "integrity": "sha512-FAAwHn6t9Y5AJNNmDZRhrR+6GhujIl3tItBexsfuYbkJz6gvwfHZgtQ2jXaIf8g8iCxEUNd+/9zb7jDHS+Vqng==" + }, "jest": { "version": "27.5.1", "resolved": "https://registry.npmmirror.com/jest/-/jest-27.5.1.tgz", @@ -23533,7 +23628,8 @@ "version": "1.2.2", "resolved": "https://registry.npmmirror.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "dev": true + "dev": true, + "requires": {} }, "jest-regex-util": { "version": "27.5.1", @@ -25834,25 +25930,29 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.0.tgz", "integrity": "sha512-L0IKF4jAshRyn03SkEO6ar/Ipz2oLywVbg2THf2EqqdNkBwmVMxuTR/RoAltOw4piiaLt3gCAdrbAqmTBInmhg==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-empty": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.0.tgz", "integrity": "sha512-782T/buGgb3HOuHOJAHpdyKzAAKsv/BxWqsutnZ+QsiHEcDkY7v+6WWdturuBiSal6XMOO1p1aJvwXdqLD5vhA==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-loader": { "version": "6.2.1", @@ -25942,7 +26042,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -25977,7 +26078,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "dev": true + "dev": true, + "requires": {} }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -26571,6 +26673,27 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "sass": { + "version": "1.52.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", + "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", + "dev": true, + "requires": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + } + }, + "sass-loader": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz", + "integrity": "sha512-IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q==", + "dev": true, + "requires": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + } + }, "saxes": { "version": "5.0.1", "resolved": "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz", @@ -27870,6 +27993,14 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", "dev": true }, + "webmix": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/webmix/-/webmix-1.0.13.tgz", + "integrity": "sha512-H5siSXijYX4p5kb/mWrC38jhhkMejKqc7BY8zkj4Ih/oOoZt23cjaXAIR0cKPBqJZtdOPNVoQqID6BFpOzt/FQ==", + "requires": { + "jbecool": "^*" + } + }, "webpack": { "version": "5.70.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz", @@ -28149,7 +28280,8 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "dev": true + "dev": true, + "requires": {} } } }, @@ -28303,7 +28435,8 @@ "version": "7.5.7", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "3.0.0", diff --git a/package.json b/package.json index a55cefa..001593b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "momentjs": "^2.0.0", "vue": "^3.2.13", "vue-router": "^4.0.3", - "vuex": "^4.0.0" + "vuex": "^4.0.0", + "webmix": "^1.0.13" }, "devDependencies": { "@babel/core": "^7.12.16", @@ -32,7 +33,9 @@ "babel-jest": "^27.0.6", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", - "jest": "^27.0.5" + "jest": "^27.0.5", + "sass": "^1.52.1", + "sass-loader": "^13.0.0" }, "eslintConfig": { "root": true, diff --git a/src/assets/avocado/1.png b/src/assets/crops/avocado/1.png similarity index 100% rename from src/assets/avocado/1.png rename to src/assets/crops/avocado/1.png diff --git a/src/assets/avocado/2.png b/src/assets/crops/avocado/2.png similarity index 100% rename from src/assets/avocado/2.png rename to src/assets/crops/avocado/2.png diff --git a/src/assets/avocado/3.png b/src/assets/crops/avocado/3.png similarity index 100% rename from src/assets/avocado/3.png rename to src/assets/crops/avocado/3.png diff --git a/src/assets/avocado/4.png b/src/assets/crops/avocado/4.png similarity index 100% rename from src/assets/avocado/4.png rename to src/assets/crops/avocado/4.png diff --git a/src/assets/avocado/5.png b/src/assets/crops/avocado/5.png similarity index 100% rename from src/assets/avocado/5.png rename to src/assets/crops/avocado/5.png diff --git a/src/assets/avocado/6.png b/src/assets/crops/avocado/6.png similarity index 100% rename from src/assets/avocado/6.png rename to src/assets/crops/avocado/6.png diff --git a/src/assets/cassava/1.png b/src/assets/crops/cassava/1.png similarity index 100% rename from src/assets/cassava/1.png rename to src/assets/crops/cassava/1.png diff --git a/src/assets/cassava/2.png b/src/assets/crops/cassava/2.png similarity index 100% rename from src/assets/cassava/2.png rename to src/assets/crops/cassava/2.png diff --git a/src/assets/cassava/3.png b/src/assets/crops/cassava/3.png similarity index 100% rename from src/assets/cassava/3.png rename to src/assets/crops/cassava/3.png diff --git a/src/assets/cassava/4.png b/src/assets/crops/cassava/4.png similarity index 100% rename from src/assets/cassava/4.png rename to src/assets/crops/cassava/4.png diff --git a/src/assets/cassava/5.png b/src/assets/crops/cassava/5.png similarity index 100% rename from src/assets/cassava/5.png rename to src/assets/crops/cassava/5.png diff --git a/src/assets/cassava/6.png b/src/assets/crops/cassava/6.png similarity index 100% rename from src/assets/cassava/6.png rename to src/assets/crops/cassava/6.png diff --git a/src/assets/coffee/1.png b/src/assets/crops/coffee/1.png similarity index 100% rename from src/assets/coffee/1.png rename to src/assets/crops/coffee/1.png diff --git a/src/assets/coffee/2.png b/src/assets/crops/coffee/2.png similarity index 100% rename from src/assets/coffee/2.png rename to src/assets/crops/coffee/2.png diff --git a/src/assets/coffee/3.png b/src/assets/crops/coffee/3.png similarity index 100% rename from src/assets/coffee/3.png rename to src/assets/crops/coffee/3.png diff --git a/src/assets/coffee/4.png b/src/assets/crops/coffee/4.png similarity index 100% rename from src/assets/coffee/4.png rename to src/assets/crops/coffee/4.png diff --git a/src/assets/coffee/5.png b/src/assets/crops/coffee/5.png similarity index 100% rename from src/assets/coffee/5.png rename to src/assets/crops/coffee/5.png diff --git a/src/assets/coffee/6.png b/src/assets/crops/coffee/6.png similarity index 100% rename from src/assets/coffee/6.png rename to src/assets/crops/coffee/6.png diff --git a/src/assets/corn/1.png b/src/assets/crops/corn/1.png similarity index 100% rename from src/assets/corn/1.png rename to src/assets/crops/corn/1.png diff --git a/src/assets/corn/2.png b/src/assets/crops/corn/2.png similarity index 100% rename from src/assets/corn/2.png rename to src/assets/crops/corn/2.png diff --git a/src/assets/corn/3.png b/src/assets/crops/corn/3.png similarity index 100% rename from src/assets/corn/3.png rename to src/assets/crops/corn/3.png diff --git a/src/assets/corn/4.png b/src/assets/crops/corn/4.png similarity index 100% rename from src/assets/corn/4.png rename to src/assets/crops/corn/4.png diff --git a/src/assets/corn/5.png b/src/assets/crops/corn/5.png similarity index 100% rename from src/assets/corn/5.png rename to src/assets/crops/corn/5.png diff --git a/src/assets/corn/6.png b/src/assets/crops/corn/6.png similarity index 100% rename from src/assets/corn/6.png rename to src/assets/crops/corn/6.png diff --git a/src/assets/cucumber/1.png b/src/assets/crops/cucumber/1.png similarity index 100% rename from src/assets/cucumber/1.png rename to src/assets/crops/cucumber/1.png diff --git a/src/assets/cucumber/2.png b/src/assets/crops/cucumber/2.png similarity index 100% rename from src/assets/cucumber/2.png rename to src/assets/crops/cucumber/2.png diff --git a/src/assets/cucumber/3.png b/src/assets/crops/cucumber/3.png similarity index 100% rename from src/assets/cucumber/3.png rename to src/assets/crops/cucumber/3.png diff --git a/src/assets/cucumber/4.png b/src/assets/crops/cucumber/4.png similarity index 100% rename from src/assets/cucumber/4.png rename to src/assets/crops/cucumber/4.png diff --git a/src/assets/cucumber/5.png b/src/assets/crops/cucumber/5.png similarity index 100% rename from src/assets/cucumber/5.png rename to src/assets/crops/cucumber/5.png diff --git a/src/assets/cucumber/6.png b/src/assets/crops/cucumber/6.png similarity index 100% rename from src/assets/cucumber/6.png rename to src/assets/crops/cucumber/6.png diff --git a/src/assets/cursor/ui_648.png b/src/assets/crops/cursor/ui_648.png similarity index 100% rename from src/assets/cursor/ui_648.png rename to src/assets/crops/cursor/ui_648.png diff --git a/src/assets/cursor/ui_752.png b/src/assets/crops/cursor/ui_752.png similarity index 100% rename from src/assets/cursor/ui_752.png rename to src/assets/crops/cursor/ui_752.png diff --git a/src/assets/dairy/milk-carton.png b/src/assets/crops/dairy/milk-carton.png similarity index 100% rename from src/assets/dairy/milk-carton.png rename to src/assets/crops/dairy/milk-carton.png diff --git a/src/assets/eggplant/1.png b/src/assets/crops/eggplant/1.png similarity index 100% rename from src/assets/eggplant/1.png rename to src/assets/crops/eggplant/1.png diff --git a/src/assets/eggplant/2.png b/src/assets/crops/eggplant/2.png similarity index 100% rename from src/assets/eggplant/2.png rename to src/assets/crops/eggplant/2.png diff --git a/src/assets/eggplant/3.png b/src/assets/crops/eggplant/3.png similarity index 100% rename from src/assets/eggplant/3.png rename to src/assets/crops/eggplant/3.png diff --git a/src/assets/eggplant/4.png b/src/assets/crops/eggplant/4.png similarity index 100% rename from src/assets/eggplant/4.png rename to src/assets/crops/eggplant/4.png diff --git a/src/assets/eggplant/5.png b/src/assets/crops/eggplant/5.png similarity index 100% rename from src/assets/eggplant/5.png rename to src/assets/crops/eggplant/5.png diff --git a/src/assets/eggplant/6.png b/src/assets/crops/eggplant/6.png similarity index 100% rename from src/assets/eggplant/6.png rename to src/assets/crops/eggplant/6.png diff --git a/src/assets/grapes/1.png b/src/assets/crops/grapes/1.png similarity index 100% rename from src/assets/grapes/1.png rename to src/assets/crops/grapes/1.png diff --git a/src/assets/grapes/2.png b/src/assets/crops/grapes/2.png similarity index 100% rename from src/assets/grapes/2.png rename to src/assets/crops/grapes/2.png diff --git a/src/assets/grapes/3.png b/src/assets/crops/grapes/3.png similarity index 100% rename from src/assets/grapes/3.png rename to src/assets/crops/grapes/3.png diff --git a/src/assets/grapes/4.png b/src/assets/crops/grapes/4.png similarity index 100% rename from src/assets/grapes/4.png rename to src/assets/crops/grapes/4.png diff --git a/src/assets/grapes/5.png b/src/assets/crops/grapes/5.png similarity index 100% rename from src/assets/grapes/5.png rename to src/assets/crops/grapes/5.png diff --git a/src/assets/grapes/6.png b/src/assets/crops/grapes/6.png similarity index 100% rename from src/assets/grapes/6.png rename to src/assets/crops/grapes/6.png diff --git a/src/assets/lemon/1.png b/src/assets/crops/lemon/1.png similarity index 100% rename from src/assets/lemon/1.png rename to src/assets/crops/lemon/1.png diff --git a/src/assets/lemon/2.png b/src/assets/crops/lemon/2.png similarity index 100% rename from src/assets/lemon/2.png rename to src/assets/crops/lemon/2.png diff --git a/src/assets/lemon/3.png b/src/assets/crops/lemon/3.png similarity index 100% rename from src/assets/lemon/3.png rename to src/assets/crops/lemon/3.png diff --git a/src/assets/lemon/4.png b/src/assets/crops/lemon/4.png similarity index 100% rename from src/assets/lemon/4.png rename to src/assets/crops/lemon/4.png diff --git a/src/assets/lemon/5.png b/src/assets/crops/lemon/5.png similarity index 100% rename from src/assets/lemon/5.png rename to src/assets/crops/lemon/5.png diff --git a/src/assets/lemon/6.png b/src/assets/crops/lemon/6.png similarity index 100% rename from src/assets/lemon/6.png rename to src/assets/crops/lemon/6.png diff --git a/src/assets/melon/1.png b/src/assets/crops/melon/1.png similarity index 100% rename from src/assets/melon/1.png rename to src/assets/crops/melon/1.png diff --git a/src/assets/melon/2.png b/src/assets/crops/melon/2.png similarity index 100% rename from src/assets/melon/2.png rename to src/assets/crops/melon/2.png diff --git a/src/assets/melon/3.png b/src/assets/crops/melon/3.png similarity index 100% rename from src/assets/melon/3.png rename to src/assets/crops/melon/3.png diff --git a/src/assets/melon/4.png b/src/assets/crops/melon/4.png similarity index 100% rename from src/assets/melon/4.png rename to src/assets/crops/melon/4.png diff --git a/src/assets/melon/5.png b/src/assets/crops/melon/5.png similarity index 100% rename from src/assets/melon/5.png rename to src/assets/crops/melon/5.png diff --git a/src/assets/melon/6.png b/src/assets/crops/melon/6.png similarity index 100% rename from src/assets/melon/6.png rename to src/assets/crops/melon/6.png diff --git a/src/assets/orange/1.png b/src/assets/crops/orange/1.png similarity index 100% rename from src/assets/orange/1.png rename to src/assets/crops/orange/1.png diff --git a/src/assets/orange/2.png b/src/assets/crops/orange/2.png similarity index 100% rename from src/assets/orange/2.png rename to src/assets/crops/orange/2.png diff --git a/src/assets/orange/3.png b/src/assets/crops/orange/3.png similarity index 100% rename from src/assets/orange/3.png rename to src/assets/crops/orange/3.png diff --git a/src/assets/orange/4.png b/src/assets/crops/orange/4.png similarity index 100% rename from src/assets/orange/4.png rename to src/assets/crops/orange/4.png diff --git a/src/assets/orange/5.png b/src/assets/crops/orange/5.png similarity index 100% rename from src/assets/orange/5.png rename to src/assets/crops/orange/5.png diff --git a/src/assets/orange/6.png b/src/assets/crops/orange/6.png similarity index 100% rename from src/assets/orange/6.png rename to src/assets/crops/orange/6.png diff --git a/src/assets/pineapple/1.png b/src/assets/crops/pineapple/1.png similarity index 100% rename from src/assets/pineapple/1.png rename to src/assets/crops/pineapple/1.png diff --git a/src/assets/pineapple/2.png b/src/assets/crops/pineapple/2.png similarity index 100% rename from src/assets/pineapple/2.png rename to src/assets/crops/pineapple/2.png diff --git a/src/assets/pineapple/3.png b/src/assets/crops/pineapple/3.png similarity index 100% rename from src/assets/pineapple/3.png rename to src/assets/crops/pineapple/3.png diff --git a/src/assets/pineapple/4.png b/src/assets/crops/pineapple/4.png similarity index 100% rename from src/assets/pineapple/4.png rename to src/assets/crops/pineapple/4.png diff --git a/src/assets/pineapple/5.png b/src/assets/crops/pineapple/5.png similarity index 100% rename from src/assets/pineapple/5.png rename to src/assets/crops/pineapple/5.png diff --git a/src/assets/pineapple/6.png b/src/assets/crops/pineapple/6.png similarity index 100% rename from src/assets/pineapple/6.png rename to src/assets/crops/pineapple/6.png diff --git a/src/assets/potato/1.png b/src/assets/crops/potato/1.png similarity index 100% rename from src/assets/potato/1.png rename to src/assets/crops/potato/1.png diff --git a/src/assets/potato/2.png b/src/assets/crops/potato/2.png similarity index 100% rename from src/assets/potato/2.png rename to src/assets/crops/potato/2.png diff --git a/src/assets/potato/3.png b/src/assets/crops/potato/3.png similarity index 100% rename from src/assets/potato/3.png rename to src/assets/crops/potato/3.png diff --git a/src/assets/potato/4.png b/src/assets/crops/potato/4.png similarity index 100% rename from src/assets/potato/4.png rename to src/assets/crops/potato/4.png diff --git a/src/assets/potato/5.png b/src/assets/crops/potato/5.png similarity index 100% rename from src/assets/potato/5.png rename to src/assets/crops/potato/5.png diff --git a/src/assets/potato/6.png b/src/assets/crops/potato/6.png similarity index 100% rename from src/assets/potato/6.png rename to src/assets/crops/potato/6.png diff --git a/src/assets/rice/1.png b/src/assets/crops/rice/1.png similarity index 100% rename from src/assets/rice/1.png rename to src/assets/crops/rice/1.png diff --git a/src/assets/rice/2.png b/src/assets/crops/rice/2.png similarity index 100% rename from src/assets/rice/2.png rename to src/assets/crops/rice/2.png diff --git a/src/assets/rice/3.png b/src/assets/crops/rice/3.png similarity index 100% rename from src/assets/rice/3.png rename to src/assets/crops/rice/3.png diff --git a/src/assets/rice/4.png b/src/assets/crops/rice/4.png similarity index 100% rename from src/assets/rice/4.png rename to src/assets/crops/rice/4.png diff --git a/src/assets/rice/5.png b/src/assets/crops/rice/5.png similarity index 100% rename from src/assets/rice/5.png rename to src/assets/crops/rice/5.png diff --git a/src/assets/rice/6.png b/src/assets/crops/rice/6.png similarity index 100% rename from src/assets/rice/6.png rename to src/assets/crops/rice/6.png diff --git a/src/assets/rose/1.png b/src/assets/crops/rose/1.png similarity index 100% rename from src/assets/rose/1.png rename to src/assets/crops/rose/1.png diff --git a/src/assets/rose/2.png b/src/assets/crops/rose/2.png similarity index 100% rename from src/assets/rose/2.png rename to src/assets/crops/rose/2.png diff --git a/src/assets/rose/3.png b/src/assets/crops/rose/3.png similarity index 100% rename from src/assets/rose/3.png rename to src/assets/crops/rose/3.png diff --git a/src/assets/rose/4.png b/src/assets/crops/rose/4.png similarity index 100% rename from src/assets/rose/4.png rename to src/assets/crops/rose/4.png diff --git a/src/assets/rose/5.png b/src/assets/crops/rose/5.png similarity index 100% rename from src/assets/rose/5.png rename to src/assets/crops/rose/5.png diff --git a/src/assets/rose/6.png b/src/assets/crops/rose/6.png similarity index 100% rename from src/assets/rose/6.png rename to src/assets/crops/rose/6.png diff --git a/src/assets/strawberry/1.png b/src/assets/crops/strawberry/1.png similarity index 100% rename from src/assets/strawberry/1.png rename to src/assets/crops/strawberry/1.png diff --git a/src/assets/strawberry/2.png b/src/assets/crops/strawberry/2.png similarity index 100% rename from src/assets/strawberry/2.png rename to src/assets/crops/strawberry/2.png diff --git a/src/assets/strawberry/3.png b/src/assets/crops/strawberry/3.png similarity index 100% rename from src/assets/strawberry/3.png rename to src/assets/crops/strawberry/3.png diff --git a/src/assets/strawberry/4.png b/src/assets/crops/strawberry/4.png similarity index 100% rename from src/assets/strawberry/4.png rename to src/assets/crops/strawberry/4.png diff --git a/src/assets/strawberry/5.png b/src/assets/crops/strawberry/5.png similarity index 100% rename from src/assets/strawberry/5.png rename to src/assets/crops/strawberry/5.png diff --git a/src/assets/strawberry/6.png b/src/assets/crops/strawberry/6.png similarity index 100% rename from src/assets/strawberry/6.png rename to src/assets/crops/strawberry/6.png diff --git a/src/assets/sunflower/1.png b/src/assets/crops/sunflower/1.png similarity index 100% rename from src/assets/sunflower/1.png rename to src/assets/crops/sunflower/1.png diff --git a/src/assets/sunflower/2.png b/src/assets/crops/sunflower/2.png similarity index 100% rename from src/assets/sunflower/2.png rename to src/assets/crops/sunflower/2.png diff --git a/src/assets/sunflower/3.png b/src/assets/crops/sunflower/3.png similarity index 100% rename from src/assets/sunflower/3.png rename to src/assets/crops/sunflower/3.png diff --git a/src/assets/sunflower/4.png b/src/assets/crops/sunflower/4.png similarity index 100% rename from src/assets/sunflower/4.png rename to src/assets/crops/sunflower/4.png diff --git a/src/assets/sunflower/5.png b/src/assets/crops/sunflower/5.png similarity index 100% rename from src/assets/sunflower/5.png rename to src/assets/crops/sunflower/5.png diff --git a/src/assets/sunflower/6.png b/src/assets/crops/sunflower/6.png similarity index 100% rename from src/assets/sunflower/6.png rename to src/assets/crops/sunflower/6.png diff --git a/src/assets/tomato/1.png b/src/assets/crops/tomato/1.png similarity index 100% rename from src/assets/tomato/1.png rename to src/assets/crops/tomato/1.png diff --git a/src/assets/tomato/2.png b/src/assets/crops/tomato/2.png similarity index 100% rename from src/assets/tomato/2.png rename to src/assets/crops/tomato/2.png diff --git a/src/assets/tomato/3.png b/src/assets/crops/tomato/3.png similarity index 100% rename from src/assets/tomato/3.png rename to src/assets/crops/tomato/3.png diff --git a/src/assets/tomato/4.png b/src/assets/crops/tomato/4.png similarity index 100% rename from src/assets/tomato/4.png rename to src/assets/crops/tomato/4.png diff --git a/src/assets/tomato/5.png b/src/assets/crops/tomato/5.png similarity index 100% rename from src/assets/tomato/5.png rename to src/assets/crops/tomato/5.png diff --git a/src/assets/tomato/6.png b/src/assets/crops/tomato/6.png similarity index 100% rename from src/assets/tomato/6.png rename to src/assets/crops/tomato/6.png diff --git a/src/assets/tulip/1.png b/src/assets/crops/tulip/1.png similarity index 100% rename from src/assets/tulip/1.png rename to src/assets/crops/tulip/1.png diff --git a/src/assets/tulip/2.png b/src/assets/crops/tulip/2.png similarity index 100% rename from src/assets/tulip/2.png rename to src/assets/crops/tulip/2.png diff --git a/src/assets/tulip/3.png b/src/assets/crops/tulip/3.png similarity index 100% rename from src/assets/tulip/3.png rename to src/assets/crops/tulip/3.png diff --git a/src/assets/tulip/4.png b/src/assets/crops/tulip/4.png similarity index 100% rename from src/assets/tulip/4.png rename to src/assets/crops/tulip/4.png diff --git a/src/assets/tulip/5.png b/src/assets/crops/tulip/5.png similarity index 100% rename from src/assets/tulip/5.png rename to src/assets/crops/tulip/5.png diff --git a/src/assets/tulip/6.png b/src/assets/crops/tulip/6.png similarity index 100% rename from src/assets/tulip/6.png rename to src/assets/crops/tulip/6.png diff --git a/src/assets/turnip/1.png b/src/assets/crops/turnip/1.png similarity index 100% rename from src/assets/turnip/1.png rename to src/assets/crops/turnip/1.png diff --git a/src/assets/turnip/2.png b/src/assets/crops/turnip/2.png similarity index 100% rename from src/assets/turnip/2.png rename to src/assets/crops/turnip/2.png diff --git a/src/assets/turnip/3.png b/src/assets/crops/turnip/3.png similarity index 100% rename from src/assets/turnip/3.png rename to src/assets/crops/turnip/3.png diff --git a/src/assets/turnip/4.png b/src/assets/crops/turnip/4.png similarity index 100% rename from src/assets/turnip/4.png rename to src/assets/crops/turnip/4.png diff --git a/src/assets/turnip/5.png b/src/assets/crops/turnip/5.png similarity index 100% rename from src/assets/turnip/5.png rename to src/assets/crops/turnip/5.png diff --git a/src/assets/turnip/6.png b/src/assets/crops/turnip/6.png similarity index 100% rename from src/assets/turnip/6.png rename to src/assets/crops/turnip/6.png diff --git a/src/assets/wheat/1.png b/src/assets/crops/wheat/1.png similarity index 100% rename from src/assets/wheat/1.png rename to src/assets/crops/wheat/1.png diff --git a/src/assets/wheat/2.png b/src/assets/crops/wheat/2.png similarity index 100% rename from src/assets/wheat/2.png rename to src/assets/crops/wheat/2.png diff --git a/src/assets/wheat/3.png b/src/assets/crops/wheat/3.png similarity index 100% rename from src/assets/wheat/3.png rename to src/assets/crops/wheat/3.png diff --git a/src/assets/wheat/4.png b/src/assets/crops/wheat/4.png similarity index 100% rename from src/assets/wheat/4.png rename to src/assets/crops/wheat/4.png diff --git a/src/assets/wheat/5.png b/src/assets/crops/wheat/5.png similarity index 100% rename from src/assets/wheat/5.png rename to src/assets/crops/wheat/5.png diff --git a/src/assets/wheat/6.png b/src/assets/crops/wheat/6.png similarity index 100% rename from src/assets/wheat/6.png rename to src/assets/crops/wheat/6.png diff --git a/src/assets/fonts/Pixellari.ttf b/src/assets/fonts/Pixellari.ttf new file mode 100644 index 0000000..5a3a3c2 Binary files /dev/null and b/src/assets/fonts/Pixellari.ttf differ diff --git a/src/assets/terrain/tile000.png b/src/assets/terrain/tile000.png deleted file mode 100644 index 5867b46..0000000 Binary files a/src/assets/terrain/tile000.png and /dev/null differ diff --git a/src/assets/terrain/tile001.png b/src/assets/terrain/tile001.png deleted file mode 100644 index c143613..0000000 Binary files a/src/assets/terrain/tile001.png and /dev/null differ diff --git a/src/assets/terrain/tile002.png b/src/assets/terrain/tile002.png deleted file mode 100644 index 2b4e42d..0000000 Binary files a/src/assets/terrain/tile002.png and /dev/null differ diff --git a/src/assets/terrain/tile003.png b/src/assets/terrain/tile003.png deleted file mode 100644 index 192b30b..0000000 Binary files a/src/assets/terrain/tile003.png and /dev/null differ diff --git a/src/assets/terrain/tile004.png b/src/assets/terrain/tile004.png deleted file mode 100644 index 613a0b0..0000000 Binary files a/src/assets/terrain/tile004.png and /dev/null differ diff --git a/src/assets/terrain/tile005.png b/src/assets/terrain/tile005.png deleted file mode 100644 index dba8e1b..0000000 Binary files a/src/assets/terrain/tile005.png and /dev/null differ diff --git a/src/assets/terrain/tile007.png b/src/assets/terrain/tile007.png deleted file mode 100644 index d7ec47d..0000000 Binary files a/src/assets/terrain/tile007.png and /dev/null differ diff --git a/src/assets/terrain/tile008.png b/src/assets/terrain/tile008.png deleted file mode 100644 index 325ab99..0000000 Binary files a/src/assets/terrain/tile008.png and /dev/null differ diff --git a/src/assets/terrain/tile015.png b/src/assets/terrain/tile015.png deleted file mode 100644 index c9330f4..0000000 Binary files a/src/assets/terrain/tile015.png and /dev/null differ diff --git a/src/assets/terrain/tile016.png b/src/assets/terrain/tile016.png deleted file mode 100644 index 79ebffc..0000000 Binary files a/src/assets/terrain/tile016.png and /dev/null differ diff --git a/src/assets/terrain/tile017.png b/src/assets/terrain/tile017.png deleted file mode 100644 index 19e98cf..0000000 Binary files a/src/assets/terrain/tile017.png and /dev/null differ diff --git a/src/assets/terrain/tile018.png b/src/assets/terrain/tile018.png deleted file mode 100644 index f4435b6..0000000 Binary files a/src/assets/terrain/tile018.png and /dev/null differ diff --git a/src/assets/terrain/tile019.png b/src/assets/terrain/tile019.png deleted file mode 100644 index cbcf064..0000000 Binary files a/src/assets/terrain/tile019.png and /dev/null differ diff --git a/src/assets/terrain/tile020.png b/src/assets/terrain/tile020.png deleted file mode 100644 index 6a27099..0000000 Binary files a/src/assets/terrain/tile020.png and /dev/null differ diff --git a/src/assets/terrain/tile022.png b/src/assets/terrain/tile022.png deleted file mode 100644 index 30f0057..0000000 Binary files a/src/assets/terrain/tile022.png and /dev/null differ diff --git a/src/assets/terrain/tile023.png b/src/assets/terrain/tile023.png deleted file mode 100644 index 6f1bacf..0000000 Binary files a/src/assets/terrain/tile023.png and /dev/null differ diff --git a/src/assets/terrain/tile030.png b/src/assets/terrain/tile030.png deleted file mode 100644 index f8b19b5..0000000 Binary files a/src/assets/terrain/tile030.png and /dev/null differ diff --git a/src/assets/terrain/tile031.png b/src/assets/terrain/tile031.png deleted file mode 100644 index f2b8e01..0000000 Binary files a/src/assets/terrain/tile031.png and /dev/null differ diff --git a/src/assets/terrain/tile032.png b/src/assets/terrain/tile032.png deleted file mode 100644 index 65a9af3..0000000 Binary files a/src/assets/terrain/tile032.png and /dev/null differ diff --git a/src/assets/terrain/tile033.png b/src/assets/terrain/tile033.png deleted file mode 100644 index fbfef3a..0000000 Binary files a/src/assets/terrain/tile033.png and /dev/null differ diff --git a/src/assets/terrain/tile034.png b/src/assets/terrain/tile034.png deleted file mode 100644 index c3b0ebd..0000000 Binary files a/src/assets/terrain/tile034.png and /dev/null differ diff --git a/src/assets/terrain/tile035.png b/src/assets/terrain/tile035.png deleted file mode 100644 index 4350409..0000000 Binary files a/src/assets/terrain/tile035.png and /dev/null differ diff --git a/src/assets/terrain/tile037.png b/src/assets/terrain/tile037.png deleted file mode 100644 index c2e9292..0000000 Binary files a/src/assets/terrain/tile037.png and /dev/null differ diff --git a/src/assets/terrain/tile039.png b/src/assets/terrain/tile039.png deleted file mode 100644 index 115c3db..0000000 Binary files a/src/assets/terrain/tile039.png and /dev/null differ diff --git a/src/assets/terrain/tile040.png b/src/assets/terrain/tile040.png deleted file mode 100644 index 74e0fca..0000000 Binary files a/src/assets/terrain/tile040.png and /dev/null differ diff --git a/src/assets/terrain/tile041.png b/src/assets/terrain/tile041.png deleted file mode 100644 index d77ad0d..0000000 Binary files a/src/assets/terrain/tile041.png and /dev/null differ diff --git a/src/assets/terrain/tile042.png b/src/assets/terrain/tile042.png deleted file mode 100644 index 15eee29..0000000 Binary files a/src/assets/terrain/tile042.png and /dev/null differ diff --git a/src/assets/terrain/tile043.png b/src/assets/terrain/tile043.png deleted file mode 100644 index 5484cc9..0000000 Binary files a/src/assets/terrain/tile043.png and /dev/null differ diff --git a/src/assets/terrain/tile044.png b/src/assets/terrain/tile044.png deleted file mode 100644 index b4cc992..0000000 Binary files a/src/assets/terrain/tile044.png and /dev/null differ diff --git a/src/assets/terrain/tile045.png b/src/assets/terrain/tile045.png deleted file mode 100644 index 66cd610..0000000 Binary files a/src/assets/terrain/tile045.png and /dev/null differ diff --git a/src/assets/terrain/tile046.png b/src/assets/terrain/tile046.png deleted file mode 100644 index a00b940..0000000 Binary files a/src/assets/terrain/tile046.png and /dev/null differ diff --git a/src/assets/terrain/tile047.png b/src/assets/terrain/tile047.png deleted file mode 100644 index 6fc9218..0000000 Binary files a/src/assets/terrain/tile047.png and /dev/null differ diff --git a/src/assets/terrain/tile048.png b/src/assets/terrain/tile048.png deleted file mode 100644 index c7d2268..0000000 Binary files a/src/assets/terrain/tile048.png and /dev/null differ diff --git a/src/assets/terrain/tile049.png b/src/assets/terrain/tile049.png deleted file mode 100644 index 278e0bb..0000000 Binary files a/src/assets/terrain/tile049.png and /dev/null differ diff --git a/src/assets/terrain/tile050.png b/src/assets/terrain/tile050.png deleted file mode 100644 index 241f06f..0000000 Binary files a/src/assets/terrain/tile050.png and /dev/null differ diff --git a/src/assets/terrain/tile051.png b/src/assets/terrain/tile051.png deleted file mode 100644 index 404cca0..0000000 Binary files a/src/assets/terrain/tile051.png and /dev/null differ diff --git a/src/assets/terrain/tile052.png b/src/assets/terrain/tile052.png deleted file mode 100644 index edad90b..0000000 Binary files a/src/assets/terrain/tile052.png and /dev/null differ diff --git a/src/assets/terrain/tile053.png b/src/assets/terrain/tile053.png deleted file mode 100644 index 6d6e029..0000000 Binary files a/src/assets/terrain/tile053.png and /dev/null differ diff --git a/src/assets/terrain/tile054.png b/src/assets/terrain/tile054.png deleted file mode 100644 index 98de12d..0000000 Binary files a/src/assets/terrain/tile054.png and /dev/null differ diff --git a/src/assets/terrain/tile056.png b/src/assets/terrain/tile056.png deleted file mode 100644 index abf082f..0000000 Binary files a/src/assets/terrain/tile056.png and /dev/null differ diff --git a/src/assets/terrain/tile057.png b/src/assets/terrain/tile057.png deleted file mode 100644 index c7a813c..0000000 Binary files a/src/assets/terrain/tile057.png and /dev/null differ diff --git a/src/assets/terrain/tile058.png b/src/assets/terrain/tile058.png deleted file mode 100644 index 85858d8..0000000 Binary files a/src/assets/terrain/tile058.png and /dev/null differ diff --git a/src/assets/terrain/tile059.png b/src/assets/terrain/tile059.png deleted file mode 100644 index cf985ee..0000000 Binary files a/src/assets/terrain/tile059.png and /dev/null differ diff --git a/src/assets/terrain/tile060.png b/src/assets/terrain/tile060.png deleted file mode 100644 index 35566f0..0000000 Binary files a/src/assets/terrain/tile060.png and /dev/null differ diff --git a/src/assets/terrain/tile061.png b/src/assets/terrain/tile061.png deleted file mode 100644 index aea2e0b..0000000 Binary files a/src/assets/terrain/tile061.png and /dev/null differ diff --git a/src/assets/terrain/tile062.png b/src/assets/terrain/tile062.png deleted file mode 100644 index 6286836..0000000 Binary files a/src/assets/terrain/tile062.png and /dev/null differ diff --git a/src/assets/terrain/tile063.png b/src/assets/terrain/tile063.png deleted file mode 100644 index 61aee70..0000000 Binary files a/src/assets/terrain/tile063.png and /dev/null differ diff --git a/src/assets/terrain/tile064.png b/src/assets/terrain/tile064.png deleted file mode 100644 index 5df041b..0000000 Binary files a/src/assets/terrain/tile064.png and /dev/null differ diff --git a/src/assets/terrain/tile065.png b/src/assets/terrain/tile065.png deleted file mode 100644 index 41b5015..0000000 Binary files a/src/assets/terrain/tile065.png and /dev/null differ diff --git a/src/assets/terrain/tile067.png b/src/assets/terrain/tile067.png deleted file mode 100644 index 08402f1..0000000 Binary files a/src/assets/terrain/tile067.png and /dev/null differ diff --git a/src/assets/terrain/tile069.png b/src/assets/terrain/tile069.png deleted file mode 100644 index 30f0057..0000000 Binary files a/src/assets/terrain/tile069.png and /dev/null differ diff --git a/src/assets/terrain/tile070.png b/src/assets/terrain/tile070.png deleted file mode 100644 index 50a8a49..0000000 Binary files a/src/assets/terrain/tile070.png and /dev/null differ diff --git a/src/assets/terrain/tile071.png b/src/assets/terrain/tile071.png deleted file mode 100644 index 034ee1c..0000000 Binary files a/src/assets/terrain/tile071.png and /dev/null differ diff --git a/src/assets/terrain/tile072.png b/src/assets/terrain/tile072.png deleted file mode 100644 index dcdb1b5..0000000 Binary files a/src/assets/terrain/tile072.png and /dev/null differ diff --git a/src/assets/terrain/tile073.png b/src/assets/terrain/tile073.png deleted file mode 100644 index 77dbd16..0000000 Binary files a/src/assets/terrain/tile073.png and /dev/null differ diff --git a/src/assets/terrain/tile074.png b/src/assets/terrain/tile074.png deleted file mode 100644 index f538821..0000000 Binary files a/src/assets/terrain/tile074.png and /dev/null differ diff --git a/src/assets/terrain/tile075.png b/src/assets/terrain/tile075.png deleted file mode 100644 index 56ec92f..0000000 Binary files a/src/assets/terrain/tile075.png and /dev/null differ diff --git a/src/assets/terrain/tile076.png b/src/assets/terrain/tile076.png deleted file mode 100644 index 240f214..0000000 Binary files a/src/assets/terrain/tile076.png and /dev/null differ diff --git a/src/assets/terrain/tile077.png b/src/assets/terrain/tile077.png deleted file mode 100644 index 4925696..0000000 Binary files a/src/assets/terrain/tile077.png and /dev/null differ diff --git a/src/assets/terrain/tile078.png b/src/assets/terrain/tile078.png deleted file mode 100644 index cee57d2..0000000 Binary files a/src/assets/terrain/tile078.png and /dev/null differ diff --git a/src/assets/terrain/tile079.png b/src/assets/terrain/tile079.png deleted file mode 100644 index bb9886d..0000000 Binary files a/src/assets/terrain/tile079.png and /dev/null differ diff --git a/src/assets/terrain/tile080.png b/src/assets/terrain/tile080.png deleted file mode 100644 index 7cbbd42..0000000 Binary files a/src/assets/terrain/tile080.png and /dev/null differ diff --git a/src/assets/terrain/tile081.png b/src/assets/terrain/tile081.png deleted file mode 100644 index ec98485..0000000 Binary files a/src/assets/terrain/tile081.png and /dev/null differ diff --git a/src/assets/terrain/tile082.png b/src/assets/terrain/tile082.png deleted file mode 100644 index 11624ed..0000000 Binary files a/src/assets/terrain/tile082.png and /dev/null differ diff --git a/src/assets/terrain/tile083.png b/src/assets/terrain/tile083.png deleted file mode 100644 index 2d82d9a..0000000 Binary files a/src/assets/terrain/tile083.png and /dev/null differ diff --git a/src/assets/terrain/tile084.png b/src/assets/terrain/tile084.png deleted file mode 100644 index b1160b4..0000000 Binary files a/src/assets/terrain/tile084.png and /dev/null differ diff --git a/src/assets/terrain/tile085.png b/src/assets/terrain/tile085.png deleted file mode 100644 index 5a0ca99..0000000 Binary files a/src/assets/terrain/tile085.png and /dev/null differ diff --git a/src/assets/terrain/tile086.png b/src/assets/terrain/tile086.png deleted file mode 100644 index b8d6b5c..0000000 Binary files a/src/assets/terrain/tile086.png and /dev/null differ diff --git a/src/components/CropField.vue b/src/components/CropField.vue new file mode 100644 index 0000000..bdf4e9f --- /dev/null +++ b/src/components/CropField.vue @@ -0,0 +1,36 @@ + + + + + \ No newline at end of file diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue new file mode 100644 index 0000000..e39b348 --- /dev/null +++ b/src/components/StatusBar.vue @@ -0,0 +1,43 @@ + + + + + \ No newline at end of file diff --git a/src/data/seasons.js b/src/data/seasons.js index 09ffc01..cd8628d 100644 --- a/src/data/seasons.js +++ b/src/data/seasons.js @@ -1,6 +1,6 @@ export default { - Spring: 'spring', - Summer: 'summer', - Autumn: 'autumn', - Winter: 'winter' + Spring: 'Spring', + Summer: 'Summer', + Autumn: 'Autumn', + Winter: 'Winter' }; diff --git a/src/data/weekdays.js b/src/data/weekdays.js new file mode 100644 index 0000000..91efde8 --- /dev/null +++ b/src/data/weekdays.js @@ -0,0 +1,9 @@ +export default { + 1: 'Monday', + 2: 'Tuesday', + 3: 'Wednesday', + 4: 'Thursday', + 5: 'Friday', + 6: 'Saturday', + 7: 'Sunday' +}; diff --git a/src/main.js b/src/main.js index 3a11b0b..f505ac2 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,6 @@ import { createApp } from 'vue' import App from './App.vue' import store from './store' +import './style/app.scss' createApp(App).use(store).mount('#app') diff --git a/src/store/index.js b/src/store/index.js index 0c27a03..f18d26e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,9 +7,11 @@ export default createStore({ state: { player: null, time: { + stamp: null, week: null, season: null, - weekday: null + weekday: null, + weekdayNr: null }, inventory: [] }, @@ -18,7 +20,11 @@ export default createStore({ initialize(state) { state.time.week = moment().week(); state.time.season = getSeason(state.time.week); - state.time.weekday = moment().weekday() + state.time.weekday = moment().weekday(); + state.time.weekdayNr = moment().format('dddd'); + }, + updateTimestamp(state) { + state.time.stamp = moment().format('H:mm:ss') } }, actions: {}, diff --git a/src/style/app.scss b/src/style/app.scss new file mode 100644 index 0000000..1211985 --- /dev/null +++ b/src/style/app.scss @@ -0,0 +1,39 @@ +@import "bootswatch/dist/simplex/bootstrap.min.css"; + +@font-face { + font-family: Pixellari; + src: url("@/assets/fonts/Pixellari.ttf") format('truetype') +} + +body { + font-family: 'Pixellari', sans-serif; + background-image: url("@/assets/grass/tile049.png"); +} + + +.grass-border { + background-position: 64px 64px; + + border: 16px solid transparent; + border-image: url(@/assets/border.png) 10% round; + padding-left: 0; + padding-right: 0; + padding-bottom: 10px; +} + +.steel-border { + border: 12px solid transparent; + border-image: url(@/assets/gui/border_steel.png) 36 repeat; + padding-left: 0; + padding-right: 0; +} + +.pixel-border { + padding: 0; + border: 12px solid transparent; + border-image: url(@/assets/gui/border_light.png) 36 repeat; +} + +.pixel-border:hover { + border-image: url(@/assets/gui/border_dark.png) 36 repeat; +} diff --git a/src/views/GameView.vue b/src/views/GameView.vue index f6d1f7c..61fe53e 100644 --- a/src/views/GameView.vue +++ b/src/views/GameView.vue @@ -1,15 +1,52 @@