Skip to content

John Changes on train ride home. #2

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.

Sign up for GitHub

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
stackedactors1 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

John Changes on train ride home. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cfdb33
John Changes on train ride home.
stackedactors1 Jun 6, 2014
8c37b26
push from mac mini
stackedactors1 Jun 7, 2014
8a448dd
John grunt addition.
stackedactors1 Jun 10, 2014
9c53358
Merge remote-tracking branch 'origin/master'
stackedactors1 Jun 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/scopes/scope_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module.exports = function(grunt) {

// 1. All configuration goes here
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

uglify: {
options: {
mangle: false, compress: false
//, beautify: true
},
min: {
files: [
{
src: "js/*.js",
dest: "js/build/production.min.js"
}
]
}
},

});

// 3. Where we tell Grunt we plan to use this plug-in.
//grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
// 4. Where we tell Grunt what to do when we type "grunt" into the terminal.
grunt.registerTask('default', ['uglify']);

grunt.task.run('uglify');
};

10 changes: 10 additions & 0 deletions Triangle_Game.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

33 changes: 17 additions & 16 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="css/main.css">
<script src="js/jquery-1.10.2.js"></script>
<script src="js/jquery-ui-1.10.4.custom.min.js"></script>
<script src="js/jquery.ui.touch-punch.min.js"></script>
<script src="js/board.js"></script>
<script src= "js/view.js"></script>
<script src= "js/controller.js"></script>
<script src="js/main.js"></script>
<script>
console.log('john was here!');
console.log('john was here again!');
</script>
</head>
<body>

<select class="colorPicker">
<option>Choose Color</option>
<option value="blue">Blue</option>
<option value="red">Red</option>
<option value="green">Green</option>
<option value="orange">Orange</option>
<option value="pink">Pink</option>
<option value="yellow">Yellow</option>
<option value="purple">Purple</option>
<option value="monochrome">Monochrome</option>
</select>
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class ="board">
<div class ="triangle">
Expand All @@ -34,9 +33,11 @@ <h3 id = "message" class = "message">Message</h3>
<footer>
<p>&copy; Company 2013</p>
</footer>
</div> <!-- /container -->



</div> <!-- /container -->
<script src="js/libs/jquery-1.10.2.js"></script>
<script src="js/libs/jquery-ui-1.10.4.custom.min.js"></script>
<script src="js/libs/jquery.ui.touch-punch.min.js"></script>
<script src="js/libs/random-color.js"></script>
<script src="js/build/production.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions js/build/production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 js/jquery-1.10.2.js → js/libs/jquery-1.10.2.js
View file
Open in desktop
File renamed without changes.
0 js/jquery-ui-1.10.4.custom.min.js → js/libs/jquery-ui-1.10.4.custom.min.js
View file
Open in desktop
File renamed without changes.
0 js/jquery.ui.touch-punch.min.js → js/libs/jquery.ui.touch-punch.min.js
View file
Open in desktop
File renamed without changes.
Loading