Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Development branch to Main branch #1

Open
wants to merge 97 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
bf59a91
Set up Firebase hosting for Staging env. Deployment is triggered on …
oleg-saidov Jan 26, 2024
b810489
Check development branch deploy on staging env
oleg-saidov Jan 26, 2024
517ab55
Check development branch staging build.
oleg-saidov Jan 26, 2024
25ff888
Merge branch 'main' into development
souljja Feb 15, 2024
6374b3b
- Added basic reset
souljja Feb 16, 2024
e4ed36a
- installed sass
souljja Feb 16, 2024
ce3430e
- desktop-first -> mobile-first
souljja Feb 16, 2024
b18cdac
- add lists to reset
souljja Feb 16, 2024
cbc0c0e
- fix breakpoints according to requirements
souljja Feb 19, 2024
d7b6cbd
- added primary palette
souljja Feb 19, 2024
26302ab
- removed redundant comments
souljja Feb 20, 2024
2ce71e4
- Added button component
souljja Feb 15, 2024
8ba8809
- fix color-mix-duplication
souljja Feb 15, 2024
29595d6
- added sass and changed nesting
souljja Feb 15, 2024
a70b82e
- changed all files to sass
souljja Feb 15, 2024
3cd20b6
- fix button size
souljja Feb 15, 2024
73125b0
- fix after rebase to develop
souljja Feb 20, 2024
fc65d53
- fix buttons according to requirements
souljja Feb 21, 2024
e294414
[EPMGCIPCNT-19] - Component to deliver footer navigation for the website
souljja Feb 21, 2024
8daf926
- Fixes after rebase
souljja Feb 23, 2024
a7eeba6
- added header and navigation
souljja Feb 21, 2024
0823b3f
- fix lock file after rebase
souljja Feb 29, 2024
e5497dd
[EPMGCIPCNT-34] - hero component
souljja Feb 26, 2024
6f59be8
[EPMGCIPCNT-34] - changed div to section
souljja Feb 26, 2024
7f34fd1
- Fix wave after rebase
souljja Mar 4, 2024
dec3eee
[EPMGCIPCNT-34] - changed div to section
souljja Feb 26, 2024
0b6c7bb
- integration with BE
souljja Feb 28, 2024
856d059
- Added request for a particular page
souljja Feb 28, 2024
3c079cc
- Fix part of the data
souljja Feb 28, 2024
25da254
- Fix integration after rebase
souljja Mar 4, 2024
23ff713
- Added projects section
souljja Mar 4, 2024
3cd7ae8
- added ellipsis after 5 rows
souljja Mar 4, 2024
0188045
- added information section
souljja Feb 29, 2024
167fc00
- fix semantics and class naming
souljja Feb 29, 2024
531d6f9
- fix imports order after rebase
souljja Feb 29, 2024
014633c
- added news card
souljja Feb 29, 2024
2cc4bea
- fix after rebase
souljja Mar 5, 2024
77e0a65
- added image banner
souljja Mar 5, 2024
73a7770
- fix after rebase
souljja Mar 6, 2024
3d47af3
- wave banner
souljja Mar 5, 2024
03c29ef
- Added integration of header and footer
souljja Mar 6, 2024
0e27cff
- remove redundant constant
souljja Mar 6, 2024
137d50e
- added palette component
souljja Mar 6, 2024
8065093
- moved wavy image to mixin for further usage
souljja Mar 6, 2024
30794f9
- changed inverted button color
souljja Mar 7, 2024
e5ccf97
- added wave delimiter for section
souljja Mar 11, 2024
1982444
- changed header behavior (hide on scroll to bottom and show on scrol…
souljja Mar 11, 2024
befe2ae
- added secondary banner
souljja Mar 11, 2024
f4da4f6
add: initial text component draft
Feb 21, 2024
7768205
add: color and hover
Feb 26, 2024
51a0c02
- added title
souljja Mar 12, 2024
d353594
- added carousel for partners
souljja Mar 12, 2024
f4222b1
Delete .env
souljja Mar 13, 2024
b3f7a6e
- added integration for all available sections
souljja Mar 14, 2024
474a684
- added timeline section
souljja Mar 18, 2024
6c61d50
- added profiles section
souljja Mar 19, 2024
19878b9
- added testimonials section
souljja Mar 25, 2024
a6394b1
- added spinner and width restrictions
souljja Mar 25, 2024
a597c20
- update dependencies
souljja Mar 25, 2024
b11fbab
- Added categorized news and pagination
souljja Apr 3, 2024
b4965aa
EPMGCIPCNT-54 modify wave banner
Apr 15, 2024
2c87016
EPMGCIPCNT-54 review changes
Apr 16, 2024
e86d351
EPMGCIPCNT-54 review changes
Apr 17, 2024
b96d032
EPMGCIPCNT-54 review changes
Apr 17, 2024
8bf87d0
- Used wave from section
souljja Apr 17, 2024
d9ae464
Merge pull request #30 from epam/EPMGCIPCNT-54
bszabolcs Apr 18, 2024
f0ffed6
- Payment methods
souljja Apr 27, 2024
f72373b
EPMGCIPCNT-58 - Expandable section
Apr 29, 2024
d7c78b1
review fix
May 3, 2024
ded01c7
remove package-lock
May 3, 2024
e4bb072
review fixes
May 3, 2024
c733a32
Fix review remarks
souljja May 9, 2024
302608f
Added two columns component
souljja May 9, 2024
fec3b94
changed page and data-graph
souljja May 15, 2024
6741808
Initial NextJS migration
souljja May 26, 2024
bf0eb01
Fix build
souljja May 26, 2024
649d8aa
Remove mode from staging build
souljja May 26, 2024
ffe084c
Add loading and locale change
souljja Jun 1, 2024
f8d09aa
Fix svgr types
souljja Jun 1, 2024
65a371b
Change firebase config
souljja Jun 1, 2024
5056deb
Change function id
souljja Jun 1, 2024
6775f7a
Fix minor issues
souljja Jun 2, 2024
358ec0b
Added test deployment config for FE
souljja Jun 24, 2024
ebddda3
Update deps
souljja Jul 14, 2024
4132a75
Update test data
souljja Jul 14, 2024
e1bd4af
Added the integration with BE
souljja Jul 16, 2024
08e6609
Added the integration with BE
souljja Jul 21, 2024
22ccd48
Fix styles
souljja Jul 28, 2024
edb3b37
Added fragments
souljja Jul 28, 2024
419c2e0
Added fragments
souljja Jul 28, 2024
7ebd747
- Added signup form
souljja Feb 21, 2024
be0f50f
- Fixes after rebase
souljja Feb 23, 2024
008d59b
- added name field
souljja Mar 4, 2024
65104ad
- Updated form according to design
souljja Mar 26, 2024
502da93
- updated form according to the new design
souljja Mar 27, 2024
94df96c
- update sign up according to new design
souljja Mar 29, 2024
f368e8a
Fix after rebase
souljja Aug 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
vite.config.ts
codegen.ts
node_modules/**
coverage/**
src/assets/**
src/__generated__/**
.eslintrc
/dist

Expand Down
65 changes: 62 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,72 @@
},
{
"group": "external",
"pattern": "@/pages/**",
"position": "after"
},
{
"group": "external",
"pattern": "@/features/**/*.tsx",
"position": "after"
},
{
"group": "external",
"pattern": "@/components/**/*.tsx",
"position": "after"
},
{
"group": "external",
"pattern": "@/**/*.tsx",
"position": "after"
},
{
"group": "external",
"pattern": "@/features/**/*.ts",
"position": "after"
},
{
"group": "external",
"pattern": "@/components/**/*.ts",
"position": "after"
},
{
"group": "external",
"pattern": "@/hooks/**",
"position": "after"
},
{
"group": "external",
"pattern": "@/utils/**",
"position": "after"
},
{
"group": "external",
"pattern": "@/queries/**",
"position": "after"
},
{
"group": "external",
"pattern": "@/constants/**",
"position": "after"
},
{
"group": "external",
"pattern": "@/assets/**",
"position": "after"
},
{
"group": "external",
"pattern": "@/__generated__/**",
"position": "after"
},
{
"group": "object",
"pattern": "./*.svg",
"position": "after"
},
{
"pattern": "./*.css",
"group": "sibling",
"pattern": "./*.scss",
"group": "object",
"position": "after"
}
],
Expand Down Expand Up @@ -170,7 +230,6 @@
"react/destructuring-assignment": "warn",
"react/forbid-prop-types": "error",
"react/prop-types": "error",
"react/button-has-type": "warn",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"@typescript-eslint/no-var-requires": "warn",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ node_modules
dist
dist-ssr
*.local
.env

