Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
146424e
Adds base folder structure and Login page
aalejandromr Jun 24, 2019
7c276bb
Adds Register/Login View witth tabs
aalejandromr Jun 24, 2019
c6549ac
Add Two components for loginRegistration and Login
aalejandromr Jun 24, 2019
93e327b
Created basic file structure for various components. Began styling fo…
SamanthaEgge Jun 24, 2019
9be8389
Merge branch 'alejandro-mejia' of https://github.com/corporate-event-…
SamanthaEgge Jun 24, 2019
3c8383a
Routing/Linking was broken. This is fixed now.
SamanthaEgge Jun 25, 2019
83c0cf3
Initial set-up of Events List, actions, and reducers. Unable to reall…
SamanthaEgge Jun 25, 2019
cea9154
Adds Modal when selecting an event
aalejandromr Jun 25, 2019
832046a
Event Action/Reducers for fetching events from false API working. Ini…
SamanthaEgge Jun 25, 2019
05e942d
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 25, 2019
961ad61
Adding merfe conflicts to tree
aalejandromr Jun 25, 2019
945e821
FIXED a yarn/npm conflict issue. ONLY using npm at this point.
SamanthaEgge Jun 25, 2019
86c347d
Saving lifes
aalejandromr Jun 25, 2019
1d38834
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 25, 2019
fe9c092
Initial Commint
aalejandromr Jun 25, 2019
284d10c
Adds loader for form and connect form to reducer
aalejandromr Jun 25, 2019
cbb9059
Search is working for events list page, need to implement display. Ad…
SamanthaEgge Jun 26, 2019
b4a893f
Search function
SamanthaEgge Jun 26, 2019
8d48e52
Fix Login, Register and Event Forms
aalejandromr Jun 26, 2019
d1e549c
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 26, 2019
68d0de3
Adding private Routes
aalejandromr Jun 26, 2019
1dbd3e9
More work on single event page. Not done yet. PUshing, to Pull Alejan…
SamanthaEgge Jun 26, 2019
fcc9cdc
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 26, 2019
bf69428
Did some cleaning in Actions/Reducers and Index.js
SamanthaEgge Jun 26, 2019
4b4f52a
Adds Create functionality to Events
aalejandromr Jun 27, 2019
1331cf9
EventPage and Tasks page are currently display data. Still needs Add/…
SamanthaEgge Jun 27, 2019
b76e807
Added skeleton for user manip on Event Page. Drafted reducer/actions.…
SamanthaEgge Jun 27, 2019
8a1b910
Added Nav/Footer to Calendar Component
SamanthaEgge Jun 27, 2019
9d9c09b
Merged conflicts from Alejandro-Mejia branch pull.
SamanthaEgge Jun 27, 2019
87aa2de
Adds event to calendar when created
aalejandromr Jun 27, 2019
d365440
Working on Event Page functionality. Having issues sending to DB.
SamanthaEgge Jun 27, 2019
e1ad588
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 27, 2019
7c123da
Fixed issue where Event data would persist on pages you didn't have a…
SamanthaEgge Jun 27, 2019
c4875b2
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 27, 2019
c1fea42
Adds support for double click in events
aalejandromr Jun 27, 2019
b914195
Added lodash. Dropdown working in Add Task.
SamanthaEgge Jun 27, 2019
a53014e
Working on Add Task fields. Pushing for merge conflicts.
SamanthaEgge Jun 27, 2019
c7d48c6
Merge branch 'alejandro-mejia' of https://github.com/corporate-event-…
SamanthaEgge Jun 27, 2019
e3e504a
Calendar date picking working for task.
SamanthaEgge Jun 27, 2019
ebd6ac4
Completed state hook-up for Task List. Creating actions/reducers now.
SamanthaEgge Jun 27, 2019
0fb78c3
Fix bugs in the calendar view
aalejandromr Jun 27, 2019
b22139a
Adds placeholder function of delete event
aalejandromr Jun 27, 2019
f38118f
Work started on add task action/reducer. Committing to pull/push
SamanthaEgge Jun 27, 2019
c57287d
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 27, 2019
b80cba4
Adds Edit profile form
aalejandromr Jun 27, 2019
b3a381a
Added Profile Reducer/Actions, work on Event Page.
SamanthaEgge Jun 27, 2019
a4347ee
Merge branch 'samantha-egge' of github.com:corporate-event-planner/De…
aalejandromr Jun 27, 2019
37940ba
Adds update for profile info - 403
aalejandromr Jun 27, 2019
341b25d
MVP met
aalejandromr Jun 27, 2019
bfb44db
Adding Tasks now works on Event Page.
SamanthaEgge Jun 27, 2019
e34b00b
Merge branch 'alejandro-mejia' of https://github.com/corporate-event-…
SamanthaEgge Jun 27, 2019
9741ad8
Styling on Event Page.
SamanthaEgge Jun 28, 2019
a823a4f
Added styling to Task list (still needs work). Tried to fix reload pr…
SamanthaEgge Jun 28, 2019
4662347
Home page inital formatting, reducers, actions, and styling created. …
SamanthaEgge Jun 28, 2019
b4b3ae6
AddUser does not require reloading to show anymore.
SamanthaEgge Jun 28, 2019
a31a2c7
Styling changes to each page. Added Font Awesome.
SamanthaEgge Jun 28, 2019
09045cb
Worked on some small task set-up. Modified Register so it points at t…
SamanthaEgge Jun 28, 2019
230a3e0
pushing a working branch of add user + other additions.
SamanthaEgge Jun 28, 2019
e86c9a2
Edit button working
SamanthaEgge Jun 28, 2019
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
1 change: 1 addition & 0 deletions client/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GENERATE_SOURCEMAP=false
23 changes: 23 additions & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
68 changes: 68 additions & 0 deletions client/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.<br>
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.<br>
You will also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.<br>
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.<br>
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.<br>
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting

### Analyzing the Bundle Size

This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size

### Making a Progressive Web App

This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app

### Advanced Configuration

This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration

### Deployment

This section has moved here: https://facebook.github.io/create-react-app/docs/deployment

### `npm run build` fails to minify

This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
Loading