Skip to content

Commit

Permalink
Merge pull request #16 from delegit-xyz/nik-minor-renames
Browse files Browse the repository at this point in the history
Minor renamings of Page and deactivate dependabot
  • Loading branch information
wirednkod authored Aug 20, 2024
2 parents 8babe54 + 7590ac5 commit 427e2e7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: Dependabot Auto Merge
# name: Dependabot Auto Merge

on: pull_request
# on: pull_request

permissions:
contents: write
pull-requests: write
# permissions:
# contents: write
# pull-requests: write

jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
target: minor
github-token: ${{ secrets.AUTOMERGE_TOKEN }}
# jobs:
# auto-merge:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: ahmadnassri/action-dependabot-auto-merge@v2
# with:
# target: minor
# github-token: ${{ secrets.AUTOMERGE_TOKEN }}
8 changes: 4 additions & 4 deletions src/Content.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Route, Routes } from 'react-router-dom'

import { About } from '@/pages/About'
import { Home } from '@/pages/Home'

const pages = [
{
path: '',
element: <About />,
element: <Home />,
},
{
path: '/about',
element: <About />,
path: '/home',
element: <Home />,
},
]

Expand Down
4 changes: 2 additions & 2 deletions src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ClassValue, clsx } from 'clsx'
import { LucideProps, Globe } from 'lucide-react'
import { LucideProps, House } from 'lucide-react'
import { ForwardRefExoticComponent, RefAttributes } from 'react'

import { twMerge } from 'tailwind-merge'
Expand All @@ -17,5 +17,5 @@ export type RouterType = {
}

export const routes: RouterType[] = [
{ link: 'about', name: 'About', icon: Globe },
{ link: 'home', name: 'Home', icon: House },
]
2 changes: 1 addition & 1 deletion src/pages/About/index.tsx → src/pages/Home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const openInNewTab = (url: string | URL | undefined) => {
window.open(url, '_blank', 'noopener,noreferrer')
}

export const About = () => {
export const Home = () => {
return (
<main className="grid flex-1 items-start gap-4 p-4 sm:mx-[5%] xl:mx-[20%] mx-0 sm:px-6 sm:py-0 md:gap-8">
<h1 className="font-unbounded text-primary flex-1 shrink-0 whitespace-nowrap text-xl font-semibold tracking-tight sm:grow-0">
Expand Down

0 comments on commit 427e2e7

Please sign in to comment.