Skip to content

Commit 2493e60

Browse files
committed
Merge branch 'master' of github.com:csesoc/csesoc-website-2023 into CW2-30-Design-events-cards
2 parents 11aed9f + a192064 commit 2493e60

File tree

95 files changed

+2717
-1273
lines changed

Some content is hidden

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

95 files changed

+2717
-1273
lines changed

frontend/.eslintrc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// "plugin:prettier/recommended"
66
],
77
"parser": "@typescript-eslint/parser",
8-
"plugins": ["@typescript-eslint"]
9-
// "rules": {
8+
"plugins": ["@typescript-eslint"],
9+
"rules": {
1010
// "prettier/prettier": ["error", { "endOfLine": "auto" }]
11-
// }
11+
}
1212
}

frontend/package-lock.json

+61-48
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
"autoprefixer": "10.4.15",
2121
"axios": "^1.7.2",
2222
"eslint-config-next": "13.4.19",
23-
"framer-motion": "^11.1.2",
24-
"next": "13.4.19",
23+
"framer-motion": "^11.2.13",
24+
"next": "13.4.12",
2525
"postcss": "8.4.29",
2626
"react": "18.2.0",
2727
"react-dom": "18.2.0",
28+
"react-multi-carousel": "^2.8.5",
2829
"tailwindcss": "3.3.3",
2930
"typescript": "5.1"
3031
},

0 commit comments

Comments
 (0)