Skip to content

Commit 022fe30

Browse files
authored
Merge pull request #208 from darkobas2/main
upgrade pacakages
2 parents 21c3c3d + 6a44b80 commit 022fe30

File tree

153 files changed

+9399
-8645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+9399
-8645
lines changed

components/Navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const Navigation: React.FC<NavigationProps> = ({
143143
<div className="perspective-[2000px] absolute top-full left-0 w-full flex justify-center ">
144144
<NavigationMenu.Viewport
145145
forceMount
146-
className="relative mt-[10px] data-[state=closed]:opacity-0 data-[state=closed]:scale-50 h-[var(--radix-navigation-menu-viewport-height)] w-full origin-[top_center] overflow-hidden bg-opacity-90 border border-[#2D3843] bg-[#1F2831] backdrop-blur-md rounded-xl duration-100 sm:w-[var(--radix-navigation-menu-viewport-width)] shadow-dark "
146+
className="relative mt-[10px] data-[state=closed]:opacity-0 data-[state=closed]:scale-50 h-(--radix-navigation-menu-viewport-height) w-full origin-[top_center] overflow-hidden bg-opacity-90 border border-[#2D3843] bg-[#1F2831] backdrop-blur-md rounded-xl duration-100 sm:w-(--radix-navigation-menu-viewport-width) shadow-dark "
147147
style={{
148148
transform: `translateX(${offset}px)`,
149149
transition: `transform ${

components/Newsletter.tsx

Lines changed: 63 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,96 @@
1-
import Script from "next/script";
2-
import React from "react";
1+
import { FC } from 'react'
2+
import Script from 'next/script'
33

4-
type NewsletterProps = {};
4+
interface NewsletterProps {}
55

6-
const Newsletter: React.FC<NewsletterProps> = () => {
6+
const Newsletter: FC<NewsletterProps> = () => {
77
return (
88
<>
99
<Script
1010
id="mauticform-script-websitenewslettersubscription"
11+
strategy="afterInteractive"
1112
dangerouslySetInnerHTML={{
1213
__html: `
13-
/** This section is only needed once per page if manually copying **/
14-
if (typeof MauticSDKLoaded == 'undefined') {
15-
var MauticSDKLoaded = true;
16-
var head = document.getElementsByTagName('head')[0];
17-
var script = document.createElement('script');
18-
script.type = 'text/javascript';
19-
script.src = 'https://mautic.int.ethswarm.org/index.php/media/js/mautic-form.js';
20-
script.onload = function() {
21-
MauticSDK.onLoad();
22-
};
23-
head.appendChild(script);
24-
var MauticDomain = 'https://mautic.int.ethswarm.org/index.php';
25-
var MauticLang = {
26-
'submittingMessage': "Please wait..."
14+
if (typeof window !== 'undefined') {
15+
if (typeof MauticSDKLoaded == 'undefined') {
16+
var MauticSDKLoaded = true;
17+
var head = document.getElementsByTagName('head')[0];
18+
var script = document.createElement('script');
19+
script.type = 'text/javascript';
20+
script.src = 'https://mautic.int.ethswarm.org/index.php/media/js/mautic-form.js';
21+
script.onload = function() {
22+
MauticSDK.onLoad();
23+
};
24+
head.appendChild(script);
25+
var MauticDomain = 'https://mautic.int.ethswarm.org/index.php';
26+
var MauticLang = {
27+
'submittingMessage': "Please wait..."
28+
}
29+
} else if (typeof MauticSDK != 'undefined') {
30+
MauticSDK.onLoad();
31+
}
2732
}
28-
}else if (typeof MauticSDK != 'undefined') {
29-
MauticSDK.onLoad();
30-
}
31-
`,
33+
`,
3234
}}
3335
/>
34-
<div
35-
id="mauticform_wrapper_websitenewslettersubscription"
36-
className="mt-4 mauticform_wrapper"
37-
>
36+
<div id="mauticform_wrapper_websitenewslettersubscription" className="mauticform_wrapper">
3837
<form
3938
autoComplete="false"
4039
role="form"
4140
method="post"
42-
action="https://mautic.int.ethswarm.org/form/submit?formId=4"
41+
action="https://mautic.int.ethswarm.org/index.php/form/submit?formId=5"
4342
id="mauticform_websitenewslettersubscription"
4443
data-mautic-form="websitenewslettersubscription"
4544
encType="multipart/form-data"
4645
>
47-
<div
48-
className="mb-4 text-xs mauticform-error"
49-
id="mauticform_websitenewslettersubscription_error"
50-
></div>
51-
<div
52-
className="mb-4 text-xs mauticform-message"
53-
id="mauticform_websitenewslettersubscription_message"
54-
></div>
5546
<div className="mauticform-innerform">
56-
<div
57-
className="!flex items-start justify-center w-full gap-4 mauticform-page-wrapper mauticform-page-1 "
58-
data-mautic-form-page="1"
59-
>
47+
<div className="mauticform-page-wrapper mautic-page-1" data-mautic-form-page="1">
6048
<div
6149
id="mauticform_websitenewslettersubscription_email_address"
62-
className="flex-grow mauticform-row mauticform-email mauticform-field-1"
50+
className="mauticform-row mauticform-email mauticform-field-1"
6351
>
64-
<label className="sr-only" htmlFor="email">
52+
<label className="sr-only" htmlFor="mauticform_input_websitenewslettersubscription_email_address">
6553
Enter your email address
6654
</label>
67-
<input
68-
id="mauticform_input_websitenewslettersubscription_email_address"
69-
name="mauticform[email_address]"
70-
className="w-full text-[#F6F7F9] text-sm rounded-full duration-100 bg-white bg-opacity-10 border-none focus:ring-1 focus:ring-gray-300 placeholder-[#F6F7F9] px-8 py-3"
71-
type="email"
72-
required={true}
73-
placeholder={"Enter your email address"}
74-
/>
75-
76-
<div className="mt-4 text-[10px] text-[#F6F7F9] text-opacity-50">
77-
By clicking on Subscribe you consent to usage of your given
78-
e-mail address for receiving communication and news about the
79-
Swarm project. Data will be controlled and processed by Swarm
80-
Foundation.
55+
{/* This is the input field that needed fixing. */}
56+
<div className="flex items-center bg-[#2D3843] rounded-full p-1">
57+
<input
58+
id="mauticform_input_websitenewslettersubscription_email_address"
59+
name="mauticform[email_address]"
60+
placeholder="Enter your email address"
61+
className="flex-grow bg-transparent text-white placeholder-gray-400 px-4 py-2 focus:outline-none"
62+
type="email"
63+
/>
64+
<button
65+
type="submit"
66+
name="mauticform[submit]"
67+
id="mauticform_input_websitenewslettersubscription_submit"
68+
className="bg-[#F6F7F9] text-black rounded-full p-2 hover:bg-gray-200"
69+
>
70+
<svg
71+
className="w-5 h-5"
72+
fill="none"
73+
stroke="currentColor"
74+
viewBox="0 0 24 24"
75+
xmlns="http://www.w3.org/2000/svg"
76+
>
77+
<path
78+
strokeLinecap="round"
79+
strokeLinejoin="round"
80+
strokeWidth="2"
81+
d="M14 5l7 7m0 0l-7 7m7-7H3"
82+
></path>
83+
</svg>
84+
</button>
8185
</div>
8286
</div>
83-
84-
<button
85-
type="submit"
86-
name="mauticform[submit]"
87-
id="mauticform_input_websitenewslettersubscription_submit"
88-
value=""
89-
className="flex-shrink-0 px-4 py-3 text-sm font-semibold bg-white rounded-full focus:outline-none bg-opacity-10"
90-
>
91-
{`->`}
92-
</button>
9387
</div>
9488
</div>
95-
96-
<input
97-
type="hidden"
98-
name="mauticform[formId]"
99-
id="mauticform_websitenewslettersubscription_id"
100-
value="4"
101-
/>
102-
<input
103-
type="hidden"
104-
name="mauticform[return]"
105-
id="mauticform_websitenewslettersubscription_return"
106-
value=""
107-
/>
108-
<input
109-
type="hidden"
110-
name="mauticform[formName]"
111-
id="mauticform_websitenewslettersubscription_name"
112-
value="websitenewslettersubscription"
113-
/>
114-
<input
115-
name="mauticform[gdpr_accepted]"
116-
id="mauticform_radiogrp_radio_gdpr_accepted_Yes0"
117-
type="hidden"
118-
value="1"
119-
/>
120-
<input
121-
name="mauticform[i_consent_to_gathering_an]"
122-
id="mauticform_radiogrp_radio_i_consent_to_gathering_an_Yes0"
123-
type="hidden"
124-
value="1"
125-
/>
12689
</form>
12790
</div>
12891
</>
129-
);
130-
};
92+
)
93+
}
94+
95+
export default Newsletter
13196

