Skip to content

Commit 094701d

Browse files
author
Shaun Prince
committed
clean-up tailwind build
1 parent 67ba630 commit 094701d

14 files changed

+86
-873
lines changed

Diff for: .github/workflows/deploy.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414

1515
- name: Set up Node.js
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v3
1717
with:
1818
node-version: '22'
1919

@@ -27,4 +27,7 @@ jobs:
2727
uses: JamesIves/github-pages-deploy-action@v4
2828
with:
2929
branch: gh-pages
30-
folder: build
30+
folder: build
31+
clean: true
32+
clean-exclude: |
33+
CNAME

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@
2323
npm-debug.log*
2424
yarn-debug.log*
2525
yarn-error.log*
26+
27+
WORKFLOW.md

Diff for: README.md

+9
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,12 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
6868
### `npm run build` fails to minify
6969

7070
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
71+
72+
73+
74+
```bash
75+
rm -rf node_modules
76+
rm -rf build
77+
npm cache clean --force
78+
npm install
79+
```

Diff for: craco.config.js

+10-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ const autoprefixer = require('autoprefixer');
44
module.exports = {
55
style: {
66
postcss: {
7-
plugins: [
8-
tailwindcss('./tailwind.config.js'),
9-
autoprefixer,
10-
],
7+
loaderOptions: (postcssLoaderOptions) => {
8+
postcssLoaderOptions.postcssOptions = {
9+
plugins: [
10+
tailwindcss('./tailwind.config.js'),
11+
autoprefixer,
12+
],
13+
};
14+
return postcssLoaderOptions;
15+
},
1116
},
1217
},
13-
}
18+
};

Diff for: package-lock.json

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
"test": "craco test",
2121
"eject": "react-scripts eject",
2222
"predeploy": "npm run build",
23-
"deploy": "gh-pages -d build --dotfiles",
24-
"postinstall": "tailwindcss build -i ./src/index.css -o ./src/tailwind.output.css"
23+
"deploy": "gh-pages -d build --dotfiles"
2524
},
2625
"eslintConfig": {
2726
"extends": [

Diff for: postcss.config.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
2-
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
5-
},
6-
}
2+
plugins: [
3+
require('tailwindcss'),
4+
require('autoprefixer'),
5+
],
6+
}

Diff for: public/index.html

+4-28
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,17 @@
44
<meta charset="utf-8" />
55
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
8-
<meta http-equiv="Content-Security-Policy" content="style-src 'self' 'unsafe-inline';">
7+
<meta name="theme-color" content="#1a7830" />
98
<meta
109
name="description"
11-
content="Web site created using create-react-app"
10+
content="Technical Fusion Canada: A community focused on information technology, 3D printing, automotive modification, and innovative technical challenges."
1211
/>
1312
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
14-
<!--
15-
manifest.json provides metadata used when your web app is installed on a
16-
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
17-
-->
1813
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
19-
<!--
20-
Notice the use of %PUBLIC_URL% in the tags above.
21-
It will be replaced with the URL of the `public` folder during the build.
22-
Only files inside the `public` folder can be referenced from the HTML.
23-
24-
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
25-
work correctly both with client-side routing and a non-root public URL.
26-
Learn how to configure a non-root public URL by running `npm run build`.
27-
-->
28-
<title>React App</title>
14+
<title>Technical Fusion Canada</title>
2915
</head>
3016
<body>
3117
<noscript>You need to enable JavaScript to run this app.</noscript>
3218
<div id="root"></div>
33-
<!--
34-
This HTML file is a template.
35-
If you open it directly in the browser, you will see an empty page.
36-
37-
You can add webfonts, meta tags, or analytics to this file.
38-
The build step will place the bundled scripts into the <body> tag.
39-
40-
To begin the development, run `npm start` or `yarn start`.
41-
To create a production bundle, use `npm run build` or `yarn build`.
42-
-->
4319
</body>
44-
</html>
20+
</html>

Diff for: public/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"short_name": "React App",
3-
"name": "Create React App Sample",
2+
"short_name": "TechFusion",
3+
"name": "Technical Fusion Canada",
44
"icons": [
55
{
66
"src": "favicon.ico",
@@ -20,6 +20,6 @@
2020
],
2121
"start_url": ".",
2222
"display": "standalone",
23-
"theme_color": "#000000",
23+
"theme_color": "#1a7830",
2424
"background_color": "#ffffff"
2525
}

Diff for: src/Home.js

+31-24
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
11
import React from 'react';
22
import { Github, Zap, Printer, Car, Code } from 'lucide-react';
33

