raymon
/
Personal-Website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' into 'master'

Browse Source
master c2.1.0-s2.0.0
Raymonzut 4 years ago
parent 25b90a3432 b4440c8cc9
commit 120d6b6941
No known key found for this signature in database
GPG Key ID: 1E9BCC39EDD1DD53
8 changed files with 65 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      client/public/assets/styling/general.css
  2. 18
      client/public/assets/styling/themes.css
  3. 11
      client/public/index.html
  4. 10
      client/public/posts.html
  5. 2
      client/public/posts.mjs
  6. 4
      client/public/qa.html
  7. 1
      client/public/robots.txt
  8. 33
      server/routes/api/posts.js

29
client/public/assets/styling/general.css
Unescape View File

@ -1,15 +1,36 @@
:root {
--primary-color: #272736;
--text-color: #ffffeb;
/* Overriding DP DS */
--body-background: var(--primary-color);
--body-color: var(--text-color);
--nav-color: var(--primary-color);
--nav-background: var(--text-color);
--a-color: var(--text-color);
}
nav { nav {
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
} }
.question {
font-style: italic;
}
@media (prefers-color-scheme: light) {
:root {
--primary-color: #ffffeb;
--text-color: #272736;
}
}
@media (max-width: 420px) { @media (max-width: 420px) {
#app { #app {
margin-left: 0vw; margin-left: 0vw;
margin-right: 0vw; margin-right: 0vw;
} }
} }
.question {
font-style: italic;
}

18
client/public/assets/styling/themes.css
Unescape View File

@ -1,18 +0,0 @@
:root {
--primary-color: #272736;
--text-color: #ffffeb;
/* Overriding DP DS */
--body-background: var(--primary-color);
--body-color: var(--text-color);
--nav-color: var(--primary-color);
--nav-background: var(--text-color);
}
@media (prefers-color-scheme: light) {
:root {
--primary-color: #ffffeb;
--text-color: #272736;
}
}

11
client/public/index.html
Unescape View File

@ -2,19 +2,23 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta
name="description"
content="Raymon's personal website about his life and projects with a blog.">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Raymon Zutekouw</title> <title>Raymon Zutekouw</title>
<link rel="preload" href="./lib/me.mjs" as="script" crossorigin="anonymous" type="application/javascript">
<link rel="preload" href="index.mjs" as="script" crossorigin="anonymous" type="application/javascript">
<link rel="dns-prefetch" href="https://cdn.statically.io">
<link defer <link defer
rel="stylesheet" rel="stylesheet"
href="https://cdn.statically.io/gh/dragonprojects/dragondesign/master/main.min.css" href="https://cdn.statically.io/gh/dragonprojects/dragondesign/master/main.min.css"
media="all" media="all"
> >
<link defer rel="stylesheet" href="css/themes.css" media="all">
<link defer rel="stylesheet" href="css/general.css" media="all"> <link defer rel="stylesheet" href="css/general.css" media="all">
<script defer type="module" src="index.mjs"></script>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
@ -45,5 +49,6 @@
</p> </p>
</div> </div>
</div> </div>
<script async type="module" src="index.mjs"></script>
</body> </body>
</html> </html>

10
client/public/posts.html
Unescape View File

@ -2,19 +2,22 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta
name="description"
content="Raymon typing nonsense on his blog">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Raymon Zutekouw</title> <title>Raymon Zutekouw</title>
<link rel="preload" href="./lib/remote.mjs" as="script" crossorigin="anonymous" type="application/javascript">
<link rel="preload" href="posts.mjs" as="script" crossorigin="anonymous" type="application/javascript">
<link defer <link defer
rel="stylesheet" rel="stylesheet"
href="https://cdn.statically.io/gh/dragonprojects/dragondesign/master/main.min.css" href="https://cdn.statically.io/gh/dragonprojects/dragondesign/master/main.min.css"
media="all" media="all"
> >
<link defer rel="stylesheet" href="css/themes.css" media="all">
<link defer rel="stylesheet" href="css/general.css" media="all"> <link defer rel="stylesheet" href="css/general.css" media="all">
<script defer type="module" src="posts.mjs"></script>
</head> </head>
<body> <body>
<noscript> <noscript>
@ -32,6 +35,7 @@
<!-- Placeholder for posts --> <!-- Placeholder for posts -->
<div id="posts"></div> <div id="posts"></div>
<script async type="module" src="posts.mjs"></script>
</div> </div>
</body> </body>
</html> </html>

