Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
aa466df4
Commit
aa466df4
authored
May 29, 2024
by
isstuev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Ad banner to 404 page
parent
89be9fd8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
63 additions
and
32 deletions
+63
-32
AppError.pw.tsx
ui/shared/AppError/AppError.pw.tsx
+5
-3
AppError.tsx
ui/shared/AppError/AppError.tsx
+7
-0
AppError.pw.tsx_default_block-lost-consensus-1.png
...hots__/AppError.pw.tsx_default_block-lost-consensus-1.png
+0
-0
AppError.pw.tsx_default_status-code-404-1.png
...reenshots__/AppError.pw.tsx_default_status-code-404-1.png
+0
-0
AdBanner.tsx
ui/shared/ad/AdBanner.tsx
+6
-29
AdBannerContent.tsx
ui/shared/ad/AdBannerContent.tsx
+45
-0
No files found.
ui/shared/AppError/AppError.pw.tsx
View file @
aa466df4
...
@@ -5,10 +5,13 @@ import * as pwConfig from 'playwright/utils/config';
...
@@ -5,10 +5,13 @@ import * as pwConfig from 'playwright/utils/config';
import
AppError
from
'
./AppError
'
;
import
AppError
from
'
./AppError
'
;
test
(
'
status code 404
'
,
async
({
render
})
=>
{
test
(
'
status code 404
'
,
async
({
render
,
page
})
=>
{
const
error
=
{
message
:
'
Not found
'
,
cause
:
{
status
:
404
}
}
as
Error
;
const
error
=
{
message
:
'
Not found
'
,
cause
:
{
status
:
404
}
}
as
Error
;
const
component
=
await
render
(<
AppError
error=
{
error
}
/>);
const
component
=
await
render
(<
AppError
error=
{
error
}
/>);
await
expect
(
component
).
toHaveScreenshot
();
await
expect
(
component
).
toHaveScreenshot
({
mask
:
[
page
.
locator
(
pwConfig
.
adsBannerSelector
)
],
maskColor
:
pwConfig
.
maskColor
,
});
});
});
test
(
'
status code 422
'
,
async
({
render
})
=>
{
test
(
'
status code 422
'
,
async
({
render
})
=>
{
...
@@ -44,7 +47,6 @@ test('too many requests +@mobile', async({ render, page }) => {
...
@@ -44,7 +47,6 @@ test('too many requests +@mobile', async({ render, page }) => {
cause
:
{
status
:
429
},
cause
:
{
status
:
429
},
}
as
Error
;
}
as
Error
;
const
component
=
await
render
(<
AppError
error=
{
error
}
/>);
const
component
=
await
render
(<
AppError
error=
{
error
}
/>);
await
page
.
waitForResponse
(
'
https://www.google.com/recaptcha/api2/**
'
);
await
expect
(
component
).
toHaveScreenshot
({
await
expect
(
component
).
toHaveScreenshot
({
mask
:
[
page
.
locator
(
'
.recaptcha
'
)
],
mask
:
[
page
.
locator
(
'
.recaptcha
'
)
],
maskColor
:
pwConfig
.
maskColor
,
maskColor
:
pwConfig
.
maskColor
,
...
...
ui/shared/AppError/AppError.tsx
View file @
aa466df4
...
@@ -3,10 +3,12 @@ import React from 'react';
...
@@ -3,10 +3,12 @@ import React from 'react';
import
{
route
}
from
'
nextjs-routes
'
;
import
{
route
}
from
'
nextjs-routes
'
;
import
config
from
'
configs/app
'
;
import
getErrorCause
from
'
lib/errors/getErrorCause
'
;
import
getErrorCause
from
'
lib/errors/getErrorCause
'
;
import
getErrorCauseStatusCode
from
'
lib/errors/getErrorCauseStatusCode
'
;
import
getErrorCauseStatusCode
from
'
lib/errors/getErrorCauseStatusCode
'
;
import
getErrorObjStatusCode
from
'
lib/errors/getErrorObjStatusCode
'
;
import
getErrorObjStatusCode
from
'
lib/errors/getErrorObjStatusCode
'
;
import
getResourceErrorPayload
from
'
lib/errors/getResourceErrorPayload
'
;
import
getResourceErrorPayload
from
'
lib/errors/getResourceErrorPayload
'
;
import
AdBannerContent
from
'
ui/shared/ad/AdBannerContent
'
;
import
AppErrorIcon
from
'
./AppErrorIcon
'
;
import
AppErrorIcon
from
'
./AppErrorIcon
'
;
import
AppErrorTitle
from
'
./AppErrorTitle
'
;
import
AppErrorTitle
from
'
./AppErrorTitle
'
;
...
@@ -14,6 +16,8 @@ import AppErrorBlockConsensus from './custom/AppErrorBlockConsensus';
...
@@ -14,6 +16,8 @@ import AppErrorBlockConsensus from './custom/AppErrorBlockConsensus';
import
AppErrorTooManyRequests
from
'
./custom/AppErrorTooManyRequests
'
;
import
AppErrorTooManyRequests
from
'
./custom/AppErrorTooManyRequests
'
;
import
AppErrorTxNotFound
from
'
./custom/AppErrorTxNotFound
'
;
import
AppErrorTxNotFound
from
'
./custom/AppErrorTxNotFound
'
;
const
adBannerConfig
=
config
.
features
.
adsBanner
;
interface
Props
{
interface
Props
{
className
?:
string
;
className
?:
string
;
error
:
Error
|
undefined
;
error
:
Error
|
undefined
;
...
@@ -73,6 +77,8 @@ const AppError = ({ error, className }: Props) => {
...
@@ -73,6 +77,8 @@ const AppError = ({ error, className }: Props) => {
default
:
{
default
:
{
const
{
title
,
text
}
=
ERROR_TEXTS
[
String
(
statusCode
)]
??
ERROR_TEXTS
[
500
];
const
{
title
,
text
}
=
ERROR_TEXTS
[
String
(
statusCode
)]
??
ERROR_TEXTS
[
500
];
const
adBannerProvider
=
adBannerConfig
.
isEnabled
?
adBannerConfig
.
provider
:
null
;
return
(
return
(
<>
<>
<
AppErrorIcon
statusCode=
{
statusCode
}
/>
<
AppErrorIcon
statusCode=
{
statusCode
}
/>
...
@@ -87,6 +93,7 @@ const AppError = ({ error, className }: Props) => {
...
@@ -87,6 +93,7 @@ const AppError = ({ error, className }: Props) => {
>
>
Back to home
Back to home
</
Button
>
</
Button
>
{
statusCode
===
404
&&
adBannerProvider
&&
<
AdBannerContent
mt=
{
12
}
provider=
{
adBannerProvider
}
/>
}
</>
</>
);
);
}
}
...
...
ui/shared/AppError/__screenshots__/AppError.pw.tsx_default_block-lost-consensus-1.png
View replaced file @
89be9fd8
View file @
aa466df4
24.3 KB
|
W:
|
H:
24.4 KB
|
W:
|
H:
2-up
Swipe
Onion skin
ui/shared/AppError/__screenshots__/AppError.pw.tsx_default_status-code-404-1.png
View replaced file @
89be9fd8
View file @
aa466df4
21.6 KB
|
W:
|
H:
22.8 KB
|
W:
|
H:
2-up
Swipe
Onion skin
ui/shared/ad/AdBanner.tsx
View file @
aa466df4
import
{
chakra
,
Skeleton
}
from
'
@chakra-ui/react
'
;
import
{
chakra
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
config
from
'
configs/app
'
;
import
config
from
'
configs/app
'
;
import
{
useAppContext
}
from
'
lib/contexts/app
'
;
import
{
useAppContext
}
from
'
lib/contexts/app
'
;
import
*
as
cookies
from
'
lib/cookies
'
;
import
*
as
cookies
from
'
lib/cookies
'
;
import
AdbutlerBanner
from
'
./AdbutlerBanner
'
;
import
AdBannerContent
from
'
./AdBannerContent
'
;
import
CoinzillaBanner
from
'
./CoinzillaBanner
'
;
import
GetitBanner
from
'
./GetitBanner
'
;
import
HypeBanner
from
'
./HypeBanner
'
;
import
SliseBanner
from
'
./SliseBanner
'
;
const
feature
=
config
.
features
.
adsBanner
;
const
feature
=
config
.
features
.
adsBanner
;
...
@@ -22,31 +18,12 @@ const AdBanner = ({ className, isLoading }: { className?: string; isLoading?: bo
...
@@ -22,31 +18,12 @@ const AdBanner = ({ className, isLoading }: { className?: string; isLoading?: bo
return
null
;
return
null
;
}
}
const
content
=
(()
=>
{
switch
(
provider
)
{
case
'
adbutler
'
:
return
<
AdbutlerBanner
/>;
case
'
coinzilla
'
:
return
<
CoinzillaBanner
/>;
case
'
getit
'
:
return
<
GetitBanner
/>;
case
'
hype
'
:
return
<
HypeBanner
/>;
case
'
slise
'
:
return
<
SliseBanner
/>;
}
})();
return
(
return
(
<
Skeleton
<
AdBannerContent
className=
{
className
}
className=
{
className
}
isLoaded=
{
!
isLoading
}
isLoading=
{
isLoading
}
borderRadius=
"none"
provider=
{
provider
}
maxW=
{
(
'
adButler
'
in
feature
&&
feature
.
adButler
)
?
feature
.
adButler
.
config
.
desktop
.
width
:
'
728px
'
}
/>
w=
"100%"
>
{
content
}
</
Skeleton
>
);
);
};
};
...
...
ui/shared/ad/AdBannerContent.tsx
0 → 100644
View file @
aa466df4
import
{
chakra
,
Skeleton
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
type
{
AdBannerProviders
}
from
'
types/client/adProviders
'
;
import
config
from
'
configs/app
'
;
import
AdbutlerBanner
from
'
./AdbutlerBanner
'
;
import
CoinzillaBanner
from
'
./CoinzillaBanner
'
;
import
GetitBanner
from
'
./GetitBanner
'
;
import
HypeBanner
from
'
./HypeBanner
'
;
import
SliseBanner
from
'
./SliseBanner
'
;
const
feature
=
config
.
features
.
adsBanner
;
const
AdBannerContent
=
({
className
,
isLoading
,
provider
}:
{
className
?:
string
;
isLoading
?:
boolean
;
provider
:
AdBannerProviders
})
=>
{
const
content
=
(()
=>
{
switch
(
provider
)
{
case
'
adbutler
'
:
return
<
AdbutlerBanner
/>;
case
'
coinzilla
'
:
return
<
CoinzillaBanner
/>;
case
'
getit
'
:
return
<
GetitBanner
/>;
case
'
hype
'
:
return
<
HypeBanner
/>;
case
'
slise
'
:
return
<
SliseBanner
/>;
}
})();
return
(
<
Skeleton
className=
{
className
}
isLoaded=
{
!
isLoading
}
borderRadius=
"none"
maxW=
{
(
'
adButler
'
in
feature
&&
feature
.
adButler
)
?
feature
.
adButler
.
config
.
desktop
.
width
:
'
728px
'
}
w=
"100%"
>
{
content
}
</
Skeleton
>
);
};
export
default
chakra
(
AdBannerContent
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment