Skip to content

site is done v1 #68

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.

Sign up for GitHub

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

Open
andriy-yurkiv wants to merge 16 commits into
base: master
Choose a base branch
from
Open

site is done v1 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6d7fa6a
site is done v1
andriy-yurkiv Dec 2, 2021
d14aaaf
site v1.1
andriy-yurkiv Dec 3, 2021
0b7ad2e
site v1.2
andriy-yurkiv Dec 3, 2021
84cc564
site v1.3
andriy-yurkiv Dec 3, 2021
856471c
site v1.4
andriy-yurkiv Dec 4, 2021
9fcda9d
moving html to root
andriy-yurkiv Dec 5, 2021
5f52f59
return html to src
andriy-yurkiv Dec 5, 2021
0902e83
change readme
andriy-yurkiv Dec 5, 2021
cc8ad8f
add docs/index
andriy-yurkiv Dec 5, 2021
54f9b86
add index.html to root
andriy-yurkiv Dec 5, 2021
9c14774
return index to src
andriy-yurkiv Dec 5, 2021
7c1eee1
change ReadMe
andriy-yurkiv Dec 5, 2021
a1b365f
change readMe demoLink path
andriy-yurkiv Dec 5, 2021
4b33243
site v1.5
andriy-yurkiv Dec 6, 2021
03aceac
site v1.5.1
andriy-yurkiv Dec 6, 2021
60d6c2d
fix aboutUs block
andriy-yurkiv Dec 7, 2021
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
10 changes: 8 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm start & sleep 5 && npm test
- run: npm install
- run: npm test
- name: Upload HTML report(backstop data)
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: report
path: backstop_data
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ node_modules
# Generated files
backstop_data
dist
.cache
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Thrive_talk landing page
[DEMO LINK](https://andriy-yurkiv.github.io/Thrive_talk/src/index.html)

Implement landing page according to [Figma design](https://www.figma.com/file/aHd2rHMrnzDXhowLuIQjIyVQ/ThriveTalk-Landing-Page?node-id=0%3A1) - Use BEM and SCSS
- Large screens 2560px
- Full HD 1920px
Expand Down Expand Up @@ -58,7 +60,7 @@ Implement landing page according to [Figma design](https://www.figma.com/file/aH
11. `git push origin develop` - to send you code for PR.
12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo.
13. Replace `<your_account>` with your Github username in the
[DEMO LINK](https://<your_account>.github.io/Thrive_talk/).
[DEMO LINK](https://andriy-yurkiv.github.io/Thrive_talk/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
11,052 changes: 7,573 additions & 3,479 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@mate-academy/bemlint": "^0.1.1",
"@mate-academy/eslint-config": "*",
"@mate-academy/linthtml-config": "0.0.1",
"@mate-academy/scripts": "^0.2.0",
"@mate-academy/scripts": "^0.9.13",
"@mate-academy/stylelint-config": "0.0.9",
"colors": "^1.3.3",
"eslint": "^5.16.0",
Expand All @@ -44,5 +44,7 @@
"bem": false
}
},
"dependencies": {}
"dependencies": {
"jest": "^27.3.1"
}
}
228 changes: 119 additions & 109 deletions src/fonts/Larsseit family/stylesheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,144 +1,154 @@
@font-face {
font-family: 'Larsseit';
src: url('Larsseit-MediumItalic.eot');
src: local('Larsseit Medium Italic'), local('Larsseit-MediumItalic'),
url('Larsseit-MediumItalic.eot?#iefix') format('embedded-opentype'),
url('Larsseit-MediumItalic.woff2') format('woff2'),
url('Larsseit-MediumItalic.woff') format('woff'),
url('Larsseit-MediumItalic.ttf') format('truetype');
font-weight: 500;
font-style: italic;
font-family: "Larsseit";
src: url("Larsseit-MediumItalic.eot");
src: local("Larsseit Medium Italic"),
local("Larsseit-MediumItalic"),
url("Larsseit-MediumItalic.eot?#iefix") format("embedded-opentype"),
url("Larsseit-MediumItalic.woff2") format("woff2"),
url("Larsseit-MediumItalic.woff") format("woff"),
url("Larsseit-MediumItalic.ttf") format("truetype");
font-weight: 500;
font-style: italic;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-Thin.eot');
src: local('Larsseit Thin'), local('Larsseit-Thin'),
url('Larsseit-Thin.eot?#iefix') format('embedded-opentype'),
url('Larsseit-Thin.woff2') format('woff2'),
url('Larsseit-Thin.woff') format('woff'),
url('Larsseit-Thin.ttf') format('truetype');
font-weight: 100;
font-style: normal;
font-family: "Larsseit";
src: url("Larsseit-Thin.eot");
src: local("Larsseit Thin"),
local("Larsseit-Thin"),
url("Larsseit-Thin.eot?#iefix") format("embedded-opentype"),
url("Larsseit-Thin.woff2") format("woff2"),
url("Larsseit-Thin.woff") format("woff"),
url("Larsseit-Thin.ttf") format("truetype");
font-weight: 100;
font-style: normal;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-LightItalic.eot');
src: local('Larsseit Light Italic'), local('Larsseit-LightItalic'),
url('Larsseit-LightItalic.eot?#iefix') format('embedded-opentype'),
url('Larsseit-LightItalic.woff2') format('woff2'),
url('Larsseit-LightItalic.woff') format('woff'),
url('Larsseit-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;
font-family: "Larsseit";
src: url("Larsseit-LightItalic.eot");
src: local("Larsseit Light Italic"),
local("Larsseit-LightItalic"),
url("Larsseit-LightItalic.eot?#iefix") format("embedded-opentype"),
url("Larsseit-LightItalic.woff2") format("woff2"),
url("Larsseit-LightItalic.woff") format("woff"),
url("Larsseit-LightItalic.ttf") format("truetype");
font-weight: 300;
font-style: italic;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit.eot');
src: local('Larsseit'),
url('Larsseit.eot?#iefix') format('embedded-opentype'),
url('Larsseit.woff2') format('woff2'),
url('Larsseit.woff') format('woff'),
url('Larsseit.ttf') format('truetype');
font-weight: normal;
font-style: normal;
font-family: "Larsseit";
src: url("Larsseit.eot");
src: local("Larsseit"),
url("Larsseit.eot?#iefix") format("embedded-opentype"),
url("Larsseit.woff2") format("woff2"),
url("Larsseit.woff") format("woff"),
url("Larsseit.ttf") format("truetype");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-ExtraBold.eot');
src: local('Larsseit ExtraBold'), local('Larsseit-ExtraBold'),
url('Larsseit-ExtraBold.eot?#iefix') format('embedded-opentype'),
url('Larsseit-ExtraBold.woff2') format('woff2'),
url('Larsseit-ExtraBold.woff') format('woff'),
url('Larsseit-ExtraBold.ttf') format('truetype');
font-weight: 800;
font-style: normal;
font-family: "Larsseit";
src: url("Larsseit-ExtraBold.eot");
src: local("Larsseit ExtraBold"),
local("Larsseit-ExtraBold"),
url("Larsseit-ExtraBold.eot?#iefix") format("embedded-opentype"),
url("Larsseit-ExtraBold.woff2") format("woff2"),
url("Larsseit-ExtraBold.woff") format("woff"),
url("Larsseit-ExtraBold.ttf") format("truetype");
font-weight: 800;
font-style: normal;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-BoldItalic.eot');
src: local('Larsseit Bold Italic'), local('Larsseit-BoldItalic'),
url('Larsseit-BoldItalic.eot?#iefix') format('embedded-opentype'),
url('Larsseit-BoldItalic.woff2') format('woff2'),
url('Larsseit-BoldItalic.woff') format('woff'),
url('Larsseit-BoldItalic.ttf') format('truetype');
font-weight: bold;
font-style: italic;
font-family: "Larsseit";
src: url("Larsseit-BoldItalic.eot");
src: local("Larsseit Bold Italic"),
local("Larsseit-BoldItalic"),
url("Larsseit-BoldItalic.eot?#iefix") format("embedded-opentype"),
url("Larsseit-BoldItalic.woff2") format("woff2"),
url("Larsseit-BoldItalic.woff") format("woff"),
url("Larsseit-BoldItalic.ttf") format("truetype");
font-weight: bold;
font-style: italic;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-Light.eot');
src: local('Larsseit Light'), local('Larsseit-Light'),
url('Larsseit-Light.eot?#iefix') format('embedded-opentype'),
url('Larsseit-Light.woff2') format('woff2'),
url('Larsseit-Light.woff') format('woff'),
url('Larsseit-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
font-family: "Larsseit";
src: url("Larsseit-Light.eot");
src: local("Larsseit Light"),
local("Larsseit-Light"),
url("Larsseit-Light.eot?#iefix") format("embedded-opentype"),
url("Larsseit-Light.woff2") format("woff2"),
url("Larsseit-Light.woff") format("woff"),
url("Larsseit-Light.ttf") format("truetype");
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-Bold.eot');
src: local('Larsseit Bold'), local('Larsseit-Bold'),
url('Larsseit-Bold.eot?#iefix') format('embedded-opentype'),
url('Larsseit-Bold.woff2') format('woff2'),
url('Larsseit-Bold.woff') format('woff'),
url('Larsseit-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
font-family: "Larsseit";
src: url("Larsseit-Bold.eot");
src: local("Larsseit Bold"),
local("Larsseit-Bold"),
url("Larsseit-Bold.eot?#iefix") format("embedded-opentype"),
url("Larsseit-Bold.woff2") format("woff2"),
url("Larsseit-Bold.woff") format("woff"),
url("Larsseit-Bold.ttf") format("truetype");
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-Italic.eot');
src: local('Larsseit Italic'), local('Larsseit-Italic'),
url('Larsseit-Italic.eot?#iefix') format('embedded-opentype'),
url('Larsseit-Italic.woff2') format('woff2'),
url('Larsseit-Italic.woff') format('woff'),
url('Larsseit-Italic.ttf') format('truetype');
font-weight: normal;
font-style: italic;
font-family: "Larsseit";
src: url("Larsseit-Italic.eot");
src: local("Larsseit Italic"),
local("Larsseit-Italic"),
url("Larsseit-Italic.eot?#iefix") format("embedded-opentype"),
url("Larsseit-Italic.woff2") format("woff2"),
url("Larsseit-Italic.woff") format("woff"),
url("Larsseit-Italic.ttf") format("truetype");
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-Medium.eot');
src: local('Larsseit Medium'), local('Larsseit-Medium'),
url('Larsseit-Medium.eot?#iefix') format('embedded-opentype'),
url('Larsseit-Medium.woff2') format('woff2'),
url('Larsseit-Medium.woff') format('woff'),
url('Larsseit-Medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;
font-family: "Larsseit";
src: url("Larsseit-Medium.eot");
src: local("Larsseit Medium"),
local("Larsseit-Medium"),
url("Larsseit-Medium.eot?#iefix") format("embedded-opentype"),
url("Larsseit-Medium.woff2") format("woff2"),
url("Larsseit-Medium.woff") format("woff"),
url("Larsseit-Medium.ttf") format("truetype");
font-weight: 500;
font-style: normal;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-ExtraBoldItalic.eot');
src: local('Larsseit ExtraBold Italic'), local('Larsseit-ExtraBoldItalic'),
url('Larsseit-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
url('Larsseit-ExtraBoldItalic.woff2') format('woff2'),
url('Larsseit-ExtraBoldItalic.woff') format('woff'),
url('Larsseit-ExtraBoldItalic.ttf') format('truetype');
font-weight: 800;
font-style: italic;
font-family: "Larsseit";
src: url("Larsseit-ExtraBoldItalic.eot");
src: local("Larsseit ExtraBold Italic"),
local("Larsseit-ExtraBoldItalic"),
url("Larsseit-ExtraBoldItalic.eot?#iefix") format("embedded-opentype"),
url("Larsseit-ExtraBoldItalic.woff2") format("woff2"),
url("Larsseit-ExtraBoldItalic.woff") format("woff"),
url("Larsseit-ExtraBoldItalic.ttf") format("truetype");
font-weight: 800;
font-style: italic;
}

@font-face {
font-family: 'Larsseit';
src: url('Larsseit-ThinItalic.eot');
src: local('Larsseit Thin Italic'), local('Larsseit-ThinItalic'),
url('Larsseit-ThinItalic.eot?#iefix') format('embedded-opentype'),
url('Larsseit-ThinItalic.woff2') format('woff2'),
url('Larsseit-ThinItalic.woff') format('woff'),
url('Larsseit-ThinItalic.ttf') format('truetype');
font-weight: 100;
font-style: italic;
font-family: "Larsseit";
src: url("Larsseit-ThinItalic.eot");
src: local("Larsseit Thin Italic"),
local("Larsseit-ThinItalic"),
url("Larsseit-ThinItalic.eot?#iefix") format("embedded-opentype"),
url("Larsseit-ThinItalic.woff2") format("woff2"),
url("Larsseit-ThinItalic.woff") format("woff"),
url("Larsseit-ThinItalic.ttf") format("truetype");
font-weight: 100;
font-style: italic;
}

Binary file added src/images/Mask Group.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about-img.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/cda-image.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/contact_us-image.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/footer-image.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/main-block-photo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading