Skip to content

Commit 0f60c07

Browse files
Pr0xximity999Pr0xximity999
authored
Merge pull request #6 from Pr0xximity999/main
Update of website # Added featues: - Some glitched styling - Better styling/fixed some styling - Added more to my first blog - Added the noita poop stone - Return of the sex button
2 parents 02c25bb + dbd9486 commit 0f60c07

9 files changed

+469
-90
lines changed

‎Sound_effects/ElectricalHum.wav

10.4 MB
Binary file not shown.

‎Sound_effects/fnaf_scare.ogg

41.5 KB
Binary file not shown.

‎blogs/23-11-2023_firstBlog.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
<html lang="en">
33
<head>
44
<title>WEBISTE</title>
5-
<meta content="WEBISTE????????" property="og:title" />
6-
<meta content="Personal website where i put stuff about myself and things i do/make and other cool stuff and" property="og:description" />
7-
<meta content="https://tominhisroom.dev" property="og:url" />
8-
<meta content="https://imgur.com/a/tO1Ehow" property="og:image" />
9-
<meta content="#43B581" data-react-helmet="true" name="theme-color" />
105
<link rel="shortcut icon" href="../Images/tinymogus.gif" type="image/x-icon">
116
<link rel="stylesheet" href="../styles/style.css">
127
<meta charset="UTF-8">
138
<meta name="viewport" content="width=device-width, initial-scale=1.0">
149
</head>
1510
<body>
16-
<div id="crtDiv" class="crt" style="width: 100%; height: 100%;"></div>
11+
<div id="crtDiv" class="crt"></div>
1712
<div id="blogBody">
1813
<div id="blogSideBarLeft">
1914
<div onclick="goToMainPage()" id="BlogBack" class="cardBox roundedBorders glow clickable">
@@ -22,15 +17,20 @@ <h1>Back</h1>
2217
</div>
2318
<div id="mainBlogBody">
2419
<div id="blogTitle" class="cardBox roundedBorders glow">
25-
<h1>Filler text</h1>
26-
<p>First blogpost work in progress!!!</p>
20+
<h1>The beginning</h1>
21+
<p>>First blogpost!! (pog)</p>
2722
</div>
2823
<div id="blogText" class="cardBox glow">
29-
<h1>Have Some cool lorum ipsum instead :)</h1>
30-
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
31-
<p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
32-
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
33-
<p>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."</p>
24+
<h1>Hiii hello, welcome to my first blogpost :3</h1>
25+
<p>
26+
> I want to start by talking about the history of this website. <br>
27+
It all started when a friend of mine showed me a website he found. <br>
28+
The website in question being <a target="_blank" href="https://www.dimden.dev">dimden's website.</a> <br>
29+
<img class="blogImg centered" src="https://i.imgur.com/6jImevH.png" onclick="window.open('https://www.dimden.dev')">
30+
<a class="centered">The website in question^</a><br>
31+
This page really inspired me to make my own
32+
</p>
33+
3434
</div>
3535
</div>
3636
</div>

‎fridge.html

-14
This file was deleted.

‎index.html

+38-25
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
</head>
1717

1818
<body>
19-
<div id="crtDiv" class="crt" style="width: 100%; height: 100%;"></div>
19+
<div style="position: fixed; size: 100%;" id="jermaHidden" class="centered"></div>
20+
<audio id="jermaSound" src="Sound_effects/fnaf_scare.ogg"></audio>
21+
22+
<div id="crtDiv" class="crt"></div>
2023
<!-- <div id="ball"></div> -->
2124
<div id="body">
2225
<div id="sideBarLeft">
@@ -26,7 +29,7 @@ <h1 id="blogHeaderTitle">My blog</h1>
2629
<div onclick="openBlog('23-11-2023_firstBlog.html')" id="blogCard1" class="cardBox clickable">
2730
<div id="blogCardTitle">
2831
<h3>Genesis</h3>
29-
<h5>23/11/2023</h5>
32+
<h6>23/11/2023</h6>
3033
</div>
3134
<p>The birth of this website</p>
3235
</div>
@@ -35,11 +38,31 @@ <h5>23/11/2023</h5>
3538
</div>
3639

