Skip to content

Commit

Permalink
Added some album reviews.
Browse files Browse the repository at this point in the history
  • Loading branch information
@petermcaughan
petermcaughan committed Sep 13, 2017
1 parent e554922 commit 52dd787
Show file tree
Hide file tree
Showing 16 changed files with 254 additions and 319 deletions.
424 changes: 127 additions & 297 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/css/aboutPage.css
View file
Expand Up @@ -58,7 +58,7 @@ body{
width: 40vw;
/*background-color: lightsteelblue;*/
background-color: black;
height:160vw;
height:167vw;
z-index:-5;
}

Expand Down
9 changes: 7 additions & 2 deletions src/css/experiencePage.css
View file
Expand Up @@ -62,7 +62,8 @@ body{
left: 1vw;
height: 21vw;
width: 26vw;
background-color: red;
color:black;

}

.skills-list{
Expand All @@ -71,9 +72,13 @@ body{
left: 28vw;
height: 10vw;
width: 15vw;
background-color: blue;
}

.skills{
color:black;
position:absolute;
font-size:1.3vw;
}
.date-range-container{
position:relative;
top:-49vw;
Expand Down
8 changes: 5 additions & 3 deletions src/html/aboutPage.html
View file
Expand Up @@ -25,11 +25,13 @@ <h2 align="center"> This Site </h2>
put some games and news into the site, but really that's a side goal that comes after having everything else in a functional state.
</p>
<h2 align="center"> Future Plans </h2>
<p> &emsp; I'm currently working an 8 hour workday and I'll be going back to school in the fall so I don't have a lot of free time to work on this site, but I'd like to use this to share my interests.
This means constantly updating my music page as well as my interests page. The next concrete additions I'd like to make are importing my projects onto this site, completing my experience portfolio, and
adding at least some games and news articles under their respective pages.</p>
<p> &emsp; School's back in session so I'll be working on this site a whole lot less, unfortunately :(</p>
<p> &emsp; I'd like to make the News section either in a usable state, or alternatively change the page entirely into a different concept. In addition to that, the games I've
put into the page are pretty simple examples from the engine site, and I'd like to at least have one more complex game that I've created or imported from a good source. I could try and
put in the game that I've created in my Projects page, but I need to look more into how Amazon handles its server and maybe rewrite some server code from our game. </p>

<h2 align="center"> Change Log </h2>
<p> &emsp; August 31st - Realized a changelog here is unideal. Check out the commit messages in the <a href="https://github.com/petermcaughan/pmcaughanSite/commits/master">Github repository.</a></p>
<p> &emsp; August 6th - Now hosted with Amazon Web Services! 100% uptime! URL looks a little wonky but that'll get sorted out. </p>
<p> &emsp; August 5th - Redesigned music page: now with filters! </p>
<p> &emsp; August 1st - Source code now included in Projects page! </p>
Expand Down
54 changes: 39 additions & 15 deletions src/html/experiencePage.html
View file
Expand Up @@ -14,13 +14,19 @@
<div class="position-title-container">
<h2>Software Engineer Intern</h2>
</div>
<div class="experience-details">
<p>My internship involved being a part of the software development teams for two major products. In addition to helping with various bugs, I was put in lead in two projects. </br>
The first was a port of a major product from iOS to the android environment. This involved getting familiar with Java and Android projects, as well as coordinating with testers across
the development team and customer volunteers. I also put together the Google Play Store page together for tlkj </p>
<div class="experience-details" style="font-size: .85vw;">
<p> I worked in an agile environment with a team of 8-9 developers for around 3 months. Along with various bug fixes, I was assigned to two major projects: </p>
<p> Porting a major product from iOS to Android. This involved using various open-source software packages including Apache Cordova to make the transition, as well as handling the release of
the application on the Google Play Store. Organizing in-office testing among co-workers and beta testing with customers was my responsibility, as well as creating and decorating the company's Google Play account. </p>
<p> Creating a sales demo for presentation to potential customers for analytical software. I was responsible for manipulating data in a SQL database to create an environment where customers could see how their
data would appear in an analytic dashboard. Understanding how to create a large amount of realistic, "real-time" data in the most efficient way was a big challenge in this project. </p>
</div>
<div class="skills-list">

<ul class="skills">
<li> JavaScript </li>
<li> SQL </li>
<li> Agile Development </li>
</ul>
</div>
<div class="date-range-container">
<p class="date-text"> May 2017 - August 2017 </p>
Expand All @@ -33,11 +39,16 @@ <h2>Software Engineer Intern</h2>
<div class="position-title-container">
<h2>Student HelpDesk Worker</h2>
</div>
<div class="experience-details">

<div class="experience-details" style="font-size: 1.2vw;">
<p> Performed general IT work for the university's Chemistry department. Daily work includes troubleshooting various software and hardware issues, preparing new tech purchases for student and professor use,
and enforcing updates in university policy to existing devices. Examples range from wiring ethernet cords through a new building to learning a new laboratory software to teach professors how to use it effectively. </p>
</div>
<div class="skills-list">

<ul class="skills">
<li> Problem-Solving </li>
<li> Office Communication </li>
<li> Windows/Linux Environments </li>
</ul>
</div>
<div class="date-range-container">
<p class="date-text"> October 2016 - Present </p>
Expand All @@ -55,11 +66,18 @@ <h2>Student HelpDesk Worker</h2>
<div class="position-title-container">
<h2>Station Engineer</h2>
</div>
<div class="experience-details">

<div class="experience-details" style="font-size:1vw;">
<p> Worked as the tech lead in the student-run radio station of Texas A&M. Technical responsibilities include maintaining database of music to be played, handling automatic DJ playing during non-broadcast hours,
helping develop the kanm.org website, and handle all hardware issues that arise. Communicating the status of all these responsibilities to non-technical members of the station is a big part of this role.</p>
<p> In addition to the officer position, I also have a weekly radio show where I organize and play setlists as well as talk about music, current issues, or anything that I want, really. For just about three years now
I've gone on air and talked into a microphone for an hour, which has improved my speaking skills considerably.</p>
</div>
<div class="skills-list">

<ul class="skills">
<li> HTML/CSS </li>
<li> Interdisciplinary Communication </li>
<li> Public Speaking </li>
</ul>
</div>
<div class="date-range-container">
<p class="date-text"> August 2017 - Present </p>
Expand All @@ -70,13 +88,19 @@ <h2>Station Engineer</h2>
<div class="position-container">
<img class="position-img" style="background-color: white;" src="../img/experiencePage/sga.png">
<div class="position-title-container">
<h2>Freshmen Mentor</h2>
<h2>Freshman Mentor</h2>
</div>
<div class="experience-details">

<div class="experience-details" style="font-size:1vw;">
<p> Worked as a Team Leader in a student mentorship organization. Responsibilities included matching up upperclassmen mentors with freshman and checking up on these relationships to make sure they were beneficial to
both parties. This included organizing and hosting weekly activities and meetings for around 14 people, and handling important communication between officers and members. </p>
<p> I've been in this organization since my freshman year and have really come to enjoy the mentorship process and what it can do for everyone involved. </p>
</div>
<div class="skills-list">

<ul class="skills">
<li> Organizational Ability </li>
<li> Leadership </li>
<li> Social Skills </li>
</ul>
</div>
<div class="date-range-container">
<p class="date-text"> August 2015 - May 2017 </p>
Expand Down
52 changes: 51 additions & 1 deletion src/html/explorePage.html
View file
Expand Up @@ -209,7 +209,16 @@
</div>
</div>

<div class="art-container" data-text="beatTape-text" data-genre="Electronic" data-rating="S" data-review="Yes">
<div class="art-container" data-text="stripes-text" data-genre="Rock" data-rating="B" data-review="No">
<img class="album-art" src="../img/album_art/whitestripes.jpg">
<div class="art-overlay" id="stripes-text">
<p class="overlay-text"> The White Stripes <br/> _ <br/> <br/> White Blood Cells </p>
<button class="rating">B</button>
</div>
</div>


<div class="art-container" data-text="beatTape-text" data-genre="Electronic" data-rating="S" data-review="Yes">
<img class="album-art" src="../img/album_art/beatTape.jpg">
<div class="art-overlay" id="beatTape-text">
<p class="overlay-text"> Tom Misch <br/> _ <br/> <br/> Beat Tape 2 </p>
Expand All @@ -236,6 +245,14 @@
</div>
</div>

<div class="art-container" data-text="strokes-text" data-genre="Rock" data-rating="S" data-review="No">
<img class="album-art" src="../img/album_art/strokes.jpg">
<div class="art-overlay" id="strokes-text">
<p class="overlay-text"> The Strokes <br/> _ <br/> <br/> Is This It </p>
<button class="rating">S</button>
</div>
</div>

<div class="art-container" data-text="soursoul-text" data-genre="Rap" data-rating="A" data-review="No">
<img class="album-art" src="../img/album_art/soursoul.jpg">
<div class="art-overlay" id="soursoul-text">
Expand Down Expand Up @@ -287,6 +304,22 @@
</div>
</div>

<div class="art-container" data-text="blackkeys-text" data-genre="Indie" data-rating="B" data-review="No">
<img class="album-art" src="../img/album_art/blackkeys.jpg">
<div class="art-overlay" id="blackkeys-text">
<p class="overlay-text"> The Black Keys <br/> _ <br/> <br/> Brother </p>
<button class="rating">B</button>
</div>
</div>

<div class="art-container" data-text="laroux-text" data-genre="Electronic" data-rating="S" data-review="No">
<img class="album-art" src="../img/album_art/laroux.jpg">
<div class="art-overlay" id="laroux-text">
<p class="overlay-text"> La Roux <br/> _ <br/> <br/> La Roux </p>
<button class="rating">S</button>
</div>
</div>

<div class="art-container" data-text="tuxedo-text" data-genre="Dance" data-rating="B" data-review="No">
<img class="album-art" src="../img/album_art/tuxedo.jpg">
<div class="art-overlay" id="tuxedo-text">
Expand Down Expand Up @@ -322,6 +355,14 @@
</div>
</div>

<div class="art-container" data-text="fjord-text" data-genre="Rock" data-rating="B" data-review="No">
<img class="album-art" src="../img/album_art/fjord.jpg">
<div class="art-overlay" id="fjord-text">
<p class="overlay-text"> Harrison Fjord <br/> _ <br/> <br/> Puspa In Space </p>
<button class="rating">B</button>
</div>
</div>

<div class="art-container" data-text="endless-text" data-genre="Rock" data-rating="A" data-review="No">
<img class="album-art" src="../img/album_art/endlessFantasy.jpg">
<div class="art-overlay" id="endless-text">
Expand All @@ -339,6 +380,15 @@
</div>


<div class="art-container" data-text="honne-text" data-genre="R&B" data-rating="S" data-review="No">
<img class="album-art" src="../img/album_art/honne.jpg">
<div class="art-overlay" id="honne-text">
<p class="overlay-text"> Honne <br/> _ <br/> <br/> Warm On A Cold Night (Deluxe) </p>
<button class="rating">S</button>
</div>
</div>


</div>


Expand Down
24 changes: 24 additions & 0 deletions src/html/projectsPage.html
View file
Expand Up @@ -135,6 +135,30 @@ <h1 class="project-name-text">Single-Cycle &nbsp; CPU &nbsp; Implementation</h1>
</div>


<div class="project-container" style="background-color: #FFFF4C;">
<div class="project-name">
<h1 class="project-name-text">This &nbsp; site! &nbsp;</h1>
</div>
<div class="img-container">
<span class="helper"></span><img class="img" style="height:400px;" src="../img/projectImg/site.png">
</div>
<div class="description-container">
<p class="description-text">This site is a great experience in UI design, JavaScript, HTML, CSS, and learning more about hosting services and web domains! I'm learning more
and more as I update these pages, so I'm planning on this being a ever-growing project.</p>
</div>
<div class="skills-container">
<ul class="skills-list">Skills/Concepts Used
<li class="skill"> &emsp; UI Design</li>
<li class="skill"> &emsp; HTML/CSS/JavaScript </li>
<li class="skill"> &emsp; Code Optimization </li>
</ul>
</div>
<div class="download-button">
<a class="download-text" href="https://github.com/petermcaughan/pmcaughanSite"> Check out the Github! </a>
</div>
</div>


</div>


Expand Down
Binary file added src/img/album_art/blackkeys.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/album_art/fjord.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/album_art/honne.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/album_art/laroux.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/album_art/strokes.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/album_art/whitestripes.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/projectImg/site.PNG
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/js/phaser/examples/games/assets/sprites/diamonds32x24x5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/js/phaser/examples/games/assets/sprites/diamonds32x5.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 52dd787

Please sign in to comment.