Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit fdff846

Browse files
JulianCataldoJulianCataldo
committed
Merge branch 'develop' into full-theme-switcher/feat/1
2 parents 179f740 + d2f4462 commit fdff846

Some content is hidden

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

82 files changed

+1031
-1096
lines changed

‎.github/workflows/branch.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Build and Deploy [BRANCH] to Netlify
2+
on:
3+
push:
4+
branches:
5+
- '**'
6+
- '!master'
7+
# pull_request:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-20.04
12+
13+
steps:
14+
- name: Check out Git repository
15+
uses: actions/checkout@v2
16+
17+
# ————————————————————————————————————————————————————————————————————————
18+
19+
- name: Use Node.js 17
20+
uses: actions/setup-node@v2
21+
with:
22+
node-version: 17
23+
24+
- name: Setup PNPM 7
25+
uses: pnpm/[email protected]
26+
with:
27+
version: 7.1.7
28+
29+
- name: Install Node dependencies
30+
run: pnpm install --recursive
31+
32+
- name: Build Astro Website
33+
working-directory: ./demo
34+
run: pnpm run build
35+
36+
# ————————————————————————————————————————————————————————————————————————
37+
38+
- name: Generate Netlify alias
39+
shell: bash
40+
run: ruby -e 'puts "::set-output name=netlify_alias::#{`git branch --show-current`.chomp.gsub(/[^a-zA-Z\d]/){"-"}.downcase}"'
41+
id: get_netlify_alias
42+
43+
- name: Deploy to Netlify (branch)
44+
uses: nwtgck/[email protected]
45+
with:
46+
publish-dir: './demo/dist'
47+
github-token: ${{ secrets.GITHUB_TOKEN }}
48+
alias: ${{ steps.get_netlify_alias.outputs.netlify_alias }}
49+
# enable-pull-request-comment: false
50+
# enable-commit-comment: false
51+
# enable-commit-status: false
52+
github-deployment-environment: ${{ steps.get_netlify_alias.outputs.netlify_alias }}
53+
env:
54+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
55+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
56+
timeout-minutes: 1

‎.github/workflows/deploy.yaml

-40
This file was deleted.

‎.github/workflows/production.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Build and Deploy [PRODUCTION] to Netlify
2+
on:
3+
push:
4+
branches: [master]
5+
# pull_request:
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-20.04
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
# ————————————————————————————————————————————————————————————————————————
15+
16+
- name: Use Node.js 17
17+
uses: actions/setup-node@v2
18+
with:
19+
node-version: 17
20+
21+
- name: Setup PNPM 7
22+
uses: pnpm/[email protected]
23+
with:
24+
version: 7.1.7
25+
26+
- name: Install Node dependencies
27+
run: pnpm install --recursive
28+
29+
- name: Build Astro Website
30+
working-directory: ./demo
31+
run: pnpm run build
32+
33+
# ————————————————————————————————————————————————————————————————————————
34+
35+
- name: Deploy to Netlify
36+
uses: nwtgck/[email protected]
37+
with:
38+
publish-dir: './demo/dist'
39+
production-branch: master
40+
github-token: ${{ secrets.GITHUB_TOKEN }}
41+
deploy-message: 'Deploy from GitHub Actions'
42+
# enable-pull-request-comment: false
43+
# enable-commit-comment: true
44+
# overwrites-pull-request-comment: true
45+
env:
46+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
47+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
48+
timeout-minutes: 1

