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.

Sign up for GitHub

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

Enhancment/issue 881 update for content over configuration #59

Closed
wants to merge 7 commits into from
Closed

Enhancment/issue 881 update for content over configuration #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3bff469
upgrade greenwood v0.23.0
thescientist13 Jan 29, 2022
8575149
upgrade alpha.1
thescientist13 Feb 5, 2022
0e38ee2
final version upgrade
thescientist13 Feb 12, 2022
c59da85
move content out of configuration
thescientist13 Feb 19, 2022
c9e07e5
move favicon into root folder
thescientist13 Feb 19, 2022
cb2ed76
update ESLint pattern
thescientist13 Feb 19, 2022
c84dc92
remove duplicate footer
thescientist13 Feb 19, 2022
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
11 changes: 0 additions & 11 deletions greenwood.config.js
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"develop": "greenwood develop",
"start": "npm run develop",
"serve": "rimraf ./public && greenwood serve",
"lint:js": "eslint \"*.js\" \"./src/**/**/*.js\"",
"lint:js": "eslint \"./src/**/**/*.js\"",
"lint:css": "stylelint \"./src/**/*.js\", \"./src/**/*.css\"",
"lint": "ls-lint && npm run lint:js && npm run lint:css"
},
Expand All @@ -31,7 +31,7 @@
},
"homepage": "https://github.com/ProjectEvergreen/greenwood-getting-started#readme",
"devDependencies": {
"@greenwood/cli": "~0.22.0",
"@greenwood/cli": "~0.23.0",
"@ls-lint/ls-lint": "^1.10.0",
"eslint": "^8.4.0",
"stylelint": "^13.8.0",
Expand Down
0 src/assets/favicon.ico → src/favicon.ico
View file
Open in desktop
File renamed without changes.
33 changes: 33 additions & 0 deletions src/templates/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<!DOCTYPE html>
<html lang="en" prefix="og:http://ogp.me/ns#">

<head>
<title>My Personal Blog</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="My cool blog! Thanks for being here."/>
<link rel="shortcut icon" href="/favicon.ico"/>
<link rel="icon" href="/favicon.ico"/>

<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'>
<page-outlet></page-outlet>
</div>

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

</body>

</html>
21 changes: 1 addition & 20 deletions src/templates/blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
<!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>

<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>

<html>
<body>

<app-header></app-header>

<div class='page-template content'>

Expand All @@ -30,8 +14,5 @@ <h3>More Posts</h3>
</nav>
</div>

<app-footer></app-footer>

</body>

</html>
27 changes: 3 additions & 24 deletions src/templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,9 @@
<!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>

<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>

<html>
<body>

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

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

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

</body>

</html>