Skip to content
This repository has been archived by the owner on May 13, 2021. It is now read-only.

replace node server with caddy and hexo with hugo #314

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

butlerx
Copy link
Member

@butlerx butlerx commented Oct 27, 2018

Closes #

Description

Remove node app.
None of these features are used and add complexity so should be removed

Checklist

I confirm that before I submitted this pull request I did the following:

  • Confirmed that no other open PRs address this issue.
  • Checked out the latest version of the site.
  • Ran yarn start and confirmed that there were no issues.
  • Annotated my code with the relevant license information (if applicable).

VoyTechnology
VoyTechnology previously approved these changes Oct 27, 2018
Copy link
Contributor

@VoyTechnology VoyTechnology left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I strongly approve.

(Aside from the comment)

Caddyfile Outdated Show resolved Hide resolved
m1cr0man
m1cr0man previously approved these changes Oct 28, 2018
Copy link
Member

@m1cr0man m1cr0man left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. I got 2 questions but they are non blocking.

docker-compose.yml Show resolved Hide resolved
.dockerignore Show resolved Hide resolved
@m1cr0man
Copy link
Member

Will the circleci test start passing after this is merged or is it very broken?

@theycallmemac
Copy link
Member

Conflicts with some commits I made a few hours ago, once he has those files, it should be passing ci again and good to merge.

@butlerx
Copy link
Member Author

butlerx commented Oct 28, 2018

while chatting too @m1cr0man offline he mentioned a possible rewrite id like to suggest using hugo and using https://caddyserver.com/docs/http.hugo

this will have to manually deployed now by one of the @admins

@theycallmemac
Copy link
Member

We talked about the idea last Thursday with @Frazl

A hugo replacement would be very nice. Probably not as extendable as hexo is, but then again, we only use some of the existing extensions.

@butlerx
Copy link
Member Author

butlerx commented Oct 28, 2018

I think you'll find that a lot of the extensions that are used in hugo can be taken care of by some nice templates in hugo.

Using caddy you can also get a lot of the minification advantages you got in hexo

@butlerx
Copy link
Member Author

butlerx commented Oct 28, 2018

a hugo rewite would also mean sistem, redbrick and admin-blog would all be the same platform

@m1cr0man
Copy link
Member

Hm, that last one is a pretty compelling argument.

I will look into what we can do with Hugo then, and how the other 2 sites are currently set up/what differs between them (if anything).

My main concern with these templating engines is that once you want to deviate from the template it gets more complex than it is worth.

@butlerx butlerx force-pushed the rfc/remove-dynamic branch 2 times, most recently from 63dfa99 to 72fc1ff Compare October 28, 2018 18:39
@butlerx
Copy link
Member Author

butlerx commented Oct 28, 2018

this convo may want to be moved to an issue.
I think sistem has a bit of a unique set up as it uses scss and es6 for client stuff but the templating and md rendering is all hugo.

admin-blog is just plain css and no js

ping me with any questions

@theycallmemac
Copy link
Member

Yeah, all three being one and the same would be nice. Best move it to issue for now like you say

@butlerx butlerx force-pushed the rfc/remove-dynamic branch 2 times, most recently from 98d5fc6 to 4bf8946 Compare October 28, 2018 20:25
@butlerx
Copy link
Member Author

butlerx commented Oct 29, 2018

tests are now passing, when an admin is available to deploy the new container and very its all working you can merge

it should be noted the reason tests were not working was one of the dependency upgrades I tried mangled the use of <!-- more --> so I reverted all dependencies

@butlerx
Copy link
Member Author

butlerx commented Oct 29, 2018

closes #30 #114 #183 #194 #77 #48

@butlerx butlerx mentioned this pull request Oct 29, 2018
@butlerx butlerx force-pushed the rfc/remove-dynamic branch 3 times, most recently from 1c223b9 to af5d6e6 Compare September 7, 2019 14:10
@butlerx butlerx changed the title replace node server with caddy replace node server with caddy and hexo with hugo Sep 7, 2019
@butlerx butlerx force-pushed the rfc/remove-dynamic branch 10 times, most recently from fc731e1 to e4cafb3 Compare September 9, 2019 09:53
@butlerx
Copy link
Member Author

butlerx commented Sep 9, 2019

@m1cr0man @theycallmemac updated with hugo

  • Move Theme into the repository
    • remove submodules
    • keep all resources in one repo
    • simplify build
    • simplify setup
  • Migrate stylus to scss
    • stylus is mostly dead and not well understood
    • scss is closer to standard css
  • Migrate Hexo with Hugo
    • removes the need for node
    • hugo used in other redbrick sites
    • hugo has built-in scss building
    • cirlceci has predefined build env and tests for Hugo
  • Replace custom node server with caddy
    • replaces custom build process with the standard caddy git plugin
    • add support for GitHub and gitea webhooks
  • Adds basic JSON interface.

@m1cr0man
Copy link
Member

m1cr0man commented Sep 9, 2019

I will review this too James so please don't merge if you beat me to it

@butlerx butlerx force-pushed the rfc/remove-dynamic branch 3 times, most recently from 04e0663 to b61c74e Compare September 9, 2019 11:28
@benmcmahon100
Copy link
Contributor

@m1cr0man Did you get to take a look or will I? @theycallmemac If you got to have a look feel free to leave a review

@m1cr0man
Copy link
Member

m1cr0man commented Oct 8, 2019

Ah, yes I will review at lunch time

m1cr0man
m1cr0man previously approved these changes Oct 8, 2019
Copy link
Member

@m1cr0man m1cr0man left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@theycallmemac
Copy link
Member

@butlerx will review this evening when I finished off some college work.

@theycallmemac theycallmemac self-requested a review October 8, 2019 21:37
Copy link
Member

@theycallmemac theycallmemac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to merge this now @butlerx but a question with CircleCI, why is it saying checks have yet to complete, I guess it's using the old config yeah?

@butlerx
Copy link
Member Author

butlerx commented Jul 21, 2020

circle is broken, think the keys expired

Move Theme in to the repository
  - remove submodules
  - keep all resources in one repo
  - simplify build
  - simplify setup
Migrate stylus to scss
  - stylus is mostly dead and not well understood
  - scss is closer to standard css
Migrate Hexo with Hugo
  - removes need for node
  - hugo used in other redbrick sites
  - hugo has built in scss building
  - cirlceci has predefined build env and tests for hugo
Replace custom node server with caddy
  - replaces custom build process with standard caddy git plugin
  - add support for github and gitea webhooks
Adds basic json interface.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants