Skip to content

[vercel-tutor] Move files / add loading indicator #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chibicode merged 2 commits into from
Jan 14, 2025
Merged

[vercel-tutor] Move files / add loading indicator #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d02c90
Move files
chibicode Jan 14, 2025
0244c11
Add loading state
chibicode Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 vercel-tutor/app/helpful-links/page.tsx → vercel-tutor/app/helpful-links.tsx
View file
Open in desktop
File renamed without changes.
10 changes: 9 additions & 1 deletion vercel-tutor/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function Circle() {

export default function Home() {
const [nextUrl, setNextUrl] = useState("#");
const [isLoading, setIsLoading] = useState(false);

useEffect(() => {
const host = window.location.hostname;
Expand Down Expand Up @@ -74,8 +75,15 @@ export default function Home() {
<a
className="rounded-full border border-solid border-transparent transition-colors flex items-center justify-center bg-foreground font-medium text-background hover:bg-[#383838] dark:hover:bg-[#ccc] h-12 font-[family-name:var(--font-geist-sans)]"
href={nextUrl}
onClick={(e) => {
if (isLoading) {
e.preventDefault();
} else {
setIsLoading(true);
}
}}
>
View Pull Request
{isLoading ? 'Loading…' : 'View Pull Request'}
</a>
<a
className="font-[family-name:var(--font-geist-sans)] text-secondary hover:underline flex items-center justify-center h-12 font-medium"
Expand Down
10 changes: 9 additions & 1 deletion vercel-tutor/app/smaller-triangle/page.tsx → vercel-tutor/app/smaller-triangle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function Check() {

export default function Home() {
const [nextUrl, setNextUrl] = useState("#");
const [isLoading, setIsLoading] = useState(false);

useEffect(() => {
const host = window.location.hostname;
Expand Down Expand Up @@ -119,8 +120,15 @@ export default function Home() {
<a
className="rounded-full border border-solid border-transparent transition-colors flex items-center justify-center bg-foreground font-medium text-background hover:bg-[#383838] dark:hover:bg-[#ccc] h-12 font-[family-name:var(--font-geist-sans)]"
href={nextUrl}
onClick={(e) => {
if (isLoading) {
e.preventDefault();
} else {
setIsLoading(true);
}
}}
>
Push Commit and Merge Pull Request
{isLoading ? 'Loading…' : 'Push Commit and Merge Pull Request'}
</a>
<a
className="font-[family-name:var(--font-geist-sans)] text-secondary hover:underline flex items-center justify-center h-12 font-medium"
Expand Down
6 changes: 3 additions & 3 deletions vercel-tutor/steps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"branchName": "main"
},
"target": {
"templatePath": "app/smaller-triangle/page.tsx",
"templatePath": "app/smaller-triangle.tsx",
"branchName": "vercel-bot-patch"
},
"path": "app/page.tsx",
Expand All @@ -17,11 +17,11 @@
"helpful-links": {
"type": "commit-merge-comment",
"base": {
"templatePath": "app/smaller-triangle/page.tsx",
"templatePath": "app/smaller-triangle.tsx",
"branchName": "vercel-bot-patch"
},
"target": {
"templatePath": "app/helpful-links/page.tsx",
"templatePath": "app/helpful-links.tsx",
"branchName": "vercel-bot-patch"
},
"path": "app/page.tsx",
Expand Down