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
32f7acb7
Commit
32f7acb7
authored
Dec 08, 2022
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove vercel
parent
945042fa
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
15 deletions
+17
-15
config.ts
configs/app/config.ts
+2
-2
nextjs.ts
configs/sentry/nextjs.ts
+2
-2
react.ts
configs/sentry/react.ts
+2
-2
values.yaml
deploy/values/main/values.yaml
+1
-0
values.yaml
deploy/values/review/values.yaml
+2
-0
package.json
package.json
+0
-1
login.tsx
pages/login.tsx
+5
-5
Login.tsx
ui/pages/Login.tsx
+3
-3
No files found.
configs/app/config.ts
View file @
32f7acb7
...
...
@@ -13,7 +13,7 @@ const parseEnvJson = <DataType>(env: string | undefined): DataType | null => {
};
const
stripTrailingSlash
=
(
str
:
string
)
=>
str
[
str
.
length
-
1
]
===
'
/
'
?
str
.
slice
(
0
,
-
1
)
:
str
;
const
env
=
process
.
env
.
VERCEL_ENV
||
process
.
env
.
NODE_ENV
;
const
env
=
process
.
env
.
NODE_ENV
;
const
isDev
=
env
===
'
development
'
;
const
appPort
=
getEnvValue
(
process
.
env
.
NEXT_PUBLIC_APP_PORT
);
...
...
@@ -22,7 +22,7 @@ const appHost = getEnvValue(process.env.NEXT_PUBLIC_APP_HOST);
const
baseUrl
=
[
appSchema
||
'
https
'
,
'
://
'
,
process
.
env
.
NEXT_PUBLIC_VERCEL_URL
||
appHost
,
appHost
,
appPort
&&
'
:
'
+
appPort
,
].
filter
(
Boolean
).
join
(
''
);
const
authUrl
=
getEnvValue
(
process
.
env
.
NEXT_PUBLIC_AUTH_URL
)
||
baseUrl
;
...
...
configs/sentry/nextjs.ts
View file @
32f7acb7
import
type
{
NextjsOptions
}
from
'
@sentry/nextjs/types/utils/nextjsOptions
'
;
const
config
:
NextjsOptions
=
{
environment
:
process
.
env
.
VERCEL_ENV
||
process
.
env
.
NODE_ENV
,
environment
:
process
.
env
.
NODE_ENV
,
dsn
:
process
.
env
.
NEXT_PUBLIC_SENTRY_DSN
,
release
:
process
.
env
.
NEXT_PUBLIC_GIT_COMMIT_SHA
||
process
.
env
.
NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA
,
release
:
process
.
env
.
NEXT_PUBLIC_GIT_COMMIT_SHA
,
// We recommend adjusting this value in production, or using tracesSampler
// for finer control
tracesSampleRate
:
1.0
,
...
...
configs/sentry/react.ts
View file @
32f7acb7
...
...
@@ -2,9 +2,9 @@ import type * as Sentry from '@sentry/react';
import
{
BrowserTracing
}
from
'
@sentry/tracing
'
;
export
const
config
:
Sentry
.
BrowserOptions
=
{
environment
:
process
.
env
.
VERCEL_ENV
||
process
.
env
.
NEXT_PUBLIC_APP_ENV
||
process
.
env
.
NODE_ENV
,
environment
:
process
.
env
.
NEXT_PUBLIC_APP_ENV
||
process
.
env
.
NODE_ENV
,
dsn
:
process
.
env
.
NEXT_PUBLIC_SENTRY_DSN
,
release
:
process
.
env
.
NEXT_PUBLIC_GIT_COMMIT_SHA
||
process
.
env
.
NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA
,
release
:
process
.
env
.
NEXT_PUBLIC_GIT_COMMIT_SHA
,
integrations
:
[
new
BrowserTracing
()
],
// We recommend adjusting this value in production, or using tracesSampler
// for finer control
...
...
deploy/values/main/values.yaml
View file @
32f7acb7
...
...
@@ -454,6 +454,7 @@ frontend:
-
"
/tx"
-
"
/blocks"
-
"
/block"
-
"
/address"
resources
:
limits
:
memory
:
...
...
deploy/values/review/values.yaml
View file @
32f7acb7
...
...
@@ -316,6 +316,8 @@ frontend:
-
"
/tx"
-
"
/blocks"
-
"
/block"
-
"
/login"
-
"
/address"
resources
:
limits
:
memory
:
...
...
package.json
View file @
32f7acb7
...
...
@@ -12,7 +12,6 @@
"dev:poa_core"
:
"./node_modules/.bin/dotenv -e ./configs/envs/.env.poa_core -e ./configs/envs/.env.common -e ./configs/envs/.env.secrets next dev | ./node_modules/.bin/pino-pretty"
,
"dev:goerli"
:
"./node_modules/.bin/dotenv -e ./configs/envs/.env.goerli -e ./configs/envs/.env.common -e ./configs/envs/.env.secrets next dev | ./node_modules/.bin/pino-pretty"
,
"build"
:
"next build"
,
"build:vercel"
:
"./node_modules/.bin/dotenv -e ./configs/envs/.env.poa_core -e ./configs/envs/.env.common next build"
,
"build:docker"
:
"docker build --build-arg GIT_COMMIT_SHA=$(git rev-parse HEAD) -t blockscout ./"
,
"start"
:
"next start"
,
"start:docker:poa_core"
:
"docker run -p 3000:3000 --env-file ./configs/envs/.env.common --env-file ./configs/envs/.env.poa_core --env-file ./configs/envs/.env.secrets blockscout"
,
...
...
pages/
vercel
.tsx
→
pages/
login
.tsx
View file @
32f7acb7
...
...
@@ -2,17 +2,17 @@ import type { NextPage } from 'next';
import
Head
from
'
next/head
'
;
import
React
from
'
react
'
;
import
Vercel
from
'
ui/pages/Vercel
'
;
import
Login
from
'
ui/pages/Login
'
;
const
Vercel
Page
:
NextPage
=
()
=>
{
const
Login
Page
:
NextPage
=
()
=>
{
return
(
<>
<
Head
><
title
>
Vercel
Page
</
title
></
Head
>
<
Vercel
/>
<
Head
><
title
>
Login
Page
</
title
></
Head
>
<
Login
/>
</>
);
};
export
default
Vercel
Page
;
export
default
Login
Page
;
export
{
getServerSideProps
}
from
'
lib/next/getServerSideProps
'
;
ui/pages/
Vercel
.tsx
→
ui/pages/
Login
.tsx
View file @
32f7acb7
...
...
@@ -10,8 +10,8 @@ import useToast from 'lib/hooks/useToast';
import
Page
from
'
ui/shared/Page/Page
'
;
import
PageTitle
from
'
ui/shared/Page/PageTitle
'
;
{
/* will be deleted when we
move to new CI
*/
}
const
Vercel
=
()
=>
{
{
/* will be deleted when we
fix login in preview CI stands
*/
}
const
Login
=
()
=>
{
const
toast
=
useToast
();
const
[
num
,
setNum
]
=
useGradualIncrement
(
0
);
...
...
@@ -86,4 +86,4 @@ const Vercel = () => {
};
export
default
Vercel
;
export
default
Login
;
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