Compare commits

..

No commits in common. "1fe22556c0f900d1ba5ff6daf308ba7d0c782e35" and "a3c5c90756d4636dd264b483ce0007482f0da659" have entirely different histories.

30 changed files with 12 additions and 199 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -96,7 +96,7 @@
</a>
<a href="blog/blog.html"><h1>Blog</h1></a>
<a href="site/report.html"><h1>Site Report</h1></a>
<a href="site/construction.html"><h1>Site Map</h1></a>
<a href="site/map.html"><h1>Site Map</h1></a>
<a href="site/construction.html"><h1>Terms</h1></a>
<a href="site/construction.html"><h1>Privacy</h1></a>
</footer>

View File

@ -68,7 +68,7 @@
</a>
<a id="blog_footer" href="blog/blog.html"><h1>Blog</h1></a>
<a href="site/report.html"><h1>Site Report</h1></a>
<a href="site/construction.html"><h1>Site Map</h1></a>
<a href="site/map.html"><h1>Site Map</h1></a>
<a href="site/construction.html"><h1>Terms</h1></a>
<a href="site/construction.html"><h1>Privacy</h1></a>
</footer>

View File

@ -139,7 +139,7 @@
</a>
<a href="blog/blog.html"><h1>Blog</h1></a>
<a href="site/report.html"><h1>Site Report</h1></a>
<a href="site/construction.html"><h1>Site Map</h1></a>
<a href="site/map.html"><h1>Site Map</h1></a>
<a href="site/construction.html"><h1>Terms</h1></a>
<a href="site/construction.html"><h1>Privacy</h1></a>
</footer>

View File

@ -38,28 +38,19 @@
<video controls>
<source src="assets/portfolio/videos/ardent.mp4" type="video/mp4"/>
</video>
<p class="description"><span class="moreInfo">Ardent London<span class="extraInfo">A candle and wax melt retailer</span></span> contracted me to design the front-end of their new e-commerce website on wix. This entailed pitching colour themes, motifs, and layout ideas until the employer was satisfied.
After the design phase, I was required to implement the design through the wix interface. Other tech stacks were left unconsidered due to the employer wanting to use wix for it's user-friendly dashboard
used to manage the inventory of products they sell. The video is from early in the design stage, as I am still waiting for a finished walkthrough for my portfolio.
</p>
<p class="description">Lorem ipsum dolor sit, amet consectetur adipisicing elit. Facere, odit aut quod quam dolores fuga dolor illum neque, sunt laboriosam consequuntur harum, assumenda id soluta aliquid dolorum ullam deleniti vero.</p>
</section>
<section class="project right">
<h2 class="title">Efron's Dice (Java CLI script)</h2>
<img src="assets/portfolio/images/efron.png" alt="An image of the output of the project script"/>
<p class="description">I developed this code using Java, this code proves the mathematical reasoning behind Efron's Dice.
Efron's dice is an example of intransitive dice. In the example to the left, <span class="moreInfo">A > B > C > D<span class="extraInfo">In terms of rolling higher</span></span> more than 50% of the time.
This would lead us to believe that A > D, however this is not true. TL;DR: there is always a die in the set that can roll higher than the die we roll.
</p>
<p class="description">Lorem ipsum dolor sit amet consectetur adipisicing elit. Explicabo commodi eveniet porro hic saepe ratione adipisci soluta consectetur voluptates id, asperiores voluptatum fugiat reiciendis impedit quasi quae aliquam? Atque, ipsum!</p>
</section>
<section class="project left">
<h2 class="title">Portfolio Website (Fullstack Project)</h2>
<img src="assets/portfolio/images/website.png" alt="An image of the project site"/>
<p class="description">I developed this for a university assignment in my web design <span class="moreInfo">module<span class="extraInfo">CSY1018</span></span> in my Software Engnineering degree.
I was required to produce the portfolio website that you are currently viewing to show my skills in HTML and CSS. The site itself needed to display past projects, a blog, and be mobile responsive.
</p>
<p class="description">Lorem ipsum dolor sit, amet consectetur adipisicing elit. Facere, odit aut quod quam dolores fuga dolor illum neque, sunt laboriosam consequuntur harum, assumenda id soluta aliquid dolorum ullam deleniti vero.</p>
</section>
</main>
@ -70,7 +61,7 @@
</a>
<a href="blog/blog.html"><h1>Blog</h1></a>
<a href="site/report.html"><h1>Site Report</h1></a>
<a href="site/construction.html"><h1>Site Map</h1></a>
<a href="site/map.html"><h1>Site Map</h1></a>
<a href="site/construction.html"><h1>Terms</h1></a>
<a href="site/construction.html"><h1>Privacy</h1></a>
</footer>

