Skip to content

Commit 2feb54b

Browse files
ThomasJButlerThomasJButler
authored
Merge pull request #47 from ThomasJButler/v3.5---Fix-to-sort-project-root.-
Complete migration to root domain - remove all /ThomasJButler references
2 parents 928cb49 + eb011e8 commit 2feb54b

File tree

9 files changed

+36
-36
lines changed

9 files changed

+36
-36
lines changed

‎blog.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Blog - Thomas J Butler | Redirecting...</title>
77

88
<!-- Immediate redirect to React app blog -->
9-
<meta http-equiv="refresh" content="0; url=/ThomasJButler/react.html#blog">
9+
<meta http-equiv="refresh" content="0; url=/react.html#blog">
1010

1111
<!-- SEO Meta Tags -->
1212
<meta name="description" content="Read thought leadership articles by Thomas J Butler on AI, development, and human-centered technology.">
@@ -16,7 +16,7 @@
1616
<!-- Open Graph -->
1717
<meta property="og:title" content="Blog - Thomas J Butler">
1818
<meta property="og:description" content="Thought leadership on AI, development, and human-centered technology">
19-
<meta property="og:url" content="https://thomasjbutler.github.io/ThomasJButler/blog.html">
19+
<meta property="og:url" content="https://thomasjbutler.github.io/blog.html">
2020

2121
<style>
2222
body {
@@ -56,14 +56,14 @@
5656
return;
5757
}
5858
// Redirect to React app blog route
59-
window.location.replace('/ThomasJButler/react.html#blog');
59+
window.location.replace('/react.html#blog');
6060
};
6161
</script>
6262
</head>
6363
<body>
6464
<div class="redirect-message">
6565
<h1 class="matrix-text">Redirecting to Blog...</h1>
66-
<p>If you are not redirected automatically, <a href="/ThomasJButler/react.html#blog">click here</a>.</p>
66+
<p>If you are not redirected automatically, <a href="/react.html#blog">click here</a>.</p>
6767
</div>
6868
</body>
6969
</html>

‎index.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Thomas J Butler - Portfolio | Full-Stack Developer | Liverpool</title>
77

88
<!-- Immediate redirect to React app -->
9-
<meta http-equiv="refresh" content="0; url=/ThomasJButler/react.html">
9+
<meta http-equiv="refresh" content="0; url=/react.html">
1010

1111
<!-- Basic Meta Tags -->
1212
<meta name="description" content="Thomas J Butler - Full-Stack Developer specializing in React, TypeScript, AI integration, and neurodiversity applications. Liverpool-based tech innovator with expertise in modern web development.">
@@ -17,22 +17,22 @@
1717

1818
<!-- Open Graph / Facebook -->
1919
<meta property="og:type" content="website">
20-
<meta property="og:url" content="https://thomasjbutler.github.io/ThomasJButler/">
20+
<meta property="og:url" content="https://thomasjbutler.github.io/">
2121
<meta property="og:title" content="Thomas J Butler - Full-Stack Developer Portfolio">
2222
<meta property="og:description" content="Explore the portfolio of Thomas J Butler, a Liverpool-based full-stack developer specializing in React, TypeScript, and AI integration.">
23-
<meta property="og:image" content="https://thomasjbutler.github.io/ThomasJButler/logo.svg">
23+
<meta property="og:image" content="https://thomasjbutler.github.io/logo.svg">
2424
<meta property="og:site_name" content="Thomas J Butler Portfolio">
2525
<meta property="og:locale" content="en_GB">
2626

2727
<!-- Twitter Card -->
2828
<meta name="twitter:card" content="summary_large_image">
29-
<meta name="twitter:url" content="https://thomasjbutler.github.io/ThomasJButler/">
29+
<meta name="twitter:url" content="https://thomasjbutler.github.io/">
3030
<meta name="twitter:title" content="Thomas J Butler - Full-Stack Developer Portfolio">
3131
<meta name="twitter:description" content="Liverpool-based full-stack developer specializing in React, TypeScript, and AI integration. View my projects and expertise.">
32-
<meta name="twitter:image" content="https://thomasjbutler.github.io/ThomasJButler/logo.svg">
32+
<meta name="twitter:image" content="https://thomasjbutler.github.io/logo.svg">
3333

