Skip to content

Commit

Permalink
Back to Next.js
Browse files Browse the repository at this point in the history
  • Loading branch information
wxh06 committed Jul 8, 2023
1 parent feb9dea commit 0a1b40f
Show file tree
Hide file tree
Showing 36 changed files with 1,492 additions and 3,754 deletions.
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
node_modules/
dist/
.vercel/
.next/
/out/

!.*rc.js
!.*rc.[mc]js
26 changes: 0 additions & 26 deletions .eslintrc.cjs

This file was deleted.

21 changes: 21 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"root": true,
"extends": [
"next/core-web-vitals",
"airbnb",
"plugin:react/jsx-runtime",
"plugin:prettier/recommended"
],
"overrides": [
{
"files": ["*.ts", "*.tsx"],
"extends": [
"airbnb-typescript",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:prettier/recommended"
],
"parserOptions": { "project": "tsconfig.json" }
}
]
}
41 changes: 26 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
# build output
dist/

# generated types
.astro/
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules/
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# logs
# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# environment variables
.env
.env.production

# macOS-specific files
.DS_Store
# local env files
.env*.local

# vercel
.vercel/
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
5 changes: 3 additions & 2 deletions .lintstagedrc.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const eslint = "eslint --fix";
const prettier = "prettier --write";
const prettierCheck = "prettier --check";

module.exports = {
"*.{astro,js,mjs,cjs,ts}": [prettier, eslint],
"*.{md,html,json,yml,yaml}": prettier,
"*.{js,mjs,cjs,jsx,ts,tsx}": [eslint, prettierCheck],
"*.{md,html,css,json,yml,yaml}": prettier,
};
5 changes: 3 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules/
dist/
.vercel/
.next/
/out/

pnpm-lock.yaml
14 changes: 0 additions & 14 deletions .prettierrc.cjs

This file was deleted.

3 changes: 3 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": ["prettier-plugin-tailwindcss"]
}
9 changes: 0 additions & 9 deletions .vscode/extensions.json

This file was deleted.

11 changes: 0 additions & 11 deletions .vscode/launch.json

This file was deleted.

62 changes: 21 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,54 +1,34 @@
# Astro Starter Kit: Basics
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

```
npm create astro@latest -- --template basics
```

[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics)
[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/basics)
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/basics/devcontainer.json)

> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
## Getting Started

![basics](https://user-images.githubusercontent.com/4677417/186188965-73453154-fdec-4d6b-9c34-cb35c248ae5b.png)
First, run the development server:

## 🚀 Project Structure
```bash
npm run dev
# or
yarn dev
# or
pnpm dev
```

Inside of your Astro project, you'll see the following folders and files:
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

```
/
├── public/
│ └── favicon.svg
├── src/
│ ├── components/
│ │ └── Card.astro
│ ├── layouts/
│ │ └── Layout.astro
│ └── pages/
│ └── index.astro
└── package.json
```
You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
## Learn More

Any static assets, like images, can be placed in the `public/` directory.
To learn more about Next.js, take a look at the following resources:

## 🧞 Commands
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

All commands are run from the root of the project, from a terminal:
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

| Command | Action |
| :--------------------- | :----------------------------------------------- |
| `npm install` | Installs dependencies |
| `npm run dev` | Starts local dev server at `localhost:3000` |
| `npm run build` | Build your production site to `./dist/` |
| `npm run preview` | Preview your build locally, before deploying |
| `npm run astro ...` | Run CLI commands like `astro add`, `astro check` |
| `npm run astro --help` | Get help using the Astro CLI |
## Deploy on Vercel

## 👀 Want to learn more?
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
20 changes: 0 additions & 20 deletions astro.config.mjs

This file was deleted.

45 changes: 45 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/** @type {string[]} */
const skills = require("./skills.json");

/** @param theme {"light" | "dark"} */
const skillIcons = (theme) =>
`https://skillicons.dev/icons?i=${skills.join(",")}&theme=${theme}&perline=6`;

/** @type {import("next").NextConfig} */
const nextConfig = {
images: {
remotePatterns: [
{
protocol: "https",
hostname: "raw.githubusercontent.com",
port: "",
},
{
protocol: "https",
hostname: "thirdqq.qlogo.cn",
port: "",
pathname: "/g",
},
{
protocol: "https",
hostname: "blog.smallfang.fun",
port: "",
pathname: "/image/**",
},
],
},
async rewrites() {
return [
{
source: "/skills/light",
destination: skillIcons("light"),
},
{
source: "/skills/dark",
destination: skillIcons("dark"),
},
];
},
};

module.exports = nextConfig;
49 changes: 25 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
{
"name": "wxh.im",
"version": "0.1.0",
"private": true,
"type": "module",
"version": "0.0.1",
"scripts": {
"prepare": "husky install",
"dev": "astro dev",
"start": "astro dev",
"build": "astro build",
"preview": "astro preview",
"astro": "astro"
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
},
"dependencies": {
"@astrojs/image": "^0.16.9",
"@astrojs/prefetch": "^0.2.3",
"@astrojs/tailwind": "^3.1.3",
"@astrojs/vercel": "^3.4.1",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"astro": "^2.5.6",
"@fortawesome/react-fontawesome": "^0.2.0",
"bsi": "^0.0.7",
"github-buttons": "^2.27.0",
"masonry-layout": "^4.2.2",
"sharp": "^0.32.1",
"tailwindcss": "^3.3.2"
"next": "^13.4.9",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-github-btn": "^1.4.0"
},
"devDependencies": {
"@typescript-eslint/parser": "^5.59.8",
"eslint": "^8.41.0",
"eslint-config-airbnb-base": "^15.0.0",
"@types/masonry-layout": "^4.2.5",
"@types/node": "^20.4.1",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"autoprefixer": "^10.4.14",
"eslint": "^8.44.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-next": "^13.4.9",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-astro": "^0.27.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"husky": "^8.0.3",
"lint-staged": "^13.2.2",
"lint-staged": "^13.2.3",
"postcss": "^8.4.25",
"prettier": "^2.8.8",
"prettier-plugin-astro": "^0.10.0",
"prettier-plugin-tailwindcss": "^0.3.0",
"typescript": "^5.1.3"
"tailwindcss": "^3.3.2",
"typescript": "^5.1.6"
}
}

1 comment on commit 0a1b40f

@vercel
Copy link

@vercel vercel bot commented on 0a1b40f Jul 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

wxh-im – ./

wxh-im.vercel.app
wxh-im-wangxinhe.vercel.app
wxh-im-git-main-wangxinhe.vercel.app
wxh.im

Please sign in to comment.