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

Update timeline.json #104

Merged
merged 4 commits into from
May 9, 2020
Merged

Update timeline.json #104

merged 4 commits into from
May 9, 2020

Conversation

AnaGarza
Copy link
Collaborator

@AnaGarza AnaGarza commented May 6, 2020

What does this PR do?

  • Agrega el contenido de la timeline

Related issues

#53

Merge Checklist:

  • The branch is up-to-date (i.e. rebased) with the base branch
  • No code style issues

@AnaGarza AnaGarza requested a review from gallosanchez23 as a code owner May 6, 2020 02:32
@gallosanchez23 gallosanchez23 merged commit cb42020 into develop May 9, 2020
@gallosanchez23 gallosanchez23 deleted the data/jsons branch May 9, 2020 01:43
gallosanchez23 added a commit that referenced this pull request May 15, 2020
* Update Readme with Developers' info

* Create Home component directories

* Move components images to images principle directory

* Move styles from css compoent files to index.css

* Add home#sponsors images

* Create sponsors.json file

* Add images for Carusel display

* Create Carousel structure to display info in Home

* Create HomeSinglesponsor and Homesponsors components

* Modify HomeHeader to render Carousel

* Add HomeSponsors reference to Home component file

* Add header img to HomeHeader component

* Add background images for home page

* Add Kia logo image

* Add .npm/ directory to gitignore file

* Create Footer component

* Create HomeFooter component

* Create HomeInformation component

* Create MembersFooter component

* Add font link on main index.html file

* Correct indentation on App.js file

* Delete unused references on HomeCarousel component

* Delete unused references and add alt to logo image on HomeFooter component

* Delete unused references and add alt to logo image on MembersFooter component

* Add kia to sponsors json file

* Reorder and remove unused references on MembersGrid component file

* Add MembersFooter to Members component

* Change amount of sponsors showed by row on HomeSponsors component

* Modify hover single sponsor animation on HomeSingleSponsor

* Delete unused references on HomeInformation component

* Add HomeInformation and HomeFooter to Home component

* Center HomeHeader content and add typing animation

* Add styles for new components

* Change AboutUs component for About, and add Contact component in App.js file

* Delete Footer componenet

* Update routes on routes file

* Change background img in members header and contact us components

* Create Contact component

* Fix paths on Members and Gome footers

* Refactor Dockerfile and docker-compose file

* Updated README to test commits.

* Creates CODEOWNERS config file

* Bump js-yaml from 3.12.1 to 3.13.1

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.1 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](nodeca/js-yaml@3.12.1...3.13.1)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump handlebars from 4.1.0 to 4.7.3

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.7.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](handlebars-lang/handlebars.js@v4.1.0...v4.7.3)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump eslint-utils from 1.3.1 to 1.4.3

Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.3.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](mysticatea/eslint-utils@v1.3.1...v1.4.3)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump lodash.template from 4.4.0 to 4.5.0

Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.4.0...4.5.0)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump mixin-deep from 1.3.1 to 1.3.2

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <[email protected]>