3740
<div id="mainBody">
38-
<div id="welcomeCard" class="cardBox glow outerMargin">
39-
<h1>Hewwoooo</h1>
40-
<p>Welcome to my amazing website!!!</p>
41-
<p></p>
42-
<a href="fridge.html">Click for cool plant in fridge</a>
41+
<div id="topRow">
42+
<div id="welcomeCard" class="cardBox glow outerMargin">
43+
<h1>Hellooo</h1>
44+
<p>Welcome to my amazing website!!!</p>
45+
<p></p>
46+
<a href="pages/fridge.html">Click for cool plant in fridge</a><br>
47+
<button id="sexButton" onclick="{
48+
var img = new Image()
49+
img.src = 'https://cdn.discordapp.com/attachments/1135311307516690573/1175053970855702631/latest.png'
50+
img.style.width = '200vh'
51+
img.style.height = '100vh'
52+
img.classList = 'centered'
53+
var jermaHidden = document.getElementById('jermaHidden')
54+
jermaHidden.appendChild(img)
55+
document.getElementById('jermaSound').play()
56+
new Promise(resolve => setTimeout(resolve, '600')).then(() =>{
57+
jermaHidden.innerHTML = '';
58+
document.getElementById('sexButton').remove();
59+
});
60+
}">sex(real)</button>
61+
</div>
62+
<div id="poopStoneDiv" class="cardBox glow outerMargin">
63+
<h3><a class="noGlitch" href="https://noita.wiki.gg/wiki/Kakkakikkare" target="_blank">NOITA POOP STONE</a></h3>
64+
<img src="https://noita.wiki.gg/images/3/3d/Item_kakke.png">
65+
</div>
4366
</div>
4467
<div id="infoCard" class="cardBox glow outerMargin">
4568
<div id="infoCardRight">
@@ -59,21 +82,7 @@ <h4>Some info about me:</h4>
5982
src="https://dimden.dev/services/images/88x31.gif"></a><br>
6083
</div>
6184
</div>
62-
<!--<div id="jermaHidden"></div>
63-
<button onclick="{
64-
var img = new Image()
65-
img.src = 'https://cdn.discordapp.com/attachments/1135311307516690573/1175053970855702631/latest.png'
66-
img.style.width = '70%'
67-
img.style.height = '70%'
68-
var jermaHidden = document.getElementById('jermaHidden')
69-
jermaHidden.appendChild(img)
70-
new Promise(resolve => setTimeout(resolve, '600')).then(() =>{
71-
jermaHidden.innerHTML = '';
72-
window.close();
73-
});
74-
}">sex(real)</button>
75-
<p>(only works if you opened this site by clicking a link)</p>
76-
<br>-->
85+
<br>
7786
<div id="gifDrawer1" class="cardBox glow outerMargin">
7887
<h2 style="margin-bottom: 0;">Some cool gifs(or not gifs) my friends told me to add :3</h2>
7988
<div id="gifDrawer2">
@@ -96,8 +105,8 @@ <h1>TODO List:</h1>
96105
<p>Some stuff im probably going to put onto here (or not lol)</p>
97106
<br>
98107
<ul>
99-
<li><strong>DONE| </strong>Find a good font to use lol</li>
100-
<li><strong>IN PROGRESS|</strong> blog page</li>
108+
<li><b class="glitchText">DONE| </b>Find a good font to use lol</li>
109+
<li><b class="glitchText">IN PROGRESS|</b> blog page</li>
101110
<li>Some place to put my updates on (probably also the blog page lol)</li>
102111
<li>An about me page</li>
103112
<li>Improve the styling</li>
@@ -109,9 +118,13 @@ <h1>TODO List:</h1>
109118
</div>
110119
</div>
111120
</body>
121+
<audio id="electricalHum" src="Sound_effects/ElectricalHum.wav" loop></audio>
112122
<script>
123+
window.onload = function(){
124+
//document.getElementById("electricalHum").play();
125+
}
113126
function openBlog(url){
114-
window.open('blogs/' + url, "_self")
127+
window.open('blogs/' + url, "_self");
115128
}
116129
</script>
117130
</html>

‎pages/fridge.html

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<title>Firdge</title>
5+
<link rel="shortcut icon" href="../Images/tinymogus.gif" type="image/x-icon">
6+
<link rel="stylesheet" href="../styles/style.css">
7+
<meta charset="UTF-8">
8+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9+
</head>
10+
<body>
11+
<div id="crtDiv" class="crt"></div>
12+
<br>
13+
<a class="cardBox roundedBorders glow glitchText" href="../">Return</a>
14+
<img class="centered" style="width: 90%; height: 90%;" src="../Images/PVZ_fridge.png">
15+
</body>
16+
</html>

‎.gitignore ‎styles/.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)