Skip to content

Commit 9a5db0a

Browse files
inolasvSaloni VaishnavBeckyBlakeskylajkikis05
authored
Add Notion-Integrated External Opportunities Board to the Resources Page (#363)
* clean up next js defaults and leftover old website files * update global styles according to figma (#324) * add external opportunities grid on resources page (#329) * add external opportunities grid on resources page * add external opportunities grid on resources page * change to using color variables in css files * Finish Kirthi member card * express + data access functions in ExternalOpps.js + packages were added * .env * ignored node_modules in server folder? * git rmed node_modules * Create External Opportunities Popup Modal (#336) * Make external opportunities modal * Remove comments * Render colors dynamically * Change modal to single component * Remove comments * Fix card styling * Fix opportunity card styling * add necessary dependencies and rm unnecessary files * Ks/notion experimental (#337) * Finish Kirthi member card * express + data access functions in ExternalOpps.js + packages were added * .env * ignored node_modules in server folder? * git rmed node_modules * add necessary dependencies and rm unnecessary files --------- Co-authored-by: inolasv <57074850+inolasv@users.noreply.github.com> * importing React, useEffect, useState * Ks/trying to merge (#346) * added server into src * reconfigured package.jsons * added a time filter * trying to merge * Ks/time (#347) * added server into src * reconfigured package.jsons * added a time filter * notion database reconfig (#348) * added server into src * reconfigured package.jsons * added a time filter * database switch * error handling in External Opps, added section to display when this happens based on master * cloud message fit * Write data to JSON file (#351) * Write fetched data to JSON file * Formatting * Use functions to get data * Clean up code * Remove from history * Update gitignore * opportunities are sorted in the modal (#352) * opportunities are sorted in the modal * rmed externalOpportunities.json * getting on the same page * Ks/format opps (#354) * opportunities are sorted in the modal * rmed externalOpportunities.json * prettier for sort * New UI Updates (#360) * Make UI changes * Make repsonsive layout * concurrently for build, .env in workflow (#361) * concurrently for build, .env in workflow * changed formatting * link to full resources below external opps (#362) * added link to full resources below external opps in resources.js * update external opp notion link --------- Co-authored-by: Saloni Vaishnav <saloniv2@illinois.ed> Co-authored-by: inolasv <57074850+inolasv@users.noreply.github.com> * minor fixes, update to be more compatible with master * clean up next js defaults and leftover old website files * update global styles according to figma (#324) * add external opportunities grid on resources page (#329) * add external opportunities grid on resources page * add external opportunities grid on resources page * change to using color variables in css files * Create External Opportunities Popup Modal (#336) * Make external opportunities modal * Remove comments * Render colors dynamically * Change modal to single component * Remove comments * Fix card styling * Fix opportunity card styling * Finish Kirthi member card * express + data access functions in ExternalOpps.js + packages were added * .env * ignored node_modules in server folder? * git rmed node_modules * add necessary dependencies and rm unnecessary files * Ks/trying to merge (#346) * added server into src * reconfigured package.jsons * added a time filter * trying to merge * Ks/time (#347) * added server into src * reconfigured package.jsons * added a time filter * notion database reconfig (#348) * added server into src * reconfigured package.jsons * added a time filter * database switch * error handling in External Opps, added section to display when this happens based on master * cloud message fit * Write data to JSON file (#351) * Write fetched data to JSON file * Formatting * Use functions to get data * Clean up code * Remove from history * Update gitignore * opportunities are sorted in the modal (#352) * opportunities are sorted in the modal * rmed externalOpportunities.json * getting on the same page * Ks/format opps (#354) * opportunities are sorted in the modal * rmed externalOpportunities.json * prettier for sort * New UI Updates (#360) * Make UI changes * Make repsonsive layout * concurrently for build, .env in workflow (#361) * concurrently for build, .env in workflow * changed formatting * link to full resources below external opps (#362) * added link to full resources below external opps in resources.js * update external opp notion link --------- Co-authored-by: Saloni Vaishnav <saloniv2@illinois.ed> Co-authored-by: inolasv <57074850+inolasv@users.noreply.github.com> * minor fixes, update to be more compatible with master * move where backup link is located * fix blank lines array --------- Co-authored-by: Saloni Vaishnav <saloniv2@illinois.ed> Co-authored-by: Becky Blake <ryblake2@illinois.edu> Co-authored-by: Skyla Jin <109620882+skylaj@users.noreply.github.com> Co-authored-by: kikis05 <kirthis2@illinois.edu> Co-authored-by: ziaxlu <124220349+ziaxlu@users.noreply.github.com> Co-authored-by: Kirthi Shankar <148816975+kikis05@users.noreply.github.com>
1 parent 5fa53cc commit 9a5db0a

35 files changed

+2133
-4059
lines changed

‎.bowerrc

-3
This file was deleted.

‎.eslintrc.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
// "extends":
2+
// "extends":
33
"extends": [
4-
"next/core-web-vitals",
4+
"next/core-web-vitals",
55
"prettier",
66
"airbnb",
77
"airbnb/hooks",
@@ -29,6 +29,7 @@
2929
"react-hooks/exhaustive-deps": "warn",
3030
"import/prefer-default-export": "off",
3131
"react/no-array-index-key": "off",
32-
"object-curly-newline": "off"
32+
"object-curly-newline": "off",
33+
"operator-linebreak": "off"
3334
}
34-
}
35+
}

