Skip to content

Commit

Permalink
Merge pull request #66 from googleinterns/revert-57-activity-viewer-r…
Browse files Browse the repository at this point in the history
…eact

Revert "Activity viewer react"
  • Loading branch information
anan-ya-y authored Jul 14, 2020
2 parents c7b4319 + faec107 commit 68e5d07
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 390 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SLURP

This is the repo for the SLURP web application. The frontend is built using the React web framework and the Firebase development platform, with the backend built using Google's App Engine computing platform.
This is the repo for the SLURP web application. The frontend is built using the React web framework and the Firebase development platform, with the backend built using Google's App Engine computing platform.

## CLI Tools
This project makes use of the `gcloud` SDK for project deployment to Google Cloud, the `npm` and `yarn` package managers for Node.js, and the `nvm` Node.js version manager. Node.js 10 is the specific version required for this project.
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/App/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class App extends React.Component {
<Route exact path={ROUTES.LANDING} component={LandingPage} />
<Route path={ROUTES.SIGN_IN} component={SignInPage} />
<Route path={ROUTES.VIEW_TRIPS} component={ViewTripsPage} />
<Route path={ROUTES.VIEW_ACTIVITIES + "/:tripId"} component={ViewActivitiesPage} />
<Route path={ROUTES.VIEW_ACTIVITIES} component={ViewActivitiesPage} />
</div>
</Router>
);
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/Landing/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React from 'react';

import SignInButton from './signin-button.js';
import Card from 'react-bootstrap/Card';

/**
* Landing component.
* Landing component that defines the first page the user encounters in the
* application.
*/
class Landing extends React.Component {
/** @inheritdoc */
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/SignIn/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';

import * as firebase from 'firebase/app';
import app from '../Firebase';
import StyledFirebaseAuth from 'react-firebaseui/StyledFirebaseAuth';
Expand Down
36 changes: 0 additions & 36 deletions frontend/src/components/Utils/utils.js

This file was deleted.

37 changes: 0 additions & 37 deletions frontend/src/components/Utils/utils.test.js

This file was deleted.

21 changes: 0 additions & 21 deletions frontend/src/components/ViewActivities/activity.js

This file was deleted.

36 changes: 0 additions & 36 deletions frontend/src/components/ViewActivities/activityday.js

This file was deleted.

77 changes: 0 additions & 77 deletions frontend/src/components/ViewActivities/activityfns.js

This file was deleted.

97 changes: 0 additions & 97 deletions frontend/src/components/ViewActivities/activityfns.test.js

This file was deleted.

47 changes: 0 additions & 47 deletions frontend/src/components/ViewActivities/activitylist.js

This file was deleted.

Loading

0 comments on commit 68e5d07

Please sign in to comment.