From a929991f6e9562312f96cfc399cd9fdf55010640 Mon Sep 17 00:00:00 2001 From: Anna Bauza <31966073+annabauza@users.noreply.github.com> Date: Sat, 9 Jan 2021 09:56:51 +0000 Subject: [PATCH] release: Merge current develop to production (#191) * change troger branch * feat: Travis integration (#13) * docs: Fix Pull Request Template (#19) * docs: Create a Contribution Guidelines markdown file (#17) * chore: Switch to using yarn (#16) * feat: clickable menu content (#24) * docs: Updated ReadMe's Description. (#15) * docs: Explain development setup and run instructions (#31) * fix: change web title from react app to AnitaB org open source * fix: Deployment does not work from travis (#33) * Update: Contact Section in README.md to include link to this project's stream on Zulip. (#38) * docs: Add relative paths to files located within the repository * content: Add 4 short descriptions to About Us page (#57) * content: Added descriptions for home page (#58) Merging it, we wait 6 days for @anitab-org/content-team if you will have any issues please rise seperate issue. * Update home_content.json (#74) * docs: readme.md updated (#71) * docs: Created a new GitHub Wiki page that includes the "Setup and Install" (#64) * chore: rename master branch to main * maintain: content folders and consistency in naming(#78) * content: Add description for Contact Us section of Footer (#79) * feat: Partners section - recently hidden (#82) * docs: create content for Contribute Page Section (#87) * docs: create content for Contribute Page Section * fix words and letters * Content: Added description for Events page (#96) * feat: Meet section add * docs: Add events top content * Coding: Meet Our Open Source Community Part Of About Page (#95) * feat: Meet section add * bug: File json rename * Revert "Coding: Meet Our Open Source Community Part Of About Page (#95)" (#99) This reverts commit 627cfcbefd83a87b316cf596840645d3b272781c. * content: add descriptions for each project in Projects page (#84) * feat: Footer implementation (#76) * Update .travis.yml * docs: updated project setup instructions (#101) Co-authored-by: Anna Bauza <31966073+annabauza@users.noreply.github.com> * Content: Create descriptions for each recent program for Programs page (#104) * Bugs: Fixed renderContent() content declaration (#119) * Deploy to testing GitHub pages on develop change. (#124) * test deployment * update branches * update target * update repo name * revert node verison * update trigger branch * update homepage to relative path * test * trigger on develop branch changes * content: Added badges in README (#117) * docs: Add description for Events and Highlights (#103) * docs: update zulip stream link (#127) * fix: Updated Footer Color from #101820 to #231B4E (#132) * content: update project_content (#129) * Feat: Add more info to Bridge-In-Tech Backend and Web project description (#138) * feat: Develop the projects section on projects section (#135) * no message * fix: travis build fail * remove unused dependencies * Added Top Section About Us (#133) * chore(deps): bump websocket-extensions from 0.1.3 to 0.1.4 (#70) * chore(deps): bump elliptic from 6.5.2 to 6.5.3 (#120) * chore(deps): bump http-proxy from 1.18.0 to 1.18.1 (#140) * fix: About us style and code consistency, responsiveness. (#142) * fix: missing dependency warning * feat: About us (#152) * Delete package-lock.json chore: we use yaml not nom. * feat: Landing page (#153) * fix: lex issues * Meet open source community (#151) * fix: our community alignment (#154) * Coding : Developed the New To Open Source Section of Contribute Page (#146) * fix: footer scaling ans social links (#155) * Add home section (#125) * fix: display ways to contribute (#156) * Update PULL_REQUEST_TEMPLATE.md and CONTRIBUTING.md (#148) * Create config.yml (#144) * fix: hide footer form because it is not implemented (#157) * Update ContributionSection.js * chore(deps): bump ini from 1.3.5 to 1.3.8 (#177) Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * coding: fix the navbar collision in responsive view (#176) * feat: events components added * Styles Fixed * Navbar collision fixed * style fixed * collision fixed Co-authored-by: Anna Bauza <31966073+annabauza@users.noreply.github.com> * fix: Added styles for image section. (#170) * fixed image styling * imageSection moved to sectionImage * resolved responsiveness issues Co-authored-by: Anna Bauza <31966073+annabauza@users.noreply.github.com> * docs: Fixed grammatical/typographical errors in the website (#180) * fix: Fixed grammatical/typographical errors in the website * Update src/content/home.json Co-authored-by: Kapil Bansal * doc: fixed grammatical/typographical errors in the document Co-authored-by: Kapil Bansal * Fix: generic header margin * Added SEOs for the web pages (#189) * Added SEOs for the web pages * updated the description * Feat: added snapshot test for components (#186) * added snapshot test for components * added dependencies of react testing lib. * added dependencies of react testing lib. Co-authored-by: Anna Bauza <31966073+annabauza@users.noreply.github.com> Co-authored-by: Gauri V. Nair <48416306+gaurivn@users.noreply.github.com> Co-authored-by: Siddharth Venu Co-authored-by: Abha <39526159+abha224@users.noreply.github.com> Co-authored-by: Nandini goel Co-authored-by: Doctype Human <64356980+doctypehuman@users.noreply.github.com> Co-authored-by: Garima Singh Co-authored-by: Foong Min Wong Co-authored-by: Vaishnavi Joshi <60894542+vj-codes@users.noreply.github.com> Co-authored-by: Aditya Adi <47720423+adi-001@users.noreply.github.com> Co-authored-by: Abhishek Sharma <56453541+abhi0504@users.noreply.github.com> Co-authored-by: Shreya Prasad Co-authored-by: Triman Kaur Co-authored-by: Siddhi Pandare Co-authored-by: Anna4 Co-authored-by: Simran Shilky <49720151+Sonal240@users.noreply.github.com> Co-authored-by: Gauri V. Nair Co-authored-by: Sanchit Arora <56799401+tichnas@users.noreply.github.com> Co-authored-by: saideepesh000 <43727167+saideepesh000@users.noreply.github.com> Co-authored-by: Sai Deepesh Co-authored-by: Jivthesh M R Co-authored-by: Vaishnavi Dwivedi Co-authored-by: Adithya Krishna Co-authored-by: Maya Treacy Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: parthsarthiprasad <44730599+parthsarthiprasad@users.noreply.github.com> Co-authored-by: Shipra Verma <66299533+Aaishpra@users.noreply.github.com> Co-authored-by: Ria Dhanani Co-authored-by: Akanksha Singh Co-authored-by: Prabhat sharma Co-authored-by: Nitanshu Lokhande <56120084+nlok5923@users.noreply.github.com> Co-authored-by: Antriksh Misri <54466356+antrikshmisri@users.noreply.github.com> Co-authored-by: Kapil Bansal Co-authored-by: Shruti Agarwal <56133783+Shruti3004@users.noreply.github.com> Co-authored-by: Bucky25 <65112369+Bucky25@users.noreply.github.com> --- package.json | 2 +- public/index.html | 45 +- src/Components/Header/index.js | 2 +- src/content/home.json | 6 +- src/test/AboutUs.test.js | 9 + src/test/Contribute.test.js | 9 + src/test/Home.test.js | 9 + src/test/OurEvents.test.js | 9 + src/test/Projects.test.js | 9 + src/test/__snapshots__/AboutUs.test.js.snap | 241 +++ .../__snapshots__/Contribute.test.js.snap | 94 + src/test/__snapshots__/Home.test.js.snap | 498 +++++ src/test/__snapshots__/OurEvents.test.js.snap | 113 ++ src/test/__snapshots__/Projects.test.js.snap | 1722 +++++++++++++++++ yarn.lock | 213 +- 15 files changed, 2873 insertions(+), 108 deletions(-) create mode 100644 src/test/AboutUs.test.js create mode 100644 src/test/Contribute.test.js create mode 100644 src/test/Home.test.js create mode 100644 src/test/OurEvents.test.js create mode 100644 src/test/Projects.test.js create mode 100644 src/test/__snapshots__/AboutUs.test.js.snap create mode 100644 src/test/__snapshots__/Contribute.test.js.snap create mode 100644 src/test/__snapshots__/Home.test.js.snap create mode 100644 src/test/__snapshots__/OurEvents.test.js.snap create mode 100644 src/test/__snapshots__/Projects.test.js.snap diff --git a/package.json b/package.json index 086b62fb..cd0e9cbb 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "private": true, "dependencies": { "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", "react": "^16.13.1", "react-dom": "^16.13.1", @@ -37,6 +36,7 @@ ] }, "devDependencies": { + "@testing-library/react": "^11.2.2", "gh-pages": "^2.2.0" } } diff --git a/public/index.html b/public/index.html index dfb75c27..4b6e3042 100644 --- a/public/index.html +++ b/public/index.html @@ -5,9 +5,52 @@ + + + + + + + + + + + + + + + + + + +