diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 4ba094de..8684b875 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -14,7 +14,6 @@ // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) -import '@mdi/font/css/materialdesignicons.css'; import { createApp } from 'vue'; import VueCookies from 'vue3-cookies'; @@ -22,11 +21,52 @@ import * as Sentry from '@sentry/vue'; import { createVuetify } from 'vuetify'; /* eslint-disable import/no-unresolved */ -import * as components from 'vuetify/components'; -import * as directives from 'vuetify/directives'; -import { aliases, mdi } from 'vuetify/iconsets/mdi'; -import '../styles/site.scss'; +import { aliases, mdi } from 'vuetify/iconsets/mdi-svg'; +import { + VApp, + VContainer, + VLayout, + VMain, + VProgressCircular, + VDialog, + VBtn, + VCard, + VCardTitle, + VCardText, + VRow, + VCol, + VCardActions, + VTooltip, + VSheet, + VToolbar, +} from 'vuetify/components'; /* eslint-enable import/no-unresolved */ +import { + mdiAccount, + mdiAccountGroup, + mdiAccountPlus, + mdiBookOpenVariant, + mdiCircle, + mdiCircleMedium, + mdiClose, + mdiContentDuplicate, + mdiCrown, + mdiEmailOutline, + mdiFlag, + mdiFullscreen, + mdiHelpCircleOutline, + mdiHome, + mdiIncognito, + mdiInformation, + mdiLogout, + mdiScriptTextOutline, + mdiStar, + mdiThemeLightDark, + mdiTimerSand, + mdiTrophy, +} from '@mdi/js'; +import '../styles/site.scss'; + import { VueMasonryPlugin } from 'vue-masonry'; import { nationColors } from '../../../nationColors'; import App from '../src/App.vue'; @@ -53,11 +93,51 @@ const lightTheme = { }; const vuetify = createVuetify({ - components, - directives, + components: { + VApp, + VLayout, + VMain, + VContainer, + VProgressCircular, + VDialog, + VBtn, + VCard, + VCardTitle, + VCardText, + VRow, + VCol, + VCardActions, + VTooltip, + VSheet, + VToolbar, + }, icons: { defaultSet: 'mdi', - aliases, + aliases: { + ...aliases, + account: mdiAccount, + accountGroup: mdiAccountGroup, + accountPlus: mdiAccountPlus, + bookOpenVariant: mdiBookOpenVariant, + close: mdiClose, + circle: mdiCircle, + circleMedium: mdiCircleMedium, + contentDuplicate: mdiContentDuplicate, + crown: mdiCrown, + emailOutline: mdiEmailOutline, + flag: mdiFlag, + fullscreen: mdiFullscreen, + helpCircleOutline: mdiHelpCircleOutline, + home: mdiHome, + incognito: mdiIncognito, + information: mdiInformation, + logout: mdiLogout, + scriptTextOutline: mdiScriptTextOutline, + star: mdiStar, + themeLightDark: mdiThemeLightDark, + timerSand: mdiTimerSand, + trophy: mdiTrophy, + }, sets: { mdi, }, diff --git a/app/javascript/src/assets/tailwind.css b/app/javascript/src/assets/styles.css similarity index 100% rename from app/javascript/src/assets/tailwind.css rename to app/javascript/src/assets/styles.css diff --git a/app/javascript/src/components/BondPurchase.vue b/app/javascript/src/components/BondPurchase.vue index ea17456d..e16466dc 100644 --- a/app/javascript/src/components/BondPurchase.vue +++ b/app/javascript/src/components/BondPurchase.vue @@ -29,7 +29,7 @@ diff --git a/app/javascript/src/components/CurrentGames.vue b/app/javascript/src/components/CurrentGames.vue index 1422ac4d..d5fad499 100644 --- a/app/javascript/src/components/CurrentGames.vue +++ b/app/javascript/src/components/CurrentGames.vue @@ -41,7 +41,7 @@ {{ player.name }} diff --git a/app/javascript/src/components/Header.vue b/app/javascript/src/components/Header.vue index a708c8de..8aa2389a 100644 --- a/app/javascript/src/components/Header.vue +++ b/app/javascript/src/components/Header.vue @@ -7,7 +7,7 @@ Home @@ -31,7 +31,7 @@ @@ -51,8 +51,8 @@ @@ -61,45 +61,46 @@ Play anonymously as {{ profile.username }} @@ -107,7 +108,7 @@ @@ -119,7 +120,7 @@ > @@ -130,7 +131,7 @@ > @@ -140,7 +141,7 @@ > @@ -150,7 +151,7 @@ > diff --git a/app/javascript/src/components/Player.vue b/app/javascript/src/components/Player.vue index 1f538a66..a9cb1955 100644 --- a/app/javascript/src/components/Player.vue +++ b/app/javascript/src/components/Player.vue @@ -28,7 +28,7 @@ v-if="onlineUsers.includes(player.name)" color="blue" > - mdi-circle-medium + $circleMedium {{ player.name }} diff --git a/app/javascript/src/components/YourGames.vue b/app/javascript/src/components/YourGames.vue index 7e5633d8..9e661eff 100644 --- a/app/javascript/src/components/YourGames.vue +++ b/app/javascript/src/components/YourGames.vue @@ -32,7 +32,7 @@ #prepend > @@ -52,7 +52,7 @@ {{ player.name }} @@ -67,7 +67,7 @@ /> - Time Commitment: {{ timeCommitment(game.timeCommitment) }} + Time Commitment: {{ timeCommitment(game.timeCommitment) }} diff --git a/app/javascript/src/views/Game.vue b/app/javascript/src/views/Game.vue index f3b56d71..8443659a 100644 --- a/app/javascript/src/views/Game.vue +++ b/app/javascript/src/views/Game.vue @@ -6,7 +6,7 @@ > @@ -75,7 +75,7 @@ - Time Commitment: {{ timeCommitment(gameData.timeCommitment) }} + Time Commitment: {{ timeCommitment(gameData.timeCommitment) }} How do I play Imperial? @@ -103,7 +103,7 @@ How to Play Imperial @@ -161,7 +161,7 @@ v-bind="props" size="x-large" > - mdi-fullscreen + $fullscreen @@ -176,7 +176,7 @@ v-bind="props" size="x-large" > - mdi-flag + $flag @@ -191,7 +191,7 @@ v-bind="props" size="x-large" > - mdi-account-group + $accountGroup @@ -206,7 +206,7 @@ v-bind="props" size="x-large" > - mdi-script-text-outline + $scriptTextOutline diff --git a/app/javascript/src/views/Home.vue b/app/javascript/src/views/Home.vue index 3709168e..4caf8d22 100644 --- a/app/javascript/src/views/Home.vue +++ b/app/javascript/src/views/Home.vue @@ -106,4 +106,4 @@ export default { }; -