Skip to content

Commit ddbf39a

Browse files
Nextjs rewrite (#187)
* wiped old gatsby site * added next rewrite * add readme * fixed image and link errors * add cors * fixing images * removed design suborg * various image tweaks * Nextjs rewrite (#193) * fixed home page * finished everything * fix mobile not opening split screen * fix tiny x on mobile nav * no more acm design * Update src/sections/about/About.Board.tsx Co-authored-by: Ronak Shah <ronakshahultimate@gmail.com> * Update About.Board.tsx Co-authored-by: Ronak Shah <ronakshahultimate@gmail.com> * typo * build failed bc config missing * upgrade node * remove nonexistent test script * potential font fix * fixed design board cards * fix communities page on mobile * smooth scroll everything * wrap entire app component with layout in one place * preserve grid layout communities * fixes * referenced page layout directly in app template * restricted community grid to 2 columns * removed linting bypass * add acm favicon * added temporary meta tags for each page * add robot.txt and sitemap.xml for seo web crawling * remove unneeded role property * fix url * pls work * moved pages to root level Co-authored-by: Faris Ashai <farisashai@gmail.com>
1 parent 10c899d commit ddbf39a

File tree

166 files changed

+5226
-15631
lines changed

Some content is hidden

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

166 files changed

+5226
-15631
lines changed

.circleci/config.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 2
66
jobs:
77
build:
88
docker:
9-
- image: circleci/node:12.22.1
9+
- image: circleci/node:16.13.1
1010
steps:
1111
- checkout
1212
- restore_cache:
@@ -21,7 +21,7 @@ jobs:
2121
command: yarn build
2222
test:
2323
docker:
24-
- image: circleci/node:12.22.1
24+
- image: circleci/node:16.13.1
2525
steps:
2626
- checkout
2727
- restore_cache:
@@ -36,7 +36,7 @@ jobs:
3636
command: yarn test
3737
lint:
3838
docker:
39-
- image: circleci/node:12.22.1
39+
- image: circleci/node:16.13.1
4040
steps:
4141
- checkout
4242
- restore_cache:
@@ -54,5 +54,4 @@ workflows:
5454
test_and_deploy:
5555
jobs:
5656
- build
57-
- test
58-
- lint
57+
- lint

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
build/*
2+
public/*

.eslintrc.js

-15
This file was deleted.

.eslintrc.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": ["next"],
3+
"rules": {
4+
"@next/next/no-img-element": "off"
5+
}
6+
}

.gitignore

+26-61
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,34 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
8-
# Runtime data
9-
pids
10-
*.pid
11-
*.seed
12-
*.pid.lock
13-
14-
# Directory for instrumented libs generated by jscoverage/JSCover
15-
lib-cov
16-
17-
# Coverage directory used by tools like istanbul
18-
coverage
19-
20-
# nyc test coverage
21-
.nyc_output
22-
23-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
24-
.grunt
25-
26-
# Bower dependency directory (https://bower.io/)
27-
bower_components
28-
29-
# node-waf configuration
30-
.lock-wscript
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
312

32-
# Compiled binary addons (http://nodejs.org/api/addons.html)
33-
build/Release
34-
35-
# Dependency directories
36-
node_modules/
37-
jspm_packages/
38-
39-
# Typescript v1 declaration files
40-
typings/
41-
42-
# Optional npm cache directory
43-
.npm
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
447

45-
# Optional eslint cache
46-
.eslintcache
8+
# testing
9+
/coverage
4710

48-
# Optional REPL history
49-
.node_repl_history
11+
# next.js
12+
/.next/
13+
/out/
5014

51-
# Output of 'npm pack'
52-
*.tgz
15+
# production
16+
/build
5317

54-
# dotenv environment variable files
55-
.env*
18+
# misc
19+
.DS_Store
20+
*.pem
5621

57-
# gatsby files
58-
.cache/
59-
public
22+
# debug
23+
npm-debug.log*
24+
yarn-debug.log*
25+
yarn-error.log*
6026

61-
# Mac files
62-
.DS_Store
27+
# local env files
28+
.env.local
29+
.env.development.local
30+
.env.test.local
31+
.env.production.local
6332

64-
# Yarn
65-
yarn-error.log
66-
.pnp/
67-
.pnp.js
68-
# Yarn Integrity file
69-
.yarn-integrity
33+
# vercel
34+
.vercel

.nvmrc

-1
This file was deleted.

.prettierignore

-4
This file was deleted.

.prettierrc

-4
This file was deleted.

.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"editor.formatOnSave": true
3+
}

LICENSE

-14
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Check it out @ [acmucsd.com](https://acmucsd.com/)
44

55
Powered by Vercel
66

7-
[<img src="./src/assets/vercel.svg">](https://vercel.com/)
7+
[<img src="./public/assets/vercel.svg">](https://vercel.com/?utm_source=acmucsd&utm_campaign=oss)

gatsby-browser.js

-9
This file was deleted.

gatsby-config.js

-36
This file was deleted.

gatsby-node.js

-7
This file was deleted.

gatsby-ssr.js

-7
This file was deleted.

next-env.d.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/// <reference types="next" />
2+
/// <reference types="next/image-types/global" />
3+
4+
// NOTE: This file should not be edited
5+
// see https://nextjs.org/docs/basic-features/typescript for more information.

next.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
reactStrictMode: true,
3+
images: {
4+
domains: ["drive.google.com", "acmucsd.s3.us-west-1.amazonaws.com"],
5+
},
6+
};

package.json

+35-60
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,44 @@
11
{
2-
"name": "main-website",
2+
"name": "nexty",
33
"private": true,
4-
"description": "The main website for ACM at UCSD.",
5-
"version": "0.9.0",
6-
"author": "ACM at UCSD",
4+
"scripts": {
5+
"dev": "next dev",
6+
"build": "next build",
7+
"start": "next start",
8+
"lint": "next lint",
9+
"isready": "npm run format && npm run lint && npm run build"
10+
},
711
"dependencies": {
8-
"@babel/core": "^7.13.1",
9-
"@fontsource/dm-sans": "^4.2.2",
10-
"gatsby": "^2.32.3",
11-
"gatsby-image": "^2.11.0",
12-
"gatsby-plugin-less": "^4.7.0",
13-
"gatsby-plugin-manifest": "^2.12.0",
14-
"gatsby-plugin-offline": "^3.10.0",
15-
"gatsby-plugin-sharp": "^2.14.1",
16-
"gatsby-plugin-tslint": "^0.0.2",
17-
"gatsby-plugin-typescript": "^2.12.0",
18-
"gatsby-source-filesystem": "^2.11.0",
19-
"gatsby-transformer-sharp": "^2.12.0",
20-
"prop-types": "^15.7.2",
21-
"react": "^16.12.0",
22-
"react-countup": "^4.3.3",
23-
"react-dom": "^16.12.0",
24-
"react-error-overlay": "^6.0.9",
25-
"react-helmet": "^6.1.0",
12+
"fs": "^0.0.1-security",
13+
"next": "12.0.10",
14+
"react": "17.0.2",
15+
"react-countup": "^6.1.1",
16+
"react-dom": "17.0.2",
2617
"react-typist": "^2.0.5",
2718
"react-visibility-sensor": "^5.1.1",
28-
"tslint-config-airbnb": "^5.11.2"
19+
"sass": "^1.49.7"
2920
},
3021
"devDependencies": {
31-
"@types/react": "^17.0.2",
32-
"@types/react-dom": "^17.0.1",
33-
"csv-string": "^4.0.1",
34-
"html-webpack-plugin": "^5.2.0",
35-
"prettier": "2.2.1",
36-
"tslint": "^6.1.3",
37-
"tslint-config-prettier": "^1.18.0",
38-
"tslint-loader": "^3.5.4",
39-
"tslint-plugin-prettier": "^2.3.0",
40-
"tslint-react": "^5.0.0",
41-
"typescript": "^4.1.5",
42-
"webpack": "^5.24.2",
43-
"webpack-cli": "^4.5.0",
44-
"webpack-dev-middleware": "^4.1.0",
45-
"webpack-dev-server": "^3.11.2"
46-
},
47-
"keywords": [
48-
"gatsby"
49-
],
50-
"license": "0BSD",
51-
"scripts": {
52-
"build": "gatsby build",
53-
"develop": "gatsby develop",
54-
"lint": "prettier --check \"**/*.{js,jsx,ts,tsx,json,md}\"",
55-
"lint:fix": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md}\"",
56-
"start": "npm run develop",
57-
"serve": "gatsby serve",
58-
"clean": "gatsby clean",
59-
"test": "echo \"No tests! Write tests! -> https://gatsby.dev/unit-testing\"",
60-
"fetchBoard": "node src/fetch-board-data.js && prettier --write src/board-data.json"
61-
},
62-
"repository": {
63-
"type": "git",
64-
"url": "https://github.com/gatsbyjs/gatsby-starter-default"
65-
},
66-
"bugs": {
67-
"url": "https://github.com/gatsbyjs/gatsby/issues"
22+
"@types/node": "^17.0.14",
23+
"@types/react": "^17.0.38",
24+
"@types/react-typist": "^2.0.3",
25+
"@typescript-eslint/eslint-plugin": "^5.10.2",
26+
"@typescript-eslint/parser": "^5.10.2",
27+
"eslint": "8.8.0",
28+
"eslint-config-next": "12.0.10",
29+
"eslint-config-prettier": "^8.3.0",
30+
"eslint-config-react-app": "^7.0.0",
31+
"eslint-import-resolver-typescript": "^2.5.0",
32+
"eslint-loader": "^4.0.2",
33+
"eslint-plugin-flowtype": "^8.0.3",
34+
"eslint-plugin-import": "^2.25.4",
35+
"eslint-plugin-jsx-a11y": "^6.5.1",
36+
"eslint-plugin-prettier": "^4.0.0",
37+
"eslint-plugin-react": "^7.28.0",
38+
"eslint-plugin-react-hooks": "^4.3.0",
39+
"prettier": "^2.5.1",
40+
"prettier-eslint": "^13.0.0",
41+
"prettier-eslint-cli": "^5.0.1",
42+
"typescript": "^4.5.5"
6843
}
6944
}

0 commit comments

Comments
 (0)