From 8fbdc858af635d3aee733d2bf4f70cf6302806e4 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Sat, 7 Aug 2021 14:14:53 -0400 Subject: [PATCH] Out with Vuetify, in with vanilla Bootstrap --- src/JobsJobsJobs/App/package-lock.json | 126 ++++-------- src/JobsJobsJobs/App/package.json | 7 +- src/JobsJobsJobs/App/src/App.vue | 59 +++--- .../App/src/components/CollapsePanel.vue | 18 +- src/JobsJobsJobs/App/src/components/Icon.vue | 22 +++ .../App/src/components/MarkdownEditor.vue | 42 ++-- .../App/src/components/layout/AppFooter.vue | 21 +- .../App/src/components/layout/AppNav.vue | 29 +-- .../App/src/components/layout/TitleBar.vue | 14 +- .../components/profile/PublicSearchForm.vue | 95 ++++----- .../App/src/components/profile/SearchForm.vue | 97 +++++----- .../App/src/components/profile/SkillEdit.vue | 52 +++-- src/JobsJobsJobs/App/src/main.ts | 4 +- src/JobsJobsJobs/App/src/plugins/.gitkeep | 0 src/JobsJobsJobs/App/src/plugins/vuetify.ts | 48 ----- src/JobsJobsJobs/App/src/views/Home.vue | 1 + .../App/src/views/citizen/Authorized.vue | 1 + .../App/src/views/citizen/Dashboard.vue | 103 +++++----- .../App/src/views/citizen/EditProfile.vue | 181 +++++++++--------- .../App/src/views/citizen/LogOff.vue | 3 +- .../App/src/views/citizen/LogOn.vue | 5 +- .../App/src/views/profile/ProfileView.vue | 2 +- .../App/src/views/so-long/DeletionOptions.vue | 4 +- .../App/src/views/success-story/StoryList.vue | 5 +- 24 files changed, 445 insertions(+), 494 deletions(-) create mode 100644 src/JobsJobsJobs/App/src/components/Icon.vue create mode 100644 src/JobsJobsJobs/App/src/plugins/.gitkeep delete mode 100644 src/JobsJobsJobs/App/src/plugins/vuetify.ts diff --git a/src/JobsJobsJobs/App/package-lock.json b/src/JobsJobsJobs/App/package-lock.json index f324895..c10dd26 100644 --- a/src/JobsJobsJobs/App/package-lock.json +++ b/src/JobsJobsJobs/App/package-lock.json @@ -1200,6 +1200,12 @@ "fastq": "^1.6.0" } }, + "@popperjs/core": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", + "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==", + "dev": true + }, "@soda/friendly-errors-webpack-plugin": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz", @@ -1280,6 +1286,16 @@ "@types/node": "*" } }, + "@types/bootstrap": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.0.tgz", + "integrity": "sha512-cR+eQJ/IrgcJZheb7xkKPiPNOa48zkc6fLZ4U9lDNNQp3qiiq3tW1xgrd+VzVJCram/Bnh+DdBsdsPdXKIYClA==", + "dev": true, + "requires": { + "@popperjs/core": "^2.9.2", + "@types/jquery": "*" + } + }, "@types/connect": { "version": "3.4.35", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", @@ -1347,6 +1363,15 @@ "@types/node": "*" } }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dev": true, + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.8", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz", @@ -1424,6 +1449,12 @@ "@types/node": "*" } }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", + "dev": true + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -3403,6 +3434,11 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, + "bootstrap": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.0.tgz", + "integrity": "sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -8989,29 +9025,6 @@ "boolbase": "~1.0.0" } }, - "null-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz", - "integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==", - "dev": true, - "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", @@ -10635,15 +10648,6 @@ "picomatch": "^2.2.1" } }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "requires": { - "resolve": "^1.1.6" - } - }, "regenerate": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", @@ -10991,11 +10995,6 @@ "inherits": "^2.0.1" } }, - "roboto-fontface": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz", - "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==" - }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -11359,17 +11358,6 @@ "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", "dev": true }, - "shelljs": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", - "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", - "dev": true, - "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - } - }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", @@ -12865,43 +12853,6 @@ "@vue/shared": "3.1.4" } }, - "vue-cli-plugin-vuetify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.1.tgz", - "integrity": "sha512-ZfhvQ13X41atsCSKdSGiHnSJlhAccv4QIFOZmd8kyq6NktpeeWlvQz/dEKBf6u1AWKmKdwiCDuxS2VNT9fxhOA==", - "dev": true, - "requires": { - "null-loader": "^3.0.0", - "semver": "^7.1.2", - "shelljs": "^0.8.3" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, "vue-eslint-parser": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz", @@ -12994,11 +12945,6 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, - "vuetify": { - "version": "3.0.0-alpha.9", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.0.0-alpha.9.tgz", - "integrity": "sha512-F8xwdAp65gUY0kf0lGKMKhYZDAA2j6cqLEc63uqIOq/dZ8R2k3ZSfBMGtt+jOMCt/w28BZ7rx7AuLxPA5oF/pA==" - }, "vuex": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz", diff --git a/src/JobsJobsJobs/App/package.json b/src/JobsJobsJobs/App/package.json index 87c38ff..3c8fe17 100644 --- a/src/JobsJobsJobs/App/package.json +++ b/src/JobsJobsJobs/App/package.json @@ -10,17 +10,17 @@ }, "dependencies": { "@mdi/font": "5.9.55", + "bootstrap": "^5.1.0", "core-js": "^3.6.5", "date-fns": "^2.23.0", "date-fns-tz": "^1.1.4", "marked": "^2.1.3", - "roboto-fontface": "*", "vue": "^3.0.0", "vue-router": "^4.0.0-0", - "vuetify": "^3.0.0-alpha.0", "vuex": "^4.0.0-0" }, "devDependencies": { + "@types/bootstrap": "^5.1.0", "@types/marked": "^2.0.4", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", @@ -41,7 +41,6 @@ "eslint-plugin-vue": "^7.0.0", "sass": "~1.32.0", "sass-loader": "^10.0.0", - "typescript": "~4.1.5", - "vue-cli-plugin-vuetify": "~2.4.1" + "typescript": "~4.1.5" } } diff --git a/src/JobsJobsJobs/App/src/App.vue b/src/JobsJobsJobs/App/src/App.vue index e61c272..ee49162 100644 --- a/src/JobsJobsJobs/App/src/App.vue +++ b/src/JobsJobsJobs/App/src/App.vue @@ -1,24 +1,18 @@ diff --git a/src/JobsJobsJobs/App/src/components/MarkdownEditor.vue b/src/JobsJobsJobs/App/src/components/MarkdownEditor.vue index 89729e4..925e631 100644 --- a/src/JobsJobsJobs/App/src/components/MarkdownEditor.vue +++ b/src/JobsJobsJobs/App/src/components/MarkdownEditor.vue @@ -1,12 +1,19 @@ diff --git a/src/JobsJobsJobs/App/src/components/layout/AppFooter.vue b/src/JobsJobsJobs/App/src/components/layout/AppFooter.vue index 49ca03c..f55a5c1 100644 --- a/src/JobsJobsJobs/App/src/components/layout/AppFooter.vue +++ b/src/JobsJobsJobs/App/src/components/layout/AppFooter.vue @@ -1,8 +1,10 @@ diff --git a/src/JobsJobsJobs/App/src/components/layout/AppNav.vue b/src/JobsJobsJobs/App/src/components/layout/AppNav.vue index d61cb59..b19c3da 100644 --- a/src/JobsJobsJobs/App/src/components/layout/AppNav.vue +++ b/src/JobsJobsJobs/App/src/components/layout/AppNav.vue @@ -1,21 +1,21 @@ @@ -39,13 +39,18 @@ export default defineComponent({ diff --git a/src/JobsJobsJobs/App/src/components/profile/PublicSearchForm.vue b/src/JobsJobsJobs/App/src/components/profile/PublicSearchForm.vue index 9989428..cbedac2 100644 --- a/src/JobsJobsJobs/App/src/components/profile/PublicSearchForm.vue +++ b/src/JobsJobsJobs/App/src/components/profile/PublicSearchForm.vue @@ -1,56 +1,62 @@ - - diff --git a/src/JobsJobsJobs/App/src/views/citizen/EditProfile.vue b/src/JobsJobsJobs/App/src/views/citizen/EditProfile.vue index e695297..11658d2 100644 --- a/src/JobsJobsJobs/App/src/views/citizen/EditProfile.vue +++ b/src/JobsJobsJobs/App/src/views/citizen/EditProfile.vue @@ -4,104 +4,103 @@

Employment Profile

- - - - - +
+
+ - - - - - -     If you have found employment, consider - telling your fellow citizens about it - - - - - - - + +
+

+ If you have found employment, consider telling your fellow + citizens about it! +

+
+ +
+
+
+ - - - - Continent +
+
+
+
+ - - - - - - - - - - - - - - - - -
-

- Skills   - Add a Skill -

- -
-

Experience

-

- This application does not have a place to individually list your chronological job history; however, you can - use this area to list prior jobs, their dates, and anything else you want to include that’s not - already a part of your Professional Biography above. -

- - - - - - - -
+
Country, state, geographic area, etc.
+
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+

+ Skills   + +

+ +
+

Experience

+

+ This application does not have a place to individually list your chronological job history; however, you can + use this area to list prior jobs, their dates, and anything else you want to include that’s not + already a part of your Professional Biography above. +

+ +
+
+
+ + - - - - -
- Save -
-
- +
+
+
+
+
+ + +
+
-

-
- -   View Your User Profile - -

-

-
If you want to delete your profile, or your entire account, see your - deletion options here. +


+

+ (If you want to delete your profile, or your entire account, see your deletion + options here.)

diff --git a/src/JobsJobsJobs/App/src/views/citizen/LogOff.vue b/src/JobsJobsJobs/App/src/views/citizen/LogOff.vue index e72f74a..ca241d1 100644 --- a/src/JobsJobsJobs/App/src/views/citizen/LogOff.vue +++ b/src/JobsJobsJobs/App/src/views/citizen/LogOff.vue @@ -1,7 +1,8 @@ diff --git a/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue b/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue index 2f55a65..60149a9 100644 --- a/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue +++ b/src/JobsJobsJobs/App/src/views/citizen/LogOn.vue @@ -1,5 +1,8 @@