From da7f8c46a6024f4d48b49f1b1829f1550b71e0ef Mon Sep 17 00:00:00 2001 From: Thog Date: Mon, 10 Feb 2020 15:59:13 +0100 Subject: [PATCH] Migrate to Vuetify 2.0.0 --- .eslintrc.js | 28 ++++++ package.json | 5 +- src/layouts/Default.vue | 114 ++++++++++++----------- src/main.js | 27 ++++-- src/pages/Build.vue | 40 ++++---- src/pages/Contribute.vue | 64 ++++++------- src/pages/Download.vue | 196 +++++++++++++++++++++------------------ src/pages/Index.vue | 151 ++++++++++++++++-------------- 8 files changed, 349 insertions(+), 276 deletions(-) create mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..22ba591 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,28 @@ +module.exports = { + "env": { + "browser": true, + "es6": true, + "node": true + }, + "extends": [ + "eslint:recommended", + "plugin:vue/essential" + ], + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaVersion": 2018, + "sourceType": "module" + }, + "plugins": [ + "vue", + 'vuetify' + ], + "rules": { + 'vuetify/no-deprecated-classes': 'error', + 'vuetify/grid-unknown-attributes': 'error', + 'vuetify/no-legacy-grid': 'error', + } +}; \ No newline at end of file diff --git a/package.json b/package.json index fa12373..af737d6 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,13 @@ }, "dependencies": { "gridsome": "^0.7.0", - "vuetify": "^1.0.0" + "vuetify": "^2.0.0" }, "devDependencies": { "@gridsome/plugin-sitemap": "^0.2.3", + "eslint": "^6.8.0", + "eslint-plugin-vue": "^6.1.2", + "eslint-plugin-vuetify": "^1.0.0-beta.5", "gridsome-plugin-robots-txt": "^1.0.2", "webpack-node-externals": "^1.7.2" } diff --git a/src/layouts/Default.vue b/src/layouts/Default.vue index 01d6171..fb06dad 100644 --- a/src/layouts/Default.vue +++ b/src/layouts/Default.vue @@ -1,29 +1,29 @@ @@ -171,15 +171,17 @@ export default { data() { return { title: "Ryujinx - Nintendo Switch Emulator", - dark: process.isClient && localStorage.dark_mode === "true", drawer: false, }; }, methods: { toggleDarkMode() { - this.dark = !this.dark; - localStorage.dark_mode = this.dark; + this.$vuetify.theme.dark = !this.$vuetify.theme.dark; + localStorage.dark_mode = this.$vuetify.theme.dark; } + }, + beforeMount() { + this.$vuetify.theme.dark = localStorage.dark_mode === "true" } }; diff --git a/src/main.js b/src/main.js index d657cd0..9c2b9ab 100644 --- a/src/main.js +++ b/src/main.js @@ -4,11 +4,11 @@ import '~/external/fontawesome/css/fontawesome-all.css' import DefaultLayout from '~/layouts/Default.vue' import SEO from '~/components/SEO.vue' -export default function (Vue, { appOptions, router, head }) { +export default function (Vue, { appOptions, head }) { // First inject custom CSS needed head.link.push({ rel: 'stylesheet', - href: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500|Material+Icons&display=swap' + href: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap' }) // Remove the generator tag @@ -27,15 +27,28 @@ export default function (Vue, { appOptions, router, head }) { const opts = { theme: { - ryu_blue: '#00C4E1', - ryu_orange: '#FF5E5B' - } + themes: { + light: { + ryu_blue: '#00C4E1', + ryu_orange: '#FF5E5B', + }, + dark: { + ryu_blue: '#00C4E1', + ryu_orange: '#FF5E5B', + } + } + }, + icons: { + iconfont: 'fa', + }, } //opts includes, vuetify themes, icons, etc. - Vue.use(Vuetify, opts) + Vue.use(Vuetify) + + appOptions.vuetify = new Vuetify(opts); // Disable production tip - Vue.config.productionTip = false; + //Vue.config.productionTip = false; // Set default layout as a global component Vue.component('Layout', DefaultLayout) diff --git a/src/pages/Build.vue b/src/pages/Build.vue index 9efe823..60ff377 100644 --- a/src/pages/Build.vue +++ b/src/pages/Build.vue @@ -2,15 +2,15 @@
- - - - -
+ + + + +

Building Ryujinx:

- - + +

Step one:

Download NET Core @@ -20,20 +20,20 @@ target="_blank" >here. Then install the SDK.

- - + +

Step two (Variant one):

After the installation of the Net Core SDK is done; go ahead and copy the Clone link from GitHub from here (via Clone or Download --> Copy HTTPS Link. Or you can download the ZIP tarball.) You can Git Clone the repo by using the GitBash, or you may use the second variant.

- - + +

Step two (Variant two):

Download the ZIP Tarball. Then extract it to a directory of your choice.

- - + +

Step three:

Build the App using a Command prompt in the ROOT directory. You can quickly access it by Holding shift in explorer (in the Ryujinx directory) then right clicking, @@ -41,21 +41,21 @@ dotnet publish -c Release -r win10-x64. The build directory is "root/bin/release/etc/etc."

- - + +

Step four:

In order to run a game or homebrew; simply drag the file onto the Executable. The app will launch, and the homebrew/game will begin emulation. Do keep in mind, that emulation is finicky, and will most likely crash at some point.

- - + +
- - + + - +
diff --git a/src/pages/Contribute.vue b/src/pages/Contribute.vue index 3c1e213..e08415f 100644 --- a/src/pages/Contribute.vue +++ b/src/pages/Contribute.vue @@ -2,42 +2,42 @@
- - - - -
+ + + + +

How may I contribute?

- - + +

Helping With Development

- - + +

Helping With Donations

- - + + - - + +

You may contribute if you have experience in C#, Switch Homebrew, image design, Discord management, etc. It doesn't matter what you're good at. If you have any skills that you think would be useful in the development, please do contact us through our Discord.

- - + +

If you can't help out with development experience, there's other ways to support. Whilst monetary donations are by no means required, we do appreciate them. They'll go towards necessary equipment and the likes. In return, there's some rewards that you as a supporter will get (for example access to a patreon-only text channel on our Discord).

- - + + - - + + fab fa-discordJoin our Discord! - - + + fab fa-patreonBecome a patron! - - + + - - + +

Helping With Development

You may contribute if you have experience in C#, Switch Homebrew, image design, Discord management, etc. @@ -82,8 +82,8 @@ > fab fa-discordJoin our Discord! - - + +

Helping With Donations

If you can't help out with development experience, there's other ways to support. @@ -102,8 +102,8 @@ > fab fa-patreonBecome a patron! - - + +