Merge pull request nettleweb#49 from nettleweb/main

Merge 6.1 Update
TheEKingWasTaken · Nov 1, 2024 · 43f06a8 · 43f06a8
2 parents fa7bc26 + cad06ab
commit 43f06a8
Show file tree

Hide file tree

Showing 58 changed files with 638 additions and 399 deletions.
diff --git a/_headers b/_headers
@@ -4,7 +4,6 @@
 	Permissions-Policy: camera=(), gyroscope=(), microphone=(), geolocation=(), local-fonts=(), magnetometer=(), accelerometer=(), idle-detection=(), storage-access=(), browsing-topics=(), display-capture=(), encrypted-media=(), compute-pressure=(), window-management=(), xr-spatial-tracking=(), attribution-reporting=()
 	X-Content-Type-Options: nosniff
 	Cross-Origin-Opener-Policy: same-origin
-	Cross-Origin-Resource-Policy: same-origin
 	Cross-Origin-Embedder-Policy: credentialless
 
 /ext/webemu/
@@ -15,4 +14,3 @@
 
 /res/pay.json
 	Link: </res/pay.json>; rel="payment-method-manifest"
-	Cross-Origin-Resource-Policy: cross-origin
diff --git a/d/Bejeweled 2.jpg b/d/Bejeweled 2.jpg
diff --git a/d/Bejeweled: Twist.jpg b/d/Bejeweled: Twist.jpg
diff --git a/d/Family Guy: Save the Couch!.jpg b/d/Family Guy: Save the Couch!.jpg
diff --git a/d/Get to the Top Although There is no top 2.jpg b/d/Get to the Top Although There is no top 2.jpg
diff --git a/d/Jungle Swing.jpg b/d/Jungle Swing.jpg
diff --git a/d/Madness Interactive.jpg b/d/Madness Interactive.jpg
diff --git a/d/Madness Project Nexus (Classic).jpg b/d/Madness Project Nexus (Classic).jpg
diff --git a/d/Madness: Project Nexus.jpg b/d/Madness: Project Nexus.jpg
diff --git a/d/EaglercraftX 1.8.jpg → d/Minecraft 1.8.8 (EaglercraftX).jpg b/d/EaglercraftX 1.8.jpg → d/Minecraft 1.8.8 (EaglercraftX).jpg
diff --git a/d/Murder.jpg b/d/Murder.jpg
diff --git a/d/Newgrounds Rumble.jpg b/d/Newgrounds Rumble.jpg
diff --git a/d/Orca Slap.jpg b/d/Orca Slap.jpg
diff --git a/d/Pac Man Tree Top Token Game.jpg b/d/Pac Man Tree Top Token Game.jpg
diff --git a/d/Pepsi Handball.jpg b/d/Pepsi Handball.jpg
diff --git a/d/Plasmaburst 2.jpg b/d/Plasmaburst 2.jpg
diff --git a/d/Sanguo Cavalier.jpg b/d/Sanguo Cavalier.jpg
diff --git a/d/Sanguo Sha.jpg b/d/Sanguo Sha.jpg
diff --git a/d/Snoring 2: Wild West.jpg b/d/Snoring 2: Wild West.jpg
diff --git a/d/Snoring.jpg b/d/Snoring.jpg
diff --git a/d/Super-Sized Mario Bros.jpg b/d/Super-Sized Mario Bros.jpg
diff --git a/d/The Game.jpg b/d/The Game.jpg
diff --git a/d/Zuma: The Lost Treasure.jpg b/d/Zuma: The Lost Treasure.jpg
diff --git a/d/index.json b/d/index.json
diff --git a/index.css b/index.css
@@ -549,7 +549,7 @@ div.user[vip="diamond"]::after {
 	margin: 40px 0px;
 }
 
-#discover>h3, #services-page>h3 {
+#discover>h3, #services-page>h3, #store-manager-page-1>h3, #store-manager-page-2>h3 {
 	position: relative;
 	display: block;
 	width: fit-content;
@@ -560,7 +560,7 @@ div.user[vip="diamond"]::after {
 	letter-spacing: 0px;
 }
 
-#discover>hr, #services-page>hr {
+#discover>hr, #services-page>hr, #store-manager-page-1>hr, #store-manager-page-2>hr {
 	margin: 20px 0px;
 	border-bottom: 1px solid #c0c0c0;
 }
