Skip to content

Workingonissues #77

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
adrianhuebner wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Workingonissues #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74be9e7
issues #67-69 are solved with this code
adrianhuebner Apr 24, 2023
85a788e
working on moving rdp to own folder, this push solves issue #66
adrianhuebner Apr 24, 2023
1db37ea
code being pushed solves issues #66, #67, #68, #69
adrianhuebner Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions acmerocketco/arcjrmas1/index.html → acmerocketco/arcjrmas3/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Javelin Rocket Model a Series 1</title>
<title>Javelin Rocket Model A Series 3</title>
<link href="../css/reset.css" rel="stylesheet" type="text/css">
<link href="../css/corporate-espionage-styles.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css2?family=Days+One&family=Dosis&display=swap" rel="stylesheet">
Expand Down Expand Up @@ -81,7 +81,7 @@ <h3 class="productdetailsheader">Javelin Rocket Model a Series 1</h3>
</div>
<div id="moneymaker" class="buybutton">
<input type="button" value="Add to cart"
onclick="AddToCart('Acme Rocket Co. Javelin Rocket','Model a Series 1',62000000)" />
onclick="AddToCart('Acme Rocket Co. Javelin Rocket','Model A Series 3',62000000)" />
</div>
</div>
</div>
Expand Down
7 changes: 2 additions & 5 deletions acmerocketco/arcjrmbs3/index.html → acmerocketco/arcjrmbs1/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Javelin Rocket Model b Series 3</title>
<title>Javelin Rocket Model B Series 1</title>
<link href="../css/reset.css" rel="stylesheet" type="text/css">
<link href="../css/corporate-espionage-styles.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css2?family=Days+One&family=Dosis&display=swap" rel="stylesheet">
</head>
<body>
<header>
<!-- <div>
<h2></h2>
</div> -->
<div>
<h2>Menu</h2>
</div>
Expand Down Expand Up @@ -55,7 +52,7 @@ <h3 class = "productdetailsheader">Javelin Rocket Model b Series 3</h3>
</ul>
</div>
<div class="buybutton">
<input type="button" value="Add to cart" onclick="AddtoCart('Acme Rocket Co. Javelin Rocket','Model b Series 3',72000000)"/>
<input type="button" value="Add to cart" onclick="AddtoCart('Acme Rocket Co. Javelin Rocket','Model B Series 1',72000000)"/>
</div>
</div>
</div>
Expand Down
15 changes: 14 additions & 1 deletion acmerocketco/css/corporate-espionage-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,17 @@ h2{
}
#updateDetails:hover{
transform: scale(1.15);
}
}
#favDialog {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 50%;
max-width: 500px;
background-color: white;
padding: 20px;
border-radius: 5px;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
}

6 changes: 3 additions & 3 deletions js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'use strict';

document.getElementById('buttonLeft').onclick = function () {
location.href = 'windows-login-loginpage.html';
location.href = 'windows-attack/windows-login-loginpage.html';
};

document.getElementById('buttonMid').onclick = function () {
location.href = 'photo-albums/index.html';
location.href = 'pixon/index.html';
};

document.getElementById('buttonRight').onclick = function () {
location.href = 'acmerocketco/arcjrmas1/index.html';
location.href = 'acmerocketco/arcjrmas3/index.html';
};
4 changes: 2 additions & 2 deletions ...albums/celebrity-hack-password-reset.html → pixon/celebrity-hack-password-reset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<link href="../css/reset.css" rel='stylesheet' type='text/css'>
<link href="celebrity-hack-password-reset.css" type='text/css' rel='stylesheet' />
<link href="css/celebrity-hack-password-reset.css" type='text/css' rel='stylesheet' />
<link href="https://fonts.googleapis.com/css2?family=Merriweather+Sans:wght@500&display=swap" rel="stylesheet">
<title>Pixon Celebrity Data Breach</title>
</head>
Expand Down Expand Up @@ -41,7 +41,7 @@
&copy;Pixon
</div>
</footer>
<script src="celebrity-hack-password-app.js" type="text/javascript"></script>
<script src="js/celebrity-hack-password-app.js" type="text/javascript"></script>
</body>

</html>
2 changes: 1 addition & 1 deletion photo-albums/celebrity-hack-sb-photos.html → pixon/celebrity-hack-sb-photos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Pixon Celebrity Data Breach</title>
<link href="/css/reset.css" rel='stylesheet' type='text/css'>
<link href="celebrityhack-style.css" rel="stylesheet" type="text/css" />
<link href="css/celebrityhack-style.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css2?family=Permanent+Marker&display=swap" rel="stylesheet">
</head>