* Eliminated Alexis from developer list (#21)

* Creates issue_template (#22)

* Fixes issue_template subtitle style (#25)

* Fixes issue_template subtitle style

* Adds spaces at the end of each line of issue_template file

* Adds spaces at the end of each line of pr_template

* Update pull_request_template.md (#27)

* Feature/sponsor images (#39)

* Add response to sponsor image

* Add new sponsor image and change opacity style

* Add sponsor and fix code style

* Generalized footer component (#43)

* Generalized footer component

* Fixed colors

* Modifies import components order in Home file

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Home content (#14)

* Changed content of home page

* Changed home image

* Added images to home sections

* Modifies animation phrases of header.

* Adjusted some code according to the standard followed.

* Added responsivity for grid.

* Fixed some issues with the responsivity of the grid.

* Adjusted logo's responsivity

* Fixes style code issues on home header

* Fixes code style issues in index css

* Fixes footer call issue in members component

* Adds newline at end of file

* Renames competitions jpg file

* Fixes code style issues and changes breakpoint in media query

* Creates constants file

* Fixes indentation, code style issues and adds reference to constants file

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Members page (#13)

* Added description for members page

* Changed color of members-header and added separation between member photos

* Added button to /contact in members

* Eliminated info from memeber's page

* Made short text description responsive

* Added responsivity to banner text

* Made button responsive.

* Updated header descripciton

* Fixed some code format details.

* Fixed image responsivity for member info design.

* Fixed some button details and added description.

* Added responsivity to the grid.

* Fixed small bug of grid's width size.

* Fixed little bug showing the grid a little too to the right.

* Fixed button responsivity and other small issues

* Declares medium and small width constants

* Changes large to medium constant in home information component

* Fixes code style issues in members header component

* Fixes code style and indentation issues and implements constants ligic in members grid component

Co-authored-by: Eduardo Sánchez <[email protected]>

* Fixed Nav Bar responsivity bug (#37)

* Fixed Nav Bar responsivity bug

* Added color to toggle navbar (a darker shade because then it looks bad)

* Adjusted the logo in the nav bar

* Corrected color bug for expanded navbar.

* Fixed padding of navbar

* Fized last color bug

* Changes > with >= in contition to set number of columns in members grid

* Fixes code style issues

* Modifies navbar styles

Co-authored-by: Eduardo Sánchez <[email protected]>

* Small features (#42)

* Changed some links in the footer and added some information.

* Changed favicon

* Changed some links in the footer and added some information.

* Changed favicon

* Added icons and formatted social media links.

* Deletes unused component home footer

* Deletes unused styles for members footer

* Fixes code style issues and adds icon btns to footer

* Modifies icon btn styles in footer

* Fixes code style issues in footer

Co-authored-by: Eduardo Sánchez <[email protected]>

* Bump acorn from 5.7.3 to 5.7.4 (#51)

Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](acornjs/acorn@5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Adds Chapa and Clara to dev team in readme (#56)

* Add InVision to management tools (#58)

* Update README.md (#57)

* Update README.md

* Updates README

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Feature/title copy (#69)

* Make title show current position in Web site

* Fix error in index.html

* Fix error in components/Home/Home.js

* Adds newline in Home component file

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Feature/timeline (#52)

* Add response to sponsor image

* Add new sponsor image and change opacity style

* Add sponsor and fix code style

* Add timeline draft

* Modify timeline data collection to a JSON data collection

* Fix code style

* Modify data gather on timeline component

* Add hover response in react component

* Deletes unused provisional About component and fixes code style issues

* Fixes code style issues

* Deletes unnecesary AboutHeader component

* Removes deleted component from About

* Modifies date format on data/timeline.json file

* Refactors timeline files to fix codestyle issues and improve performance

Co-authored-by: RicardoChapaRomero <[email protected]>
Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Fixes code style issues (#73)

* Sets a static path for the tab icon in the browser. (#72)

- Creates images folder under public.
- Adds black_icon.ico image under public/images
- References the shortcut icon to ./images/black_icon.ico

Co-authored-by: Tomas Lugo <[email protected]>

* Modifies indentation in component files to 2 spaces. (#71)

* Modifies indentation in component files to 2 spaces.

- Changes tab (2 spaces or 4 spaces long) into actual 2 spaces.

* Update README.md (#57)

* Update README.md

* Updates README

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Feature/title copy (#69)

* Make title show current position in Web site

* Fix error in index.html

* Fix error in components/Home/Home.js

* Adds newline in Home component file

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Feature/timeline (#52)

* Add response to sponsor image

* Add new sponsor image and change opacity style

* Add sponsor and fix code style

* Add timeline draft

* Modify timeline data collection to a JSON data collection

* Fix code style

* Modify data gather on timeline component

* Add hover response in react component

* Deletes unused provisional About component and fixes code style issues

* Fixes code style issues

* Deletes unnecesary AboutHeader component

* Removes deleted component from About

* Modifies date format on data/timeline.json file

* Refactors timeline files to fix codestyle issues and improve performance

Co-authored-by: RicardoChapaRomero <[email protected]>
Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

* Fixes code style issues (#73)

* Sets a static path for the tab icon in the browser. (#72)

- Creates images folder under public.
- Adds black_icon.ico image under public/images
- References the shortcut icon to ./images/black_icon.ico

Co-authored-by: Tomas Lugo <[email protected]>

Co-authored-by: Tomas Lugo <[email protected]>
Co-authored-by: Ana Garza <[email protected]>
Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>
Co-authored-by: OUMontiel <[email protected]>
Co-authored-by: RicardoChapaRomero <[email protected]>
Co-authored-by: RicardoChapaRomero <[email protected]>

* Seccionar archivo index.css en diferentes archivos de estilos. (#70)

* separacion de todo el css

* Creates new About style files and adds reference to components

Co-authored-by: Eduardo Sánchez <[email protected]>

* Adds docker-compose.override.yml to gitignore (#91)

* Fixes ignore docker-compose override (#92)

* Add About section header (#84)

* Added design for large and small views

* Added responsivity and changed some design positioning of elements.

* Add About section header

* Adjust About header to fit vertically

* Fix code style issues

* Fix NavBar bug and text scaling issues

* Update pictures of header

* Fix vertical fit behavior of header

* Adjusted description view to desing updates.

* Added correct icons and props references

* Fixed some responsiveness bug.

* Added data validation for modal view.

* Added functionality to close modal with esc key.

* Fixed some warnings.

* Rebased changes

* Added responsivity and changed some design positioning of elements.

* Added correct icons and props references

* Fixed some responsiveness bug.

* Fixed some responsivity detail for people that do not have a description.

* Fixes code style issues

Co-authored-by: Aurora Tijerina <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/home mini info (#97)

* Add minimal section of information in Home

* Change style of icons

* Deletes Home component background

* Fixes intentation

* Fixes indentation and changes background color

Co-authored-by: Eduardo Sánchez <[email protected]>

* Update readme dev team (#98)

* Updates dev team table

* Updates members table in readme

* Feature/members grid animation (#99)

* Add minimal section of information in Home

* Change style of icons

* Add new hover animation to Members Grid Tile

* Adds newline at end of files

Co-authored-by: Eduardo Sánchez <[email protected]>

* Add animation to Timeline Events (#103)

* Add animation to Timeline Events

* Fixes code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/home information (#85)

* separacion de todo el css

* add HomeInformation

* small corrections

* change images

* add transitions

* add empty line

* change DOM to ref

* add background layer

* change responsive according to invision

* change time

* small text correction

* keep Visible correction

* Fixes code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/contact candidates (#96)

* separacion de todo el css

* add HomeInformation

* small corrections

* change images

* add transitions

* add empty line

* change DOM to ref

* add background layer

* change responsive according to invision

* initSponsors

* initContact

* Add Contact JOinUs/OpenPositions

* Color Updates and joinUsCallBack

* Adds newline

* Deletes unnecessary constructor

* Modifies footer import

* Fixes code style issues

* Fixes code style issues

* Removes unnused imports

* Fixes indentation in members and positions json files

* Fixes code style and indentation issues

* Fixes code style issues and styles in ContactJoinUs component files

* Refactors ContactOpenPosition component

Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/contact sponsors (#101)

* separacion de todo el css

* add HomeInformation

* small corrections

* change images

* add transitions

* add empty line

* change DOM to ref

* add background layer

* change responsive according to invision

* initSponsors

* initContact

* Add Contact JOinUs/OpenPositions

* Color Updates and joinUsCallBack

* Add SponsorUs

* Add Packages Data

* background pattern

* Add SponsorUs callback

* logo smaller in packages

* Deletes unnecessary contstructor in Contact component

* Fixes type from merge

* Substitutes span with h2 in ContactJoinUs component

* Refactors ContactSponsorUs component to simplify element tree

* Refactors ContactSponsorPackages component to simplify elements tree

Co-authored-by: Eduardo Sánchez <[email protected]>

* Update timeline.json (#104)

* Update timeline.json

* Update Timeline2

* Update Candidates.json

* Fixes indentation

Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/new footer (#100)

* Updated design

* Corrected some alingment errors.

* Fixed some responsivity issues of largescreen view

* Added responsivity for small screen except for icons and logo

* Added image responsivity and fixed some alignment issues

* Finished responsive views

* Fixed some small details

* Adde linking to paths for go up functionality

* Corrected the Back to Top button functionality

* Changed const value

* Fixes code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Added grid separation between active members and inactive members (#102)

* Added grid separation between active members and inactive members

* Added responsivity for phone size

* Added priority sort function for legacy member section

* Added priority to active members part, just in case

* Changed the data structure for an easier button app design of grid for another issue.

Co-authored-by: Eduardo Sánchez <[email protected]>

* Active member modal view (#90)

* Added design for large and small views

* Added responsivity and changed some design positioning of elements.

* Adjusted description view to desing updates.

* Added correct icons and props references

* Fixed some responsiveness bug.

* Added data validation for modal view.

* Added functionality to close modal with esc key.

* Fixed some warnings.

* Rebased changes

* Added responsivity and changed some design positioning of elements.

* Added correct icons and props references

* Fixed some responsiveness bug.

* Fixed some responsivity detail for people that do not have a description.

* Fixed some responsivity issues

* Fixed some code format details.

* Eliminated members with no description and PDF dummy links.

* Eliminated some spaces

* Fixed some large view issue and centered the member's info.

* Changed Gaby's status to active.

* FIxed some bug regarding medium-to-small views.

* Made font size of modal smaller for description.

* Fixes indentation

* Updates single timeline event component styles

* Fixes js console issues from footer

* Refactors member modal

* Fixes double modal issue and code style issues

* Fixes code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* [Hot Fix] Members header banner (#108)

* Changed header's orientation to follow invision's styling.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Removes unnecessary style definitions

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Updated photos of members and json (#106)

* Added photos of members and json

* Added Osvaldo

* Added missing photos and corrected member order.

* Changed Emerico's photo.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* [Hot Fix] Members header banner (#108)

* Changed header's orientation to follow invision's styling.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Removes unnecessary style definitions

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Fixes intentation!

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/modal inactive (#107)

* Added semester, class and subtitle atributes to members.json

* Added subtitles for inactive members in modal large and small views.

* Added photographs to match new json.

* Solved some code style issues.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* [Hot Fix] Members header banner (#108)

* Changed header's orientation to follow invision's styling.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Removes unnecessary style definitions

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Updated photos of members and json (#106)

* Added photos of members and json

* Added Osvaldo

* Added missing photos and corrected member order.

* Changed Emerico's photo.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* [Hot Fix] Members header banner (#108)

* Changed header's orientation to follow invision's styling.

* Feature/all contact (#105)

* oldDonations

* Add Competitions in Contact

* Add Donation and Header section and small updates

* Fixes indentation and code style issues

Co-authored-by: Eduardo Sánchez <[email protected]>

* Removes unnecessary style definitions

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Fixes intentation!

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Adds subtitle, class and semesters to members

Co-authored-by: Josecisneros001 <[email protected]>
Co-authored-by: Eduardo Sánchez <[email protected]>

* Feature/all candidates (#109)

* Add Candidates page

* Add Header, Carousel, Info, and JoinUs to Candidates

* Update Candidates Carousel images

* Make style changes to Header and Info

* Deletes unnecessary styles declarations

* Refact!!!

Co-authored-by: Eduardo Sánchez <[email protected]>

* [Hotfix] About Header (#110)

* Fixed some text issue and modified

* Fixed some responsivity thing too.

Co-authored-by: José Eduardo Sánchez Yépiz <[email protected]>

Co-authored-by: Sebastian Rivera <[email protected]>
Co-authored-by: Aurora Tijerina <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ClaraGtz <[email protected]>
Co-authored-by: Ana Garza <[email protected]>
Co-authored-by: OUMontiel <[email protected]>
Co-authored-by: RicardoChapaRomero <[email protected]>
Co-authored-by: RicardoChapaRomero <[email protected]>
Co-authored-by: tomvik <[email protected]>
Co-authored-by: Tomas Lugo <[email protected]>
Co-authored-by: Josecisneros001 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants