rossprogram · dependabot · Dec 29, 2019 · Dec 30, 2019 · Dec 30, 2019 · Dec 30, 2019
diff --git a/.env.production b/.env.production
@@ -0,0 +1,2 @@
+VUE_APP_API_URL=https://api.rossprogram.org
+VUE_APP_STRIPE_API_KEY=pk_live_EVv0HE4EnEnGBfjY2iBzPnuS003Q0UNubO
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.0.0",
+  "version": "1.6.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -14,6 +14,8 @@
     "core-js": "^3.4.3",
     "material-design-icons-iconfont": "^5.0.1",
     "pluralize": "^8.0.0",
+    "v-currency-field": "^3.0.7",
+    "v-stripe-elements": "^1.2.0",
     "vue": "^2.6.10",
     "vue-moment": "^4.0.0",
     "vue-router": "^3.1.3",
@@ -22,7 +24,6 @@
     "vuex": "^3.1.2"
   },
   "devDependencies": {
-    "vue-cli-plugin-s3-deploy": "^3.0.0",    
     "@vue/cli-plugin-babel": "^4.1.0",
     "@vue/cli-plugin-eslint": "^4.1.0",
     "@vue/cli-plugin-router": "^4.1.0",
@@ -36,6 +37,7 @@
     "node-sass": "^4.12.0",
     "sass": "^1.19.0",
     "sass-loader": "^8.0.0",
+    "vue-cli-plugin-s3-deploy": "^3.0.0",
     "vue-cli-plugin-vuetify": "^2.0.2",
     "vue-template-compiler": "^2.6.10",
     "vuetify-loader": "^1.3.0"

diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -4,11 +4,15 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= BASE_URL %>apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="<%= BASE_URL %>favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="<%= BASE_URL %>favicon-16x16.png">
+    <link rel="manifest" href="<%= BASE_URL %>site.webmanifest">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <script src="https://js.stripe.com/v3/"></script>
     <title>Apply - Ross Mathematics Program</title>
     <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,300italic,400italic|Material+Icons' rel="stylesheet" type="text/css">
     <link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
-
   </head>
   <body>
     <noscript>

diff --git a/public/logo.png b/public/logo.png
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+   "background_color" : "#ffffff",
+   "display" : "standalone",
+   "icons" : [
+      {
+         "sizes" : "192x192",
+         "src" : "/android-chrome-192x192.png",
+         "type" : "image/png"
+      },
+      {
+         "sizes" : "512x512",
+         "src" : "/android-chrome-512x512.png",
+         "type" : "image/png"
+      }
+   ],
+   "name" : "Apply to the Ross Program",
+   "short_name" : "apply to ross",
+   "theme_color" : "#ffffff"
+}
diff --git a/src/App.vue b/src/App.vue
@@ -70,9 +70,10 @@
         nav
       >
         <v-list-item
-          v-for="item in items"
+          v-for="item in (application.juniorCounselor ? jcItems : items)"
           :key="item.title"
 	  :to="item.to"
+	  :exact="true"
           link
         >
           <v-list-item-icon>