3434
<!-- Canonical URL -->
35-
<link rel="canonical" href="https://thomasjbutler.github.io/ThomasJButler/">
35+
<link rel="canonical" href="https://thomasjbutler.github.io/">
3636

3737
<!-- Theme Color -->
3838
<meta name="theme-color" content="#00FF00">
@@ -44,11 +44,11 @@
4444
"@type": "Person",
4545
"name": "Thomas J Butler",
4646
"jobTitle": "Full-Stack Developer",
47-
"url": "https://thomasjbutler.github.io/ThomasJButler",
48-
"image": "https://thomasjbutler.github.io/ThomasJButler/logo.svg",
47+
"url": "https://thomasjbutler.github.io",
48+
"image": "https://thomasjbutler.github.io/logo.svg",
4949
"logo": {
5050
"@type": "ImageObject",
51-
"url": "https://thomasjbutler.github.io/ThomasJButler/logo.svg"
51+
"url": "https://thomasjbutler.github.io/logo.svg"
5252
},
5353
"sameAs": [
5454
"https://github.com/ThomasJButler",
@@ -169,14 +169,14 @@
169169
// JavaScript redirect to React app
170170
window.onload = function() {
171171
// Redirect to React app homepage
172-
window.location.replace('/ThomasJButler/react.html');
172+
window.location.replace('/react.html');
173173
};
174174

175175
// Fallback redirect after 3 seconds
176176
setTimeout(function() {
177-
if (window.location.pathname === '/ThomasJButler/' ||
178-
window.location.pathname === '/ThomasJButler/index.html') {
179-
window.location.replace('/ThomasJButler/react.html');
177+
if (window.location.pathname === '/' ||
178+
window.location.pathname === '/index.html') {
179+
window.location.replace('/react.html');
180180
}
181181
}, 3000);
182182
</script>
@@ -189,7 +189,7 @@ <h1 class="matrix-text">[ INITIALIZING ]</h1>
189189
<div class="loading-bar">
190190
<div class="loading-progress"></div>
191191
</div>
192-
<p>If you are not redirected automatically, <a href="/ThomasJButler/react.html">click here</a>.</p>
192+
<p>If you are not redirected automatically, <a href="/react.html">click here</a>.</p>
193193
</div>
194194
</body>
195195
</html>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"name": "thomasjbutler",
2222
"description": "Hi there! I'm Tom, an aspiring full-stack web developer passionate about exploring the depths of technology. \r My journey spans from web development to exciting areas like networking, database analysis, indie game development, and creating engaging creations with AI. \r I aim to blend insatiable curiosity with practical skills, delving into everything from creating engaging websites to understanding AI principles and game design. \r Join me as I explore the nuts and bolts of technology, hoping to push the boundaries of whats possible in web development and beyond.",
2323
"version": "3.5.0",
24-
"homepage": "https://thomasjbutler.github.io/ThomasJButler",
24+
"homepage": "https://thomasjbutler.github.io",
2525
"main": "index.js",
2626
"scripts": {
2727
"dev": "vite",

‎public/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"name": "Thomas J Butler - Portfolio",
33
"short_name": "TJB Portfolio",
44
"description": "Liverpool-based Full Stack Developer specializing in AI integration",
5-
"start_url": "/ThomasJButler/",
6-
"scope": "/ThomasJButler/",
5+
"start_url": "/",
6+
"scope": "/",
77
"display": "standalone",
88
"background_color": "#000000",
99
"theme_color": "#00FF00",
1010
"orientation": "portrait-primary",
1111
"icons": [
1212
{
13-
"src": "/ThomasJButler/logo.svg",
13+
"src": "/logo.svg",
1414
"sizes": "any",
1515
"type": "image/svg+xml",
1616
"purpose": "any maskable"

‎react.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<link rel="icon" type="image/svg+xml" href="./logo.svg">
2020

2121
<!-- Open Graph Logo -->
22-
<meta property="og:image" content="https://thomasjbutler.github.io/ThomasJButler/logo.svg">
22+
<meta property="og:image" content="https://thomasjbutler.github.io/logo.svg">
2323
<meta property="og:image:alt" content="Thomas J Butler Logo">
2424

2525
<!-- Twitter Card Logo -->
2626
<meta name="twitter:card" content="summary">
27-
<meta name="twitter:image" content="https://thomasjbutler.github.io/ThomasJButler/logo.svg">
27+
<meta name="twitter:image" content="https://thomasjbutler.github.io/logo.svg">
2828
<meta name="twitter:image:alt" content="Thomas J Butler Logo">
2929

3030
<!-- PWA Manifest -->

‎src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export const App: React.FC = () => {
9999
<ThemeProvider>
100100
{/* Global components outside Router to avoid context issues */}
101101
<BackToTop threshold={300} showText={true} enableScanLine={true} />
102-
<Router basename="/ThomasJButler">
102+
<Router>
103103
<ReactHtmlRedirect />
104104
<Routes>
105105
<Route path="/" element={<Layout />}>

‎src/components/Header.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const Header: React.FC = () => {
125125
<div className={styles.container}>
126126
<Link to="/" className={styles.headerTitle}>
127127
<img
128-
src="/ThomasJButler/logo.svg"
128+
src="/logo.svg"
129129
alt="Thomas J Butler Logo"
130130
className={styles.headerLogo}
131131
/>

‎src/utils/blogLoader.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ function getBasePath(): string {
130130
if (import.meta.env.DEV) {
131131
return '';
132132
}
133-
// In production, use GitHub Pages subdirectory
134-
return '/ThomasJButler';
133+
// In production, use root path
134+
return '';
135135
}
136136

137137
/**

‎vite.config.mjs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync } from '
66

77
export default defineConfig({
88
root: '.',
9-
base: '/ThomasJButler/',
9+
base: '/',
1010
build: {
1111
outDir: 'dist',
1212
rollupOptions: {
@@ -37,16 +37,16 @@ export default defineConfig({
3737
{
3838
name: 'serve-blog-files',
3939
configureServer(server) {
40-
// Serve markdown files - handle both /src/content/blog and /ThomasJButler/src/content/blog paths
40+
// Serve markdown files from /src/content/blog path
4141
server.middlewares.use((req, res, next) => {
4242
// Check if this is a request for a blog markdown file
4343
const url = req.url;
4444
let blogPath = null;
4545

4646
if (url.startsWith('/src/content/blog/')) {
4747
blogPath = url.replace('/src/content/blog/', '');
48-
} else if (url.startsWith('/ThomasJButler/src/content/blog/')) {
49-
blogPath = url.replace('/ThomasJButler/src/content/blog/', '');
48+
} else if (url.startsWith('/src/content/blog/')) {
49+
blogPath = url.replace('/src/content/blog/', '');
5050
}
5151

5252
if (blogPath && blogPath.endsWith('.md')) {
@@ -70,19 +70,19 @@ export default defineConfig({
7070
});
7171

7272
// Redirect blog article routes to React app with hash
73-
server.middlewares.use('/ThomasJButler/blog/', (req, res, next) => {
73+
server.middlewares.use('/blog/', (req, res, next) => {
7474
// Extract the blog slug from the URL
7575
const path = req.url;
7676
const slug = path.split('/').pop();
7777

7878
if (slug && slug !== 'blog') {
7979
// Redirect to react.html with hash routing
80-
const redirectUrl = `/ThomasJButler/react.html#/blog/${slug}`;
80+
const redirectUrl = `/react.html#/blog/${slug}`;
8181
res.writeHead(302, { Location: redirectUrl });
8282
res.end();
8383
} else {
8484
// For /blog route, redirect to blog list
85-
const redirectUrl = `/ThomasJButler/react.html#/blog`;
85+
const redirectUrl = `/react.html#/blog`;
8686
res.writeHead(302, { Location: redirectUrl });
8787
res.end();
8888
}
@@ -119,7 +119,7 @@ export default defineConfig({
119119
],
120120
server: {
121121
port: 3000,
122-
open: '/ThomasJButler/react.html', // Open directly to correct URL to avoid base path warning
122+
open: '/react.html', // Open directly to correct URL to avoid base path warning
123123
watch: {
124124
usePolling: true
125125
}

0 commit comments

Comments
 (0)