@@ -821,7 +821,7 @@ div.user[vip="diamond"]::after {
 	border-bottom: 1px solid #303030;
 }
 
-#game-disclaimer, #item-disclaimer {
+#game-disclaimer, #item-disclaimer, #idisc {
 	position: relative;
 	display: block;
 	width: 100%;
@@ -1560,7 +1560,7 @@ div.user[vip="diamond"]::after {
 	display: none;
 }
 
-#account-settings>button {
+#account-settings>button, #purchase-page>button {
 	position: relative;
 	display: block;
 	width: 120px;
@@ -1719,7 +1719,7 @@ div.user[vip="diamond"]::after {
 	background-position: 0px 0px;
 }
 
-#ac-games, #pf-games {
+#ac-games, #pf-games, #s-products, #pf-items {
 	position: relative;
 	display: block;
 	width: 100%;
@@ -1730,6 +1730,28 @@ div.user[vip="diamond"]::after {
 	overflow-y: auto;
 }
 
+#ac-orders, #s-orders {
+	position: relative;
+	display: block;
+	width: 100%;
+	height: fit-content;
+	margin: 20px 0px;
+}
+
+#ac-orders>table, #s-orders>table {
+	position: relative;
+	width: fit-content;
+	height: fit-content;
+	border: 2px solid #303030;
+}
+
+#ac-orders>table th, #ac-orders>table td, #s-orders>table th, #s-orders>table td {
+	position: relative;
+	width: fit-content;
+	height: fit-content;
+	border: 1px solid #808080;
+}
+
 #ac-name-edit, #ac-email-edit {
 	position: relative;
 	display: inline-block;
@@ -1810,15 +1832,121 @@ div.user[vip="diamond"]::after {
 	line-height: 24px;
 }
 
-#settings-page>div, #uploadgames-page>div, #gamemu-options>div, #editor>div {
+#purchase-page>div {
+	position: relative;
+	display: block;
+	width: 100%;
+	height: 70px;
+	margin: 15px 0px;
+}
+
+#purchase-page>div>img {
+	position: absolute;
+	display: block;
+	width: 50px;
+	height: 50px;
+	top: 10px;
+	left: 10px;
+	object-fit: cover;
+	object-position: center;
+}
+
+#purchase-page>div>div {
+	position: absolute;
+	display: block;
+	width: calc(100% - 114px);
+	height: 32px;
+	top: 10px;
+	left: 70px;
+	font-size: 14px;
+	line-height: 16px;
+	letter-spacing: 0px;
+}
+
+#purchase-page>div>span {
+	position: absolute;
+	display: block;
+	width: calc(100% - 114px);
+	height: 18px;
+	top: 42px;
+	left: 70px;
+	font-size: 13px;
+	font-weight: 600;
+	line-height: 18px;
+	letter-spacing: 0px;
+}
+
+#purchase-page>div>button {
+	position: absolute;
+	display: block;
+	width: 24px;
+	height: 24px;
+	top: 18px;
+	right: 10px;
+	border: 2px solid #303030;
+	cursor: pointer;
+	outline: none;
+	background-image: url("res/close.svg");
+	background-size: 24px 24px;
+	background-repeat: no-repeat;
+	background-position: 0px 0px;
+}
+
+#purchase-page>span {
+	position: relative;
+	display: block;
+	width: fit-content;
+	height: fit-content;
+	margin: 15px 0px;
+	font-size: 18px;
+	font-weight: 600;
+	line-height: 24px;
+	letter-spacing: 0px;
+}
+
+#purchase-page>form {
+	position: relative;
+	display: block;
+	width: calc(100% - 20px);
+	height: fit-content;
+	margin: 15px 0px;
+	padding: 10px;
+}
+
+#purchase-page>form>div {
+	position: relative;
+	display: block;
+	width: fit-content;
+	height: fit-content;
+	margin: 15px 0px;
+}
+
+#purchase-page>form>fieldset {
+	position: relative;
+	display: block;
+	width: 100%;
+	height: fit-content;
+	margin: 15px 0px;
+	border: 1px solid #808080;
+}
+
+#purchase-page>form>fieldset>div {
+	position: relative;
+	display: block;
+	width: fit-content;
+	height: fit-content;
+	margin: 5px;
+}
+
+#settings-page>div, #uploadgames-page>div, #gamemu-options>div, #editor>div, #a-product>div, #payi {
 	position: relative;
 	display: block;
 	width: fit-content;
 	height: fit-content;
 	margin: 10px 0px;
 }
 