@@ -105,56 +106,104 @@ export default {
 name: 'App',
   computed: {
     ...mapState(['profile']),
+    ...mapState(['application']),
   },
 
   components: {
     Snackbar,
   },
   data() {
-return {
-drawer: true,
-items: [
-{
- title: 'Background',
-icon: 'person',
-to: '/apply/background',
-},
-{
- title: 'Parent Information',
-icon: 'supervisor_account',
-to: '/apply/parent',
-},
-{
- title: 'Short Essays',
-icon: 'message',
-to: '/apply/essays',
-},
-{
- title: 'Recommendation',
-icon: 'mail',
-to: '/apply/recommendation',
-},
-{
- title: 'Solutions',
-icon: 'assignment',
-to: '/apply/solutions',
-},
-{
- title: 'Personal Statement',
-icon: 'face',
-to: '/apply/statement',
-},
-{
- title: 'Attachments',
-icon: 'attachment',
-to: '/apply/attachments',
-},
-{
- title: 'Submit',
-icon: 'done',
-to: '/apply/submit',
-},
-],
+    return {
+      drawer: true,
+      jcItems: [
+	{
+	  title: 'Instructions',
+	  icon: 'grading',
+	  to: '/apply/',
+	},
+	{
+	  title: 'Background',
+	  icon: 'person',
+	  to: '/apply/background',
+	},
+	{
+	  title: 'Parent Information',
+	  icon: 'supervisor_account',
+	  to: '/apply/parent',
+	},
+	{
+	  title: 'Transcript',
+	  icon: 'school',
+	  to: '/apply/transcript',
+	},
+	{
+	  title: 'JC Essays',
+	  icon: 'message',
+	  to: '/apply/jc-essays',
+	},
+	{
+	  title: 'Attachments',
+	  icon: 'attachment',
+	  to: '/apply/attachments',
+	},
+	{
+	  title: 'Submit',
+	  icon: 'done',
+	  to: '/apply/submit',
+	},
+      ],
+      items: [
+	{
+	  title: 'Instructions',
+	  icon: 'grading',
+	  to: '/apply/',
+	},
+	{
+	  title: 'Background',
+	  icon: 'person',
+	  to: '/apply/background',
+	},
+	{
+	  title: 'Parent Information',
+	  icon: 'supervisor_account',
+	  to: '/apply/parent',
+	},
+	{
+	  title: 'Personal Statement',
+	  icon: 'face',
+	  to: '/apply/statement',
+	},
+	{
+	  title: 'Short Essays',
+	  icon: 'message',
+	  to: '/apply/essays',
+	},
+	{
+	  title: 'Solutions',
+	  icon: 'assignment',
+	  to: '/apply/solutions',
+	},
+	{
+	  title: 'Transcript',
+	  icon: 'school',
+	  to: '/apply/transcript',
+	},
+	{
+	  title: 'Recommendation',
+	  icon: 'mail',
+	  to: '/apply/recommendation',
+	},
+	{
+	  title: 'Attachments',
+	  icon: 'attachment',
+	  to: '/apply/attachments',
+	},
+	{
+	  title: 'Submit',
+	  icon: 'done',
+	  to: '/apply/submit',
+	},
+      ],
       publicPath: process.env.BASE_URL,
     };
   },

diff --git a/src/main.js b/src/main.js
@@ -2,6 +2,8 @@ import Vue from 'vue';
 import pluralize from 'pluralize';
 import VueTelInput from 'vue-tel-input';
 import moment from 'vue-moment';
+import VCurrencyField from 'v-currency-field';
+import { VTextField } from 'vuetify/lib'; // Globally import VTextField
 import App from './App.vue';
 import router from './router';
 import store from './store';
@@ -14,6 +16,16 @@ Vue.config.productionTip = false;
 
 Vue.filter('pluralize', (value, number) => pluralize(value, number));
 
+Vue.component('v-text-field', VTextField);
+Vue.use(VCurrencyField, {
+	locale: 'en-US',
+	decimalLength: 2,
+	autoDecimalMode: true,
+	min: null,
+	max: null,
+	defaultValue: 0,
+});
+
 new Vue({
   router,
   store,

diff --git a/src/router/index.js b/src/router/index.js
@@ -3,15 +3,20 @@ import VueRouter from 'vue-router';
 import Home from '../views/Home.vue';
 import Signup from '../views/Signup.vue';
 import Apply from '../views/Apply.vue';
+import Status from '../views/Status.vue';
+import Fees from '../views/Fees.vue';
 import Background from '../views/Background.vue';
 import Essays from '../views/Essays.vue';
+import JCEssays from '../views/JCEssays.vue';
 import Login from '../views/Login.vue';
 import ParentInformation from '../views/ParentInformation.vue';
 import PersonalStatement from '../views/PersonalStatement.vue';
 import Recommendation from '../views/Recommendation.vue';
 import Attachments from '../views/Attachments.vue';
 import Solutions from '../views/Solutions.vue';
+import Transcript from '../views/Transcript.vue';
 import SubmitApplication from '../views/SubmitApplication.vue';
+import store from '../store';
 
 Vue.use(VueRouter);
 
@@ -36,11 +41,32 @@ const routes = [
     name: 'apply',
     component: Apply,
   },
+  {
+    path: '/status',
+    name: 'status',
+    component: Status,
+    meta: {
+      requiresAuth: true,
+    },
+  },
+  {
+    path: '/fees',
+    name: 'fees',
+    component: Fees,
+    meta: {
+      requiresAuth: true,
+    },
+  },
   {
     path: '/apply/essays',
     name: 'essays',
     component: Essays,
   },
+  {
+    path: '/apply/jc-essays',
+    name: 'jc-essays',
+    component: JCEssays,
+  },
   {
     path: '/apply/background',
     name: 'background',
@@ -61,6 +87,11 @@ const routes = [
     name: 'solutions',
     component: Solutions,
   },
+  {
+    path: '/apply/transcript',
+    name: 'transcript',
+    component: Transcript,
+  },
   {
     path: '/apply/attachments',
     name: 'attachments',
@@ -84,4 +115,16 @@ const router = new VueRouter({
   routes,
 });
 
+router.beforeEach((to, from, next) => {
+  if (to.matched.some(record => record.meta.requiresAuth)) {
+    if (store.state.profile) {
+      next();
+      return;
+    }
+    next('/login');
+  } else {
+    next();
+  }
+});
+
 export default router;
diff --git a/src/services/user.js b/src/services/user.js
@@ -19,6 +19,22 @@ export default {
     });
   },
 
+  async getPayments() {
+    return axios.get('/users/me/payments');
+  },
+
+  async postPayment(data) {
+    return axios.post(`/users/me/payments/${data.amount}`);
+  },
+
+  async getOffer() {
+    return axios.get(`/users/me/application/${new Date().getFullYear()}/offer`);
+  },
+
+  async putOffer(data) {
+    return axios.put(`/users/me/application/${new Date().getFullYear()}/offer`, data);
+  },
+
   async putApplication(id, data) {
     return axios.put(`/users/${id}/application/${new Date().getFullYear()}`, data);
   },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		VUE_APP_API_URL=https://api.rossprogram.org
		VUE_APP_STRIPE_API_KEY=pk_live_EVv0HE4EnEnGBfjY2iBzPnuS003Q0UNubO