Tailwind Migration - Githubissues

Here's a diff without the formatting noise:

Click to expand!

```diff diff --git a/package.json b/package.json index 7c851fe..204755a 100644 --- a/package.json +++ b/package.json @@ -9,13 +9,16 @@ }, "dependencies": { "animate.css": "^3.7.2", + "autoprefixer": "^9.8.8", "axios": "^0.19.2", "bignumber.js": "^9.0.0", "bootstrap-vue": "^2.11.0", "core-js": "^3.4.4", "countup.js": "^2.0.4", "moment": "^2.24.0", + "postcss": "^7.0.39", "qrcode.vue": "^1.7.0", + "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17", "vue": "^2.6.10", "vue-confetti": "^2.0.7", "vue-router": "^3.1.3", diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 0000000..12a703d --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,6 @@ +module.exports = { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +}; diff --git a/public/index.html b/public/index.html index f00808e..f5be28c 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ - +

We're sorry but Umbrel doesn't work properly without JavaScript diff --git a/src/App.vue b/src/App.vue index 043ea05..e13ee98 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,11 +2,9 @@

- + For security reasons Umbrel cannot be embedded in an iframe.

- {{ + {{ `${updateStatus.description}...` }}

@@ -99,38 +97,38 @@ export default { this.loadingPollInProgress = true; - // First check if manager api is up - if (this.loadingProgress <= 20) { - this.loadingProgress = 20; - await this.$store.dispatch("system/getManagerApi"); - if (!this.isManagerApiOperational) { - this.loading = true; - this.loadingPollInProgress = false; - return; - } - } - - // Then check if middleware api is up - if (this.loadingProgress <= 40) { - this.loadingProgress = 40; - await this.$store.dispatch("system/getApi"); - if (!this.isApiOperational) { - this.loading = true; - this.loadingPollInProgress = false; - return; - } - } - - // Then trigger auth check - if (this.loadingProgress <= 95 && this.jwt) { - this.loadingProgress = 95; - try { - await this.$store.dispatch("user/refreshJWT"); - } catch (error) { - // it will error if jwt has expired and automatically redirect the user to login page - null; - } - } + // // First check if manager api is up + // if (this.loadingProgress <= 20) { + // this.loadingProgress = 20; + // await this.$store.dispatch("system/getManagerApi"); + // if (!this.isManagerApiOperational) { + // this.loading = true; + // this.loadingPollInProgress = false; + // return; + // } + // } + + // // Then check if middleware api is up + // if (this.loadingProgress <= 40) { + // this.loadingProgress = 40; + // await this.$store.dispatch("system/getApi"); + // if (!this.isApiOperational) { + // this.loading = true; + // this.loadingPollInProgress = false; + // return; + // } + // } + + // // Then trigger auth check + // if (this.loadingProgress <= 95 && this.jwt) { + // this.loadingProgress = 95; + // try { + // await this.$store.dispatch("user/refreshJWT"); + // } catch (error) { + // // it will error if jwt has expired and automatically redirect the user to login page + // null; + // } + // } this.loadingProgress = 100; this.loadingPollInProgress = false; diff --git a/src/components/AuthenticatedVerticalNavbar.vue b/src/components/AuthenticatedVerticalNavbar.vue index 56c6b6e..7f39ddc 100644 --- a/src/components/AuthenticatedVerticalNavbar.vue +++ b/src/components/AuthenticatedVerticalNavbar.vue @@ -1,8 +1,8 @@

getumbrel / umbrel-dashboard

Tailwind Migration #410