diff --git a/package.json b/package.json index bc598e5..59d8cd6 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ }, "devDependencies": { "@quasar/app": "^2.1.6", - "@types/node": "^14.14.6" + "@types/node": "^14.14.6", + "vue-svg-loader": "^0.17.0-beta.2" }, "engines": { "node": ">= 10.18.1", diff --git a/quasar.conf.js b/quasar.conf.js index df02ee3..65d89c1 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -83,6 +83,30 @@ module.exports = configure(function (/* ctx */) { // https://quasar.dev/quasar-cli/cli-documentation/handling-webpack extendWebpack (cfg) { + /* + * deletes 'svg' from old url-loader regex rule + * old: /\.(png|jpe?g|gif|svg|webp|avif)(\?.*)?$/ + * new: /\.(png|jpe?g|gif|webp|avif)(\?.*)?$/ + */ + cfg.module.rules = cfg.module.rules.map(rule => { + const regstr = rule.test.toString() + if (regstr.includes('svg')) { + const newReg = new RegExp(regstr + .replace('svg', '') // delete all svg mentions + .replace('||', '|') // delete extra '|' operators + .replace('(|', '(') + .replace('|)', ')') + .slice(1, -1) // remove surrounding '/' signs + ) + return { ...rule, test: newReg } + } else { + return rule + } + }) + cfg.module.rules.push({ + test: /\.svg$/, + use: ['vue-loader', 'vue-svg-loader'] + }) }, }, diff --git a/src/assets/difficulty-icons/advanced.svg b/src/assets/difficulty-icons/advanced.svg new file mode 100644 index 0000000..69d253d --- /dev/null +++ b/src/assets/difficulty-icons/advanced.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/assets/difficulty-icons/basic.svg b/src/assets/difficulty-icons/basic.svg new file mode 100644 index 0000000..23fd2d5 --- /dev/null +++ b/src/assets/difficulty-icons/basic.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/src/assets/difficulty-icons/normal.svg b/src/assets/difficulty-icons/normal.svg new file mode 100644 index 0000000..fe06d72 --- /dev/null +++ b/src/assets/difficulty-icons/normal.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/components/CustomizePracticeCard.vue b/src/components/CustomizePracticeCard.vue index 47eab46..b379a99 100644 --- a/src/components/CustomizePracticeCard.vue +++ b/src/components/CustomizePracticeCard.vue @@ -1,99 +1,65 @@ \ No newline at end of file + diff --git a/src/pages/HomePage.vue b/src/pages/HomePage.vue index e6df173..b5d4903 100644 --- a/src/pages/HomePage.vue +++ b/src/pages/HomePage.vue @@ -6,9 +6,7 @@ Hello there! -
- -
+
@@ -22,10 +20,10 @@