Skip to content

Commit 5df3be0

Browse files
committed
Merge remote-tracking branch 'origin/through-the-years' into through-the-years
2 parents 669bbf6 + 4e4040b commit 5df3be0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+4754
-5076
lines changed

.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"react/require-default-props": "off",
4242
"react/no-unescaped-entities": "off",
4343
"react/react-in-jsx-scope": "off",
44+
"@next/next/no-img-element": "off",
4445
"no-param-reassign": [2, { "props": false }],
4546
"import/no-extraneous-dependencies": [
4647
"error",

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ next-env.d.ts
3737

3838
# IDE
3939
/.idea
40+
/.idea/

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"editor.fontFamily": "Alagard"
3+
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# HackUPC Landing Page
22

3-
[![NPM 10.2.5](https://img.shields.io/badge/npm-10.1.0-blue.svg)](https://www.npmjs.com/package/npm/v/10.1.0)
4-
[![Node.js 20.10.0](https://img.shields.io/badge/node-14.17.0-green.svg)](https://nodejs.org/en/download/releases/)
3+
[![NPM 10.2.5](https://img.shields.io/badge/npm-10.2.5-blue.svg)](https://www.npmjs.com/package/npm/v/10.2.5)
4+
[![Node.js 20.10.0](https://img.shields.io/badge/node-20.10.0-green.svg)](https://nodejs.org/en/download/releases/)
55
[![Netlify Status](https://api.netlify.com/api/v1/badges/5865fbbe-4f1a-41b2-ac97-b787dd7feb3c/deploy-status)](https://app.netlify.com/sites/roaring-valkyrie-eb612f/deploys)
66
[![](https://github.com/hackupc/new_hackupc/actions/workflows/hackupc_ci.yml/badge.svg)](https://github.com/hackupc/new_hackupc/actions/workflows/hackupc_ci.yml)
77

public/biene_ghost.svg

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

public/biene_ghost_2.svg

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

0 commit comments

Comments
 (0)