dvelo/mhsf-dev
1
0
Fork 0
mirror of https://github.com/DeveloLongScript/MHSF.git synced 2026-05-09 13:34:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: dvelo:77444ce11d7d5c85b91b62b9a25f52b2e863c501
Branches Tags
dvelo:main
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-66.4.1
dvelo:dependabot/npm_and_yarn/react-day-picker-9.8.1
dvelo:dependabot/npm_and_yarn/unplugin-tailwindcss-mangle-4.1.2
dvelo:dependabot/npm_and_yarn/tailwind-merge-3.3.1
dvelo:v2
dvelo:dev
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-65.4.0
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-0.65.3
dvelo:dependabot/npm_and_yarn/babel/parser-7.26.3
dvelo:dependabot/npm_and_yarn/typescript-5.7.2
dvelo:dependabot/npm_and_yarn/cross-spawn-7.0.6
dvelo:dependabot/npm_and_yarn/postcss-8.4.49
dvelo:1.8.0
dvelo:1.7.5
dvelo:1.7
dvelo:1.6.5
dvelo:1.6
dvelo:1.5
dvelo:1.4.5
dvelo:1.3.2
dvelo:1.3
dvelo:1.2
dvelo:1.1.0
dvelo:1.0.1
dvelo:1.0
dvelo:0.10.7
dvelo:0.10.2
dvelo:0.10
dvelo:0.9
...
compare: dvelo:e6f2df132a85628da1ec2c0db9705c2736ef0e25
Branches Tags
dvelo:main
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-66.4.1
dvelo:dependabot/npm_and_yarn/react-day-picker-9.8.1
dvelo:dependabot/npm_and_yarn/unplugin-tailwindcss-mangle-4.1.2
dvelo:dependabot/npm_and_yarn/tailwind-merge-3.3.1
dvelo:v2
dvelo:dev
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-65.4.0
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-0.65.3
dvelo:dependabot/npm_and_yarn/babel/parser-7.26.3
dvelo:dependabot/npm_and_yarn/typescript-5.7.2
dvelo:dependabot/npm_and_yarn/cross-spawn-7.0.6
dvelo:dependabot/npm_and_yarn/postcss-8.4.49
dvelo:1.8.0
dvelo:1.7.5
dvelo:1.7
dvelo:1.6.5
dvelo:1.6
dvelo:1.5
dvelo:1.4.5
dvelo:1.3.2
dvelo:1.3
dvelo:1.2
dvelo:1.1.0
dvelo:1.0.1
dvelo:1.0
dvelo:0.10.7
dvelo:0.10.2
dvelo:0.10
dvelo:0.9

8 Commits
77444ce11d ... e6f2df132a

Author SHA1 Message Date
dependabot[bot]
e6f2df132a
Merge 103880ff3af19ac5c85475350b325e6ecfed6bef into 62eabef06235552d0476c7edccd1dde661969078 2024-12-03 17:04:23 -08:00
dvelo
62eabef062
feat: improve server icons 
feat: improve server icons
 2024-11-25 19:41:11 -06:00
dvelo
0e4632b79a feat: improve server icons 2024-11-25 19:39:47 -06:00
dvelo
db587401bf
fix: use custom top property for environments in production or not 
fix: use custom `top` property for environments in production or not
 2024-11-23 19:15:52 -06:00
dvelo
d7714f4cdb fix: use custom top property for environments in production or not 2024-11-23 19:13:18 -06:00
dvelo
6528152e12
fix: types in ThemeProvider (to main) 
fix: types in ThemeProvider (to main)
 2024-11-23 18:31:30 -06:00