-#settings-page>div>label, #uploadgames-page>div>label, #gamemu-options>div>label, #editor>div>label {
+#settings-page>div>label, #uploadgames-page>div>label, #gamemu-options>div>label, #editor>div>label, #a-product>label, #payi>label {
 	position: relative;
 	display: inline-block;
 	width: fit-content;
@@ -1830,7 +1958,7 @@ div.user[vip="diamond"]::after {
 	vertical-align: middle;
 }
 
-#uploadgames-page>div>textarea, #editor>div>textarea {
+#uploadgames-page>div>textarea, #editor>div>textarea, #a-product>div>textarea, #payi>textarea {
 	position: relative;
 	display: block;
 	width: 100%;
@@ -1845,7 +1973,7 @@ div.user[vip="diamond"]::after {
 	letter-spacing: 0px;
 }
 
-#settings-page>div>input[type="text"], #settings-page>div>select, #uploadgames-page>div>input[type="text"], #uploadgames-page>div>select, #gamemu-options>div>select, #editor>div>input[type="text"] {
+#settings-page>div>input[type="text"], #settings-page>div>select, #uploadgames-page>div>input[type="text"], #uploadgames-page>div>select, #gamemu-options>div>select, #editor>div>input[type="text"], #a-product>div>input[type="text"], #a-product>div>input[type="number"], #payi>select {
 	position: relative;
 	display: inline-block;
 	width: fit-content;
@@ -1859,7 +1987,7 @@ div.user[vip="diamond"]::after {
 	vertical-align: middle;
 }
 
-#settings-page>div>input[type="text"]:focus, #settings-page>div>select:focus, #uploadgames-page>div>input[type="text"]:focus, #uploadgames-page>div>select:focus, #uploadgames-page>div>textarea:focus, #gamemu-options>div>select:focus, #editor>div>input[type="text"]:focus, #editor>div>textarea:focus {
+#settings-page>div>input[type="text"]:focus, #settings-page>div>select:focus, #uploadgames-page>div>input[type="text"]:focus, #uploadgames-page>div>select:focus, #uploadgames-page>div>textarea:focus, #gamemu-options>div>select:focus, #editor>div>input[type="text"]:focus, #editor>div>textarea:focus, #a-product>div>input[type="text"]:focus, #a-product>div>input[type="number"]:focus, #a-product>div>textarea:focus, #payi>select:focus, #payi>textarea:focus {
 	border-color: #808080;
 }
 
@@ -1967,10 +2095,27 @@ div.user[vip="diamond"]::after {
 	background-position: 0px 0px;
 }
 
-#settings:active {
+#settings:active, #checkout:active {
 	box-shadow: -2px -2px #808080;
 }
 
+#checkout {
+	position: absolute;
+	display: none;
+	width: 48px;
+	height: 48px;
+	right: 78px;
+	bottom: 22px;
+	cursor: pointer;
+	outline: none;
+	box-shadow: 2px 2px #808080;
+	border-radius: 25px;
+	background-image: url("res/checkout.svg");
+	background-size: 48px 48px;
+	background-repeat: no-repeat;
+	background-position: 0px 0px;
+}
+
 #frame-view {
 	position: absolute;
 	display: none;
@@ -2109,15 +2254,15 @@ div.user[vip="diamond"]::after {
 	margin: 10px 0px;
 }
 
-#user {
+#user, #seller {
 	position: relative;
 	display: block;
 	width: fit-content;
 	height: fit-content;
 	cursor: pointer;
 }
 
-#user>img {
+#user>img, #seller>img {
 	position: relative;
 	display: inline-block;
 	width: 32px;
@@ -2129,7 +2274,7 @@ div.user[vip="diamond"]::after {
 	background: #ffffff;
 }
 
-#user>div {
+#user>div, #seller>div {
 	position: relative;
 	display: inline-block;
 	width: fit-content;