4+
const FeatureCard = ({ icon: Icon, title, description, color }) => (
5+
<div className="bg-tech-green-700 p-6 rounded-lg shadow-lg flex items-start">
6+
<Icon className={`${color} mr-4 flex-shrink-0`} size={48} aria-hidden="true" />
7+
<div>
8+
<h3 className="text-2xl font-semibold mb-2">{title}</h3>
9+
<p>{description}</p>
10+
</div>
11+
</div>
12+
);
13+
414
const Home = () => {
15+
const features = [
16+
{ icon: Zap, title: "Information Technology", description: "Exploring the latest in tech innovations and solutions.", color: "text-yellow-400" },
17+
{ icon: Printer, title: "3D Printing", description: "Bringing ideas to life with cutting-edge 3D printing technology.", color: "text-blue-400" },
18+
{ icon: Car, title: "Automotive Modification", description: "Pushing the boundaries of vehicle performance and customization.", color: "text-red-400" },
19+
{ icon: Code, title: "And More...", description: "Diving into any technical challenge that comes our way.", color: "text-purple-400" },
20+
];
21+
522
return (
6-
<div className="min-h-screen bg-gradient-to-b from-green-800 to-green-600 text-white">
7-
<header className="bg-green-900 p-4 flex justify-between items-center">
23+
<div className="min-h-screen bg-gradient-to-b from-tech-green-800 to-tech-green-600 text-white">
24+
<header className="bg-tech-green-900 p-4 flex justify-between items-center">
825
<h1 className="text-2xl font-bold">Technical Fusion Canada</h1>
926
<nav>
10-
<a href="https://github.com/SolidRusT/techfusion.github.io" className="ml-4 hover:text-green-300 flex items-center">
11-
<Github className="mr-1" size={24} />
27+
<a href="https://github.com/SolidRusT/techfusion.github.io" className="ml-4 hover:text-tech-green-300 flex items-center" target="_blank" rel="noopener noreferrer">
28+
<Github className="mr-1" size={24} aria-hidden="true" />
1229
<span>GitHub</span>
1330
</a>
1431
</nav>
@@ -18,45 +35,35 @@ const Home = () => {
1835
<section className="mb-12 text-center">
1936
<h2 className="text-4xl font-bold mb-4">Welcome to the Canadian Technical Community</h2>
2037
<p className="text-xl max-w-2xl mx-auto">
21-
Focused on information technology, 3D printing, automotive modification, and anything else that sparks our interest.
38+
Focused on information technology, 3D printing, automotive modification,
39+
and anything else that sparks our interest.
2240
</p>
2341
</section>
2442

2543
<section className="grid grid-cols-1 md:grid-cols-2 gap-8 mb-12">
26-
{[
27-
{ icon: Zap, title: "Information Technology", description: "Exploring the latest in tech innovations and solutions.", color: "text-yellow-400" },
28-
{ icon: Printer, title: "3D Printing", description: "Bringing ideas to life with cutting-edge 3D printing technology.", color: "text-blue-400" },
29-
{ icon: Car, title: "Automotive Modification", description: "Pushing the boundaries of vehicle performance and customization.", color: "text-red-400" },
30-
{ icon: Code, title: "And More...", description: "Diving into any technical challenge that comes our way.", color: "text-purple-400" },
31-
].map((item, index) => (
32-
<div key={index} className="bg-green-700 p-6 rounded-lg shadow-lg flex items-start">
33-
<item.icon className={`${item.color} mr-4 flex-shrink-0`} size={48} />
34-
<div>
35-
<h3 className="text-2xl font-semibold mb-2">{item.title}</h3>
36-
<p>{item.description}</p>
37-
</div>
38-
</div>
44+
{features.map((feature, index) => (
45+
<FeatureCard key={index} {...feature} />
3946
))}
4047
</section>
4148

42-
<section className="bg-green-800 p-8 rounded-lg shadow-lg">
49+
<section className="bg-tech-green-800 p-8 rounded-lg shadow-lg">
4350
<h2 className="text-3xl font-bold mb-4">Our Roots</h2>
4451
<p className="mb-4">
4552
Technical Fusion Canada is proudly incubated by SolidRusT Networks,
4653
an innovator in disruptive technology solutions.
4754
</p>
4855
<div className="flex flex-wrap gap-4">
49-
<a href="https://solidrust.net" className="text-green-300 hover:underline">SolidRusT Networks</a>
50-
<a href="https://github.com/SolidRusT/" className="text-green-300 hover:underline flex items-center">
51-
<Github className="mr-1" size={24} />
56+
<a href="https://solidrust.net" className="text-tech-green-300 hover:underline" target="_blank" rel="noopener noreferrer">SolidRusT Networks</a>
57+
<a href="https://github.com/SolidRusT/" className="text-tech-green-300 hover:underline flex items-center" target="_blank" rel="noopener noreferrer">
58+
<Github className="mr-1" size={24} aria-hidden="true" />
5259
<span>GitHub Organization</span>
5360
</a>
5461
</div>
5562
</section>
5663
</main>
5764

58-
<footer className="bg-green-900 p-4 text-center mt-12">
59-
<p>&copy; 2024 Technical Fusion Canada. All rights reserved.</p>
65+
<footer className="bg-tech-green-900 p-4 text-center mt-12">
66+
<p>&copy; {new Date().getFullYear()} Technical Fusion Canada. All rights reserved.</p>
6067
</footer>
6168
</div>
6269
);

Diff for: src/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import ReactDOM from 'react-dom/client';
33
import './index.css';
44
import App from './App';
55
import reportWebVitals from './reportWebVitals';
6-
import './tailwind.output.css';
76

87
const root = ReactDOM.createRoot(document.getElementById('root'));
98
root.render(

0 commit comments

Comments
 (0)