dvelo
955ba3774c fix: types in ThemeProvider 2024-11-23 18:05:38 -06:00
dependabot[bot]
103880ff3a
build(deps-dev): bump @unocss/preset-uno from 0.61.5 to 0.64.1 
Bumps [@unocss/preset-uno](https://github.com/unocss/unocss/tree/HEAD/packages/preset-uno) from 0.61.5 to 0.64.1.
- [Release notes](https://github.com/unocss/unocss/releases)
- [Commits](https://github.com/unocss/unocss/commits/v0.64.1/packages/preset-uno)

---
updated-dependencies:
- dependency-name: "@unocss/preset-uno"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-11-18 05:52:42 +00:00
5 changed files with 93 additions and 36 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

@ -88,7 +88,7 @@
"@types/react-dom": "^18", "@types/react-dom": "^18",
"@types/react-twemoji": "^0.4.3", "@types/react-twemoji": "^0.4.3",
"@unocss/eslint-config": "^0.61.5", "@unocss/eslint-config": "^0.61.5",
"@unocss/preset-uno": "^0.61.5", "@unocss/preset-uno": "^0.64.1",
"@unocss/transformer-compile-class": "^0.61.5", "@unocss/transformer-compile-class": "^0.61.5",
"@vercel/analytics": "^1.3.1", "@vercel/analytics": "^1.3.1",
"@vercel/speed-insights": "^1.0.12", "@vercel/speed-insights": "^1.0.12",

46
src/components/AfterServerView.tsx
View File

@ -37,7 +37,7 @@ import {
getIndexFromRarity, getIndexFromRarity,
getMinehutIcons, getMinehutIcons,
} from "@/lib/types/server-icon"; } from "@/lib/types/server-icon";
import { Copy, Info, QrCode, Share2 } from "lucide-react"; import { Banknote, Copy, Info, QrCode, Share2 } from "lucide-react";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FadeIn from "react-fade-in/lib/FadeIn"; import FadeIn from "react-fade-in/lib/FadeIn";
@ -287,8 +287,9 @@ export default function AfterServerView({ server }: { server: string }) {
</td> </td>
</tr> </tr>
<tr> <tr>
<th className="border p-2">Credits per day</th> <th className="border p-2">Credits p/ day</th>
<td className="border p-2"> <td className="border p-2 flex items-center">
<Banknote className="mr-1" />
{serverObject?.credits_per_day == undefined {serverObject?.credits_per_day == undefined
? "? (unknown)" ? "? (unknown)"
: Math.floor(serverObject?.credits_per_day)} : Math.floor(serverObject?.credits_per_day)}
@ -475,7 +476,7 @@ export default function AfterServerView({ server }: { server: string }) {
{serverObject?.purchased_icons.map((icon) => ( {serverObject?.purchased_icons.map((icon) => (
<Card key={icon} className="my-4"> <Card key={icon} className="my-4">
<CardContent <CardContent
className="pt-4" className="pt-4 flex items-center"
style={{ style={{
color: getIndexFromRarity( color: getIndexFromRarity(
icons?.find((c) => c._id === icon)?.rank.toLowerCase() icons?.find((c) => c._id === icon)?.rank.toLowerCase()
@ -489,6 +490,37 @@ export default function AfterServerView({ server }: { server: string }) {
className="mr-2" className="mr-2"
/> />
{icons?.find((c) => c._id === icon)?.display_name} {icons?.find((c) => c._id === icon)?.display_name}
<Tooltip>
<TooltipTrigger>
<Info size={18} className="ml-2" />
</TooltipTrigger>
<TooltipContent>
Just because an item is available, it doesn't directly{" "}
<br />
mean that it can be bought immediately, it just means
its in the <br />
pool of icons that are in the weekly rotation.
<br />
<br />
<span className="flex items-center">
<span className="mr-1">Available currently:</span>
{toJSX(
icons?.find((c) => c._id === icon)?.available
)}
</span>
<span className="flex items-center">
<span className="mr-1">Disabled currently:</span>
{toJSX(
icons?.find((c) => c._id === icon)?.disabled
)}
</span>
<span className="flex items-center">
<span className="mr-1">Price:</span>
<Banknote size={16} className="mr-1" />
{icons?.find((c) => c._id === icon)?.price} credits
</span>
</TooltipContent>
</Tooltip>
<span <span
className="mx-2 p-1 pr-2 rounded italic font-bold" className="mx-2 p-1 pr-2 rounded italic font-bold"
style={{ style={{
@ -517,10 +549,14 @@ export default function AfterServerView({ server }: { server: string }) {
); );
} }
function toJSX(boolean: boolean) { function toJSX(boolean?: boolean) {
if (boolean) { if (boolean) {
return <div className="text-green-400">True</div>; return <div className="text-green-400">True</div>;
} }
if (boolean == undefined) {
return <div className="text-gray-400">N/A</div>;
}
return <div className="text-red-400">False</div>; return <div className="text-red-400">False</div>;
} }

2
src/components/ThemeProvider.tsx
View File

@ -32,7 +32,7 @@
import * as React from "react"; import * as React from "react";
import { ThemeProvider as NextThemesProvider, useTheme } from "next-themes"; import { ThemeProvider as NextThemesProvider, useTheme } from "next-themes";
import { type ThemeProviderProps } from "next-themes/dist/types"; import { type ThemeProviderProps } from "next-themes";
declare global { declare global {
interface Document { interface Document {

3
src/components/misc/StickyTopbar.tsx
View File

@ -30,6 +30,7 @@
"use client"; "use client";
import { banner } from "@/config/banner";
import { useEffect, useState, ReactNode } from "react"; import { useEffect, useState, ReactNode } from "react";
export default function StickyTopbar({ export default function StickyTopbar({
@ -60,7 +61,7 @@ export default function StickyTopbar({
return ( return (
<div <div
className={`transition-all duration-300 ${isSticky ? "fixed top-[70px] left-0 w-full backdrop-blur shadow-lg " + className : "block w-full bg-transparent"}`} className={`transition-all duration-300 ${isSticky ? "fixed left-0 w-full backdrop-blur shadow-lg " + (banner.isBanner == true ? "top-[70px] " : "top-[38px] ") + className : "block w-full bg-transparent"}`}
> >
{children} {children}
</div> </div>

76
yarn.lock
View File

@ -732,7 +732,7 @@
resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
"@jridgewell/sourcemap-codec@^1.4.15": "@jridgewell/sourcemap-codec@^1.4.15", "@jridgewell/sourcemap-codec@^1.5.0":
version "1.5.0" version "1.5.0"
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
@ -2428,6 +2428,11 @@
resolved "https://registry.yarnpkg.com/@unocss/core/-/core-0.61.5.tgz#09f4da600f6f50dbb68a173f23566e9171d5cd3d" resolved "https://registry.yarnpkg.com/@unocss/core/-/core-0.61.5.tgz#09f4da600f6f50dbb68a173f23566e9171d5cd3d"
integrity sha512-hB8zr2rnrCzz9x8ho2SAXQiYTEjwAPMiBzpaEe2C0+CFWeL1179h9508YVyZHHAzMyZILIG9YrVAWrrMdt2/Xg== integrity sha512-hB8zr2rnrCzz9x8ho2SAXQiYTEjwAPMiBzpaEe2C0+CFWeL1179h9508YVyZHHAzMyZILIG9YrVAWrrMdt2/Xg==
"@unocss/core@0.64.1", "@unocss/core@^0.64.1":
version "0.64.1"
resolved "https://registry.yarnpkg.com/@unocss/core/-/core-0.64.1.tgz#3526aad68062f46915adfddbe6a7331ed9a2b6cd"
integrity sha512-D1ULd70a24/k6kGyHCIijbrrIn9UjFUEBg2R4xKX2/ViQb1k2MIgOs4VS20MkJX6kbZXqqm/zAFHzDhsQGIhBA==
"@unocss/eslint-config@^0.61.5": "@unocss/eslint-config@^0.61.5":
version "0.61.5" version "0.61.5"
resolved "https://registry.yarnpkg.com/@unocss/eslint-config/-/eslint-config-0.61.5.tgz#01a8ebb4a626d22d6e29d9800c31d2f87bed2b6b" resolved "https://registry.yarnpkg.com/@unocss/eslint-config/-/eslint-config-0.61.5.tgz#01a8ebb4a626d22d6e29d9800c31d2f87bed2b6b"
@ -2446,12 +2451,12 @@
magic-string "^0.30.10" magic-string "^0.30.10"
synckit "^0.9.1" synckit "^0.9.1"
"@unocss/extractor-arbitrary-variants@0.61.5": "@unocss/extractor-arbitrary-variants@0.64.1":
version "0.61.5" version "0.64.1"
resolved "https://registry.yarnpkg.com/@unocss/extractor-arbitrary-variants/-/extractor-arbitrary-variants-0.61.5.tgz#478b15f0ae298b0f05d9978ef528b08723c22cb5" resolved "https://registry.yarnpkg.com/@unocss/extractor-arbitrary-variants/-/extractor-arbitrary-variants-0.64.1.tgz#957d35098f0cb3ca17e42ec1428a29f5ad58200d"
integrity sha512-UB1EweAaJrUxv+h3n5FqoizKHrnUgUzkdmOdJTfV6xvow90ITqbUoza+L6iVMNfcrcXTx8QpDnWh6rhLRyKY+g== integrity sha512-tKtaeZYzSCaH1ASE7Uj45rPX4ApQHYE8eZFfaL3N4ZY0LYrTJPBnaLSRfLRwGD6KLHjoL3+sorywJiS/VVBcFQ==
dependencies: dependencies:
"@unocss/core" "0.61.5" "@unocss/core" "0.64.1"
"@unocss/postcss@^0.61.5": "@unocss/postcss@^0.61.5":
version "0.61.5" version "0.61.5"
@ -2466,33 +2471,33 @@
magic-string "^0.30.10" magic-string "^0.30.10"
postcss "^8.4.39" postcss "^8.4.39"
"@unocss/preset-mini@0.61.5": "@unocss/preset-mini@0.64.1":
version "0.61.5" version "0.64.1"
resolved "https://registry.yarnpkg.com/@unocss/preset-mini/-/preset-mini-0.61.5.tgz#60dc1aa2c05e415b6e9860493fb92a20acce62da" resolved "https://registry.yarnpkg.com/@unocss/preset-mini/-/preset-mini-0.64.1.tgz#f8a32f30492547fc3727b45165b34b0b67cb3c89"
integrity sha512-gVm7Z9X0krx8CK/+pKAqcVmpqzRk1+SH7bfgRxKtKhyFSxJlwpjNp1rKm3gCT0F1Tlp3d8aufYRksaXGZhs8Ow== integrity sha512-tl+ciN0elB9eETEVZQrNaMy4NpbLdWDVW7KlmpRZi4Eomf/Ntz+Wctp5V0aBvszo8arEaDiOwsgMxITvx9Ll6Q==
dependencies: dependencies:
"@unocss/core" "0.61.5" "@unocss/core" "0.64.1"
"@unocss/extractor-arbitrary-variants" "0.61.5" "@unocss/extractor-arbitrary-variants" "0.64.1"
"@unocss/rule-utils" "0.61.5" "@unocss/rule-utils" "0.64.1"
"@unocss/preset-uno@^0.61.5": "@unocss/preset-uno@^0.64.1":
version "0.61.5" version "0.64.1"
resolved "https://registry.yarnpkg.com/@unocss/preset-uno/-/preset-uno-0.61.5.tgz#80c85edaf4ed364c91df3400dae5abfe3976f21e" resolved "https://registry.yarnpkg.com/@unocss/preset-uno/-/preset-uno-0.64.1.tgz#b5110de1e7edea25878403a3cd4400964b2e9055"
integrity sha512-CflB0l9CeZx+b/Q8mA4Ow4d63Caf+vFJ+1EGA06jG9qYjPLy76Rkci//0m9cEtO+vPnYtgLc7HZAZv0X6wh4Tg== integrity sha512-9427KmOHsck9mNfOXiCBy43Q9aAI1w15tCBJf2bDMHioJltc6JjW+Mg5DDZWnYelhzpXCYK7zTZtMJ40KxDx+g==
dependencies: dependencies:
"@unocss/core" "0.61.5" "@unocss/core" "0.64.1"
"@unocss/preset-mini" "0.61.5" "@unocss/preset-mini" "0.64.1"
"@unocss/preset-wind" "0.61.5" "@unocss/preset-wind" "0.64.1"
"@unocss/rule-utils" "0.61.5" "@unocss/rule-utils" "0.64.1"
"@unocss/preset-wind@0.61.5": "@unocss/preset-wind@0.64.1":
version "0.61.5" version "0.64.1"
resolved "https://registry.yarnpkg.com/@unocss/preset-wind/-/preset-wind-0.61.5.tgz#049f4cf3d15be5d5bf1bb3c2108cff22a69d0884" resolved "https://registry.yarnpkg.com/@unocss/preset-wind/-/preset-wind-0.64.1.tgz#ce61c01fd9ae0834b21a08e7e4880c4f1487b590"
integrity sha512-n4uepxv3gVoVQb0tv7iV8M4W0CgwLw0QaMX+3ECYzFLMynjCkZmFDtdQAX720yTvLZxwCxEZfQCgydOSt0qjZA== integrity sha512-IpAfsi2tI4elb2uZzc3BSZgbi0axgwgJLPFW0BtZQe4u1J+zrUIOvjCu/2jmiB7LR05IShCyMKIz9Vi4EJm+gQ==
dependencies: dependencies:
"@unocss/core" "0.61.5" "@unocss/core" "0.64.1"
"@unocss/preset-mini" "0.61.5" "@unocss/preset-mini" "0.64.1"
"@unocss/rule-utils" "0.61.5" "@unocss/rule-utils" "0.64.1"
"@unocss/rule-utils@0.61.5": "@unocss/rule-utils@0.61.5":
version "0.61.5" version "0.61.5"
@ -2502,6 +2507,14 @@
"@unocss/core" "^0.61.5" "@unocss/core" "^0.61.5"
magic-string "^0.30.10" magic-string "^0.30.10"
"@unocss/rule-utils@0.64.1":
version "0.64.1"
resolved "https://registry.yarnpkg.com/@unocss/rule-utils/-/rule-utils-0.64.1.tgz#4d2654413ea4003f84e1e8223d00ce92ae26cfc6"
integrity sha512-h+Du0lezKHmdsEsGQGAtGrwrTrU+Av4eij46UzpzuNWFq0mAouBu8m/lgBI1AcY9B0Jg3EJalkOgA06tAKS8jg==
dependencies:
"@unocss/core" "^0.64.1"
magic-string "^0.30.12"
"@unocss/transformer-compile-class@^0.61.5": "@unocss/transformer-compile-class@^0.61.5":
version "0.61.5" version "0.61.5"
resolved "https://registry.yarnpkg.com/@unocss/transformer-compile-class/-/transformer-compile-class-0.61.5.tgz#be992b1a9e2300314618b1866854f1f6ea95419c" resolved "https://registry.yarnpkg.com/@unocss/transformer-compile-class/-/transformer-compile-class-0.61.5.tgz#be992b1a9e2300314618b1866854f1f6ea95419c"
@ -5238,6 +5251,13 @@ magic-string@^0.30.10:
dependencies: dependencies:
"@jridgewell/sourcemap-codec" "^1.4.15" "@jridgewell/sourcemap-codec" "^1.4.15"
magic-string@^0.30.12:
version "0.30.12"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.12.tgz#9eb11c9d072b9bcb4940a5b2c2e1a217e4ee1a60"
integrity sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==
dependencies:
"@jridgewell/sourcemap-codec" "^1.5.0"
mangle-css-class-webpack-plugin@^5.1.0: mangle-css-class-webpack-plugin@^5.1.0:
version "5.1.0" version "5.1.0"
resolved "https://registry.yarnpkg.com/mangle-css-class-webpack-plugin/-/mangle-css-class-webpack-plugin-5.1.0.tgz#42008a8fbe0257f491968796320eb94b17a36321" resolved "https://registry.yarnpkg.com/mangle-css-class-webpack-plugin/-/mangle-css-class-webpack-plugin-5.1.0.tgz#42008a8fbe0257f491968796320eb94b17a36321"