Skip to content

Commit

Permalink
Merge pull request #52 from JoseHerminioCollas/main
Browse files Browse the repository at this point in the history
Refactor, add about modal and about page
  • Loading branch information
JoseHerminioCollas authored Feb 20, 2025
2 parents dc7541b + bff689f commit 3c98471
Show file tree
Hide file tree
Showing 30 changed files with 622 additions and 576 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Aaarto

on:
push:
branches: [ "main", "workflow" ]
branches: [ "*" ]
pull_request:
branches: [ "main", "workflow" ]
branches: [ "*" ]

jobs:
build:
Expand All @@ -24,7 +24,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm ci --legacy-peer-deps
- run: npm run build --if-present
- run: npm test
- name: Echo text
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ npm-debug.log*
.env

.vscode/

src/config.json
10 changes: 10 additions & 0 deletions backend/expressServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ const metadata = {
image: '',
title: ''
};

app.get('/server_status', (req, res) => {
const uptime = process.uptime(); // Server uptime in seconds
const status = {
message: 'Server is running',
uptime: `${Math.floor(uptime / 60)} minutes ${Math.floor(uptime % 60)} seconds`
};
console.log('Server status check');
res.json(status);
});
app.post('/server', async (req, res) => {
try {
const { title, svgString } = req.body;
Expand Down
62 changes: 0 additions & 62 deletions backend/index.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>404 Not Found</h1>
Binary file added docs/aaarto-2025-1-6.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 docs/aaarto-screen-2025-2-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions docs/about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="style_about.css" rel="stylesheet" />
<title>Aaarto : About</title>
</head>

<body>
<h1>Aaarto: A drawing program and NFT creator</h1>
<h2>
Aaarto online: <br /> <a href="https://aaarto.art" target="_blank">https://aaarto.art</a>
</h2>
<p>
Aaarto is an online drawing program that enables the minting of the artwork as a Non-fungible token, an NFT.
</p>
<img src="aaarto-2025-1-6.png" width="300" />
<p>
The drawing application aspect of Aaarto enables the creation of art by the adding of circles and squares of various
sizes and colors onto a canvas area. Tools to set the shapes' size and color are offered to the user. An erase tool
enables the deletion of the shapes applied to the canvas. There is a text area in which the user can give the
artwork a name.
</p>
<p>
At any point in the creation of the art, the user can create an NFT of the art.
</p>
<p>
With the Aaarto program, the process of creating the art and the characteristics of the NFT are tightly connected.
The characteristics of the NFT are controlled by a single creation mechanism. Not just any digital asset is minted.
The connection between the creation process and the NFT overcomes the generality of the uploading of any digital
data.
</p>
<p>
The artwork generated by Aaarto is in the SVG format. SVG data is stored as tags (tags that give information about
the content of the file). This data gives insight into the content of the artwork. This insight into the content and
structure of the artwork is preferable to a series of pixels. A series of pixel data has no inherent way of
indicating what the content of the artwork is.
</p>
<img src="aaarto-screen-2025-2-7.png" width="300" />
<p>
Aaarto is designed, developed and hosted by
<a href="https://goatstone.com" target="_blank">Goatstone</a>
</p>
<h3>The code for Aaarto can be found on Github</h3>
<ul>
<li>
The Front-end:
<a href="https://github.com/goatstone/aaarto">https://github.com/goatstone/aaarto</a>
</li>
<li>
The Back-end:
<a href="https://github.com/goatstone/aaarto_backend">https://github.com/goatstone/aaarto_backend</a>
</li>
</ul>
</body>

</html>
2 changes: 1 addition & 1 deletion docs/bundle.js
100644 → 100755

Large diffs are not rendered by default.

Empty file modified docs/bundle.js.LICENSE.txt
100644 → 100755
Empty file.
Empty file modified docs/favicon.ico
100644 → 100755
Empty file.
Empty file modified docs/index.html
100644 → 100755
Empty file.
Empty file modified docs/index.js
100644 → 100755
Empty file.
9 changes: 9 additions & 0 deletions docs/style.css
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,13 @@ a {

svg {
cursor: crosshair;
}

header button {
font-size: 0.9em;
font-weight: 900;
color: #fff;
background-color: darkgreen;
cursor: pointer;
border-radius: 0.25em;
}
50 changes: 50 additions & 0 deletions docs/style_about.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
:root {
background-color: #ccc;
}
body {
font-family: "Courier New", Courier, monospace;
background-color: #ddd;
margin: 0;
max-width: 700px;
margin: auto;
padding-bottom: 3em;
}

h1 {
background-color: rgba(100, 100, 100, 0.5);
text-align: center;
padding: 1em;
margin: 0;
font-size: 1.5em;
color: #eee;
}
h2{
text-align: center;
padding: 0.5em;
margin: 0;
font-size: 1.5em;
color: darkgreen;
}
h3 {
text-align: center;
padding: 0.5em;
margin: 0;
font-size: 1.5em;
color: darkred;
}
p{
margin: 1em;
}
a {
font-size: 1.0em;
text-decoration: none;
color: darkblue;
padding: 0.1em;
}
img {
text-align: center;
padding: 1em;
margin-left: auto;
margin-right: auto;
display: block;
}
Empty file modified docs/style_control.css
100644 → 100755
Empty file.
Empty file.
Loading

0 comments on commit 3c98471

Please sign in to comment.