Skip to content

SummittDweller/wieting-one-click-hugo-cms

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Netlify Status

wieting-one-click-hugo-cms: Published on Netlify.com with NetlifyCMS

This repository and subsequent static website were created on 2021-Jun-03 using NetlifyCMS: Start with a Template in a manner similar to what's documented in my blog at Moving to Netlify CMS. Unfortunately, the Wieting Theatre work that's mentioned in that blog post had to be destroyed after my git repo was apparently corrupted. This remote is a replacment for that earlier work.

Hugo Site Starter

Like my previous Netlify build, this project once again uses the Deploy to Netlify button corresponding with the Hugo Site Starter section of NetlifyCMS: Start with a Template.

wieting-theatre-DO: Now a Git Subtree

The site portion of this project used to be just that, a subdirectory in a larger project built using the aforementioned Hugo Site Starter. That site directory was spun from my original repo to create a new one, wieting-theatre-DO, and that git project is now a git "subtree" inside the site directory here in this remote.

I used guidance posted in git subtrees: a tutorial to build the site directory out. Specifics of the git command stream I used are posted in raw form below:

╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹empty-site›
╰─$ git checkout -b wieting-site-added
Switched to a new branch 'wieting-site-added'
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ git remote add wieting-site [email protected]:SummittDweller/wieting-theatre-DO
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ git subtree add --prefix=site/ wieting-site main
prefix 'site' already exists.
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ rm -fr site                   
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ git subtree add --prefix=site/ wieting-site main
git fetch wieting-site main
[email protected]: Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ git remote add wieting-site https://github.com/SummittDweller/wieting-theatre-DO   
fatal: remote wieting-site already exists.
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ git remote add wieting-theatre-DO https://github.com/SummittDweller/wieting-theatre-DO 
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›
╰─$ git subtree add --prefix=site/ wieting-theatre-DO main
git fetch wieting-theatre-DO main
warning: no common commits
remote: Enumerating objects: 370, done.
remote: Counting objects: 100% (370/370), done.
remote: Compressing objects: 100% (310/310), done.
remote: Total 370 (delta 48), reused 364 (delta 42), pack-reused 0
Receiving objects: 100% (370/370), 19.52 MiB | 13.64 MiB/s, done.
Resolving deltas: 100% (48/48), done.
From https://github.com/SummittDweller/wieting-theatre-DO
 * branch            main       -> FETCH_HEAD
 * [new branch]      main       -> wieting-theatre-DO/main
Added dir 'site'
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹wieting-site-added›

Be sure to note the trial-and-error (emphasis on error) in that sequence. Once I had it working locally I pushed the wieting-site-added branch of the code and merged it with main for publication.

Bringing Updates from my-subproject Back to Parent

The heading of this section, above, also appears as a heading in the guidance post that I used here for subtree creation. In that post my-subproject is the name of the git remote that the author incorporated as a subtree. In my case, the git remote name, or alias, is wieting-theatre-DO and it was successfully created after some failed attempts using this command: $ git remote add wieting-theatre-DO https://github.com/SummittDweller/wieting-theatre-DO, as you see above.

That remote repo was subseuqently added into the site/ subdirectory as a subtree using: $ git subtree add --prefix=site/ wieting-theatre-DO main.

The author of the post says "Imagine that someone made awesome contributions to my-subproject and you want to pull these new changes back into parent", and proceeds to show us how that can be done. The process is elegantly simple, and one that I hope to repeat in my project/sub-project arrangement. The author's command, "git subtree pull --prefix=vendor my-subtree master", becomes git subtree pull --prefix=site wieting-theatre-DO main, in my case.

The author goes on to says that... "This will execute a pull, using the “subtree” merge strategy. It is necessary so we tell git to inspect the patches and identify it should be applying in a subtree of our current project (parent)..." and that "This will generate a merge commit..." Later, the author also suggests using the --squash flag as part of the git subtree pull... command so my preferred syntax should probably be: git subtree pull --prefix=site --squash wieting-theatre-DO main.

Specifics of My Workflow

So, I'm going to add an upcoming event to the main branch of my subtree project, SummittDweller/wieting-theatre-DO, then I'll pull that additon into this larger project at SummittDweller/wieting-one-click-hugo-cms. Wish me luck.

It Worked! Beautimous!

