Adds base folder structure and Login page #1

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

Jump to bottom

Open

aalejandromr wants to merge 62 commits into master from alejandro-mejia

aalejandromr commented Jun 24, 2019

No description provided.


          Adds base folder structure and Login page

146424e

aalejandromr requested a review from shawnantonucci

June 24, 2019 18:45

aalejandromr and others added 28 commits

June 24, 2019 17:49


          Adds Register/Login View witth tabs

7c276bb


          Add Two components for loginRegistration and Login

c6549ac


          Created basic file structure for various components. Began styling fo…

93e327b

…r Nav/Footer components. Added Private Route information.


          Merge branch 'alejandro-mejia' of https://github.com/corporate-event-…

9be8389

…planner/DevelopmentFE into samantha-egge


          Routing/Linking was broken. This is fixed now.

3c8383a


          Initial set-up of Events List, actions, and reducers. Unable to reall…

83c0cf3

…y test until BE is set-up. Started on Nav styling.


          Adds Modal when selecting an event

cea9154


          Event Action/Reducers for fetching events from false API working. Ini…

832046a

…tial styling added to nav/footer bars. Initial styling added to Events List page.


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

05e942d

…velopmentFE into alejandro-mejia


          Adding merfe conflicts to tree

961ad61


          FIXED a yarn/npm conflict issue. ONLY using npm at this point.

945e821


          Saving lifes

86c347d


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

1d38834

…velopmentFE into alejandro-mejia


          Initial Commint

fe9c092


          Adds loader for form and connect form to reducer

284d10c


          Search is working for events list page, need to implement display. Ad…

cbb9059

…ded Route to single event page on index.js, began creating Event page.


          Search function

b4a893f


          Fix Login, Register and Event Forms

8d48e52


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

d1e549c

…velopmentFE into alejandro-mejia


          Adding private Routes

68d0de3


          More work on single event page. Not done yet. PUshing, to Pull Alejan…

1dbd3e9

…dro's work.


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

fcc9cdc

…velopmentFE into alejandro-mejia


          Did some cleaning in Actions/Reducers and Index.js

bf69428


          Adds Create functionality to Events

4b4f52a

Includes notifications


          EventPage and Tasks page are currently display data. Still needs Add/…

1331cf9

…Edit Event features, and Add People.


          Added skeleton for user manip on Event Page. Drafted reducer/actions.…

b76e807

… Couldn't test.


          Added Nav/Footer to Calendar Component

8a1b910


          Merged conflicts from Alejandro-Mejia branch pull.

9d9c09b

SamanthaEgge and others added 30 commits

June 27, 2019 09:23


          Fixed issue where Event data would persist on pages you didn't have a…

7c123da

…ccess to.


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

c4875b2

…velopmentFE into alejandro-mejia


          Adds support for double click in events

c1fea42


          Added lodash. Dropdown working in Add Task.

b914195


          Working on Add Task fields. Pushing for merge conflicts.

a53014e


          Merge branch 'alejandro-mejia' of https://github.com/corporate-event-…

c7d48c6

…planner/DevelopmentFE into samantha-egge


           Calendar date picking working for task.

e3e504a


          Completed state hook-up for Task List. Creating actions/reducers now.

ebd6ac4


          Fix bugs in the calendar view

0fb78c3


          Adds placeholder function of delete event

b22139a


          Work started on add task action/reducer. Committing to pull/push

f38118f


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

c57287d

…velopmentFE into alejandro-mejia


          Adds Edit profile form

b80cba4


          Added Profile Reducer/Actions, work on Event Page.

b3a381a


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

a4347ee

…velopmentFE into alejandro-mejia


          Adds update for profile info - 403

37940ba


          MVP met

341b25d


          Adding Tasks now works on Event Page.

bfb44db


          Merge branch 'alejandro-mejia' of https://github.com/corporate-event-…

e34b00b

…planner/DevelopmentFE into samantha-egge


          Styling on Event Page.

9741ad8


          Added styling to Task list (still needs work). Tried to fix reload pr…

a823a4f

…oblem. Moving on to next task for now


          Home page inital formatting, reducers, actions, and styling created. …

…Edit Profile moved to Modal on this page.


          AddUser does not require reloading to show anymore.

b4b3ae6


          Styling changes to each page. Added Font Awesome.

a31a2c7


          Worked on some small task set-up. Modified Register so it points at t…

09045cb

…he right address and spreads state properly.


          pushing a working branch of add user + other additions.

230a3e0


          Delete fixed

768d4b1


          Add favicon and title

2ef224e


          Edit button working

e86c9a2


          Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…

1179af8

…velopmentFE into alejandro-mejia

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet