Skip to content

Commit dcb4c60

Browse files
CalebLarsenCalebLarsen
committed
Updated Makefile and senseless build service
1 parent 7ac76b3 commit dcb4c60

32 files changed

+515
-323
lines changed

‎Makefile‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1-
all:
2-
cd senseless-src && npm run build
3-
bundle exec jekyll build
1+
SENSELESS_DIR := senseless-src
2+
.DEFAULT_GOAL := build
3+
.PHONY: all build serve clean
4+
5+
all: build
6+
7+
build:
8+
@echo "Building Senseless"
9+
@cd $(SENSELESS_DIR) && npm run build
10+
@echo "Building Jekyll"
11+
@JEKYLL_ENV=production bundle exec jekyll build
12+
@echo "Build complete"
13+
14+
serve:
15+
@echo "Starting development servers (Jekyll on :4000, React on :3000)..."
16+
@cd $(REACT_DIR) && npm run serve-all
17+
18+
clean:
19+
@rm -rf _site
20+
@rm -rf assets/react-build
21+
@rm -f _includes/react_senseless_assets.html
22+
@echo "Cleaning done."

‎_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ exclude:
1919
- node_modules/
2020
- senseless/node_modules
2121
- senseless-src/
22+
- todo.md
2223

2324
include: ["senseless/build"]

‎_includes/react_senseless_assets.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
<link rel="manifest" href="/assets/react-build/manifest.json"/>
3+
<link href="/assets/react-build/static/css/main.977f6247.css" rel="stylesheet">
4+
<script defer="defer" src="/assets/react-build/static/js/main.47a69718.js"></script>

‎assets/css/style.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
---
3-
4-
@import 'jekyll-theme-hacker';
3+
/* @import 'jekyll-theme-hacker'; */
4+
@use 'jekyll-theme-hacker';
55

66
.pipeline-step {
77
display: grid;
@@ -24,11 +24,11 @@
2424
grid-row: 2;
2525
grid-column: 2;
2626
justify-self: center;
27-
27+
2828
max-width: 800px;
2929
max-height: 800px;
3030
width: 800px;
31-
height:600px;
31+
height: 600px;
3232
height: auto;
3333
border: 1px solid #555;
3434
}

‎assets/react-build/asset-manifest.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"files": {
3+
"main.css": "/assets/react-build/static/css/main.977f6247.css",
4+
"main.js": "/assets/react-build/static/js/main.47a69718.js",
5+
"index.html": "/assets/react-build/index.html",
6+
"main.977f6247.css.map": "/assets/react-build/static/css/main.977f6247.css.map",
7+
"main.47a69718.js.map": "/assets/react-build/static/js/main.47a69718.js.map"
8+
},
9+
"entrypoints": [
10+
"static/css/main.977f6247.css",
11+
"static/js/main.47a69718.js"
12+
]
13+
}

‎assets/react-build/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="A sensory experience feed"/><link rel="manifest" href="/assets/react-build/manifest.json"/><title>Sensory Feed</title><script defer="defer" src="/assets/react-build/static/js/main.47a69718.js"></script><link href="/assets/react-build/static/css/main.977f6247.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

‎assets/react-build/manifest.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"short_name": "Senseless",
3+
"name": "Senselss",
4+
"icons": [
5+
{
6+
"src": "favicon.ico",
7+
"sizes": "64x64 32x32 24x24 16x16",
8+
"type": "image/x-icon"
9+
}
10+
],
11+
"start_url": ".",
12+
"display": "standalone",
13+
"theme_color": "#000000",
14+
"background_color": "#ffffff"
15+
}

‎senseless/robots.txt‎ renamed to ‎assets/react-build/robots.txt‎

File renamed without changes.

‎senseless/static/css/main.977f6247.css‎ renamed to ‎assets/react-build/static/css/main.977f6247.css‎

File renamed without changes.

‎senseless/static/css/main.977f6247.css.map‎ renamed to ‎assets/react-build/static/css/main.977f6247.css.map‎

File renamed without changes.

0 commit comments

Comments
 (0)