From e16d92171d6ac7892bcaf27ed01ee407afe51598 Mon Sep 17 00:00:00 2001 From: lilith Date: Fri, 31 Jan 2025 13:01:40 +0000 Subject: [PATCH 01/16] dont read me bro --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 99613fc..a47605f 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ $ npm install # or pnpm install or yarn install ``` -### Learn more on the [Solid Website](https://solidjs.com) and come chat with us on our [Discord](https://discord.com/invite/solidjs) - ## Available Scripts In the project directory, you can run: @@ -18,11 +16,5 @@ Open [http://localhost:5173](http://localhost:5173) to view it in the browser. ### `npm run build` Builds the app for production to the `dist` folder.
-It correctly bundles Solid in production mode and optimizes the build for the best performance. - The build is minified and the filenames include the hashes.
-Your app is ready to be deployed! - -## Deployment - -Learn more about deploying your application with the [documentations](https://vitejs.dev/guide/static-deploy.html) +Your app is ready to be deployed! \ No newline at end of file From 3840775ac797d73db5d1ba4672bf8e1e579b6d6a Mon Sep 17 00:00:00 2001 From: amy Date: Sat, 8 Feb 2025 21:35:40 +0330 Subject: [PATCH 02/16] the jason --- src/components/cumbrainz.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/cumbrainz.tsx b/src/components/cumbrainz.tsx index 16e8842..e666262 100644 --- a/src/components/cumbrainz.tsx +++ b/src/components/cumbrainz.tsx @@ -36,7 +36,7 @@ export function Cumbrainz() { const [isLoading, setIsLoading] = createSignal(true); onMount(async () => { try { - const the = await fetch("https://music.exhq.dev/") + const the = await fetch("https://api.listenbrainz.org/1/user/amyulated/playing-now") const thejson = await the.json() setMusicInfo(thejson) } catch (error) { From 7ce8c32639615e04bd256cb1a5c22bb113f6bc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linnea=20Gr=C3=A4f?= Date: Fri, 14 Feb 2025 20:18:11 +0100 Subject: [PATCH 03/16] Smoother transition for add review link --- src/App.css | 27 ++++++++++++--------------- src/components/api.tsx | 9 +++++---- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/App.css b/src/App.css index 938eb18..e85214d 100644 --- a/src/App.css +++ b/src/App.css @@ -125,6 +125,14 @@ height: 18em; } +.reviewsection { + display: flex; + flex-direction: column; + padding: 0.1em; + /* overflow: hidden; */ + max-height: 100%; +} + .cardchild:hover + .actualreviewdiv { transition: 1s; transform: rotateY(100); @@ -142,12 +150,14 @@ text-align: center; } + .reviewheadertext { margin-bottom: -0.2em; } .cardchild p { - margin-bottom: -1.5em; + margin: 0; + padding: 0.1em; } .cardchild a { @@ -156,9 +166,7 @@ color: pink; text-decoration: underline; margin-bottom: 0%; - .fadein { - animation: spawntop 1s; - } + transition: opacity 1s ease; } .cardchild span { @@ -386,17 +394,6 @@ } } -@keyframes spawntop { - 0% { - opacity: 0%; - transform: translateY(1em); - } - - 100% { - opacity: 100%; - transform: translateY(0); - } -} @keyframes shake { 0% { diff --git a/src/components/api.tsx b/src/components/api.tsx index 1452eac..6ea087a 100644 --- a/src/components/api.tsx +++ b/src/components/api.tsx @@ -41,16 +41,17 @@ export default function Reviews() { }); return ( - <> +
+

Reviews

add your reviews here

 -

Reviews

