Skip to content

Commit 820999f

Browse files
committed
Merge branch 'feature/footer' into feature/error-handling
2 parents 99d90fd + 657a0c6 commit 820999f

File tree

5 files changed

+107
-1
lines changed

5 files changed

+107
-1
lines changed

.github/workflows/nextjs.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Deploy - Github Pages
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
pages: write
11+
id-token: write
12+
13+
concurrency:
14+
group: "pages"
15+
cancel-in-progress: true
16+
17+
jobs:
18+
19+
build:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v3
24+
- name: Detect package manager
25+
id: detect-package-manager
26+
run: |
27+
if [ -f "${{ github.workspace }}/package.json" ]; then
28+
echo "::set-output name=manager::npm"
29+
echo "::set-output name=command::ci"
30+
echo "::set-output name=runner::npx --no-install"
31+
exit 0
32+
else
33+
echo "Unable to determine packager manager"
34+
exit 1
35+
fi
36+
- name: Setup Node
37+
uses: actions/setup-node@v3
38+
with:
39+
node-version: "18"
40+
cache: ${{ steps.detect-package-manager.outputs.manager }}
41+
- name: Setup Pages
42+
uses: actions/configure-pages@v2
43+
with:
44+
static_site_generator: next
45+
- name: Restore cache
46+
uses: actions/cache@v3
47+
with:
48+
path: |
49+
.next/cache
50+
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
51+
restore-keys: |
52+
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
53+
- name: Install dependencies
54+
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
55+
- name: Build with Next.js
56+
run: ${{ steps.detect-package-manager.outputs.runner }} next build
57+
- name: Static HTML export with Next.js
58+
run: ${{ steps.detect-package-manager.outputs.runner }} next export
59+
- run: echo '' > ./out/_next/.nojekyll
60+
- name: Upload artifact
61+
uses: actions/upload-pages-artifact@v1
62+
with:
63+
path: ./out
64+
65+
deploy:
66+
environment:
67+
name: github-pages
68+
url: ${{ steps.deployment.outputs.page_url }}
69+
runs-on: ubuntu-latest
70+
needs: build
71+
steps:
72+
- name: Deploy to GitHub Pages
73+
id: deployment
74+
uses: actions/deploy-pages@v1
75+

public/.nojekyll

Whitespace-only changes.

public/CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
www.commitrocket.com
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import React from "react";
2+
import Link from "./Link";
3+
4+
interface FooterProps {
5+
6+
}
7+
8+
const Footer = ({ }: FooterProps) => {
9+
return (
10+
<footer className="flex gap-4 p-4 bg-primary text-primary-contrast">
11+
<div>
12+
<p className="text-lg font-semibold text-center">Contact:</p>
13+
<div className="flex gap-2">
14+
<span className="font-semibold">Feedback:</span>
15+
<Link color="white" href="mailto:feedback@commitrocket.com" underline>feedback@commitrocket.com</Link>
16+
</div>
17+
</div>
18+
<div>
19+
<p className="text-lg font-semibold text-center">Contact:</p>
20+
<div className="flex gap-2">
21+
<span className="font-semibold">Feedback:</span>
22+
<Link color="white" href="mailto:feedback@commitrocket.com" underline>feedback@commitrocket.com</Link>
23+
</div>
24+
</div>
25+
</footer>
26+
);
27+
};
28+
29+
export default Footer;

src/pages/_app.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Head from "next/head";
66

77
import '@/styles/main.css';
88
import Header from "@/components/navigation/Header";
9+
import Footer from "@/components/navigation/Footer";
910

1011
const openSans = Open_Sans({
1112
subsets: ['latin'],
@@ -49,7 +50,6 @@ export default function App({ Component, pageProps, router }: AppProps) {
4950
</Head>
5051
<div className={"flex flex-col overflow-auto scroll-smooth scroll-p-4 " + openSans.variable}>
5152
<Header />
52-
5353
<AnimatePresence mode="wait">
5454
<motion.div
5555
key={router.pathname}
@@ -68,6 +68,7 @@ export default function App({ Component, pageProps, router }: AppProps) {
6868
/>
6969
</motion.div>
7070
</AnimatePresence>
71+
<Footer />
7172
</div>
7273
</MotionConfig>
7374
);

0 commit comments

Comments
 (0)