2
client/public/posts.mjs
Unescape View File

@ -15,7 +15,7 @@ async function showPost(id) {
post.content.split('\n').forEach(paragraph => { post.content.split('\n').forEach(paragraph => {
const p = document.createElement("p") const p = document.createElement("p")
p.textContent = paragraph p.innerHTML = paragraph
postsDOM.appendChild(p) postsDOM.appendChild(p)
}); });
} }

4
client/public/qa.html
Unescape View File

@ -2,6 +2,9 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta
name="description"
content="Raymon answering common questions">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Raymon Zutekouw</title> <title>Raymon Zutekouw</title>
@ -10,7 +13,6 @@
href="https://cdn.statically.io/gh/dragonprojects/dragondesign/master/main.min.css" href="https://cdn.statically.io/gh/dragonprojects/dragondesign/master/main.min.css"
media="all" media="all"
> >
<link defer rel="stylesheet" href="css/themes.css" media="all">
<link defer rel="stylesheet" href="css/general.css" media="all"> <link defer rel="stylesheet" href="css/general.css" media="all">
</head> </head>

1
client/public/robots.txt
Unescape View File

@ -0,0 +1 @@
User-agent: *

33
server/routes/api/posts.js
Unescape View File

@ -56,9 +56,9 @@ routes.set('/:id', async (req, res) => {
else res.send(results[0]) else res.send(results[0])
}) })
// For the sitemap.xml, will be listed in the XML Sitemap Index // Dynamic RSS feed
routes.set('/urls', async (req, res) => { routes.set('/rss.xml', async (req, res) => {
const re = /(\/api\/)?(.*)\/urls/g const re = /(\/api\/)?(.*)\/rss/g
const result = [...req.raw.originalUrl.matchAll(re)] const result = [...req.raw.originalUrl.matchAll(re)]
if (!result) { if (!result) {
notFoundResponse(res) notFoundResponse(res)
@ -67,17 +67,24 @@ routes.set('/urls', async (req, res) => {
const endpoint = result [1] ? result[1][2] : result[0][2] const endpoint = result [1] ? result[1][2] : result[0][2]
// Assumes https // Assumes https
const BASE_URL = 'https://' + req.raw.hostname + endpoint const BASE_URL = 'https://' + req.raw.hostname + endpoint
const urls = posts.map(post => const ITEMS = posts.map(post =>
`\n <url> `\r\n <item>
<loc>${BASE_URL}/${post._id}</loc> <title>${post.title}</title>
<lastmod>${post.date}</lastmod> <link>https://${req.raw.hostname}/posts?post=${post._id}</link>
<changefreq>never</changefreq> <guid>https://${req.raw.hostname}/posts?post=${post._id}</guid>
<priority>0.9</priority> <description>${post.content}</description>
</url>` </item>`
).join("\n") ).join("\n")
const xml = `<?xml version="1.0" encoding="UTF-8"?>\r<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> const xml = `<?xml version="1.0" encoding="UTF-8" ?>\n<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
${urls}\n\r</urlset>` <channel>
<atom:link href="https://${req.raw.hostname}/api/posts/rss.xml" rel="self" type="application/rss+xml" />
<title>Posts</title>
<link>https://${req.raw.hostname}</link>
<description>Personal blog</description>
<language>en-us</language>
${ITEMS}
</channel>\n</rss>`
res.header('Content-Type', 'application/xml') res.header('Content-Type', 'application/xml')
res.status(200).send(xml) res.status(200).send(xml)

Write Preview
Loading…
Cancel
Save