Merge pull request #1 from rhiannanberry/simplify

Simplify
rhiannanberry · May 26, 2020 · 80c9cf8 · 80c9cf8
2 parents c4f852c + 82364cb
commit 80c9cf8
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 4 deletions.
diff --git a/resources/css/widgets.css b/resources/css/widgets.css
@@ -55,4 +55,33 @@
   border-right: 2px solid white;
   border-bottom: 2px solid white;
   border-left: 2px solid #222;
+}
+
+.contents-window {
+
+  width:85%;
+  background:white;
+  height: 300px;
+  overflow-y: scroll;
+  border-top: 2px solid #222;
+  border-right: 2px solid white;
+  border-bottom: 2px solid white;
+  border-left: 2px solid #222;
+  margin: 0px;
+  display: inline-block;
+  padding: 2%;
+}
+
+.button#projects {
+	width: 14%;
+	display:inline-block;
+	padding: 0;
+	text-align: center;
+	margin-left: 1%;
+
+}
+
+.window-body#projects {
+	width:600px;
+	padding: 5px;
 }
diff --git a/resources/js/base.js b/resources/js/base.js
@@ -23,7 +23,9 @@ $(document).ready(function() {
 	});
 
 	$('.projects-window').window({
-		title: "Projects"
+		title: "Projects",
+		contents: $(innerWindow),
+		id: "projects"
 	});
 
 	var a=4;
@@ -68,6 +70,10 @@ $(document).ready(function() {
 
 
 	//wind.draggable({handle: ".window-title2"});
+
+	$.get('resources/windows/projects.html', function(data) {
+		conole.log(data);
+	});
 });
 
 
@@ -79,3 +85,12 @@ var abtPage = 	'<img src="resources/icons/me.bmp" alt="" style="display: inline-
 				"can be great friends.</p>";
 var persPage = '<iframe width="560" height="315" src="https://www.youtube.com/embed/v0lGQQjL-vc?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>';
 
+
+var projectContents= '<h1>2017</h1></br>'
+		+'<h3>snake-a-thon V2</h3><p>Revisiting a project I did last year in Gamemaker. This time, in Unity!</p>'
+		+'<h3>Rat Unity</h3><p>Made for a class. Mostly an early experiment in dialogue trees and unlit shaders.</p>'
+		+'<h3>snake-a-thon</h3><p>A fun spin on the classic game Snake. Created for a club I help run at Georgia Tech (VGDev), with the only rule being the game must be built in one semester.</p>'
+		+'<h1>2016</h1></br>'
+		+'<h3>Analog Dreams</h3><p>Another game made for VGDev. Co-lead with Sean Flanagan. Your standard 3D physics puzzler with portals, but with a twist!</p>'
+		+'<h3>Space Squids</h3><p>First ever game with VGDev <3. My only work on this was creating the titular squid model, and providing necessary emotional support.</p>';
+var innerWindow = '<div  class="contents-window">'+projectContents+'</div><div id= "projects" class="button">YEET</div>';
diff --git a/resources/js/widgets.js b/resources/js/widgets.js
@@ -1,7 +1,8 @@
 $.widget("custom.window", {
 	options: {
 		title: "Coming Soon TO OWN ON VHS",
-		contents: $('<div><img src="resources/icons/project.ico" alt="" style="display: inline-block;"><p style="display: inline-block; vertical-align: top; margin-left: 3px">Coming Soon</p></div>')
+		contents: $('<div><img src="resources/icons/project.ico" alt="" style="display: inline-block;"><p style="display: inline-block; vertical-align: top; margin-left: 3px">Coming Soon</p></div>'),
+		id: "about"
 
 	},
 	_create: function() {
@@ -17,7 +18,8 @@ $.widget("custom.window", {
 		}).appendTo(this.title);
 
 		this.body = $("<div>", {
-			"class": "window-body"
+			"class": "window-body",
+			"id": this.options.id
 		}).appendTo(this.element);
 
 		//this._setDefaultContent();
@@ -54,7 +56,7 @@ $.widget("custom.window", {
 
 	title: function (value) {
 		if (value === undefined) {
-			return this.optsion.title;
+			return this.options.title;
 		}
 	}
 });

diff --git a/resources/windows/projects.html b/resources/windows/projects.html
@@ -0,0 +1,9 @@
+<div  class="contents-window">
+	<h1>2017</h1>
+	</br>
+	<h3>Rat Unity</h3>
+	<p>
+		Made for a class. Mostly an early experiment in dialogue trees and unlit shaders.
+	</p>
+</div>
+<div id= "projects" class="button">YEET</div>