Skip to content

Commit

Permalink
Merge pull request #19 from IdealistCat/main
Browse files Browse the repository at this point in the history
v0.3.1
  • Loading branch information
sphis-Sinco authored Oct 30, 2024
2 parents a31916c + 57b8478 commit 4e8fb68
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# sjdolzjsdfd
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"aaron-bond.better-comments", // Comment Stuff
"wycliffepepela.color-comments",
"tobiah.comment-snippets",
"ms-vscode.cpptools-themes", // Theme stuff :)
"ms-vscode.cpptools-themes",
"ritwickdey.liveserver", // Theme stuff :)
]
}
19 changes: 19 additions & 0 deletions Assets/pages/credits.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DragginSite - Credits</title>
</head>
<body>
<h1>Navigation</h1>
<div id="navigation">
<a id="back" href="../../index.html">Back</a>
</div>
<hr>
<div id="credits">
</div>

<script type="module" src="../scripts/credits.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion Assets/pages/github.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Github</title>
<title>DragginSite - Github</title>
</head>
<body>
<h1>Navigation</h1>
Expand Down
9 changes: 9 additions & 0 deletions Assets/scripts/credits.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { CREDITS, init } from "./utilities/creditsUtil.js";

init();

for (let index = 0; index < CREDITS.length; index++) {
const person = CREDITS[index];

document.getElementById('credits').append(person);
}
3 changes: 3 additions & 0 deletions Assets/scripts/modding/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v0.2.1 - Oct 30, 2024
- Fixed `createImage` function Image SRC.

# v0.2 - Oct 30, 2024
- Added `createParagraph` function
- Added `createImage` function
Expand Down
2 changes: 1 addition & 1 deletion Assets/scripts/modding/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ purpose: create an image element for the page along with setting the source url.
*/
export function createImage(source='', ext="png", id="") {
var img = document.createElement('img');
img.src = '/Site/Assets/modding/'+MOD_DATA.name+'/images/'+source+"."+ext;
img.src = '../mods/'+MOD_DATA.name+'/images/'+source+"."+ext;
img.id = id;

if (MOD_DATA.enabled) {
Expand Down
13 changes: 13 additions & 0 deletions Assets/scripts/utilities/creditsUtil.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export const CREDITS = [];

export function addCredit(person, job) {
var newElement = document.createElement('p');
newElement.innerHTML = person + ' - ' + job;

CREDITS.push(newElement);
}

export function init() {
addCredit('IdealistCat', 'Programming, Art');
addCredit('Markknol', 'Console Log Viewer Programming');
}
5 changes: 2 additions & 3 deletions Assets/scripts/utilities/version-utility.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MOD_DATA, returnModData } from "../modding/data.js";

export const VERSION_DATA = {
version: "0.3.0",
version: "0.3.1",
version_label: "",
dev_label: "(PROTOTYPE)",
missing_type: "(NULL VERSION TYPE)",
Expand All @@ -22,8 +22,7 @@ export function returnVersion(type = "version") {
var devLabel_full = VERSION_DATA.dev_mode ? nlc + devLabel : "";

var version = (MOD_DATA.enabled) ? MOD_DATA.version : VERSION_DATA.version;
var version_nicodrag = (MOD_DATA.enabled) ? nlc + MOD_DATA.nicodrag_version : nlc + VERSION_DATA.version_nicodrag;
var versionLabel = (MOD_DATA.enabled)? '' : nlc + VERSION_DATA.version_label;
var versionLabel = (MOD_DATA.enabled)? '' : (VERSION_DATA.version_label.length > 0) ? nlc : '' + VERSION_DATA.version_label;

switch (type.toLowerCase()) {
case "version":
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
# October 30th 2024
## v0.3.1
### Changed
- Instead of "3rd Iteration" the Home page now says "Third Iteration"
- Mod API is now [v0.2.1](./Assets/scripts/modding/CHANGELOG.md)
### Added
- Page titles now have "DragginSite - " added to it if it isn't the home page
- Credits Page
- New JS Files: `utilities/creditsUtil.js`, `credits.js`
- Credits Page navigation Text on Home Page
- Version Label Length check (if its blank it removes the space)
### Removed
- " - home" from Home Page Title

## v0.3.0 - Massive Overhaul
### Removed
- v0.2.8.1 (duh)
Expand Down
7 changes: 4 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DragginSite - Home</title>
<title>DragginSite</title>
<link rel="stylesheet" href="Site/Assets/styles/main.css">
<script src="https://markknol.github.io/console-log-viewer/console-log-viewer.js?align=bottom"></script>
</head>
<body>
<h1>Navigation</h1>
<div id="navigation">
<a id="credits" href="./Assets/pages/credits.html">Credits</a>
<a id="github" href="./Assets/pages/github.html">Github</a>
</div>
<hr>
<h1 id="title">Welcome to the DragginSite 3rd Iteration Prototype!</h1>
<h1 id="title">Welcome to the DragginSite Third Iteration Prototype!</h1>
<pre id="version"></pre>
<p id="message">have a good time.</p>

<script type="module" src="./Assets/scripts/version-page.js"></script>
<script type="module" src="./Assets/scripts/random_message.js"></script>
<script type="module" src="./Assets/scripts/modding/scripts/home.js"></script>
</body>
</html>
</html>

0 comments on commit 4e8fb68

Please sign in to comment.