Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore/upgrade greenwood 0.10.0 #22

Merged
merged 22 commits into from
Apr 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/chromium-lib-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ sudo apt-get update \
&& sudo wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - \
&& sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
&& sudo apt-get update \
&& sudo apt-get install -y google-chrome-unstable --no-install-recommends \
&& sudo apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
--no-install-recommends \
&& sudo rm -rf /var/lib/apt/lists/*
1 change: 1 addition & 0 deletions greenwood.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const pkg = require('./package.json');
module.exports = {
title: 'My Personal Blog',
meta: [
{ rel: 'icon', href: '/assets/favicon.ico' },
{ name: 'description', content: pkg.description } // replace the pkg.description with a custom string if you prefer
]
};
10 changes: 10 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[build]
publish = "public/"
command = "npm run build"

[build.processing]
skip_processing = true


[build.environment]
NODE_VERSION = "12.13.0"
20,883 changes: 4,627 additions & 16,256 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"build": "greenwood build",
"develop": "greenwood develop",
"start": "npm run develop",
"serve": "rimraf ./public && npm run build && ws -d ./public",
"serve": "rimraf ./public && greenwood serve",
"lint:js": "eslint \"*.js\" \"./src/**/**/*.js\"",
"lint:css": "stylelint \"./src/**/*.js\", \"./src/**/*.css\"",
"lint": "ls-lint && npm run lint:js && npm run lint:css"
Expand All @@ -25,9 +25,9 @@
},
"homepage": "https://github.com/ProjectEvergreen/greenwood-getting-started#readme",
"devDependencies": {
"@greenwood/cli": "^0.9.0",
"eslint": "^6.1.0",
"@greenwood/cli": "^0.10.0",
"@ls-lint/ls-lint": "^1.9.2",
"eslint": "^6.1.0",
"stylelint": "^13.8.0",
"stylelint-a11y": "^1.2.3",
"stylelint-config-standard": "^20.0.0"
Expand Down
21 changes: 13 additions & 8 deletions src/components/header/header.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import logo from '../../assets/greenwood-logo.png';

class HeaderComponent extends HTMLElement {
constructor() {
super();
Expand Down Expand Up @@ -53,21 +51,28 @@ class HeaderComponent extends HTMLElement {
text-align: right;
}

.header img.github-badge {
display: inline-block;
width: 90px;
height: 20px;
}

</style>

<header class="header">
<div class="head-wrap">
<div class="brand">
<a href="/">
<img src="${logo}" />
<img src="/assets/greenwood-logo.png" alt="Greenwood logo"/>
<h4>My Personal Blog</h4>
</a>
</div>
<div class="social">
<a href="">
<a href="https://github.com/ProjectEvergreen/greenwood">
<img src="https://img.shields.io/github/stars/ProjectEvergreen/greenwood.svg?style=social&logo=github&label=github" />
</a>
<a href="https://github.com/ProjectEvergreen/greenwood">
<img
src="https://img.shields.io/github/stars/ProjectEvergreen/greenwood.svg?style=social&logo=github&label=github"
alt="Greenwood GitHub badge"
class="github-badge"/>
</a>
</div>
</div>
Expand All @@ -76,4 +81,4 @@ class HeaderComponent extends HTMLElement {
}
}

customElements.define('app-header', HeaderComponent);
customElements.define('app-header', HeaderComponent);
22 changes: 22 additions & 0 deletions src/styles/blog.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.content {
flex: 1;
max-width: 50em;
height: 100%;
margin: auto;
font-size: 1.2rem;
padding: 2rem;
}

.content h2 {
color: #0b6623;
}

.content h2,
.content h3 {
font-size: 2rem;
margin: 5px 0;
}

.content a {
color: #1d337a;
}
22 changes: 22 additions & 0 deletions src/styles/home.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.content {
flex: 1;
max-width: 50em;
height: 100%;
margin: auto;
font-size: 1.2rem;
padding: 2rem;
}

.content h3 {
color: #0b6623;
font-size: 2rem;
margin: 5px 0;
}

.content a {
color: #1d337a;
}

.content ul li {
padding: 5px 0;
}
56 changes: 0 additions & 56 deletions src/templates/blog-template.js

This file was deleted.

38 changes: 38 additions & 0 deletions src/templates/blog.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html lang="en" prefix="og:http://ogp.me/ns#">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta-outlet></meta-outlet>

<!-- TODO have to use forward slash / for path references? translate on the fly in serve.js? -->
<script type="module" src="/components/footer/footer.js"></script>
<script type="module" src="/components/header/header.js"></script>

<link rel="stylesheet" href="/styles/theme.css"></link>
<link rel="stylesheet" href="/styles/blog.css"></link>
</head>

<body>

<app-header></app-header>

<div class='page-template content'>

<content-outlet></content-outlet>

<h3>More Posts</h3>
<nav>
<ul>
<li><a href="/blog/second-post/">My Second Post</a></li>
<li><a href="/blog/first-post/">My First Post</a></li>
</ul>
</nav>
</div>

<app-footer></app-footer>

</body>

</html>
46 changes: 0 additions & 46 deletions src/templates/page-template.js

This file was deleted.

31 changes: 31 additions & 0 deletions src/templates/page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en" prefix="og:http://ogp.me/ns#">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta-outlet></meta-outlet>

<!-- TODO have to use forward slash / for path references? translate on the fly in serve.js? -->
<script type="module" src="/components/footer/footer.js"></script>
<script type="module" src="/components/header/header.js"></script>

<link rel="stylesheet" href="/styles/theme.css"></link>
<link rel="stylesheet" href="/styles/home.css"></link>
</head>

<body>

<div>
<app-header></app-header>

<div class='content'>
<content-outlet></content-outlet>
</div>

<app-footer></app-footer>
</div>

</body>

</html>