@@ -2188,6 +2333,38 @@ div.user[vip="diamond"]::after {
 	margin: 0px 8px 0px 0px;
 }
 
+#previews {
+	position: relative;
+	display: flex;
+	width: 100%;
+	height: 320px;
+	gap: 10px;
+	flex-wrap: nowrap;
+	flex-direction: row;
+	overflow-x: auto;
+	overflow-y: hidden;
+}
+
+#previews>img {
+	position: relative;
+	display: block;
+	width: 400px;
+	height: 300px;
+	flex: 300px 0 0;
+	object-fit: cover;
+	object-position: center;
+}
+
+#ibuy, #iadd {
+	position: relative;
+	display: inline-block;
+	width: calc(50% - 45px);
+	height: 20px;
+	margin: 20px 10px;
+	padding: 5px 0px;
+	vertical-align: top;
+}
+
 @media all and (max-width: 379px)  {
 	#weather {
 		height: 430px;

diff --git a/index.dark.css b/index.dark.css
@@ -11,16 +11,16 @@ option, optgroup, #navigation-bar {
 	background-image: url("res/logo-w.svg");
 }
 
-#game-category, #game-navigator, #item-navigator {
+#game-category, #game-navigator, #item-category, #item-navigator {
 	border-color: #606060;
 	background: #404040;
 }
 
-#version, #nav-bar>button, #game-category>button {
+#version, #nav-bar>button, #game-category>button, #item-category>button {
 	color: #d0d0d0;
 }
 
-#nav-bar>button[data-current], #game-category>button[data-current], #chatmode>button {
+#nav-bar>button[data-current], #game-category>button[data-current], #item-category>button[data-current], #chatmode>button {
 	color: #ffffff;
 }
 
@@ -32,7 +32,7 @@ option, optgroup, #navigation-bar {
 	background-image: url("res/search-w.svg");
 }
 
-#game-container>a {
+.game, .item {
 	border-color: #606060;
 	background-color: #404040;
 }

diff --git a/index.html b/index.html
@@ -32,7 +32,7 @@
 		<link rel="privacy-policy" type="text/plain" href="privacy.txt" />
 		<link rel="terms-of-service" type="text/plain" href="terms.txt" />
 		<link rel="canonical" href="https://nettleweb.com/" />
-		<title>NettleWeb</title>
+		<!-- <title>NettleWeb</title> -->
 		<script type="text/javascript" src="main.js" blocking="render"></script>
 	</head>
 	<body>
@@ -128,6 +128,7 @@ <h2>Mirror Links</h2>
 		</div>
 		<button id="install" type="button"><span>Install App</span></button>
 		<button id="settings" type="button" title="Settings"></button>
+		<button id="checkout" type="button" title="Checkout"></button>
 		<div id="frame-view">
 			<div id="frame"></div>
 			<button id="frame-close" type="button" title="Close"></button>

diff --git a/lib/ruffle/31b4fd38e385012bcae9.wasm → lib/ruffle/893649034424ef9d5e51.wasm b/lib/ruffle/31b4fd38e385012bcae9.wasm → lib/ruffle/893649034424ef9d5e51.wasm
diff --git a/lib/ruffle/ca82c9526b88e7a8c931.wasm → lib/ruffle/9298c97367db2c9f4841.wasm b/lib/ruffle/ca82c9526b88e7a8c931.wasm → lib/ruffle/9298c97367db2c9f4841.wasm
diff --git a/lib/ruffle/core.ruffle.17ab77b0d01a28af4f86.js b/lib/ruffle/core.ruffle.17ab77b0d01a28af4f86.js
diff --git a/lib/ruffle/core.ruffle.451eb0a07a22a13ea10d.js b/lib/ruffle/core.ruffle.451eb0a07a22a13ea10d.js
diff --git a/lib/ruffle/core.ruffle.a138b4a2777db150e3e6.js b/lib/ruffle/core.ruffle.a138b4a2777db150e3e6.js
diff --git a/lib/ruffle/core.ruffle.ecd2038e00e0d39c46f7.js b/lib/ruffle/core.ruffle.ecd2038e00e0d39c46f7.js
diff --git a/lib/ruffle/ruffle.js b/lib/ruffle/ruffle.js