Skip to content

Commit 583f70e

Browse files
committed
Merge branch 'main' of github.com:jazzsequence/profile.github.io
2 parents a2abcde + 9246135 commit 583f70e

File tree

7 files changed

+57
-11
lines changed

7 files changed

+57
-11
lines changed

.github/workflows/deploy.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,26 @@ on:
66
permissions:
77
contents: write
88
jobs:
9+
precheck:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
should_deploy: ${{ steps.check.outputs.should_deploy }}
13+
steps:
14+
- name: Check if this is the template
15+
id: check
16+
run: |
17+
if [ "${{ github.repository }}" = "jazzsequence/profile.github.io" ]; then
18+
echo "should_deploy=false" >> $GITHUB_ENV
19+
echo "Actions running on parent repository. Deploy to GitHub pages will be skipped."
20+
else
21+
echo "should_deploy=true" >> $GITHUB_ENV
22+
echo "Actions running on forked repository. Deploying to GitHub is enabled."
23+
fi
24+
env:
25+
GITHUB_OUTPUT: $GITHUB_ENV
926
deploy:
1027
runs-on: ubuntu-latest
11-
28+
if: needs.precheck.outputs.should_deploy == 'true'
1229
steps:
1330
- name: Checkout
1431
uses: actions/checkout@v4

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build
99
# Dependency directories
1010
node_modules/
1111

12-
# Don't version control package-lock.json
12+
# Don't version control the package-lock.json
1313
package-lock.json
1414

1515
# Don't version control the actual user links.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ Read the [README](https://github.com/jazzsequence/profile.github.io#how-does-it-
1919
1. Make sure you have Node **16** installed and active. If using [nvm](https://github.com/nvm-sh/nvm), run `nvm use 16` to switch to Node 16.
2020
2. Assuming you already have a copy of the repository cloned, make your changes in `src/details.js`. You can test locally by running `npm run dev` or just build the changes with `npm run build`.
2121
3. Commit your changes and push to GitHub.
22-
4. Run `npm run deploy` to deploy your changes to GitHub Pages.
22+
4. Run `npm run deploy` to deploy your changes to GitHub Pages.

gulpfile.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
const gulp = require( 'gulp' ),
2+
sass = require( 'gulp-sass' )( require( 'sass' ) ),
3+
del = require( 'del' );
4+
5+
gulp.task( 'styles', () => {
6+
return gulp.src( 'src/assets/sass/**/*.scss' )
7+
.pipe( sass().on( 'error', sass.logError ) )
8+
.pipe( gulp.dest( './src/assets/' ) );
9+
} );
10+
11+
gulp.task( 'clean', () => {
12+
return del( [
13+
'src/assets/style.css',
14+
] );
15+
} );
16+
17+
gulp.task( 'build', gulp.series( [ 'clean', 'styles' ] ) );
18+
19+
gulp.task( 'watch', () => {
20+
gulp.watch( 'src/assets/sass/**/*.scss', ( done ) => {
21+
gulp.series( [ 'clean', 'styles' ] )( done );
22+
} );
23+
} );

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "sapling-chain",
3-
"version": "1.1.1",
3+
"version": "1.2.1",
44
"description": "Create a tree of hyperlinks that can be used in social media profiles. 🔗🌲😂",
55
"author": "Chris Reynolds <[email protected]>",
66
"license": "GPL-3.0-or-later",
7+
"type": "commonjs",
78
"main": "index.js",
89
"homepage": "",
910
"repository": {

src/assets/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ body a.fork-me {
109109
.wrap .links--single a:visited:hover,
110110
.wrap .links--single a:visited:active {
111111
border-bottom: 1px transparent;
112-
}
112+
}

src/details-example.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,36 @@ const links = [
1111
icon: "link",
1212
// Refer to FontAwesome documentation to determine if an icon should be a fas or fab. (Brands are fab, so most will be fab.)
1313
// https://fontawesome.com/icons?d=gallery&p=2&m=free
14-
prefix: "fas"
14+
prefix: "fas",
15+
rel: "me"
1516
},
1617
{
1718
name: "Twitter",
1819
url: "https://twitter.com/yourusername",
1920
icon: "twitter",
20-
prefix: "fab"
21+
prefix: "fab",
22+
rel: "me"
2123
},
2224
{
2325
name: "Facebook",
2426
url: "https://facebook.com/yourusername",
2527
icon: "facebook",
26-
prefix: "fab"
28+
prefix: "fab",
29+
rel: "me"
2730
},
2831
{
2932
name: "YouTube",
3033
url: "https://youtube.com/yourchannel",
3134
icon: "youtube",
32-
prefix: "fab"
35+
prefix: "fab",
36+
rel: "me"
3337
},
3438
{
3539
name: "GitHub",
3640
url: "https://github.com/yourusername",
3741
icon: "github",
38-
prefix: "fab"
42+
prefix: "fab",
43+
rel: "me"
3944
}
4045
];
4146

@@ -64,4 +69,4 @@ export { profile };
6469
export { colorScheme };
6570
export { links };
6671

67-
export default details;
72+
export default details;

0 commit comments

Comments
 (0)