fix!: start rebrand from Modrinth to NML (Nerd's Minecraft Launcher) (#2)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mark-wiemer <7833360+mark-wiemer@users.noreply.github.com>

Author: Copilot

.github/workflows/frontend-pages.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   wait:
-    if: github.repository_owner == 'modrinth'
+    if: github.repository_owner == 'example'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -26,5 +26,5 @@ jobs:
           curl -X POST \
             -H "Authorization: Bearer ${{ secrets.CF_API_TOKEN }}" \
             -H "Content-Type: application/json" \
-            --data '{"hosts": ["modrinth.com", "www.modrinth.com"]}' \
+            --data '{"hosts": ["example.com", "www.example.com"]}' \
             https://api.cloudflare.com/client/v4/zones/e39df17b9c4ef44cbce2646346ee6d33/purge_cache

.github/workflows/theseus-release.yml

@@ -105,7 +105,7 @@ jobs:
         run: pnpm install
 
       - name: build app (macos)
-        run: pnpm --filter=@modrinth/app run tauri build --target universal-apple-darwin --config "tauri-release.conf.json"
+        run: pnpm --filter=@nml/app run tauri build --target universal-apple-darwin --config "tauri-release.conf.json"
         if: startsWith(matrix.platform, 'macos')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -120,7 +120,7 @@ jobs:
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
 
       - name: build app
-        run: pnpm --filter=@modrinth/app run tauri build --config "tauri-release.conf.json"
+        run: pnpm --filter=@nml/app run tauri build --config "tauri-release.conf.json"
         id: build_os
         if: "!startsWith(matrix.platform, 'macos')"
         env:

COPYING.md

@@ -6,8 +6,12 @@ For detailed information, consult each package's COPYING.md file, if available.
 
 ## Modrinth Branding
 
-The use of Modrinth branding elements, including but not limited to the wrench-in-labyrinth logo, the landing image, and any variations thereof, is strictly prohibited without explicit written permission from Rinth, Inc. This includes trademarks, logos, or other branding elements.
+This project is a fork of Modrinth but is not associated with Rinth, Inc. All Modrinth branding elements have been removed from this fork and replaced with NML (Nerd's Minecraft Launcher) branding.
 
-All rights reserved. © 2020-2024 Rinth, Inc.
+The original Modrinth branding policy stated:
 
-If you fork this repository, you must remove all Modrinth branding assets from your fork.
+> The use of Modrinth branding elements, including but not limited to the wrench-in-labyrinth logo, the landing image, and any variations thereof, is strictly prohibited without explicit written permission from Rinth, Inc. This includes trademarks, logos, or other branding elements.
+
+> All rights reserved. © 2020-2024 Rinth, Inc.
+
+If you fork this repository, you must ensure all Modrinth branding assets remain removed from your fork.

Cargo.toml

@@ -20,5 +20,7 @@ strip = true # Remove debug symbols
 [profile.dev.package.sqlx-macros]
 opt-level = 3
 
+# Note: This project is a fork of Modrinth (https://github.com/modrinth/code)
+# but is not associated with Rinth, Inc.
 [patch.crates-io]
 wry = { git = "https://github.com/modrinth/wry", rev ="e88d4a1" }

README.md

@@ -7,7 +7,7 @@ This project is a fork of [Modrinth](https://github.com/modrinth/code), but is n
 Welcome to the Nerd's Minecraft Launcher monorepo, the codebase for the NML app 🤓 This project is still in active development and has no releases yet.
 
 <!-- todo
-If you're not a developer and you've stumbled upon this repository, you can access the web interface on the [NML website??](https://markwiemer.com/nml) and download the latest release of the app [here](todo GitHub Releases).
+If you're not a developer and you've stumbled upon this repository, you can access the web interface on the [NML website??](https://example.com/nml) and download the latest release of the app [here](todo GitHub Releases).
 -->
 
 ## Development
@@ -25,7 +25,7 @@ If you plan to fork this repository for your own purposes, please review our [co
 
 ## Support
 
-If you need help with the Modrinth web interface or app, please open a GitHub issue.
+If you need help with Nerd's Minecraft Launcher, please open a GitHub issue.
 
 ## License
 

apps/app-frontend/COPYING.md

@@ -2,12 +2,12 @@
 
 The source code of the theseus repository is licensed under the GNU General Public License, Version 3 only, which is provided in the file [LICENSE](./LICENSE). However, some files listed below are licensed under a different license.
 
-## Modrinth logo
+**Note:** This project is a fork of Modrinth App but is not associated with Rinth, Inc.
 
-The use of Modrinth branding elements, including but not limited to the wrench-in-labyrinth logo, the landing image, and any variations thereof, is strictly prohibited without explicit written permission from Rinth, Inc. This includes trademarks, logos, or other branding elements.
+The original Modrinth branding policy stated:
 
+> The use of Modrinth branding elements, including but not limited to the wrench-in-labyrinth logo, the landing image, and any variations thereof, is strictly prohibited without explicit written permission from Rinth, Inc. This includes trademarks, logos, or other branding elements.
+>
 > All rights reserved. © 2020-2023 Rinth, Inc.
 
-This includes, but may not be limited to, the following files:
-
-- theseus_gui/src-tauri/icons/\*
+If you'd like to copy Nerd's Minecraft Launcher, you're more than welcome to do so, but you must clarify wherever possible that you are an unofficial fork of NML so that users aren't confused.

apps/app-frontend/eslint.config.mjs

@@ -13,7 +13,7 @@ export default createConfigForNuxt().append([
     },
   },
   {
-    name: 'modrinth',
+    name: 'nml',
     rules: {
       'vue/html-self-closing': 'off',
       'vue/multi-word-component-names': 'off',

apps/app-frontend/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Modrinth App</title>
+    <title>Nerd's Minecraft Launcher</title>
 
     <link rel="stylesheet" href="/src/assets/stylesheets/global.scss" />
   </head>

apps/app-frontend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@modrinth/app-frontend",
+  "name": "@nml/app-frontend",
   "private": true,
   "version": "0.9.0",
   "type": "module",
@@ -12,9 +12,9 @@
     "intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace"
   },
   "dependencies": {
-    "@modrinth/assets": "workspace:*",
-    "@modrinth/ui": "workspace:*",
-    "@modrinth/utils": "workspace:*",
+    "@nml/assets": "workspace:*",
+    "@nml/ui": "workspace:*",
+    "@nml/utils": "workspace:*",
     "@sentry/vue": "^8.27.0",
     "@tauri-apps/api": "^2.1.1",
     "@tauri-apps/plugin-dialog": "^2.2.0",

apps/app-frontend/src/App.vue

@@ -16,18 +16,18 @@ import {
   RestoreIcon,
   LogOutIcon,
   RightArrowIcon,
-} from '@modrinth/assets'
-import { Avatar, Button, ButtonStyled, Notifications, OverflowMenu } from '@modrinth/ui'
+} from '@nml/assets'
+import { Avatar, Button, ButtonStyled, Notifications, OverflowMenu } from '@nml/ui'
 import { useLoading, useTheming } from '@/store/state'
-import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
+import NMLAppLogo from '@/assets/nml_app.svg?component'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { get } from '@/helpers/settings'
 import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
 import ErrorModal from '@/components/ui/ErrorModal.vue'
-import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
+import LoadingIndicator from '@/components/LoadingIndicatorBar.vue'
 import { handleError, useNotifications } from '@/store/notifications.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
 import { type } from '@tauri-apps/plugin-os'
@@ -46,7 +46,7 @@ import { useInstall } from '@/store/install.js'
 import { invoke } from '@tauri-apps/api/core'
 import { get_opening_command, initialize_state } from '@/helpers/state'
 import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
-import { renderString } from '@modrinth/utils'
+import { renderString } from '@nml/utils'
 import { useFetch } from '@/helpers/fetch.js'
 import { check } from '@tauri-apps/plugin-updater'
 import NavButton from '@/components/ui/NavButton.vue'
@@ -258,7 +258,7 @@ themeStore.$subscribe(() => {
 
 const forceSidebar = ref(false)
 const sidebarVisible = computed(() => sidebarToggled.value || forceSidebar.value)
-const showAd = computed(() => !(!sidebarVisible.value || hasPlus.value))
+const showAd = false
 
 router.afterEach((to) => {
   forceSidebar.value = to.path.startsWith('/browse') || to.path.startsWith('/project')
@@ -442,7 +442,7 @@ function handleAuxClick(e) {
     </div>
     <div data-tauri-drag-region class="app-grid-statusbar bg-bg-raised h-[--top-bar-height] flex">
       <div data-tauri-drag-region class="flex p-3">
-        <ModrinthAppLogo class="h-full w-auto text-contrast pointer-events-none" />
+        <NMLAppLogo class="h-full w-auto text-contrast pointer-events-none" />
         <Breadcrumbs class="pt-[2px]" />
       </div>
       <section class="flex ml-auto items-center">
@@ -497,7 +497,7 @@ function handleAuxClick(e) {
           width: 'calc(100% - var(--left-bar-width) - var(--right-bar-width))',
         }"
       >
-        <ModrinthLoadingIndicator />
+        <LoadingIndicator />
       </div>
       <div
         v-if="themeStore.featureFlags.page_path"
@@ -572,16 +572,6 @@ function handleAuxClick(e) {
           </div>
         </div>
       </div>
-      <template v-if="showAd">
-        <a
-          href="https://modrinth.plus?app"
-          class="absolute bottom-[250px] w-full flex justify-center items-center gap-1 px-4 py-3 text-purple font-medium hover:underline z-10"
-          target="_blank"
-        >
-          <ArrowBigUpDashIcon class="text-2xl" /> Upgrade to Modrinth+
-        </a>
-        <PromotionWrapper />
-      </template>
     </div>
     <div class="view">
       <div v-if="criticalErrorMessage" class="critical-error-banner" data-tauri-drag-region>