‎CONTRIBUTING.md

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# 🦾  Contributing
2+
3+
Any remark, feature or pull request can be done in this [GitHub repository](https://github.com/JulianCataldo/web-garden).
4+
5+
## Conventions
6+
7+
### Issue
8+
9+
> Subject, sentence cased
10+
> Label: `type`.
11+
12+
ex.: My new component
13+
GitHub issues label: \[feature\]
14+
15+
### Branching
16+
17+
**Create branch from issue**.
18+
19+
> `{subject-kebab-cased}/{type}/{issueNumber}`
20+
21+
ex.:
22+
`my-new-component/feat/123`
23+
24+
### Committing
25+
26+
Committing is linted following [conventional commits conventions](http://conventionalcommits.org).
27+
This allows an easy and automatic versioning, change-logging, and NPM publishing workflow.
28+
29+
ex.:
30+
31+
- `feat: my new sub-feature`
32+
- `docs: some doc for this sub-feature`
33+
34+
### Pull request
35+
36+
_(GH auto-generated titles)_
37+
38+
Mono-commit:
39+
40+
> `docs: adding one-shot docs`
41+
42+
Multi-commits:
43+
44+
> My new component/feat/123

‎LICENSE

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
ISC License
2+
3+
Copyright (c) 2022 Julian Cataldo
4+
5+
Permission to use, copy, modify, and/or distribute this software for any
6+
purpose with or without fee is hereby granted, provided that the above
7+
copyright notice and this permission notice appear in all copies.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
10+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
11+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
12+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
13+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
14+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
15+
PERFORMANCE OF THIS SOFTWARE.

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,41 @@ minuscule file sizes compared to "all-or-nothing" UI frameworks.
2929
- [🚀  Julian's Web Garden](#julians-web-garden)
3030
- [🤷🏼‍♂️  Philosophy](#️philosophy)
3131
- [🔗  Quick links](#quick-links)
32-
- [LIVE DEMO  🎭  DOCUMENTATION WEBSITE ⎋ ](#live-demo--documentation-website)
32+
- [LIVE DEMO  🎭  DOCUMENTATION WEBSITE ⎋](#live-demo--documentation-website)
3333
- [📖  Website source code](#website-source-code)
34-
- [📦  Application-level components ](#application-level-components-)
34+
- [📦  Application-level components](#application-level-components)
3535
- [📦  Components](#components)
3636
- [🛠  Tooling configurations](#tooling-configurations)
3737
- [✅  Tests](#tests)
3838
- [🚧  To dos](#to-dos)
3939
- [🧫  Experimenting](#experimenting)
4040
- [🧑‍🚀  Development](#development)
4141
- [🏁  Commands](#commands)
42-
- [🦾  Contribute](#contribute)
4342

4443
---
4544

4645
</div>
4746

4847
# 🔗  Quick links
4948

50-
## [LIVE DEMO  🎭  DOCUMENTATION WEBSITE ⎋ ](https://code.juliancataldo.com/)
49+
<div class="git-web-garden-link">
50+
51+
## [LIVE DEMO  🎭  DOCUMENTATION WEBSITE ⎋](https://code.juliancataldo.com/)
52+
53+
[![Live demo website](https://code.juliancataldo.com/poster.png)](https://code.juliancataldo.com)
5154

5255
_[Deployed on `code.juliancataldo.com`](https://code.juliancataldo.com/) automatically (GitHub Pages)._
5356

54-
## [📖  Website source code](https://github.com/JulianCataldo/astro/tree/master/demo)
57+
</div>
58+
59+
## [📖  Website source code](https://github.com/JulianCataldo/web-garden/tree/master/demo)
5560

5661
See [default layout](demo/src/layouts/Default/Default.astro) and [home page](./demo/src/pages/index.astro)
5762
for live implementation examples.
5863

5964
---
6065

61-
## [📦  Application-level components ](./app)
66+
## [📦  Application-level components](./app)
6267

6368
[These are global components](./app) which enhance or augment browser behavior and style,
6469
while providing useful utilities to developers, website-wide.
@@ -106,6 +111,7 @@ Cypress:
106111
- [ ] Implement dev / prod mode for debugging outputs
107112
- [x] Rehaul demo website
108113
- [ ] Evaluate PNPM workspaces + tools for replacing Lerna version/publish?
114+
- [ ] Fix Lerna conventional commits not following breaking changes for versioning
109115

110116
# 🧫  Experimenting
111117

@@ -146,12 +152,6 @@ pnpm run version
146152
pnpm run publish
147153
```
148154

149-
## 🦾  Contribute
150-
151-
Any remark, feature or pull request can be done in this GitHub repository and issues tracker.
152-
Committing is linted following [conventional commits conventions](http://conventionalcommits.org).
153-
This allows an easy and automatic versioning, change-logging, and NPM publishing workflow.
154-
155155
<div class="git-footer">
156156

157157
---

‎app/Analytics/CHANGELOG.md

+11-27
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,42 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6-
## [0.11.1](https://github.com/JulianCataldo/astro/compare/@julian_cataldo/[email protected].0...@julian_cataldo/[email protected].1) (2022-07-18)
6+
## [0.11.2](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected].1...@julian_cataldo/[email protected].2) (2022-07-24)
77

88
**Note:** Version bump only for package @julian_cataldo/astro-analytics
99

1010

1111

1212

1313

14-
## [0.11.0](https://github.com/JulianCataldo/astro/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-28)
15-
16-
17-
### Features
18-
19-
* better defaults properties ([cc55aec](https://github.com/JulianCataldo/astro/commit/cc55aecd0ea8051ab268c391cb5a28372d7ca896))
20-
21-
22-
23-
## [0.10.4](https://github.com/JulianCataldo/astro/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-26)
14+
## [0.11.1](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-07-18)
2415

2516
**Note:** Version bump only for package @julian_cataldo/astro-analytics
2617

18+
## [0.11.0](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-28)
2719

20+
### Features
2821

22+
- better defaults properties ([cc55aec](https://github.com/JulianCataldo/web-garden/commit/cc55aecd0ea8051ab268c391cb5a28372d7ca896))
2923

30-
31-
## [0.10.3](https://github.com/JulianCataldo/astro/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-25)
24+
## [0.10.4](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-26)
3225

3326
**Note:** Version bump only for package @julian_cataldo/astro-analytics
3427

35-
36-
37-
38-
39-
## [0.10.2](https://github.com/JulianCataldo/astro/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-21)
28+
## [0.10.3](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-25)
4029

4130
**Note:** Version bump only for package @julian_cataldo/astro-analytics
4231

43-
44-
45-
46-
47-
## [0.10.1](https://github.com/JulianCataldo/astro/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-20)
32+
## [0.10.2](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-21)
4833

4934
**Note:** Version bump only for package @julian_cataldo/astro-analytics
5035

36+
## [0.10.1](https://github.com/JulianCataldo/web-garden/compare/@julian_cataldo/[email protected]...@julian_cataldo/[email protected]) (2022-06-20)
5137

52-
53-
38+
**Note:** Version bump only for package @julian_cataldo/astro-analytics
5439

5540
## 0.10.0 (2022-06-19)
5641

57-
5842
### Features
5943

60-
* init app analytics component ([f76c86e](https://github.com/JulianCataldo/astro/commit/f76c86ea2681851540e9815192bb669f4f0b7831))
44+
- init app analytics component ([f76c86e](https://github.com/JulianCataldo/web-garden/commit/f76c86ea2681851540e9815192bb669f4f0b7831))

‎app/Analytics/README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ Provides Google Analytics 4 snippet injection.
66

77
---
88

9-
[LIVE DEMO  🎭  DOCUMENTATION WEBSITE ⎋](https://code.juliancataldo.com/)
9+
## [LIVE DEMO  🎭  DOCUMENTATION WEBSITE ⎋](https://code.juliancataldo.com/)
10+
11+
[![Live demo website](https://code.juliancataldo.com/poster.png)](https://code.juliancataldo.com)
12+
13+
**_[`code.juliancataldo.com`](https://code.juliancataldo.com/)_**
1014

1115
---
1216

‎app/Analytics/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@julian_cataldo/astro-analytics",
3-
"version": "0.11.1",
3+
"version": "0.11.2",
44
"description": "Provides Google Analytics 4 snippet injection.",
55
"main": "index.js",
66
"type": "module",
@@ -10,11 +10,11 @@
1010
"author": "Julian Cataldo",
1111
"homepage": "https://code.juliancataldo.com/component/astro-analytics",
1212
"bugs": {
13-
"url": "https://github.com/JulianCataldo/astro/issues"
13+
"url": "https://github.com/JulianCataldo/web-garden/issues"
1414
},
1515
"repository": {
1616
"type": "git",
17-
"url": "https://github.com/JulianCataldo/astro",
17+
"url": "https://github.com/JulianCataldo/web-garden",
1818
"directory": "app/Analytics"
1919
},
2020
"scripts": {

0 commit comments

Comments
 (0)