View File

@ -16,13 +16,12 @@
<link rel="stylesheet" href="style/main.css" media = "screen">
<link rel="stylesheet" href="site/construction.css" media="screen">
<link rel="stylesheet" href="style/mobile.css" media ="screen and (max-width:800px)">
<link rel="stylesheet" href="site/construction_mobile.css" media ="screen and (max-width:800px)">
</head>
<body id="clicked">
<nav class="navigation">
<a class="hidenav" href="site/construction.html#"> X</a>
<a class="hidenav" href="home/index.html#"> X</a>
<a class="nav link" id="home" href="home/index.html"><h2>J-Pez Development</h2></a>
<a class="nav link" id="port" href="portfolio/portfolio.html"><h2>Portfolio</h2></a>
<a class="nav link" id="blog" href="blog/blog.html"><h2>Blog</h2></a>
@ -31,10 +30,9 @@
</nav>
<main>
<a class="shownav" href="site/construction.html#clicked"></a>
<section class="notice">
<img src="assets/images/construction.jpg" alt="Image of arbitrary source code"/>
<h2>This Page is currently Under Construction!</h2>
<h1>This Page is currently Under Construction!</h1>
</section>
</main>
@ -46,7 +44,7 @@
</a>
<a href="blog/blog.html"><h1>Blog</h1></a>
<a href="site/report.html"><h1>Site Report</h1></a>
<a href="site/construction.html"><h1>Site Map</h1></a>
<a href="site/map.html"><h1>Site Map</h1></a>
<a href="site/construction.html"><h1>Terms</h1></a>
<a href="site/construction.html"><h1>Privacy</h1></a>
</footer>

View File

@ -1,4 +0,0 @@
.notice {
margin: 0;
border-radius: 0;
}

View File

@ -1,25 +0,0 @@
li {
background-color: #000000;
list-style: none;
margin-bottom: 1em;
}
ol {
padding: 0;
margin-right: 2em;
}
img {
max-width: 10em;
transform: scale(1);
transition: transform 1s;
}
img:active {
position: relative;
z-index: 100;
top: 5em;
right: 20em;
transform: scale(10);
}

View File

