Skip to content

Commit

Permalink
final commit hopefully
Browse files Browse the repository at this point in the history
  • Loading branch information
jfwong authored and jfwong committed Jul 1, 2024
1 parent 820652e commit 34f2f3d
Show file tree
Hide file tree
Showing 9 changed files with 339 additions and 35 deletions.
4 changes: 0 additions & 4 deletions barba.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// barba.hooks.enter((data) => {
// console.log('e');
// });

barba.hooks.after(() => {
const bottomDOM = document.getElementsByTagName("body")[0]
const newScript = document.createElement("script")
Expand Down
21 changes: 3 additions & 18 deletions everything.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ let headScene = new ScrollMagic.Scene({
triggerHook: 0.9,
})
.setTween([".head-image", ".main-nav", ".head-message"], 1, {scale: 10, display: 'none'}) // trigger a TweenMax.to tween
// .addIndicators({name: "trigger div"})
// .addIndicators({name: "filler div"})
.addTo(headController)

let projectsController = new ScrollMagic.Controller()
Expand All @@ -34,10 +34,9 @@ let whiteScene = new ScrollMagic.Scene({
triggerHook: 0
})
.setTween(".home-div", 1, {
// backgroundColor: 'gray',
// backgroundImage: 'url("https://i.natgeofe.com/n/e484088d-3334-4ab6-9b75-623f7b8505c9/1086.jpg")',
backgroundImage: "radial-gradient(white 15%, black 80%)"
})
// .addIndicators({name: "trigger div"})
.addTo(projectsController)

let projectElements = document.getElementsByClassName("project-link");
Expand Down Expand Up @@ -99,19 +98,5 @@ for (let i = 0; i < parallaxSections.length; i++ ) {
.setTween(parallaxSectionsDiv[i], {y: "80%", ease: Linear.easeNone})
.addTo(parallaxController);
}
// new ScrollMagic.Scene({triggerElement: "#parallax1"})
// .setTween("#parallax1 > div", {y: "80%", ease: Linear.easeNone})
// // .addIndicators()
// .addTo(parallaxController);

// new ScrollMagic.Scene({triggerElement: "#parallax2"})
// .setTween("#parallax2 > div", {y: "80%", ease: Linear.easeNone})
// // .addIndicators()
// .addTo(parallaxController);

// new ScrollMagic.Scene({triggerElement: "#parallax3"})
// .setTween("#parallax3 > div", {y: "80%", ease: Linear.easeNone})
// // .addIndicators()
// .addTo(parallaxController);

} // init EVERYTHING
} // init EVERYTHING
Binary file added images/project4/project4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/project4/zoom.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ <h2 class="symbol">Jf</h2>
<div class="burger-line"></div>
</div>
<ul class="dropdown">
<li class="dropdown-li"><a href="projectOne.html">Project 1</a></li>
<li class="dropdown-li"><a href="projectTwo.html">Project 2</a></li>
<li class="dropdown-li"><a href="projectThree.html">Project 3</a></li>
<li class="dropdown-li"><a href="projectFour.html">Project 4</a></li>
<li class="dropdown-li" style="background-color: wheat;"><a href="projectOne.html" >Project 1</a></li>
<li class="dropdown-li" style="background-color: gold;"><a href="projectTwo.html">Project 2</a></li>
<li class="dropdown-li" style="background-color: tomato;"><a href="projectThree.html">Project 3</a></li>
<li class="dropdown-li" style="background-color: wheat;"><a href="projectFour.html">Project 4</a></li>
</ul>
</nav>
<h3 class="head-message">
Expand Down
323 changes: 323 additions & 0 deletions projectFour.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions projectOne.html
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ <h1>What could have been...</h1>
<span class="subtitle">Does anyone even read anymore?</span>
<p>
Anyway, that’s it for Tic-Tac-Toe! Feel free to move on to my other projects:
<a class="bottom-link" href="projectTwo" style="color: green;">GameShare&trade;</a>,
<a class="bottom-link" href="projectThree" style="color: #d93900;">Petrol Down Under</a>, or
<a class="bottom-link" href="projectTwo" style="color: green;">Project 2: GameShare&trade;</a>,
<a class="bottom-link" href="projectThree" style="color: #d93900;">Project 3: Petrol Down Under</a>, or
<a class="bottom-link" href="projectFour" style="color: #0047ab;">Project 4</a>
</p>
</div>
Expand Down
10 changes: 5 additions & 5 deletions projectThree.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ <h1>A Higher Calling</h1>
</div>
<section class="parallax-section" style="border-top: 10px #000094; border-bottom: 10px #d60000;border-style: solid;">
<div class="parallax-content">
<div></div>
<h1>Revelations</h1>
<p>
With our database populated, we could now move on to the next test of faith: using Google Maps API. This was just one of many APIs, albeit the central one,
Expand Down Expand Up @@ -337,10 +336,11 @@ <h1>Rapture</h1>
Maps API ever again, it will be too soon.
</p>

<p> Anyhow, what's done is done. You're forgiven, Google Maps. Now feel free to move on to my other projects:
<a class="bottom-link" href="projectOne" style="color: red;">Tic-Tac-Toe</a>,
<a class="bottom-link" href="projectTwo" style="color: green;">GameShare&trade;</a>,
<a class="bottom-link" href="projectFour" style="color: #0047ab;">Project 4</a> </p>
<p> Anyhow, what's done is done. I forgive Google Maps. Now feel free to move on to my other projects:
<a class="bottom-link" href="projectOne" style="color: red;">Project 1: Tic-Tac-Toe</a>,
<a class="bottom-link" href="projectTwo" style="color: green;">Projecte 2: GameShare&trade;</a>, or
<a class="bottom-link" href="projectFour" style="color: #0047ab;">Project 4</a>
</p>
</div>
</section>
</div> <!-- wrapper div -->
Expand Down
4 changes: 2 additions & 2 deletions projectTwo.html
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ <h1>Enjoying <span style="color: green">GameShare&trade;</span>? Be sure to leav
As I am probably going to make abundantly clear throughout this website, visual design is not my strong suit. I did my best to try and emulate the styles and colors of gaming websites I used (e.g. Nexus Mods) and while I do think the site could be more polished in some areas (like the UIs), I am fairly happy with what I made. If I went back and did it again, I would definitely not even bother with the chat feature as it ultimately took up a lot of time for something that wasn’t needed at all.
</p>
That’s it for <span style="color: green">GameShare&trade;</span>! Feel free to move on to my other projects:
<a class="bottom-link" href="projectOne" style="color: red;">Tic-Tac-Toe</a>,
<a class="bottom-link" href="projectThree" style="color: #d93900;">Petrol Down Under</a>, or
<a class="bottom-link" href="projectOne" style="color: red;">Project 1: Tic-Tac-Toe</a>,
<a class="bottom-link" href="projectThree" style="color: #d93900;">Project 3: Petrol Down Under</a>, or
<a class="bottom-link" href="projectFour" style="color: #0047ab;">Project 4</a>


Expand Down

0 comments on commit 34f2f3d

Please sign in to comment.