Merge branch 'evan/mod-172-paper-and-purpur-frontend' into evan/mod-1…

…73-panel-terminal-perf

.github/ISSUE_TEMPLATE/2-web-bug.yml

@@ -1,6 +1,6 @@
 name: 🌐 Website bug (modrinth.com)
 description: Report an issue on the Modrinth website.
-labels: [bug, frontend]
+labels: [bug, web]
 body:
   - type: checkboxes
     attributes:
@@ -49,4 +49,4 @@ body:
       label: Additional context
       description: Add any other context about the problem here.
     validations:
-      required: false
+      required: false

.github/ISSUE_TEMPLATE/3-api-bug.yml

@@ -1,6 +1,6 @@
 name: 🛠️ API issue (api.modrinth.com)
 description: Report an issue regarding the Modrinth API.
-labels: [bug, api]
+labels: [bug, backend]
 body:
   - type: checkboxes
     attributes:
@@ -38,4 +38,4 @@ body:
       label: Additional context
       description: Add any other context about the problem here.
     validations:
-      required: false
+      required: false

apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue

@@ -9,7 +9,7 @@ import {
   SteamIcon,
   GitLabIcon,
 } from '@/assets/external'
-import { login, login_2fa, create_account, login_pass } from '@/helpers/mr_auth.js'
+import { login } from '@/helpers/mr_auth.js'
 import { handleError, useNotifications } from '@/store/state.js'
 import { ref } from 'vue'
 import { handleSevereError } from '@/store/error.js'
@@ -71,8 +71,8 @@ const password = ref('')
 const confirmPassword = ref('')
 const subscribe = ref(true)
 
-async function signInOauth(provider) {
-  const creds = await login(provider).catch(handleSevereError)
+async function signInOauth() {
+  const creds = await login().catch(handleSevereError)
 
   if (creds && creds.type === 'two_factor_required') {
     twoFactorFlow.value = creds.flow

apps/app-frontend/src/helpers/mr_auth.js

@@ -5,26 +5,8 @@
  */
 import { invoke } from '@tauri-apps/api/core'
 
-export async function login(provider) {
-  return await invoke('modrinth_auth_login', { provider })
-}
-
-export async function login_pass(username, password, challenge) {
-  return await invoke('plugin:mr-auth|login_pass', { username, password, challenge })
-}
-
-export async function login_2fa(code, flow) {
-  return await invoke('plugin:mr-auth|login_2fa', { code, flow })
-}
-
-export async function create_account(username, email, password, challenge, signUpNewsletter) {
-  return await invoke('plugin:mr-auth|create_account', {
-    username,
-    email,
-    password,
-    challenge,
-    signUpNewsletter,
-  })
+export async function login() {
+  return await invoke('plugin:mr-auth|modrinth_login')
 }
 
 export async function logout() {

apps/app/.gitignore

@@ -2,3 +2,5 @@
 # will have compiled files and executables
 /target/
 
+# Generated by tauri, metadata generated at compile time
+/gen/

apps/app/build.rs

@@ -102,13 +102,7 @@ fn main() {
             .plugin(
                 "mr-auth",
                 InlinedPlugin::new()
-                    .commands(&[
-                        "login_pass",
-                        "login_2fa",
-                        "create_account",
-                        "logout",
-                        "get",
-                    ])
+                    .commands(&["modrinth_login", "logout", "get"])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),