132-
export default Newsletter;

components/Stats.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const Stats: React.FC<StatsProps> = () => {
5959
<Link
6060
href="https://swarmscan.io/"
6161
target="_blank"
62-
className="rounded-full"
62+
className="flex items-center h-8 px-4 space-x-2 text-sm font-semibold leading-8 text-gray-800 transition-all duration-1000 bg-gray-100 rounded-full bg-opacity-70 backdrop-blur-md"
6363
>
6464
<motion.div
6565
className={cx(

components/common/ButtonDownload.tsx

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import * as React from "react";
1+
import React from "react";
22
import { cx } from "utils";
33
import { ButtonBackgroundType, ButtonTextColorType } from "types";
4-
import { useOsAsset } from "hooks/useOsAsset";
4+
import useOsAsset from "hooks/useOsAsset";
55

66
type ButtonProps = {
77
background: ButtonBackgroundType;
@@ -14,9 +14,8 @@ const DownloadButton: React.FC<ButtonProps> = ({
1414
background = "orange",
1515
color = "black",
1616
}) => {
17-
let classNameBackground =
18-
"bg-orange-500 focus:outline-none hover:bg-opacity-80";
19-
17+
let classNameBackground = "bg-orange-500 focus:outline-none hover:bg-opacity-80";
18+
2019
if (background === "transparent") {
2120
classNameBackground = "bg-orange-transparent focus:outline-none";
2221
} else if (background === "white") {
@@ -26,15 +25,22 @@ const DownloadButton: React.FC<ButtonProps> = ({
2625
}
2726

2827
let classNameColor = "text-[#F6F7F9]";
29-
3028
if (color === "gray") {
3129
classNameColor = "text-gray-100";
3230
}
3331

34-
const asset: any = useOsAsset("ethersphere/swarm-desktop");
32+
const assetInfo = useOsAsset("ethersphere/swarm-desktop");
33+
34+
// If asset does not exist, unknown platform, or still loading, don't render
35+
if (!assetInfo || assetInfo.osName === "Unknown") {
36+
return null;
37+
}
3538

36-
// If asset does not exist or unknown platform, we return
37-
if (!asset || asset.osName === "Unknown") {
39+
// Type assertion to access the asset property safely
40+
const typedAssetInfo = assetInfo as any;
41+
42+
// Check if we have the asset data
43+
if (!typedAssetInfo.asset || !typedAssetInfo.asset.browser_download_url) {
3844
return null;
3945
}
4046

@@ -44,14 +50,16 @@ const DownloadButton: React.FC<ButtonProps> = ({
4450
classNameColor
4551
);
4652

53+
const downloadText = "Download for " + assetInfo.osName + " ->";
54+
4755
return (
4856
<a
49-
href={asset.asset.browser_download_url}
57+
href={typedAssetInfo.asset.browser_download_url}
5058
target="_blank"
5159
rel="noreferrer"
5260
className={className}
5361
>
54-
{`Download for ${asset.osName} ->`}
62+
{downloadText}
5563
</a>
5664
);
5765
};

components/common/Card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const Card: React.FC<CardProps> = ({
4949

5050
<div className="flex items-center">
5151
{icon && (
52-
<span className="flex-shrink-0 inline-block mr-4 overflow-hidden rounded-full">
52+
<span className="shrink-0 inline-block mr-4 overflow-hidden rounded-full">
5353
<Icon icon={icon} className="h-7 text-[#F6F7F9]" />
5454
</span>
5555
)}

components/common/FeatureBridges.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const FeatureBridges: React.FC<Props> = () => {
2727
"flex flex-col text-center items-center border border-[#2D3843] rounded-xl overflow-hidden bg-[#1F2831]/70 px-4 py-5 text-sm sm:text-[17px] font-bold duration-200 group"
2828
)}
2929
>
30-
<IconTag className="flex-shrink-0 w-6 max-h-6" />
30+
<IconTag className="shrink-0 w-6 max-h-6" />
3131

3232
<span className="mt-4">{label}</span>
3333
</a>

components/common/FeatureCentralisedExchanges.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const FeatureCentralisedExchanges: React.FC<Props> = () => {
3737
"flex flex-col text-center items-center border border-[#2D3843] rounded-xl overflow-hidden bg-[#1F2831]/70 px-2 py-5 text-sm sm:text-base hover:bg-[#1F2831]/40 font-bold duration-200 group"
3838
)}
3939
>
40-
<IconTag className="flex-shrink-0 w-6 max-h-6" />
40+
<IconTag className="shrink-0 w-6 max-h-6" />
4141

4242
<span className="mt-4">{label}</span>
4343
</a>

components/common/FeatureExchanges.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const FeatureExchanges: React.FC<Props> = () => {
3838
"flex flex-col text-center items-center border border-[#2D3843] rounded-xl overflow-hidden bg-[#1F2831]/70 px-2 py-5 text-sm sm:text-base font-bold group hover:bg-[#1F2831]/40 duration-200"
3939
)}
4040
>
41-
<IconTag className="flex-shrink-0 w-6 max-h-6" />
41+
<IconTag className="shrink-0 w-6 max-h-6" />
4242

4343
<span className="mt-4">{label}</span>
4444
</a>

0 commit comments

Comments
 (0)