Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sipb/courseroad2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6ff5d147908c53b476a5464690badce7862ae7f
Choose a base ref
..
head repository: sipb/courseroad2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7efd68976a482c22dca5e0d7e7f80fa2f5e2cae2
Choose a head ref
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
"overrides": [
{
"files": [
"tests/unit/**/*.spec.js"
"tests/unit/*.spec.js"
],
"env": {
"jest": true
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -108,6 +108,3 @@ public

# TernJS port file
.tern-port

# Credentials for the MIT People API
credentials.ini
13 changes: 0 additions & 13 deletions build/webpack.config.dev.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
'use strict'
const webpack = require('webpack')
const { VueLoaderPlugin } = require('vue-loader')
const { resolve } = require('path')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const cgi = require('cgi')

module.exports = (env) => {
return {
@@ -13,17 +11,9 @@ module.exports = (env) => {
'./src/app.js'
],
devServer: {
historyApiFallback: true,
hot: true,
watchOptions: {
poll: true
},
before: function (app, server, compiler) {
// Before handing all other dev server requests, check if the route is to the People API middleware and pass
// it to the CGI handler.
app.get('/cgi-bin/people.py', function (req, res) {
cgi(resolve(__dirname, '..', 'cgi-bin', 'people.py'))(req, res)
})
}
},
module: {
@@ -64,9 +54,6 @@ module.exports = (env) => {
}
]
},
output: {
publicPath: env.APP_URL.indexOf('dev') !== -1 ? '/dev/' : '/'
},
plugins: [
new webpack.HotModuleReplacementPlugin(),
new VueLoaderPlugin(),
44 changes: 0 additions & 44 deletions cgi-bin/people.py

This file was deleted.

4 changes: 2 additions & 2 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ if [ "$1" = "prod" ]; then
echo -n "You are about to deploy to the production site, are you sure? (y/n)? "
read answer
if [ "$answer" != "${answer#[Yy]}" ] ;then
scp -r deploy/production/.htaccess dist/* cgi-bin/ $2@athena.dialup.mit.edu:/mit/courseroad/web_scripts/courseroad/
scp -r dist/* $2@athena.dialup.mit.edu:/mit/courseroad/web_scripts/courseroad/
else
echo cancelled
fi
elif [ "$1" = "dev" ]; then
scp -r deploy/development/.htaccess dist/* cgi-bin/ $2@athena.dialup.mit.edu:/mit/courseroad/web_scripts/courseroad/dev/
scp -r dist/* $2@athena.dialup.mit.edu:/mit/courseroad/web_scripts/courseroad/dev/
else
echo "Invalid build location"
fi
1 change: 0 additions & 1 deletion deploy/development/.htaccess

This file was deleted.

1 change: 0 additions & 1 deletion deploy/production/.htaccess

This file was deleted.

3 changes: 0 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -3,9 +3,6 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="description" content="CourseRoad is a tool for planning out your classes over your entire time at MIT.
It makes it easy to explore different majors and minors, view your progress towards their requirements, and
choose which classes to take when in order to maximize your time at MIT.">
<!-- <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto" /> -->
<title>CourseRoad</title>
</head>
Loading