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

Added the solutions sub menu component #5

Open
wants to merge 145 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
534ea48
Feature setion done
Nitin1406 Feb 8, 2024
ba366c4
NAvbar Structure done
Nitin1406 Feb 9, 2024
4dd94bc
Added the solutions sub menu component
HillaryNyakundi Feb 9, 2024
153a6dc
Add suggested devDependency to suppress a warning
Kemboiray Feb 9, 2024
449eb2c
Create `ContactUs` component with hover popup
Kemboiray Feb 9, 2024
877b0d4
Remove unnecessary styling from `ContactUs`
Kemboiray Feb 9, 2024
77206a2
Add and button (pulled from Nitin)
Kemboiray Feb 10, 2024
3f72588
Add missing file
Kemboiray Feb 10, 2024
038c409
Update package.json
Kemboiray Feb 10, 2024
1efffd2
Change navbar items to list items
Kemboiray Feb 10, 2024
b8ed7fc
Move `ContactUs` to new directory
Kemboiray Feb 10, 2024
29af688
Removed conditional hovering for review of my work
HillaryNyakundi Feb 10, 2024
c817c5c
Refactor `ContactUs.js`
Kemboiray Feb 10, 2024
9478d29
Product menu done
Aman-kumar21 Feb 10, 2024
6919834
Product Menu Completed
Aman-kumar21 Feb 11, 2024
4bfb339
New folder Structure added
Nitin1406 Feb 12, 2024
37a52ca
Update directory structure
Kemboiray Feb 12, 2024
b2ce7d3
Structure and populate popup menu
Kemboiray Feb 12, 2024
fc036ee
Did customization on the solutions component
HillaryNyakundi Feb 12, 2024
48d4de4
Lint Button.jsx
Kemboiray Feb 12, 2024
a6e0336
Import from branch Nitin
Kemboiray Feb 12, 2024
f8aa32b
Import more files from branch Nitin
Kemboiray Feb 12, 2024
5fa270a
Capitalise
Kemboiray Feb 12, 2024
1422664
Add pink color to menu title
Kemboiray Feb 12, 2024
350487b
Did the final customizations of my solutions component
HillaryNyakundi Feb 12, 2024
e6d97ef
Format code with prettier
Kemboiray Feb 13, 2024
a235388
Merge raymonds contact section in Nitin branch
Nitin1406 Feb 13, 2024
32a47a7
Contact section complete
Nitin1406 Feb 13, 2024
be2f2f8
Added the the new App.jsx from Nitin's
HillaryNyakundi Feb 13, 2024
472f2f9
Deleted the App.js
HillaryNyakundi Feb 13, 2024
2d2f0ff
Added the feature and Header files
HillaryNyakundi Feb 13, 2024
5ed6ed0
Added the nav component files
HillaryNyakundi Feb 13, 2024
eba330c
Added the Nav and Button files into the components
HillaryNyakundi Feb 13, 2024
888cac6
Modified the Navbar
HillaryNyakundi Feb 13, 2024
47cd964
Update package.json
Kemboiray Feb 13, 2024
11a45de
Added the hidden the functionality on the solutions component
HillaryNyakundi Feb 13, 2024
c5076eb
Navbar items for small screen is added
Nitin1406 Feb 13, 2024
6bccaec
Final submissions on the solutions component
HillaryNyakundi Feb 13, 2024
24a0921
Merge changes in branch `Nitin` into `raymond`
Kemboiray Feb 13, 2024
a70d787
Add missing component files
Kemboiray Feb 13, 2024
a5ecad6
Merge branch 'Nitin' into aman_intern
Aman-kumar21 Feb 13, 2024
b1c9da9
Update styling
Kemboiray Feb 13, 2024
41a4bcb
Product Hover Done
Aman-kumar21 Feb 14, 2024
0326c3d
Mad small changes to my component
HillaryNyakundi Feb 14, 2024
94b9ebd
Adjusted the sizing of my component
HillaryNyakundi Feb 14, 2024
69b917f
Copied Nitin's Navbarr.jsx
HillaryNyakundi Feb 14, 2024
9f19af1
Modified the Solutions.jsx
HillaryNyakundi Feb 14, 2024
c77b45c
Notand section added successfully
Nitin1406 Feb 14, 2024
411896a
Correct naming convention
Nitin1406 Feb 14, 2024
eb72d09
Made small cuctomizations on the margin and small devices responsiveness
HillaryNyakundi Feb 14, 2024
a83e771
Did a margin customization
HillaryNyakundi Feb 14, 2024
4dc5d26
Solution added
Nitin1406 Feb 14, 2024
ed251e3
Improve positioning of menu items
Kemboiray Feb 14, 2024
43f725a
Hack hover issue for `Solutions` and `Contacts`
Kemboiray Feb 14, 2024
818ebc9
Helpdesk component added
Feb 14, 2024
1ef724b
Improved on the positioning
HillaryNyakundi Feb 15, 2024
d193554
Solution component's position resolved
Nitin1406 Feb 15, 2024
9eaafb8
Contact section position fixed
Nitin1406 Feb 15, 2024
4391a49
Merge branch 'Hillary- Solution components' into Nitin
Nitin1406 Feb 15, 2024
d4de8ea
Merge branch 'raymond Contact section' into Nitin
Nitin1406 Feb 15, 2024
e6634de
Product section added
Aman-kumar21 Feb 15, 2024
9ffb9a9
Merge branch 'aman_intern' of https://github.com/Lupleg/Interns-Build…
Nitin1406 Feb 15, 2024
2723472
Product section fixed
Nitin1406 Feb 15, 2024
67fe6d8
Merge branch 'aman_intern(Product)' into Nitin
Nitin1406 Feb 15, 2024
a35f3d3
Navbar fixed with Product, Solution and Contacts Section
Nitin1406 Feb 15, 2024
9017ddb
Made some changes to my component and it's view on small devices
HillaryNyakundi Feb 15, 2024
73c0155
added responsiveness
Feb 15, 2024
4760d1b
helpdesk section added
Nitin1406 Feb 15, 2024
0c0d1f5
Merge branch 'Vikram [HelpDesk]' into Nitin
Nitin1406 Feb 15, 2024
d2212d6
up-down arrow issue is resolved in hamburger
Nitin1406 Feb 15, 2024
3c6f030
Update branch with changes from `Nitin` branch
Kemboiray Feb 15, 2024
35dab09
Add more missing files
Kemboiray Feb 15, 2024
100a8e2
Add Resources component to Navbar (will improve on styling)
Kemboiray Feb 15, 2024
c17238f
Made changes on the hamburger
HillaryNyakundi Feb 16, 2024
67add32
Made changes on the cursor and font weight
HillaryNyakundi Feb 16, 2024
2ad19e6
Added the products component
HillaryNyakundi Feb 16, 2024
bfbdbd5
Added the productProps component
HillaryNyakundi Feb 16, 2024
1f5af67
Added the new contact.jsx
HillaryNyakundi Feb 16, 2024
d85d120
Added the Products page
HillaryNyakundi Feb 16, 2024
4209931
Made changes on the Navbar
HillaryNyakundi Feb 16, 2024
d22130b
Folder structure for Product-Overview is updated
Nitin1406 Feb 16, 2024
0d52ef9
Added the product view folder structure
HillaryNyakundi Feb 16, 2024
76cbe42
Update styling of `Resources` and `Contact`
Kemboiray Feb 16, 2024
6dc53be
Update repository structure
Kemboiray Feb 16, 2024
f18667d
Integrated Apps section done
Nitin1406 Feb 16, 2024
9dd2724
Resources component done
Nitin1406 Feb 16, 2024
71b0238
Merge branch 'resources' into Nitin
Nitin1406 Feb 16, 2024
c463069
Revert "Merge branch 'resources' into Nitin"
Nitin1406 Feb 16, 2024
9ea4d25
Resources is added
Nitin1406 Feb 16, 2024
b070bfe
Import changes from `Nitin` branch
Kemboiray Feb 16, 2024
4068ed2
Added the Explore Capabilities page
HillaryNyakundi Feb 17, 2024
7110aea
Routes are added
Nitin1406 Feb 17, 2024
ee22b3e
Added the new App.jsx and LandingPage.jsx
HillaryNyakundi Feb 17, 2024
f3732b7
Added react-router-dom
HillaryNyakundi Feb 17, 2024
7eec9a0
made changes on the product overview
HillaryNyakundi Feb 17, 2024
4f4b115
Update add react-router-dom dependency
Kemboiray Feb 17, 2024
ec9b5f5
Rename `public/assests` to `public/assets`
Kemboiray Feb 17, 2024
b471c19
Delete `n.product-overview.mp4`
Kemboiray Feb 17, 2024
e07082f
Add `public/assets` directory
Kemboiray Feb 17, 2024
91bae30
Added the Explore Capabilities Component on Product
HillaryNyakundi Feb 18, 2024
1aacd39
Update index.js from Nitin
Kemboiray Feb 18, 2024
46b25be
Update App.jsx from Nitin
Kemboiray Feb 18, 2024
b1d8fbf
Pull remaining changes from `Nitin`
Kemboiray Feb 18, 2024
082699e
Footer added
Feb 18, 2024
19d9ca7
Remove class definitions and rename component.
Kemboiray Feb 19, 2024
3194561
icon resolve
Feb 19, 2024
842ad04
Routes Updated
Nitin1406 Feb 19, 2024
69f9e7a
Placed Footer.js at its correct place in folder structure
Nitin1406 Feb 19, 2024
a9b56c5
Merge branch 'Vikram [Footer]' into Nitin
Nitin1406 Feb 19, 2024
b8edd1d
Footer implemented Successfully
Nitin1406 Feb 19, 2024
588d083
Final submissions on text alignment for smaller screens on the explo…
HillaryNyakundi Feb 19, 2024
c683d1a
information section added
Nitin1406 Feb 19, 2024
531d44f
Arrow centered
Nitin1406 Feb 19, 2024
7b5069e
Crousel added successfully in ProductOverview Page
Nitin1406 Feb 20, 2024
e28ef68
Vikram's slider added
Nitin1406 Feb 20, 2024
9e2b1b6
Added the integrations and Api section
HillaryNyakundi Feb 20, 2024
b1c2dc7
Merge branch 'Hillary' into Nitin
Nitin1406 Feb 20, 2024
172871b
Come up to date with `Nitin`
Kemboiray Feb 20, 2024
1f42ffc
Update package.json
Kemboiray Feb 20, 2024
964b80a
Product Overview fixed
Nitin1406 Feb 20, 2024
d2fb927
Product Header Added
Nitin1406 Feb 20, 2024
36d901d
Aman's component is added [Product Header]
Nitin1406 Feb 20, 2024
1fc387f
Update src/components/productOverview/ProductOverview.jsx
Kemboiray Feb 20, 2024
004094b
pricing folder structure added
Nitin1406 Feb 21, 2024
8f60240
Contact Folder added
Nitin1406 Feb 21, 2024
04bc8e3
Workflow file added
HillaryNyakundi Feb 21, 2024
f47dfe1
Update
Kemboiray Feb 21, 2024
43b6755
buttons are added
Nitin1406 Feb 21, 2024
6d2c1bc
Pricing for businessess is added
Nitin1406 Feb 22, 2024
4ddeb22
Added the pricing workflows component
HillaryNyakundi Feb 22, 2024
52cf2b5
button width is managed for all components
Nitin1406 Feb 22, 2024
a881a42
Finish prototype
Kemboiray Feb 22, 2024
26faa80
Add remaining components
Kemboiray Feb 22, 2024
0362ab8
Merge pull request #13 from Lupleg/Hillary
Nitin1406 Feb 22, 2024
c5b624b
Merge branch 'Nitin' of https://github.com/Lupleg/Interns-Build into …
Nitin1406 Feb 22, 2024
817b87e
gradient added too pricing section
Nitin1406 Feb 22, 2024
64c770d
Productoverview detailed section added
Nitin1406 Feb 22, 2024
a8593fa
Merge branch 'Nitin' into raymond
Nitin1406 Feb 22, 2024
fbe057e
Merge pull request #14 from Lupleg/raymond
Nitin1406 Feb 22, 2024
aa9c2a1
Merge branch 'Nitin' of https://github.com/Lupleg/Interns-Build into …
Nitin1406 Feb 22, 2024
490368e
Made changes in the talk to sales component
HillaryNyakundi Feb 25, 2024
8e54fea
Made major changes on the responsiveness of my component
HillaryNyakundi Feb 25, 2024
fc62a81
Made responsive changes to mt Solutions component
HillaryNyakundi Feb 28, 2024
9c42d50
Solved minor bugs
HillaryNyakundi Feb 29, 2024
4acb7f8
Added border on hover
HillaryNyakundi Feb 29, 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
224 changes: 151 additions & 73 deletions package-lock.json

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

10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"hamburger-react": "^2.5.0",
"prettier": "^3.2.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-fast-marquee": "^1.6.4",
"react-icons": "^5.0.1",
"react-router-dom": "^6.22.0",
"react-scripts": "5.0.1",
"react-slick": "^0.30.2",
"slick-carousel": "^1.8.1",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down Expand Up @@ -36,8 +43,7 @@
]
},
"devDependencies": {
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.11",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"tailwindcss": "^3.4.1"
}
}
Binary file added public/assets/product-overview.mp4
Binary file not shown.
Loading