Expand Down
0 ...-albums/celebrity-hack-password-reset.css → pixon/css/celebrity-hack-password-reset.css
View file
Open in desktop
File renamed without changes.
0 photo-albums/celebrity-hack.css → pixon/css/celebrity-hack.css
View file
Open in desktop
File renamed without changes.
67 changes: 30 additions & 37 deletions photo-albums/celebrityhack-style.css → pixon/css/celebrityhack-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,76 @@
body{
width: 1000px;
body {
max-width: 1000px;
margin: auto;
background-color: teal;
}
header{

header {
font-family: 'Permanent Marker', cursive;
text-align: left;
font-size: 40px;
color: rgb(204, 204, 53);
margin-bottom: 30px;
margin-top: 20px;
}
img{
height: 340px;

img {
height: 300px;
width: 300px;
padding: 10px;
border-radius: 20px;
border: 3px groove rgb(204, 204, 53);
object-fit: cover;
}
.public-facing{

.public-facing {
margin-bottom: 50px;
}
h2{

h2 {
font-family: 'Permanent Marker', cursive;
font-size: 30px;
margin-bottom: 20px;
color: rgb(204, 204, 53);

}
.first3{
display: flex;
flex-direction: row;
}
.firstpic{
flex-direction: column;

}
.second3{
display:flex;
flex-direction: row;
}
.secondpic{
flex-direction: column;
}
.third3{
display: flex;
flex-direction: row;
}
.thirdpic{
flex-direction: column;
}
.fourth3{
.first3,
.second3,
.third3,
.fourth3 {
display: flex;
flex-direction: row;
}
.fourthpic{

.firstpic,
.secondpic,
.thirdpic,
.fourthpic {
flex-direction: column;
}
button{

button {
border-color: transparent;
background-color: rgb(204, 204, 53);
height: 30px;
width: 200px;
margin-bottom: 20px;
border-radius: 3px;
font-family: 'Permanent Marker', cursive;

}

button:hover {
background-color: rgb(248, 248, 171)
background-color: rgb(248, 248, 171);
}
a:link{

a:link {
text-decoration: none;
}
#link{

#link {
color: black;
}

footer{
footer {
text-align: center;
padding: 30px;
font-family: 'Permanent Marker', cursive;
Expand Down
0 photo-albums/securityquestions.css → pixon/css/securityquestions.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions photo-albums/index.html → pixon/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<title>Pixon Celebrity Data Breach</title>
<link href="../css/reset.css" rel='stylesheet' type='text/css'>
<link href="celebrity-hack.css" rel="stylesheet" type="text/css" />
<link href="css/celebrity-hack.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500&display=swap" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300&display=swap" rel="stylesheet" />

Expand Down Expand Up @@ -53,7 +53,7 @@
&copy;Pixon
</div>
</footer>
<script src="celebritylogin-app.js" type="text/javascript"></script>
<script src="js/celebritylogin-app.js" type="text/javascript"></script>
</body>

</html>
0 photo-albums/celebrity-hack-password-app.js → pixon/js/celebrity-hack-password-app.js
View file
Open in desktop
File renamed without changes.
0 photo-albums/celebritylogin-app.js → pixon/js/celebritylogin-app.js
View file
Open in desktop
File renamed without changes.
0 photo-albums/securityquestions-app.js → pixon/js/securityquestions-app.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions photo-albums/securityquestions.html → pixon/securityquestions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<title>Pixon Celebrity Data Breach</title>
<link href="../css/reset.css" rel='stylesheet' type='text/css'>
<link href="securityquestions.css" rel="stylesheet" type="text/css" />
<link href="css/securityquestions.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
</head>

Expand Down Expand Up @@ -35,7 +35,7 @@ <h5 id="question"></h5>
</form>
</main>
<footer>&copy;Pixon</footer>
<script src="securityquestions-app.js" type="text/javascript"></script>
<script src="js/securityquestions-app.js" type="text/javascript"></script>
</body>

</html>
0 css/windows-login.css → windows-attack/css/windows-login.css
View file
Open in desktop
File renamed without changes.
0 js/windows.js → windows-attack/js/windows.js
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions windows-login-desktop.html → windows-attack/windows-login-desktop.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@
<main id="mainDesktop">
<div class="icon">
<figure>
<img id="recycle" class="photo2" src="img/recycle-sign.jpg">
<img id="recycle" class="photo2" src="../img/recycle-sign.jpg">
<figcaption><span class="icontext">Recycle Bin</span></figcaption>
</figure>
</div>
<div class="icon">
<figure>
<img id="notepad" class="photo2" src="img/notepad.jpg">
<img id="notepad" class="photo2" src="../img/notepad.jpg">
<figcaption><a class="icontext" href="aboutUs.html">Notes</a></figcaption>
</figure>
</div>
<div class="icon">
<figure>
<img id="file" class="photo2" src="img/filefolder.jpg">
<img id="file" class="photo2" src="../img/filefolder.jpg">
<figcaption><span class="icontext">New Folder</span></figcaption>
</figure>
</div>
<div class="icon">
<figure>
<img id="edge" class="photo2" src="img/edgeoffset.jpg">
<figcaption><a class="icontext" href="/photo-albums/index.html">Microsoft Edge</a></figcaption>
<img id="edge" class="photo2" src="../img/edgeoffset.jpg">
<figcaption><a class="icontext" href="../pixon/index.html">Microsoft Edge</a></figcaption>
</figure>
</div>
</main>
<footer id="footerDesktop">
<img id="footerImage" src="img/m-logo.png">
<img id="footerImage" src="../img/m-logo.png">
</footer>
</body>

Expand Down
2 changes: 1 addition & 1 deletion windows-login-loginpage.html → windows-attack/windows-login-loginpage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</header>

<main id="main1">
<img id="imageOne" src="img/stick-man.png" alt="imageOne" />
<img id="imageOne" src="../img/stick-man.png" alt="imageOne" />

<div id="loginBox">
<form id="userLogin">
Expand Down