{reviews().length > 0 ? ( reviews() @@ -64,7 +65,7 @@ export default function Reviews() {
Loading reviews...
)}
- +
); } From 87092fcdfb3c3dbbf8430823fee22884580c7021 Mon Sep 17 00:00:00 2001 From: amy Date: Sat, 8 Mar 2025 10:48:46 +0330 Subject: [PATCH 04/16] link updates --- src/App.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 7a17c9b..6b27946 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -84,7 +84,7 @@ function App() { onClick={() => { setIsAnimating(true); setTimeout(() => { - window.location.href = "https://git.lgbt/exhq"; + window.location.href = "https://git.amy.rip/amy"; }, 200); gitgay.src = "/gaybackground.png"; }} @@ -93,8 +93,8 @@ function App() { animate: isAnimating(), gaybackground: isAnimating(), }} - src="https://proxy.spiro.exhq.dev/_/plain/https://git.lgbt/assets/img/logo.png" - alt="logo of git.lgbt" + src="https://proxy.spiro.exhq.dev/_/plain/https://git.amy.rip/assets/img/logo.png" + alt="logo of git.amy.rip" /> ) as HTMLImageElement; // @ts-ignore @@ -341,7 +341,7 @@ function App() { support me ♥
made with ♥ by amy.{" "} - + this website is opensource From 031f84cc600c62d7949a32bf8c6e49fd1f77a0ed Mon Sep 17 00:00:00 2001 From: amy Date: Sun, 9 Mar 2025 14:43:11 +0330 Subject: [PATCH 05/16] :3 --- src/App.css | 24 ++++++ src/App.tsx | 231 ++++++++++++++++++++++++++-------------------------- 2 files changed, 141 insertions(+), 114 deletions(-) diff --git a/src/App.css b/src/App.css index e85214d..03d50cb 100644 --- a/src/App.css +++ b/src/App.css @@ -54,6 +54,30 @@ margin: 1em; } +.fakemusicbutton { + background-color: #272525; + color: pink; + font-family: Roboto, sans-serif; + font-weight: 500; + font-size: 14px; + padding: 10px 30px; + box-shadow: none; + border-radius: 5px; + transition: 100ms; + transform: translateY(0); + display: flex; + flex-wrap: wrap; + flex-direction: row; + align-items: center; + border: none; + margin: 1em; +} + +.fakemusicbutton:hover { + background-color: transparent; + color: transparent; +} + .musicdiv { background-color: rgba(0, 0, 0, 0.731); position: fixed; diff --git a/src/App.tsx b/src/App.tsx index 6b27946..89fa3ba 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -143,121 +143,124 @@ function App() { -
-
{ - setpopup(!shouldpopup()); - }} - > -

typa shit ive been on

- +
+
{ + setpopup(!shouldpopup()); + }} + > +

typa shit ive been on

+ +
+
+

:3

+
+
+
{ + setoomfies( + <> + + + + + + + + + + , + ); + }} + > + {" "} + {oomfies()} +
+
+
+

amy if it was written by vivsiepop

+
+
{ + setpopup88(true); + }} + > +

88x31's

+
+
{ + if (explodcount > 5) { + document.body.innerHTML = ""; + setTimeout(() => { + alert( + "sorry bud, you exploded so much that my document.body is gon", + ); + }, 500); + } else { + new Audio("./explod.mp3").play(); + nyaboom(); + } + }} + > + +
-
-
{ - setoomfies( - <> - - - - - - - - - - , - ); - }} - > - {" "} - {oomfies()} -
-
-
-

amy if it was written by vivsiepop

-
-
{ - setpopup88(true); - }} - > -

88x31's

-
-
{ - if (explodcount > 5) { - document.body.innerHTML = ""; - setTimeout(() => { - alert( - "sorry bud, you exploded so much that my document.body is gon", - ); - }, 500); - } else { - new Audio("./explod.mp3").play(); - nyaboom(); - } - }} - > - -
-
- - -
-
+ + +
+
-
-
- {isLoading() ? ( -

Loading...

- ) : ( - musicList().map((link) => ) - )} -
-
-
- - -
-
-
- -
-

if you're reading this you're very silly

-
-
- - -
-
-
- -
-
- -
- + + +
+
+
+ +
+
+ {isLoading() ? ( +

Loading...

+ ) : ( + musicList().map((link) => ) + )} +
+
+
+ + +
+
+
+ +
+

