Skip to content

Commit

Permalink
Merge pull request #8 from PortilizenDev/main
Browse files Browse the repository at this point in the history
v0.2.4
  • Loading branch information
sphis-Sinco authored Aug 15, 2024
2 parents 77166ee + a210c83 commit 641d91c
Show file tree
Hide file tree
Showing 19 changed files with 166 additions and 58 deletions.
8 changes: 4 additions & 4 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<div class="color4" align="center">
<div class="navigate">
<a href="./index.html" id="backBtn">Home</a>
<a href="./Pages/Help.html" id="HelpPage-Index">Help</a>
<a href="./Pages/BlogList.html" id="BlogsPageCred">Blogs</a>
<a href="./Pages/Credits.html" id="CreditsPage"> Credits</a>
<a href="/Blog/index.html" id="backBtn">Home</a>
<a href="/Blog/Pages/Help.html" id="HelpPage-Index">Help</a>
<a href="/Blog/Pages/BlogList.html" id="BlogsPageCred">Blogs</a>
<a href="/Blog/Pages/Credits.html" id="CreditsPage"> Credits</a>
</div>
</div>

Expand Down
46 changes: 36 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# August 14th 2024
## v0.2.4
### Added
- Added Missing Drago Cuven Credits
- Added Table of Contents to blog
- Added Blog Folder for Blog paged
- Added 5th Base Theme Color
- Added Scrolling Credits Text
- Added Blog 2 WIP (unaccesable)
### Fixed
- Fixed Bug where if in a higher folder than root, 404 should send you to the right place instead of stacking
- Fixed "Blog1" Spelling
### Changed
- Changed the whole changelog so now it follows the new format

# August 9th 2024
## v0.2.3
### Added
Expand All @@ -14,30 +29,41 @@
- Wip img and text is removed from home page

## v0.2.2
### Added
- Readded Blogs List Page
- Readded Blog 1 Page
- Removed Latest Blog Link Text
- Added functionality for any Link Text relating to the new new Pages
- Worked on Blog 1
- Messed around with Credit Pages Styling
- Added new credit
- Added Help Page (Idea by TRIPPY)
- Added Custom 404 Page
### Removed
- Removed Latest Blog Link Text
- Removed "Crash Report" Github Issue Template
### Changed
- Worked on Blog 1
- Messed around with Credit Pages Styling