# Editor directories and files
.vscode/*
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
"src/**/*.{js,ts,jsx,tsx}": [
"src/!(__generated__)**/*.{js,ts,jsx,tsx}": [
() => "npm run lint:types",
"npm run lint -- --fix",
],
Expand Down
18 changes: 18 additions & 0 deletions codegen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { CodegenConfig } from "@graphql-codegen/cli";

const config: CodegenConfig = {
schema: `${process.env.VITE_REACT_APP_BACKEND_URL}/graphql`,
// this assumes that all your source files are in a top-level `src/` directory - you might need to adjust this to your file structure
documents: ["src/queries/*.{ts,tsx}"],
generates: {
"./src/__generated__/": {
preset: "client",
plugins: [],
presetConfig: {
gqlTagName: "gql",
},
},
},
};

export default config;
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/png" href="/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/">
<title>Vite + React</title>
</head>
<body>
Expand Down
37 changes: 26 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,51 @@
"build": "vite build",
"build:staging": "vite build --mode staging",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint-fix": "eslint . --ext ts,tsx --fix",
"preview": "vite preview",
"compile": "dotenv -- graphql-codegen",
"watch": "graphql-codegen -w",
"lint:types": "tsc",
"lint-staged": "lint-staged -r -v",
"prepare": "husky"
},
"dependencies": {
"@apollo/client": "^3.9.7",
"classcat": "^5.0.4",
"graphql": "^16.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-router": "^6.22.3",
"react-router-dom": "^6.22.3"
},
"devDependencies": {
"@types/node": "^20.11.17",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/client-preset": "^4.2.4",
"@graphql-typed-document-node/core": "^3.2.0",
"@types/graphql": "^14.5.0",
"@types/node": "^20.11.27",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.55.0",
"dotenv-cli": "^7.4.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-alias": "~1.1.2",
"eslint-import-resolver-typescript": "~3.6.1",
"eslint-plugin-import": "~2.29.1",
"eslint-plugin-jsx-a11y": "~6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-react-refresh": "^0.4.6",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"typescript": "^5.3.3",
"vite": "^5.1.1"
"sass": "^1.72.0",
"typescript": "^5.4.0",
"vite": "^5.1.6",
"vite-plugin-svgr": "^4.2.0"
}
}
Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

67 changes: 67 additions & 0 deletions src/__generated__/fragment-masking.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading