v1, demo day ready #32

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.

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

wishinghand wants to merge 117 commits into master from dev

.eslintignore

-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     build/*.js
-    config/*.js
+    config/*.js
+    *

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ dist/ @@
     npm-debug.log
     selenium-debug.log
     test/unit/coverage
-    test/e2e/reports
+    test/e2e/reports

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,10 +1,26 @@
  
    # incentify

    # Incentify

    > Motivation app through financial consequences

    By tracking metric based achievement sites (Fitbit/Duolingo), we can interface with their API and let users set a goal (5 miles per week) and a financial incentive ($10). If they fail to meet that weekly goal, they get charged through the Stripe API.

    ## Technologies used

    **NERV Stack**

    Back End: Node/Express

    Database: RethinkDB

    Front End: Vue.js

    **APIs**

    Stripe

    Team Treehouse

    **CSS**

    Bulma.io

    Animate.css

    ## Build Setup

    ``` bash

    ```

    # install dependencies

    npm install

    @@ -13,15 +29,4 @@ npm run dev
  
    # build for production with minification

    npm run build

    # run unit tests

    npm run unit

    # run e2e tests

    npm run e2e

    # run all tests

    npm test

    ```

    For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

build/webpack.base.conf.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ var projectRoot = path.resolve(__dirname, '../') @@
     module.exports = {
       entry: {
-        app: './src/main.js'
+        app: ['./src/main.js']
       },
       output: {
         path: config.build.assetsRoot,
@@ Expand Down @@

config/dev.env.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,7 @@ var merge = require('webpack-merge') @@
     var prodEnv = require('./prod.env')
     module.exports = merge(prodEnv, {
-      NODE_ENV: '"development"'
+      DEBUG_MODE: true,
+      NODE_ENV: '"development"',
+      API_URL: '"http://localhost:3000"'
     })

config/index.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,8 @@ module.exports = { @@
         index: path.resolve(__dirname, '../dist/index.html'),
         assetsRoot: path.resolve(__dirname, '../dist'),
         assetsSubDirectory: 'static',
-        assetsPublicPath: '/',
+        // remove the dot below if you want it for webroot vs cordova
+        assetsPublicPath: './',
         productionSourceMap: true,
         // Gzip off by default as many popular static hosts such as
         // Surge or Netlify already gzip all static assets for you.
@@ Expand Down @@

config/prod.env.js

-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
     module.exports = {
-      NODE_ENV: '"production"'
+      DEBUG_MODE: false,
+      NODE_ENV: '"production"',
+      API_URL: '"https://incentifyapi.herokuapp.com"'
     }

index.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,11 @@ @@
       <head>
         <meta charset="utf-8">
         <title>Incentify</title>
+        <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
+        <script src="https://checkout.stripe.com/checkout.js"></script>
       </head>
       <body>
         <!-- built files will be auto injected -->
         <app></app>
       </body>
-    </html>
+    </html>

package.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,8 +11,14 @@
  
        "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"

      },

      "dependencies": {

        "animate.css": "^3.5.2",

        "babel-runtime": "^6.0.0",

        "font-awesome": "^4.6.3",

        "lodash": "^4.16.4",

        "stripe": "^4.12.0",

        "sweetalert": "^1.1.3",

        "vue": "^1.0.21",

        "babel-runtime": "^6.0.0"

        "vue-sweetalert": "^0.1.15"

      },

      "devDependencies": {

        "babel-core": "^6.0.0",

    @@ -34,24 +40,27 @@
  
        "eventsource-polyfill": "^0.9.6",

        "express": "^4.13.3",

        "extract-text-webpack-plugin": "^1.0.1",

        "fastclick": "^1.0.6",

        "file-loader": "^0.8.4",

        "font-awesome": "^4.6.3",

        "function-bind": "^1.0.2",

        "html-webpack-plugin": "^2.8.1",

        "http-proxy-middleware": "^0.12.0",

        "json-loader": "^0.5.4",

        "less-loader": "^2.2.3",

        "node-sass": "^3.10.1",

        "ora": "^0.2.0",

        "sass-loader": "^4.0.2",

        "shelljs": "^0.6.0",

        "spectre.css": "^0.1.26",

        "style-loader": "^0.13.1",

        "url-loader": "^0.5.7",

        "vue-hot-reload-api": "^1.2.0",

        "vue-html-loader": "^1.0.0",

        "vue-loader": "^8.3.0",

        "vue-moment": "^2.0.2",

        "vue-resource": "^1.0.3",

        "vue-router": "^0.7.13",

        "vue-style-loader": "^1.0.0",

        "vue-touch": "^1.1.0",

        "webpack": "^1.12.2",

        "webpack-dev-middleware": "^1.4.0",

        "webpack-hot-middleware": "^2.6.0",

rethinkdb_data/log_file

This file was deleted.

rethinkdb_data/metadata

Binary file not shown.

src/App.vue

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,84 +1,75 @@
  
    <template>

      <div id="app">

      <div id="app" v-bind:class="{ 'no-margin': $route.path === '/' }">

        <!-- route outlet -->

        <top-branding></top-branding>

        <router-view class="wrapper"></router-view>

        <navbar class="navbar-one"></navbar>

        <top-branding class="header" v-show="$route.path !== '/'" ></top-branding>

          <router-view></router-view>

          <navbar class="navbar" v-show="$route.path !== '/'"></navbar>

      </div>

    </template>

    <script>

      import navbar from './components/navbar';

      import topBranding from './components/top-branding';

      import Vue from 'vue';

      import auth from './auth/index.js';

      // require('spectre.css/dist/spectre.css');

      // require('bulma/css/bulma.css');

      require('bulma/bulma.sass');

      require('font-awesome/css/font-awesome.css');

      require('animate.css/animate.css');

      require('!style!css!sass!font-awesome/scss/font-awesome.scss');

      export default {

        components: {

          navbar,

          topBranding,

        },

        replace: false,

        ready() {

          Vue.http.interceptors.push((request, next) => {

              var token = auth.getToken()

              if(token && !request.headers.has("authorization")){

                request.headers.append("authorization", "JWT " + token);

              }

            next();

          });

        }

      };

    </script>

    <style>

    .navbar-one {

      position: fixed; 

      bottom: 0px; 

      width: 100%;

    body{

      font-size: calc(1em + 1vw);

    }

      body {

        align-items: center;

        justify-content: center;

        padding: 5px !important;

        flex-wrap: nowrap !important;

        background-color: ghostwhite !important;

      .no-margin {

        margin: 0 !important;

      }

      .wrapper {

        height: 81vh !important;

        width: 100% !important;

      .header{

        margin-bottom: 4rem;

        z-index: 10;

      }

      .btn-padding {

        padding: 10px !important;

        font-size: 20px !important;

        text-transform: uppercase !important;

        height: 150px !important;

      .navbar {

        position: fixed;

        bottom: 0px;

        width: 100%;

        z-index: 10;

        background-color:  ghostwhite;

      }

      .red-nav {

        color: red !important;

        border-color: red !important;

        background-color: white !important;

      /* this makes the sticky headers/footers without covering up the content */

      #app{

        margin-top: 9rem;

        margin-bottom: 3.5rem;

      }

      .red-nav:hover {

        background-color: black !important;

        color: white !important;

        border-color: red !important;

        background-color: white;

        .is-success {

        background-color: #00856d;

      }

      .red-nav:focus {

        background-color: black !important;

        color: white !important;

        border-color: red !important;

        background-color: white;

        .is-primary {

        background-color: #61cbec;

      }

      .red-nav:active {

        background-color: black !important;

        color: white !important;

        border-color: white !important;

        background-color: white;

      }

      .lil-marg {

        margin-right: 25px !important;

      }

    </style>

src/assets/incentify-logo-square_360.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

src/assets/incentify.logo.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

src/assets/logo.png

Binary file not shown.

src/assets/mountain.jpg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

src/assets/mountain.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

src/auth/index.js

-Original file line number
+Diff line change
@@ -0,0 +1,33 @@
+    import {router} from '../main'
+    export default {
+      // User object will let us check authentication status
+      user: {
+        authenticated: false
+      },
+      // To log out, we just need to remove the token
+      logout() {
+        localStorage.removeItem('token')
+        this.user.authenticated = false;
+        state.go('/register');
+      },
+      checkAuth() {
+        var jwt = localStorage.getItem('token')
+        if(jwt) {
+          this.user.authenticated = true
+          state.go('/dashboard')
+        }
+        else {
+          this.user.authenticated = false
+          state.go('/register')
+        }
+      },
+      getToken() {
+        return localStorage.getItem('token');
+      }
+    }

src/auth/interceptor.js

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    import Vue from 'vue';
+    // import VueResource from 'vue-resource';
+    import auth from './index.js';
+    export default{
+      init(){
+        Vue.http().interceptors.push((request, next) => {
+          if(!request.headers["Authorization"]) {
+              request.headers["Authorization"] = 'Bearer ' + auth.getToken()
+          }
+          next()
+        })
+      }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

v1, demo day ready #32

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

v1, demo day ready #32

Are you sure you want to change the base?

Uh oh!

v1, demo day ready #32

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!