Skip to content

Commit 21322cb

Browse files
authored
Merge pull request #14 from Tawmu/redesign-2026
UK LAN Techs website redesign
2 parents 37909ab + 60b3bab commit 21322cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+7887
-4913
lines changed

.eleventy.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import twig from '@factorial/eleventy-plugin-twig'
2+
3+
const twigOptions = {
4+
twig: {
5+
namespaces: {},
6+
},
7+
images: {},
8+
dir: {
9+
input: "src",
10+
output: "dist",
11+
watch: "src/**/*.{css,js,twig}",
12+
},
13+
};
14+
15+
export default function (config) {
16+
config.addPassthroughCopy({ 'public': './' })
17+
config.addPlugin(twig, twigOptions)
18+
config.setServerOptions({
19+
domDiff: false,
20+
})
21+
config.setBrowserSyncConfig({
22+
files: ['dist/**/*'],
23+
open: true,
24+
})
25+
return {
26+
dir: {
27+
input: 'src',
28+
output: 'dist',
29+
},
30+
markdownTemplateEngine: 'twig',
31+
}
32+
}

.github/workflows/deploy.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Deploy to GitHub Pages
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
permissions:
8+
contents: read
9+
pages: write
10+
id-token: write
11+
12+
concurrency:
13+
group: "pages"
14+
cancel-in-progress: false
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
23+
- name: Setup Node.js
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: '24'
27+
cache: 'npm'
28+
29+
- name: Install dependencies
30+
run: npm ci
31+
32+
- name: Build
33+
run: npm run build
34+
35+
- name: Setup Pages
36+
uses: actions/configure-pages@v4
37+
38+
- name: Upload artifact
39+
uses: actions/upload-pages-artifact@v3
40+
with:
41+
path: './dist'
42+
43+
deploy:
44+
environment:
45+
name: github-pages
46+
url: ${{ steps.deployment.outputs.page_url }}
47+
runs-on: ubuntu-latest
48+
needs: build
49+
steps:
50+
- name: Deploy to GitHub Pages
51+
id: deployment
52+
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
/hugo/public
1+
.DS_Store
2+
dist
3+
node_modules

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24

Dockerfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 UK LAN Techs
3+
Copyright (c) 2020 Matt Waler
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,40 @@
1-
# UK LAN Techs Website
1+
# 🫖 The TEA Stack
22

3-
## Introduction
3+
Welcome to the most minimal stack out there. This stack makes static site generation a breeze.
44

5-
This is the website for UK LAN Techs. It is intended to be built as a Docker image and is from the maintained Ubuntu/Apache/PHP image provided by 1&1 Internet.
5+
## 🧰 Tools
66

7-
## Prerequisites
7+
This project uses the following frameworks:
88

9-
This website is built using Hugo. Please install [hugo](https://gohugo.io) for local development.
9+
- [TailwindCSS](https://tailwindcss.com/)
10+
- [Eleventy](https://www.11ty.dev/)
11+
- [Alpine.js](https://alpinejs.dev/)
12+
- [Vite](https://vitejs.dev)
1013

11-
## Building the site
14+
## ⭐️ Requirements
1215

13-
The site will be built and deployed automatically when a version is pushed to master.
16+
- [Node](https://nodejs.org/en/)
17+
- [NVM](https://github.com/nvm-sh/nvm)
1418

15-
## Live Build Status
19+
## 🛠 Getting Started
1620

17-
The resulting docker image will be built automatically and be seen at (https://hub.docker.com/r/uklans/website/)
21+
- `nvm use` to switch to the valid node version (`nvm` will grab the correct version found in `.nvmrc`)
22+
- `npm i` to build that big ol' `node_modules` folder
23+
- `npm run dev` to boot up a live-reloading dev server
24+
- `npm run build` to build your production-ready site
1825

19-
## Adding a new member page
26+
Feel free to peep the `package.json` file to see all available scripts and packages being utilized.
2027

21-
If you are a member of UKLans and wish to add your information to the website please follow the instructions below
22-
* Fork this repository
23-
* Add yourself to the members list in hugo/content/sections/members.md
24-
* Create a new file in hugo/content/members/yourlan.md
25-
* Look at the [StratLAN](https://raw.githubusercontent.com/uklans/website/master/hugo/content/members/stratlan.md) / [epic.LAN](https://raw.githubusercontent.com/uklans/website/master/hugo/content/members/epiclan.md) pages for a good format
26-
* Create a pull request
28+
## ➕ Adding a member
29+
- Add your logo to `./public/<your-lan-here>.png`
30+
- Add/Update your LAN in `./src/_data/members.js`
31+
- Please use single quotes in the JSON (`'`)
32+
- Done!
2733

28-
## Issues and Feedback
34+
### 🔥 Tip:
2935

30-
Please raise all issues and feedback on GitHub at [uklans/website](https://github.com/uklans/website/issues).
36+
Running `npm run build && npx serve dist` will boot up a local server of your production site to preview before deployment.
3137

32-
## License
38+
### 👋🏻 Thank you!
3339

34-
The MIT License (MIT)
35-
36-
Copyright (c) 2017 UK LAN Techs
37-
38-
Permission is hereby granted, free of charge, to any person obtaining a copy
39-
of this software and associated documentation files (the "Software"), to deal
40-
in the Software without restriction, including without limitation the rights
41-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
42-
copies of the Software, and to permit persons to whom the Software is
43-
furnished to do so, subject to the following conditions:
44-
45-
The above copyright notice and this permission notice shall be included in all
46-
copies or substantial portions of the Software.
47-
48-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
49-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
50-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
51-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
52-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
53-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
54-
SOFTWARE.
40+
I appreciate you taking time to check out the TEA stack, Please leave a star and share it if you found it useful!

hugo/archetypes/default.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

hugo/config.toml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)