‎.github/pull_request_template.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
A few sentences describing the overall goals of the pull request's commits. If applicable, link the PR to the corresponding issue below by filling out the number.
1313
-->
1414

15-
Addresses #<number>
15+
<!-- Addresses #<number> -->
16+
17+
Addresses: <(link notion task here)>
1618

1719
## Screenshots
1820

‎.github/workflows/nextjs.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name: Deploy Next.js site to Pages
77
on:
88
# Runs on pushes targeting the default branch
99
push:
10-
branches: ["master"]
10+
branches: ['master']
1111

1212
# Allows you to run this workflow manually from the Actions tab
1313
workflow_dispatch:
@@ -21,7 +21,7 @@ permissions:
2121
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
2222
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
2323
concurrency:
24-
group: "pages"
24+
group: 'pages'
2525
cancel-in-progress: false
2626

2727
jobs:
@@ -51,7 +51,7 @@ jobs:
5151
- name: Setup Node
5252
uses: actions/setup-node@v4
5353
with:
54-
node-version: "20"
54+
node-version: '20'
5555
cache: ${{ steps.detect-package-manager.outputs.manager }}
5656
- name: Setup Pages
5757
uses: actions/configure-pages@v5
@@ -88,6 +88,12 @@ jobs:
8888
runs-on: ubuntu-latest
8989
needs: build
9090
steps:
91+
- name: 'Create env file'
92+
run: |
93+
touch .env
94+
echo "REACT_APP_NOTION_API_KEY=${{ secrets.REACT_APP_NOTION_API_KEY}}" >> .env
95+
echo "REACT_APP_NOTION_DATABASE_ID=${{ secrets.REACT_APP_NOTION_DATABASE_ID }}" >> .env
96+
cat .env
9197
- name: Deploy to GitHub Pages
9298
id: deployment
9399
uses: actions/deploy-pages@v4

‎.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ yarn-debug.log*
2525
yarn-error.log*
2626

2727
# local env files
28-
.env*.local
28+
.env
29+
*.local
2930

3031
# vercel
3132
.vercel
3233

3334
# typescript
3435
*.tsbuildinfo
3536
next-env.d.ts
37+
38+
.vscode/
39+
src/data/externalOpportunities.json

‎.prettierrc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"trailingComma": "all",
3-
"tabWidth": 2,
4-
"semi": true,
5-
"singleQuote": true
6-
}
2+
"trailingComma": "all",
3+
"tabWidth": 2,
4+
"semi": true,
5+
"singleQuote": true
6+
}

‎.vscode/settings.json

-3
This file was deleted.

‎index.html

-268
This file was deleted.

‎next.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @type {import('next').NextConfig} */
22
const nextConfig = {
33
reactStrictMode: true,
4-
}
4+
};
55

6-
module.exports = nextConfig
6+
module.exports = nextConfig;

0 commit comments

Comments
 (0)