Skip to content

Commit 98cf205

Browse files
committed
Merge branch 'prod' of https://github.com/Hemang360/Zenith into prod
2 parents d439f57 + 562168e commit 98cf205

File tree

5 files changed

+45
-79
lines changed

5 files changed

+45
-79
lines changed

.github/workflows/sync-fork.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Sync Fork
2+
3+
on:
4+
# Triggers when the upstream repository has new changes
5+
schedule:
6+
- cron: '*/5 * * * *' # Runs every 5 minutes
7+
# Also allows manual triggering
8+
workflow_dispatch:
9+
10+
jobs:
11+
sync-fork:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v3
17+
with:
18+
fetch-depth: 0
19+
token: ${{ secrets.GITHUB_TOKEN }}
20+
21+
- name: Configure Git
22+
run: |
23+
git config --global user.name 'GitHub Actions'
24+
git config --global user.email '[email protected]'
25+
26+
- name: Add upstream remote
27+
run: |
28+
git remote add upstream https://github.com/pbdsce/zenith.git
29+
30+
- name: Fetch upstream changes
31+
run: |
32+
git fetch upstream
33+
34+
- name: Sync fork with upstream
35+
run: |
36+
# Checkout your prod branch
37+
git checkout prod
38+
39+
# Merge upstream changes
40+
git merge upstream/prod
41+
42+
# Push changes to your fork
43+
git push origin prod

app/loading.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const mon = Monoton({
1212

1313
export default function Loading() {
1414
return (
15-
<div className="fixed inset-0 bg-black flex items-center justify-center z-50">
15+
<div className="fixed inset-0 bg-black flex items-center justify-center z-50 select-none">
1616
<div className="text-center">
1717
<motion.h1
1818
className={`font-dystopian text-4xl md:text-7xl text-white`}

app/page.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import { Timeline } from "@/components/timeline";
44
import { SpaceFooter } from "@/components/footer";
55
import Events from "@/components/events";
66
import { StarsBackground } from "@/components/ui/stars-background";
7-
import LoadingWrapper from "@/components/loading-wrapper";
8-
97
export default function Home() {
10-
const content = (
8+
return (
119
<main className="relative overflow-hidden">
1210
<div className="relative z-10">
1311
<section className="relative">
@@ -31,10 +29,4 @@ export default function Home() {
3129
</div>
3230
</main>
3331
);
34-
35-
return (
36-
<LoadingWrapper loadingTime={3000}>
37-
{content}
38-
</LoadingWrapper>
39-
);
4032
}

components/loading-screen.tsx

Lines changed: 0 additions & 39 deletions
This file was deleted.

components/loading-wrapper.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)