I didn't --squash in this case, but the process worked beautifully. The entire local command sequence, which included a pre-emptive add/commit/push of changes to this README.md file, was:

╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main›
╰─$ cd ../wieting-theatre-DO
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-theatre-DO ‹main›
╰─$ git pull
Already up to date.
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-theatre-DO ‹main›
╰─$ atom .
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-theatre-DO ‹main›
╰─$ git add .
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-theatre-DO ‹main*›
╰─$ git commit -m "Added 6/21/2021 rental event"
[main 5e49195] Added 6/21/2021 rental event
 1 file changed, 7 insertions(+)
 create mode 100644 content/event/2021-06-21_rental.md
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-theatre-DO ‹main›
╰─$ git push
Enumerating objects: 8, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 6 threads
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 522 bytes | 522.00 KiB/s, done.
Total 5 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://github.com/SummittDweller/wieting-theatre-DO.git
   f1ce101..5e49195  main -> main
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-theatre-DO ‹main›
╰─$ cd ..
╭─mark@Marks-Mac-Mini ~/GitHub
╰─$ cd wieting-one-click-hugo-cms
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main*›
╰─$ git status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main*›
╰─$ git add .
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main*›
╰─$ git commit -m "Updating README.md"
[main 9f5ee23] Updating README.md
 1 file changed, 71 insertions(+)
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main›
╰─$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 6 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 3.40 KiB | 3.40 MiB/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To https://github.com/SummittDweller/wieting-one-click-hugo-cms.git
   cd29fb5..9f5ee23  main -> main
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main›
╰─$ git subtree pull --prefix=site wieting-theatre-DO main
remote: Enumerating objects: 8, done.
remote: Counting objects: 100% (8/8), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 5 (delta 3), reused 5 (delta 3), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/SummittDweller/wieting-theatre-DO
 * branch            main       -> FETCH_HEAD
   f1ce101..5e49195  main       -> wieting-theatre-DO/main
Merge made by the 'recursive' strategy.
 site/content/event/2021-06-21_rental.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 site/content/event/2021-06-21_rental.md
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main›
╰─$ git status
On branch main
Your branch is ahead of 'origin/main' by 2 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
╭─mark@Marks-Mac-Mini ~/GitHub/wieting-one-click-hugo-cms ‹main›
╰─$ git push
Enumerating objects: 12, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 6 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 1.16 KiB | 1.16 MiB/s, done.
Total 7 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://github.com/SummittDweller/wieting-one-click-hugo-cms.git
   9f5ee23..8dac218  main -> main

Hugo template for Netlify CMS with Netlify Identity

This is a small business template built with Victor Hugo and Netlify CMS, designed and developed by Darin Dimitroff, spacefarm.digital.

Getting started

Use our deploy button to get your own copy of the repository.

Deploy to Netlify

This will setup everything needed for running the CMS:

  • A new repository in your GitHub account with the code
  • Full Continuous Deployment to Netlify's global CDN network
  • Control users and access with Netlify Identity
  • Manage content with Netlify CMS

Once the initial build finishes, you can invite yourself as a user. Go to the Identity tab in your new site, click "Invite" and send yourself an invite.

Now you're all set, and you can start editing content!

Local Development

Clone this repository, and run yarn or npm install from the new folder to install all required dependencies.

Then start the development server with yarn start or npm start.

Layouts

The template is based on small, content-agnostic partials that can be mixed and matched. The pre-built pages showcase just a few of the possible combinations. Refer to the site/layouts/partials folder for all available partials.

Use Hugo’s dict functionality to feed content into partials and avoid repeating yourself and creating discrepancies.

CSS

The template uses a custom fork of Tachyons and PostCSS with cssnext and cssnano. To customize the template for your brand, refer to src/css/imports/_variables.css where most of the important global variables like colors and spacing are stored.

SVG

All SVG icons stored in site/static/img/icons are automatically optimized with SVGO (gulp-svgmin) and concatenated into a single SVG sprite stored as a a partial called svg.html. Make sure you use consistent icons in terms of viewport and art direction for optimal results. Refer to an SVG via the <use> tag like so:

<svg width="16px" height="16px" class="db">
  <use xlink:href="#SVG-ID"></use>
</svg>

About

No description, website, or topics provided.

Resources

License

Code of conduct

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published