@ -14,9 +14,8 @@
<link rel="icon" type="image/svg+xml" href="assets/images/favicon.svg">
<link rel="stylesheet" href="style/main.css" media = "screen">
<link rel="stylesheet" href="site/report.css" media="screen">
<link rel="stylesheet" href="style/mobile.css" media ="screen and (max-width:800px)">
<link rel="stylesheet" href="site/report_mobile.css" media ="screen and (max-width:800px)">
<link rel="stylesheet" href="sitereport/sitereport.css" media="screen">
</head>
<body id="clicked">
@ -31,151 +30,10 @@
<main>
<a class="shownav" href="sitereport/sitereport.html#clicked"></a>
<h2>Development Log</h2>
<ol>
<li>Sun Apr 17 16:25:44 2022 +0100 misc formatting changes</li>
<li>Sun Apr 17 16:23:55 2022 +0100 misc formatting</li>
<li>Sun Apr 17 16:18:04 2022 +0100 misc formatting changes</li>
<li>Sun Apr 17 15:30:52 2022 +0100 validated contact</li>
<li>Sun Apr 17 15:22:04 2022 +0100 blog.css validated</li>
<li>Sun Apr 17 15:18:45 2022 +0100 validated blog</li>
<li>Sun Apr 17 15:11:41 2022 +0100 Merge branch 'master' of https://github.com/jpez-development/CSY1018_assignment_1</li>
<li>Sun Apr 17 15:11:37 2022 +0100 validated home page</li>
<li>Sun Apr 17 13:08:11 2022 +0100 Merge pull request #15 from jpez-development/mobile_version</li>
<li>Sun Apr 17 13:07:24 2022 +0100 minor formatting</li>
<li>Sun Apr 17 13:06:29 2022 +0100 added contact form mobile responsiveness</li>
<li>Sun Apr 17 12:51:21 2022 +0100 Merge pull request #14 from jpez-development/mobile_version</li>
<li>Sun Apr 17 12:50:13 2022 +0100 added blog mobile responsiveness</li>
<li>Sun Apr 17 12:44:07 2022 +0100 Merge pull request #13 from jpez-development/mobile_version</li>
<li>Sun Apr 17 12:42:52 2022 +0100 added mobile version for portfolio</li>
<li>Sun Apr 17 12:20:19 2022 +0100 Merge pull request #12 from jpez-development/mobile_version</li>
<li>Sun Apr 17 12:18:00 2022 +0100 individual css for mobile , minor formatting</li>
<li>Sun Apr 17 12:16:49 2022 +0100 removed unneeded statements</li>
<li>Sat Apr 16 20:21:11 2022 +0100 .</li>
<li>Sat Apr 16 20:09:12 2022 +0100 Merge pull request #11 from jpez-development/blog_page</li>
<li>Sat Apr 16 20:07:31 2022 +0100 removed uneeded id</li>
<li>Sat Apr 16 19:51:08 2022 +0100 Merge branch 'master' of https://github.com/jpez-development/CSY1018_assignment_1</li>
<li>Sat Apr 16 19:51:06 2022 +0100 added alts to blog images</li>
<li>Sat Apr 16 19:35:41 2022 +0100 Merge pull request #10 from jpez-development/blog_page</li>
<li>Sat Apr 16 19:34:15 2022 +0100 added tooltips to blogs 2, 3, and 4</li>
<li>Fri Apr 15 19:11:08 2022 +0100 adjusted footer spacing</li>
<li>Fri Apr 15 19:09:15 2022 +0100 Merge pull request #9 from jpez-development/blog_page</li>
<li>Fri Apr 15 19:08:24 2022 +0100 added fourth post</li>
<li>Fri Apr 15 18:15:51 2022 +0100 added second and third posts</li>
<li>Fri Apr 15 17:41:44 2022 +0100 formatting fixes</li>
<li>Thu Apr 14 19:08:05 2022 +0100 added first post tooltip</li>
<li>Thu Apr 14 19:05:19 2022 +0100 first post content</li>
<li>Thu Apr 14 18:40:34 2022 +0100 corrected href error</li>
<li>Thu Apr 14 18:29:33 2022 +0100 Merge pull request #8 from jpez-development/blog_page</li>
<li>Thu Apr 14 18:29:05 2022 +0100 added image to first post</li>
<li>Thu Apr 14 18:15:15 2022 +0100 Merge pull request #7 from jpez-development/legal_pages</li>
<li>Thu Apr 14 18:14:47 2022 +0100 added construction page</li>
<li>Thu Apr 14 17:50:09 2022 +0100 adjusted footer formatting</li>
<li>Thu Apr 14 17:47:23 2022 +0100 Merge pull request #6 from jpez-development/footer</li>
<li>Thu Apr 14 17:46:39 2022 +0100 added footer to completed pages</li>
<li>Thu Apr 14 17:44:53 2022 +0100 added footer & folders/files for the related pages</li>
<li>Wed Apr 13 18:39:08 2022 +0100 adjusted portfolio headings</li>
<li>Wed Apr 13 18:37:09 2022 +0100 Merge pull request #5 from jpez-development/portfolio_page</li>
<li>Wed Apr 13 18:36:29 2022 +0100 fixed minor formatting issue, adjusted opacity</li>
<li>Wed Apr 13 18:32:30 2022 +0100 Merge pull request #4 from jpez-development/contact_page</li>
<li>Wed Apr 13 18:24:20 2022 +0100 changed duration of blog enlarge animation</li>
<li>Wed Apr 13 18:22:48 2022 +0100 adjusted blog title</li>
<li>Wed Apr 13 18:21:59 2022 +0100 Merge pull request #3 from jpez-development/blog_page</li>
<li>Wed Apr 13 18:21:15 2022 +0100 populated all dummies</li>
<li>Wed Apr 13 18:18:12 2022 +0100 added blog post dummies. added enlarging animation</li>
<li>Wed Apr 13 15:10:04 2022 +0100 added accents for form</li>
<li>Wed Apr 13 15:00:43 2022 +0100 Merge pull request #2 from jpez-development/contact_page</li>
<li>Wed Apr 13 12:35:39 2022 +0100 added some styling and background to form</li>
<li>Wed Apr 13 11:57:34 2022 +0100 defined form in html. added minor formatting</li>
<li>Wed Apr 13 10:45:23 2022 +0100 Merge pull request #1 from jpez-development/portfolio_page</li>
<li>Mon Apr 11 16:57:12 2022 +0100 removed unused attribute</li>
<li>Mon Apr 11 16:04:55 2022 +0100 adjusted titles</li>
<li>Mon Apr 4 18:22:14 2022 +0100 folder restructuring</li>
<li>Mon Apr 4 18:07:23 2022 +0100 added images, videos, and additional layout edit</li>
<li>Mon Apr 4 17:30:50 2022 +0100 formatting adjustments. project layout started.</li>
<li>Sun Mar 27 19:51:01 2022 +0100 misc changes</li>
<li>Thu Mar 10 16:33:24 2022 +0000 reformatted drop down</li>
<li>Thu Mar 10 16:26:44 2022 +0000 updated formatting of main</li>
<li>Thu Mar 10 16:25:19 2022 +0000 minor formatting updates for generalInfo in .bio</li>
<li>Thu Mar 10 16:18:08 2022 +0000 moved location of mobile.css</li>
<li>Thu Mar 10 16:17:19 2022 +0000 added mobile responsiveness</li>
<li>Thu Mar 10 14:38:16 2022 +0000 added base url and updated hrefs</li>
<li>Wed Mar 9 19:13:41 2022 +0000 minor formatting changes</li>
<li>Wed Mar 9 18:55:23 2022 +0000 added metadata</li>
<li>Wed Mar 9 18:51:07 2022 +0000 updated default font and minor formating of main</li>
<li>Wed Mar 9 18:39:18 2022 +0000 added navbar arrow and animations</li>
<li>Wed Mar 9 17:14:22 2022 +0000 updated/reformatted nav bar</li>
<li>Wed Mar 9 16:40:30 2022 +0000 made main text more legible</li>
<li>Wed Mar 9 16:34:28 2022 +0000 added tooltips above acronyms</li>
<li>Fri Mar 4 20:06:43 2022 +0000 added default font</li>
<li>Fri Mar 4 19:46:28 2022 +0000 added favicon</li>
<li>Fri Mar 4 19:31:15 2022 +0000 added qualifications to bio aside</li>
<li>Fri Mar 4 18:55:12 2022 +0000 first commit</li>
</ol>
</main>
<aside>
<h1>Validation</h1>
<section>
<h2>Home Page</h2>
<img src="assets/images/report/index/html.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/index/css.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/index/mobile.PNG" alt="Proof of Validation"/>
</section>
<section>
<h2>Portfolio Page</h2>
<img src="assets/images/report/portfolio/html.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/portfolio/css.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/portfolio/mobile.PNG" alt="Proof of Validation"/>
</section>
<section>
<h2>Blog Page</h2>
<img src="assets/images/report/blog/html.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/blog/css.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/blog/mobile.PNG" alt="Proof of Validation"/>
</section>
<section>
<h2>Contact Page</h2>
<img src="assets/images/report/contact/html.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/contact/css.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/contact/mobile.PNG" alt="Proof of Validation"/>
</section>
<section>
<h2>Site Report Page</h2>
<img src="assets/images/report/report/html.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/report/css.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/report/mobile.PNG" alt="Proof of Validation"/>
</section>
<section>
<h2>Construction Page</h2>
<img src="assets/images/report/construction/html.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/construction/css.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/construction/mobile.PNG" alt="Proof of Validation"/>
</section>
<section>
<h2>Global Styles</h2>
<img src="assets/images/report/styles/main.PNG" alt="Proof of Validation"/>
<img src="assets/images/report/styles/mobile.PNG" alt="Proof of Validation"/>
</section>
</aside>
<footer>
<a href="home/index.html">
<img src="assets/images/favicon.svg" id="footer_logo" alt="Logo"/>
<p>&copy;Joshua Perry 2022</p>
</a>
<a href="blog/blog.html"><h1>Blog</h1></a>
<a href="site/report.html"><h1>Site Report</h1></a>
<a href="site/construction.html"><h1>Site Map</h1></a>
<a href="site/construction.html"><h1>Terms</h1></a>
<a href="site/construction.html"><h1>Privacy</h1></a>
&copy; Joshua Perry 2022
</footer>
</body>
</html>

View File

@ -1,5 +0,0 @@
img:active {
transform: scale(1);
top: 0em;
right: 0em;
}