diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b1b0387..88d0ff0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,15 +2,13 @@
#### Please check if the PR fulfills these requirements
-- [ ] The changes don't come from your master branch. ([Source](https://blog.jasonmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/))
+- [ ] The changes don't come from your master branch. ([Source](https://blog.jasonmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/))
---
### [Trello Card](trello.com/LINK-TO-TRELLO-CARD)
-#### What kind of change does this PR introduce? (bug fix, feature, docs update, ...)
-
-Please delete options that are not relevant.
+#### What kind of change does this PR introduce? [check at least one box] (bug fix, feature, docs update, ...)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
@@ -48,7 +46,7 @@ Please delete options that are not relevant.
---
-#### TODO:
+#### TODO: [delete if there are no relevant TODOs after this PR is merged]
- this
- that
- other
diff --git a/README.md b/README.md
index 8cdd4f0..b6eb5b3 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ Banana App is an open-source, not-for-profit project of The Be Good Foundation.
Step 0 is to [install the backend](https://github.com/FoodIsLifeBGP/banana-rails). Follow those instructions to make sure you have everything needed to install this repo.
-Then if you havent already done so, clone the repository to your desired project folder and install dependencies: `git clone https://github.com/FoodIsLifeBGP/banana-rn && cd banana-rn && npm i`
+Then if you haven't already done so, clone the repository to your desired project folder and install dependencies: `git clone https://github.com/FoodIsLifeBGP/banana-admin && cd banana-admin`
-otherwise you can just navigate to your project's root folder in the terminal (e.g. `cd ~/Projects/banana-rn`)
+otherwise you can just navigate to your project's root folder in the terminal (e.g. `cd ~/Projects/banana-admin`)
# Installation (Mac/OSX)
@@ -73,7 +73,7 @@ Run ESLint (you'll need to ensure you fix any linter errors and visually double-
yarn lint
```
-...and infequently you may need to build the project:
+...and infrequently you may need to build the project:
```
yarn run build
```
diff --git a/src/App.js b/src/App.js
index 85f8007..c5537cb 100644
--- a/src/App.js
+++ b/src/App.js
@@ -9,6 +9,8 @@ import HomePage from './Pages/HomePage';
import SettingsPage from './Pages/SettingsPage';
import ReviewApplicationPage from './Pages/ReviewApplicationPage';
import LoginPage from './Pages/LoginPage/index';
+import ApplicationIndexPage from './Pages/ApplicationIndexPage';
+import ApplicationDetailPage from './Pages/ApplicationDetailPage';
function App() {
return (
@@ -20,6 +22,9 @@ function App() {
} />
} />
} />
+ } />
+ } />
+ } />
diff --git a/src/Components/ApplicationCard/index.js b/src/Components/ApplicationCard/index.js
index 741ae92..672f7be 100644
--- a/src/Components/ApplicationCard/index.js
+++ b/src/Components/ApplicationCard/index.js
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
-import styles from './style.module.css';
+import styles from './style.module.scss';
import Icon from '../Icon';
function ApplicationCard(props) {
@@ -26,7 +26,7 @@ function ApplicationCard(props) {
return (