# August 8th 2024
## v0.2.1
### Removed
- Removed and Redid Pages Folder
- Removed Content/Source Folder, now JSP Folder not in Content Folder
### Changed
- Redid base theme/style
- Redid Credits Page
- [Fixed 404 on Credits Leave](https://github.com/DragginGroup/Blog/issues/4#issue-2456296931)
- Source code and development source text is smaller
- site contents are now centered
- archive folder is restored
### Fixed
- [Fixed 404 on Credits Leave](https://github.com/DragginGroup/Blog/issues/4#issue-2456296931)

## v0.2.0
### Changed
- Blog Version is now literally Hard-coded, through code. Lolz
- Slow Scrolling Text...
- Shortened Text
- Blog 1 in progress
### Added
- JAVASCRIPT FOLDER!! (content/source)
- ARCHIVING FOLDER! (content/archive)
- GITHUB FOLDER- wait what? (content/github)
Expand All @@ -48,25 +74,25 @@
</p>

- JAVASCRIPT FILES THAT CONTROL INDIVIDUAL PARTS OF THE SITE! (I call them JS Packets)
- Slow Scrolling Text...
- Correct Capitalization on main site page!!!
- Development fork!
- Github issue templates!
- Github Pull Request Templates!
- some little font weight fixes
- oh yeah, CHANGELOG FILE!
### Fixed
- Correct Capitalization on main site page!!!
- some little font weight fixes
- Blogs Page works
- Shortened Text
- Blog 1 in progress

## v0.1.2
### Fixed
- I hardcode the blog Version now. Fuck me man...

## v0.1.1
### Fixed
- I fixed one small thing lol, that was fast

## v0.1

### Added
- Main Site
- Credits Page
- Blogs Page (W.I.P. aka ugly as shit)
Expand Down
Binary file added Content/Archive/2024_08_10_0ka_Kleki.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 Content/Github/Github.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 Content/Site/GitNeon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
34 changes: 24 additions & 10 deletions Pages/Blog1.html → Pages/Blog/Blog1.html
Original file line number Diff line number Diff line change
@@ -1,42 +1,56 @@
<html>
<head>
<link rel="stylesheet" href="./Styles/base.css">
<link rel="stylesheet" href="./Styles/blog-page.css">
<link rel="stylesheet" href="../Styles/base.css">
<link rel="stylesheet" href="../Styles/blog-page.css">
<title>DraggingBlog - Blog 1</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
</head>
<body class="color1" align="center">

<div class="color4" align="center">
<a href="../index.html" id="backBtn">Home</a>
<a href="./Help.html" id="HelpPage-P"> Help</a>
<a href="./BlogList.html" id="BlogsPageCred"> Back</a>
<a href="/Blog/index.html">Home</a>
<a href="/Blog/Page/Help.html" id="HelpPage-P"> Help</a>
<a href="/Blog/Page/BlogList.html" id="BlogsPageCred"> Back</a>
</div>

<div class="color2">

<p class="BlogName" height="60">Blog Dev</p>
<pre class="BlogDetails">Blog 1 - August 9th 2024</pre>
<pre class="BlogDetails">by Madness-Rombank</pre>

<h1 class="Chapter">Intro</h1>
<ol class="color5">
<h1>Table of Contents</h1>
<a href="#Intro">1. Intro</a>
<br>
<a href="#ComingBack">2. Coming Back</a>
<br>
<a href="#Plans">3. Plans</a>
<br>
<a href="#Ending">4. Ending</a>
<br>
<h2>Enjoy the Blog!</h2>
</ol>

<h1 id="Intro" class="Chapter">Intro</h1>
<p>you know how you wanna make something, but your brain doesn't let you do it? or that you dont know how to do it?</p>
<p>that has been the process for this blog, since day 1</p>
<br>
<h1 class="Chapter">Coming Back</h1>
<h1 id="ComingBack" class="Chapter">Coming Back</h1>
<p>I haven't messed with HTML... CSS... or Javascript in fuckin months dude.</p>
<p>Coming back to it is like doing something for years and now someone is telling you that you can't.</p>
<p>We started with "DRAGGINGBLOG" and "the blog for all things Dragging related!"</p>
<p>And now we are at a stylized page, v0.2.3, cool custom theme, uh, blogs, ok yeah I dont know what else to mention</p>
<br>
<h1 class="Chapter">Plans</h1>
<h1 id="Plans" class="Chapter">Plans</h1>
<p>So, uh, blog is still pretty new so yesh, We got plans for it.</p>
<p>A more descriptive Help Page would be nice, Maybe user settings (can't wait to lose my mind over that!), Bigger Team, Actually Good Web Developers, etc</p>
<p>these would all honestly be good features wouldn't you agree?</p>
<h1 class="Chapter">Ending</h1>
<h1 id="Ending" class="Chapter">Ending</h1>
<p>Sorry for leaving you so soon but there isnt much to talk about except boring crap about me searching the internet for solutions to problems im having or for how to do something like user settings</p>
<p>But anyway, it's time to go, goodbye!</p>

</div>
<script src="../SP/href-setup.js"></script>
<script src=".../SP/href-setup.js"></script>
</body>
</html>
38 changes: 38 additions & 0 deletions Pages/Blog/Blog2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<html>
<head>
<link rel="stylesheet" href="../Styles/base.css">
<link rel="stylesheet" href="../Styles/blog-page.css">
<title>DraggingBlog - Blog 1</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
</head>
<body class="color1" align="center">

<div class="color4" align="center">
<a href="/Blog/index.html">Home</a>
<a href="/Blog/Page/Help.html" id="HelpPage-P"> Help</a>
<a href="/Blog/Page/BlogList.html" id="BlogsPageCred"> Back</a>
</div>

<div class="color2">

<p class="BlogName" height="60">Game Dev</p>
<pre class="BlogDetails">Blog 2 - August 14th 2024</pre>
<pre class="BlogDetails">by Madness-Rombank</pre>

<ol class="color5">
<h1>Table of Contents</h1>
<a href="#Intro">1. Intro</a>
<br>
<h2>Enjoy the Blog!</h2>
</ol>

<h1>WARNING: NERDY!!</h1>

<h1 id="Intro" class="Chapter">Intro</h1>
<p>Game development is difficult, depending on who you are, you can or can't do it.</p>
<br>

</div>
<script src=".../SP/href-setup.js"></script>
</body>
</html>
3 changes: 2 additions & 1 deletion Pages/BlogList.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ <h1 class='color2' align='center'>Blog List</h1>
<div class="blogListCont">

<section class="color2" align="center">
<a href="./Blog1" id="blog1">Blog1</a>
<a href="./Blog/Blog1" id="blog1">Blog 1</a>
<!--<a href="./Blog/Blog2" id="blog2">Blog 2</a>-->
</section>

</div>
Expand Down
25 changes: 22 additions & 3 deletions Pages/Credits.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,28 @@
</div>
<div class="color2">

<div class="creditsBlurb">
<div class="creditsBlurb" height='100'>
<marquee direction="up" id="text" height="710">
<h3>
Github my Beloved
<br>
<img src="/Blog/Content/Site/GitNeon.png" width="100" alt="github">
</h3>
<br>
<h1>Blog Team</h1>
<p>Madness-Rombank - Lead Programming</p>
<p>Trippy - Testing</p>

<p>Drago Cuven - Lua Programming</p>
<br>
<h1>Discord Suggestors</h1>
<p>trippy.69 - Help Page</p>
<p>bit7 - Text Padding</p>

<p>drago_cuven - Wasmoon Implementation</p>
<br>
<h1>Special Thanks</h1>
<p>Hazel - Scrolling Text Code Taken from funkin.me</p>
<p>Funkin Crew Inc - funkin.me, the whole inspiration for this site</p>
</marquee>
</div>
</div>
<div class="color3">
Expand All @@ -34,5 +44,14 @@ <h1>Special Thanks</h1>
</div>

<script src="../SP/href-setup.js"></script>
<script>
/*
// 1086.
var div = document.querySelector(".creditsBlurb")
var text = document.getElementById('text')
text.innerHTML = div.offsetHeight;
*/
</script>
</body>
</html>
8 changes: 4 additions & 4 deletions Pages/Styles/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
.color4 {
background-color:#212027;
}
.color5 {
background-color: #141315;
}

.color1,
.color2,
.color3,
.color4 {
.color1, .color2, .color3, .color4, .color5{
color: White;
font-family: Tahoma, Verdana, sans-serif;
font-weight: Bold;
Expand Down
4 changes: 4 additions & 0 deletions Pages/Styles/blog-page.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
.Text {
text-size: 20px;
}

.color5 {
padding: 10px;
}
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<h1 align="center">Github</h1>
<p align="center">
<img src="https://raw.githubusercontent.com/PortilizenDev/Blog/main/Content/Github/Github.png" width="100" title="github">
<br>
Github my beloved
</p>

<h1 align="center">DraggingBlog</h1>

<p align="center">
All things Dragging Related
<br>
<img src="https://raw.githubusercontent.com/DragginGroup/Blog/main/Content/Github/WIP.gif" width="150" title="wip">
</p>
<p align="center">
Work In Progress Blog Site!
</p>

# DraggingBlog
All things Dragging Related
8 changes: 4 additions & 4 deletions SP/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# SP
## anagram
sp stands for ScriptPacket
## Anagram
S.P. stands for Script Packet

## explanation
a ScriptPacket is a quick bit of code
## Explanation
A ScriptPacket is a quick bit of code
that executes a specific set of intruction
for a specific part of the site, examples.
Version. Latest Commit. Button Link Updates.
4 changes: 2 additions & 2 deletions SP/blog-version.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let VERSION = "0.2.3"
let SUFFIX = ""
let VERSION = "0.2.4"
let SUFFIX = "-dev"
let PREFIX = ""
let FALLBACK_VERSION = "0.0.0\nversion error"

Expand Down
3 changes: 1 addition & 2 deletions SP/href-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ function setHref(id, href, inital="/Blog/Pages/") {
setHref('BlogsPage', 'BlogList.html')
setHref('BlogsPageCred', 'BlogList.html', "./")

setHref('LatestBlog', 'Blog1.html')
setHref('blog1', 'Blog1.html')
setHref('blog1', 'Blog/Blog1.html')

setHref('CreditsPage', 'Credits.html')
setHref('CreditsPageBlog', 'Credits.html', "./")
Expand Down
27 changes: 12 additions & 15 deletions SP/wip-img.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
// from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random
function getRandomArbitrary(min, max) {
return Math.random() * (max - min) + min;
function getRandomInt(max) {
return Math.floor(Math.random() * max);
}

var ANIM_NAME = "WIP";
var ANIM_EXT = ".png"
var CHANCE = getRandomArbitrary(0, 2);
var animOptions = [
{ name: "Blink", ext: ".png" },
{ name: "Smoke", ext: ".gif" },
{ name: "WIP", ext: ".png" }
];

switch(CHANCE) {
case 1: ANIM_NAME = "Blink";

case 2: ANIM_NAME = "Smoke"; ANIM_EXT = ".gif";

default: ANIM_NAME = "WIP"
}
var choice = animOptions[getRandomInt(animOptions.length)];

let ANIM_FULL = "./Content/Site/" + ANIM_NAME + ANIM_EXT;
let ANIM_FULL = `./Content/Site/${choice.name}${choice.ext}`;

var img = document.createElement("img");
img.src = "http://www.google.com/intl/en_com/images/logo_plain.png";
img.src = ANIM_FULL;
var src = document.getElementById("header");

function addImg() {
src.appendChild(img);
}

addImg()
2 changes: 2 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
Made with 10 braincells, I think.
</p>
</section>

<div class="header"></div>

<div class="color3">
<marquee class="color3">
Expand Down

0 comments on commit 641d91c

Please sign in to comment.