Skip to content

Payment updated #8

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

Open
deepakh2810 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Payment updated #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56da183
Updated Payment and Added office hours to the course collection
ranjanasinha89 Nov 30, 2018
379fecc
some minor changes
eguevara1996 Dec 1, 2018
0d347a7
updated esteban
eguevara1996 Dec 1, 2018
b13ab0c
most star ratings
eguevara1996 Dec 2, 2018
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
188 changes: 174 additions & 14 deletions client/package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"radium": "^0.25.0",
"react": "^16.5.2",
"react-bootstrap": "^0.32.4",
"react-credit-card-input": "^1.0.15",
"react-dom": "^16.5.2",
"react-google-login": "^3.2.1",
"react-redux": "^5.0.7",
Expand Down
26 changes: 24 additions & 2 deletions client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ import ToDoWrapper from "./components/to-do/todowrapper";
import AddToDo from "./components/to-do/addtodo";
import AddHolds from "./components/holds/addholds";
import HoldsWrapper from "./components/holds/holdswrapper";
import Payment from "./components/payment/Payment";


import ConfirmationPage from "./components/payment/ConfirmationPage";
import PdfPage from "./components/payment/PdfPage.jsx";


library.add(faStroopwafel);

//Check for token
Expand Down Expand Up @@ -75,7 +82,9 @@ class App extends Component {
component={DashBoardLogic}
/>
</Switch>

<Switch>
<PrivateRoute exact path="/payment" component={Payment} />
</Switch>
<Switch>
<PrivateRoute
exact
Expand All @@ -91,7 +100,7 @@ class App extends Component {
/>
</Switch>

<Switch>
<Switch>
<PrivateRoute
exact
path="/addholds/:university_id"
Expand Down Expand Up @@ -178,6 +187,19 @@ class App extends Component {
component={CreateProfile}
/>
</Switch>



<Switch>
<PrivateRoute
exact
path="/confirmationpage"
component={ConfirmationPage}
/>
</Switch>



<Footer />
</React.Fragment>
</Router>
Expand Down
4 changes: 0 additions & 4 deletions client/src/actions/courseActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ export const getCourses = () => dispatch => {
};

export const createCourse = (courseData, history) => dispatch => {
console.log("In course action");
console.log("CourseData: ", courseData);
console.log("History", history);
axios
.post("/api/courses", courseData)
.then(res => history.push("/dashboard"))
Expand Down Expand Up @@ -63,7 +60,6 @@ export const getCoursesByCourseNumber = coursenumber => dispatch => {

//Delete Course by course Number
export const removeCourse = courseid => dispatch => {
console.log("In actions courses: ", courseid);
axios
.delete("/api/courses/" + courseid)
.then(res => {
Expand Down
Loading