if you're reading this you're very silly

+
+
+ + +
+
+
+ +
+
+ +
+ feel free to link mine, https://amy.rip/88x31.png -
-
- - - -
+
+
+ + + + +
+
+
+
+ +
+ {" "} + support me ♥ +
+ made with ♥ by amy.{" "} + + this website is opensource +
-
-
- -
- {" "} - support me ♥ -
- made with ♥ by amy.{" "} - - this website is opensource - -
- - ); + + ); } export default App; From 83a18f250d463c7b98682aa7e00505f986007da1 Mon Sep 17 00:00:00 2001 From: amy Date: Fri, 23 May 2025 09:58:00 +0330 Subject: [PATCH 13/16] gen :3 --- src/App.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 725abbf..ff99b8d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -329,16 +329,16 @@ function App() { url="https://sophari.org" src="https://sophari.org/img/sophari.gif" /> - +
From 8e249599c9ea1435da2cda3d7c6bc82f39246c92 Mon Sep 17 00:00:00 2001 From: amy Date: Wed, 28 May 2025 05:42:37 +0330 Subject: [PATCH 14/16] 3d shit --- package.json | 4 +- pnpm-lock.yaml | 59 ++++++++++++++++++ src/App.tsx | 1 + src/components/pfp.tsx | 75 +++++++++++----------- src/components/rotatingCubeButton.tsx | 90 +++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 39 deletions(-) create mode 100644 src/components/rotatingCubeButton.tsx diff --git a/package.json b/package.json index b808fa5..952992d 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,9 @@ }, "dependencies": { "@types/node": "^20.14.10", - "solid-js": "^1.8.17" + "@types/three": "^0.176.0", + "solid-js": "^1.8.17", + "three": "^0.176.0" }, "devDependencies": { "typescript": "^5.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3eda747..d89f785 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,9 +11,15 @@ importers: '@types/node': specifier: ^20.14.10 version: 20.14.10 + '@types/three': + specifier: ^0.176.0 + version: 0.176.0 solid-js: specifier: ^1.8.17 version: 1.8.17 + three: + specifier: ^0.176.0 + version: 0.176.0 devDependencies: typescript: specifier: ^5.2.2 @@ -132,6 +138,9 @@ packages: resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==} engines: {node: '>=6.9.0'} + '@dimforge/rapier3d-compat@0.12.0': + resolution: {integrity: sha512-uekIGetywIgopfD97oDL5PfeezkFpNhwlzlaEYNOA0N6ghdsOvh/HYjSMek5Q2O1PYvRSDFcqFVJl4r4ZBwOow==} + '@esbuild/aix-ppc64@0.21.5': resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} engines: {node: '>=12'} @@ -368,6 +377,9 @@ packages: cpu: [x64] os: [win32] + '@tweenjs/tween.js@23.1.3': + resolution: {integrity: sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==} + '@types/babel__core@7.20.5': resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} @@ -386,6 +398,18 @@ packages: '@types/node@20.14.10': resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + '@types/stats.js@0.17.4': + resolution: {integrity: sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==} + + '@types/three@0.176.0': + resolution: {integrity: sha512-FwfPXxCqOtP7EdYMagCFePNKoG1AGBDUEVKtluv2BTVRpSt7b+X27xNsirPCTCqY1pGYsPUzaM3jgWP7dXSxlw==} + + '@types/webxr@0.5.22': + resolution: {integrity: sha512-Vr6Stjv5jPRqH690f5I5GLjVk8GSsoQSYJ2FVd/3jJF7KaqfwPi3ehfBS96mlQ2kPCwZaX6U0rG2+NGHBKkA/A==} + + '@webgpu/types@0.1.60': + resolution: {integrity: sha512-8B/tdfRFKdrnejqmvq95ogp8tf52oZ51p3f4QD5m5Paey/qlX4Rhhy5Y8tgFMi7Ms70HzcMMw3EQjH/jdhTwlA==} + ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -449,6 +473,9 @@ packages: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} + fflate@0.8.2: + resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==} + fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -493,6 +520,9 @@ packages: resolution: {integrity: sha512-eRtbOb1N5iyH0tkQDAoQ4Ipsp/5qSR79Dzrz8hEPxRX10RWWR/iQXdoKmBSRCThY1Fh5EhISDtpSc93fpxUniQ==} engines: {node: '>=12.13'} + meshoptimizer@0.18.1: + resolution: {integrity: sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==} + ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} @@ -546,6 +576,9 @@ packages: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} + three@0.176.0: + resolution: {integrity: sha512-PWRKYWQo23ojf9oZSlRGH8K09q7nRSWx6LY/HF/UUrMdYgN9i1e2OwJYHoQjwc6HF/4lvvYLC5YC1X8UJL2ZpA==} + to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -767,6 +800,8 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 + '@dimforge/rapier3d-compat@0.12.0': {} + '@esbuild/aix-ppc64@0.21.5': optional: true @@ -901,6 +936,8 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.18.0': optional: true + '@tweenjs/tween.js@23.1.3': {} + '@types/babel__core@7.20.5': dependencies: '@babel/parser': 7.24.7 @@ -928,6 +965,22 @@ snapshots: dependencies: undici-types: 5.26.5 + '@types/stats.js@0.17.4': {} + + '@types/three@0.176.0': + dependencies: + '@dimforge/rapier3d-compat': 0.12.0 + '@tweenjs/tween.js': 23.1.3 + '@types/stats.js': 0.17.4 + '@types/webxr': 0.5.22 + '@webgpu/types': 0.1.60 + fflate: 0.8.2 + meshoptimizer: 0.18.1 + + '@types/webxr@0.5.22': {} + + '@webgpu/types@0.1.60': {} + ansi-styles@3.2.1: dependencies: color-convert: 1.9.3 @@ -1007,6 +1060,8 @@ snapshots: escape-string-regexp@1.0.5: {} + fflate@0.8.2: {} + fsevents@2.3.3: optional: true @@ -1034,6 +1089,8 @@ snapshots: dependencies: is-what: 4.1.16 + meshoptimizer@0.18.1: {} + ms@2.1.2: {} nanoid@3.3.7: {} @@ -1099,6 +1156,8 @@ snapshots: dependencies: has-flag: 3.0.0 + three@0.176.0: {} + to-fast-properties@2.0.0: {} typescript@5.5.2: {} diff --git a/src/App.tsx b/src/App.tsx index ff99b8d..e1952c5 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,3 +1,4 @@ +// src/App.tsx import "./App.css"; import {AdvancedBr, Singular88, SingularOomfie} from "./components/comps.tsx"; import {createSignal, onMount} from "solid-js"; diff --git a/src/components/pfp.tsx b/src/components/pfp.tsx index 46bf06a..17b5eb2 100644 --- a/src/components/pfp.tsx +++ b/src/components/pfp.tsx @@ -1,5 +1,7 @@ import HoverComponent from "./name"; import "./pfp.css"; +import {RotatingCubeButton} from "./rotatingCubeButton.tsx"; +import {createSignal} from "solid-js"; export function Bdpfp({ setpopupEasterEgg, @@ -28,42 +30,39 @@ export function Bdpfp({ } export function Normalpfp({ - setpopupEasterEgg, -}: { - setpopupEasterEgg: (value: boolean) => void; + setpopupEasterEgg, + }: { + setpopupEasterEgg: (value: boolean) => void; }) { - return ( -
{ - e.preventDefault(); - setpopupEasterEgg(true); - }} - class="birthdayparent header normal" - > - amy's current discord pfp { - (e.target as HTMLImageElement).animate( - [{ transform: "rotateZ(0deg)" }, { transform: "rotateZ(360deg)" }], - { - duration: 400, - iterations: 1, - }, - ); - }} - onClick={(e) => { - (e.target as HTMLImageElement).animate( - [{ transform: "rotateY(0deg)" }, { transform: "rotateY(360deg)" }], - { - duration: 150, - iterations: 1, - }, - ); - }} - /> - -
- ); -} + // State to control whether the cube or the image is displayed + const [showCube, setShowCube] = createSignal(false); + + return ( +
{ + e.preventDefault(); + setpopupEasterEgg(true); + }} + // On click, toggle the showCube state + onClick={() => setShowCube(true)} + class="birthdayparent header normal" + style={{ cursor: 'pointer', display: 'flex', "justify-content": 'center', "align-items": 'center' }} // Added styles for centering content + > + {showCube() ? ( + // If showCube is true, render the RotatingCubeButton + // The onClick for the cube itself can be an empty function or trigger something else + console.log("Cube pfp clicked!")} /> + ) : ( + // Otherwise, render the original image and HoverComponent + <> + amy's current discord pfp + + + )} +
+ ); +} \ No newline at end of file diff --git a/src/components/rotatingCubeButton.tsx b/src/components/rotatingCubeButton.tsx new file mode 100644 index 0000000..02374db --- /dev/null +++ b/src/components/rotatingCubeButton.tsx @@ -0,0 +1,90 @@ +// src/components/RotatingCubeButton.tsx +import { onCleanup, onMount } from 'solid-js'; +import * as THREE from 'three'; + +interface RotatingCubeButtonProps { + onClick: () => void; +} + +export const RotatingCubeButton = (props: RotatingCubeButtonProps) => { + let mountRef: HTMLDivElement | undefined; + let renderer: THREE.WebGLRenderer; + let scene: THREE.Scene; + let camera: THREE.PerspectiveCamera; + let cube: THREE.Mesh; + let animationFrameId: number; + + + onMount(() => { + if (mountRef) { + + scene = new THREE.Scene(); + camera = new THREE.PerspectiveCamera(75, 1, 0.1, 1000); + camera.position.z = 2; + + renderer = new THREE.WebGLRenderer({ antialias: true, alpha: true }); + renderer.setSize(mountRef.clientWidth, mountRef.clientHeight); + mountRef.appendChild(renderer.domElement); + + const textureLoader = new THREE.TextureLoader(); + const texture = textureLoader.load( + 'https://dp.nea.moe/avatar/603229858612510720.png', + undefined, + () => { + cube.material = new THREE.MeshBasicMaterial({ color: 0x00ff00 }); + } + ); + + const geometry = new THREE.BoxGeometry(1, 1, 1); + const material = new THREE.MeshBasicMaterial({ map: texture }); + + cube = new THREE.Mesh(geometry, material); + scene.add(cube); + + const animate = () => { + animationFrameId = requestAnimationFrame(animate); + cube.rotation.x += 0.01; + cube.rotation.y += 0.01; + renderer.render(scene, camera); + }; + animate(); + const handleResize = () => { + if (mountRef) { + camera.aspect = mountRef.clientWidth / mountRef.clientHeight; + camera.updateProjectionMatrix(); + renderer.setSize(mountRef.clientWidth, mountRef.clientHeight); + } + }; + window.addEventListener('resize', handleResize); + + onCleanup(() => { + window.removeEventListener('resize', handleResize); + cancelAnimationFrame(animationFrameId); + if (mountRef && renderer.domElement) { + mountRef.removeChild(renderer.domElement); + } + geometry.dispose(); + material.dispose(); + texture.dispose(); + renderer.dispose(); + }); + } + }); + + return ( +
+ +
+ ); +}; From 4d7c437b250cf94a50372f64e6c21d5c3f2d07fc Mon Sep 17 00:00:00 2001 From: amy Date: Sun, 1 Jun 2025 03:09:35 +0330 Subject: [PATCH 15/16] disclaimer --- review/App.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/review/App.tsx b/review/App.tsx index 8df3400..9a30f98 100644 --- a/review/App.tsx +++ b/review/App.tsx @@ -17,8 +17,7 @@ export default function App() { return (
- - (it doesnt) +

DISCLAIMER: YOUR DISCORD ID WILL BE ATTACHED TO THE REVIEW IN THE SOURCE CODE.