Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INT-11: Fix navbar responsiveness #8

Merged
merged 99 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
165ef78
implemented footer text and logo
jackkfan0305 Jan 23, 2024
e292a6a
first attempt at project component
sarahsonder Jan 24, 2024
574a18f
added copyright text + minor refactors
jackkfan0305 Jan 26, 2024
3b964dd
create team card js and css files
1michhu1 Jan 29, 2024
6a4da58
create profile component to be
1michhu1 Jan 29, 2024
f82a9c0
created unstyled profile component
1michhu1 Jan 29, 2024
d242ce7
style profile text and picture
1michhu1 Jan 29, 2024
94d5280
import poppins font for profile text
1michhu1 Jan 29, 2024
04d3e30
test Profile functionality and create test_team
1michhu1 Jan 29, 2024
2783156
add profile pic test img
1michhu1 Jan 29, 2024
6a58e29
moved cat profile pic test img
1michhu1 Jan 29, 2024
31395da
create unstyled teamCard skeleton
1michhu1 Jan 29, 2024
f3f4d8a
styled title and columns&spacing of team grid
1michhu1 Jan 29, 2024
ceaf561
fix TeamCard styles import naming
1michhu1 Jan 29, 2024
e7bd91d
test Center mantine component using with column flex
1michhu1 Jan 29, 2024
18e6578
refactor to set text+title styling w/css module
1michhu1 Jan 29, 2024
fc6bb13
refactor Profile styles import and removed unnecessary style classes
1michhu1 Jan 29, 2024
dcfcb7d
remove unnecessary use client declarations
1michhu1 Jan 29, 2024
12ddb58
refactor inline styling of Center component in Profile component
1michhu1 Jan 29, 2024
f70d376
add linkedin page link to profile pictures
1michhu1 Jan 29, 2024
f3ab64f
refactor linkedin anchor and test mantine breakpoints
1michhu1 Jan 30, 2024
faf0e84
Module not found bug - troubleshooting
sarahsonder Jan 30, 2024
ad93c93
complete projects card
sarahsonder Feb 3, 2024
653a90c
remove kermit picture
sarahsonder Feb 3, 2024
01a3c16
setup
jackkfan0305 Feb 5, 2024
507ae36
remove temp theme object
1michhu1 Feb 11, 2024
4de1cc4
responsive styling for avatar sizes
1michhu1 Feb 11, 2024
a435091
change theme breakpoints, only edit xs
1michhu1 Feb 11, 2024
a9aa4d3
refactor: team name sizing
1michhu1 Feb 11, 2024
a50fb6f
refactor: text-align for profile to css file
1michhu1 Feb 11, 2024
3a1fa14
refactor: responsive sizing for title using query
1michhu1 Feb 12, 2024
c0fb40f
Merge branch 'main' of github.com:uoftblueprint/website-v2 into miche…
1michhu1 Feb 12, 2024
2262b6f
testing team card on empty page
1michhu1 Feb 12, 2024
8e50c3f
update styling
sarahsonder Feb 12, 2024
d2c3217
completed responsive navbar
shaaaaame Feb 12, 2024
4bfeba0
minor refactoring + header height change
shaaaaame Feb 12, 2024
00fe5f7
minor refactoring + changed nav height according to figma
shaaaaame Feb 12, 2024
6f10e01
updated to match updated nav on figma
shaaaaame Feb 12, 2024
0f1c7db
added background dim
shaaaaame Feb 12, 2024
c86b57d
refactor: try using center as container for teamcard
1michhu1 Feb 16, 2024
8b3f502
refactor profile component to use id for text
1michhu1 Feb 16, 2024
d06806a
minor changes to page.js
1michhu1 Feb 16, 2024
c9e3842
Installed TS and dependencies
vai9er Feb 17, 2024
44dc150
configured Prettier and ESLint/ made workflow yml
vai9er Feb 17, 2024
f5cb1be
configured Prettier and ESLint/ made workflow yml
vai9er Feb 17, 2024
0f48db6
Fixed ESLint Issues
vai9er Feb 17, 2024
47d4d77
fixed next config
vai9er Feb 18, 2024
51dad6c
Merge pull request #11 from uoftblueprint/chore/setup-typescript
vai9er Feb 18, 2024
050b7e7
chore: using test data
1michhu1 Feb 18, 2024
9293412
re-adjust image borders and added media queries
sarahsonder Feb 18, 2024
ed3ab1b
Merge branch 'main' into sarah/INT-3
sarahsonder Feb 18, 2024
7f392e4
from main: updates to package-lock and package
sarahsonder Feb 18, 2024
be7088b
Merge branch 'main' of github.com:uoftblueprint/website-v2 into miche…
1michhu1 Feb 18, 2024
fbe0025
Merge pull request #5 from uoftblueprint/sarah/INT-3
vai9er Feb 18, 2024
596c7fe
update page.tsx template
vai9er Feb 18, 2024
9e6ecdb
Update page.tsx
vai9er Feb 18, 2024
4dc617a
refactor: remove unused imports
1michhu1 Feb 18, 2024
c40e31c
minor refactors
jackkfan0305 Feb 19, 2024
3e83b61
Merge branch 'jackfan0305/int-5-footer-component'
jackkfan0305 Feb 19, 2024
ab1907b
Merge pull request #12 from uoftblueprint/patch/pagetsx
vai9er Feb 19, 2024
b3f3f03
made footer responsive to smaller screens
jackkfan0305 Feb 20, 2024
676296a
deleted files
jackkfan0305 Feb 20, 2024
d182737
integrated font
jackkfan0305 Feb 20, 2024
fab3f64
integrated font
jackkfan0305 Feb 20, 2024
2e8103e
added navbar and footer to root layout
jackkfan0305 Feb 21, 2024
9d75e6f
Merge branch 'main' into jackfan0305/int-7-for-students-logo-showcase
jackkfan0305 Feb 21, 2024
6490073
Added logos
jackkfan0305 Feb 22, 2024
3e48742
finished adding images
jackkfan0305 Feb 23, 2024
86669a2
adjusted units to vw to make it responsive
jackkfan0305 Feb 25, 2024
ba38b50
changed units to vw to make footer responsive
jackkfan0305 Feb 25, 2024
47c7f83
font changes
jackkfan0305 Feb 25, 2024
81ad41e
deleting footer files
jackkfan0305 Feb 25, 2024
2966560
refactor: remove redundant styles
1michhu1 Feb 27, 2024
a01704a
refactor: add responsive text sizing to profile
1michhu1 Feb 27, 2024
993068e
refactor: remove static font-size
1michhu1 Feb 27, 2024
399be54
refactor: replace enclosing Center with Container
1michhu1 Feb 27, 2024
29e85f3
refactor: remove redundant styles
1michhu1 Feb 27, 2024
5a10599
Merge branch 'michelle/INT-6' of github.com:uoftblueprint/website-v2 …
1michhu1 Feb 27, 2024
ba7af13
edited breakpoint for side menu
shaaaaame Feb 28, 2024
1adc023
removed navbar component and changed height
jackkfan0305 Feb 29, 2024
b6d811c
update format of page.tsx
vai9er Mar 2, 2024
62442a8
setting text box margin to 0
jackkfan0305 Mar 2, 2024
36b44dd
refactor: adding pull request changes
1michhu1 Mar 3, 2024
74b2376
refactor: add maxwidth to names, remove mantineProvider, change colum…
1michhu1 Mar 3, 2024
4c9bd12
Merge pull request #13 from uoftblueprint/jackfan0305/int-7-for-stude…
vai9er Mar 4, 2024
4f87cf6
Merge branch 'main' into michelle/INT-6
vai9er Mar 4, 2024
655ecb4
Merge pull request #9 from uoftblueprint/michelle/INT-6
vai9er Mar 4, 2024
eaa5a9f
Merge pull request #4 from uoftblueprint/jackfan0305/int-5-footer-com…
vai9er Mar 11, 2024
8b20722
completed responsive navbar
shaaaaame Feb 12, 2024
2d28418
minor refactoring + header height change
shaaaaame Feb 12, 2024
9e7ff0a
minor refactoring + changed nav height according to figma
shaaaaame Feb 12, 2024
cc6e35b
updated to match updated nav on figma
shaaaaame Feb 12, 2024
7beb97b
added background dim
shaaaaame Feb 12, 2024
44a27f7
edited breakpoint for side menu
shaaaaame Feb 28, 2024
cf0f1f8
Merge branch 'han/INT-11' of https://github.com/uoftblueprint/website…
shaaaaame Mar 15, 2024
5f0940f
minor refactoring
shaaaaame Mar 15, 2024
472ed10
minor refactoring
shaaaaame Mar 15, 2024
ba27387
minor refactoring
shaaaaame Mar 15, 2024
8afb1a1
removed unused imports
shaaaaame Mar 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
{
"extends": "next/core-web-vitals"
"extends": [
"eslint:recommended",
"prettier",
"plugin:react/recommended",
"plugin:react/jsx-runtime"
],
"plugins": [],
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
"tsx": true
}
},
"env": {
"es6": true,
"browser": true,
"node": true
},
"rules": {
"react/prop-types": "off"
}
}
40 changes: 40 additions & 0 deletions .github/workflows/format-checker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: ci

on:
pull_request:

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20.10.0

- name: install dependencies
run: npm install

- name: lint
run: npm run lint
format:
runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20.10.0

- name: install dependencies
run: npm install

- name: format
run: npm run format
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"jsx": "react-jsx",
"paths": {
"@/*": ["./src/*"]
}
Expand Down
4 changes: 2 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {};

module.exports = nextConfig
module.exports = nextConfig;
Loading