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

main into prod #19

Merged
merged 49 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
5a83ab3
fix body issues
cliarie Nov 1, 2023
b04a50e
fix update_user and get_user
cliarie Nov 1, 2023
eba5c4b
ignore .ds_store
Jish2 Nov 2, 2023
adf5458
env example
Jish2 Nov 2, 2023
c7d8960
updated pk
Jish2 Nov 2, 2023
6f541a6
update
Jish2 Nov 2, 2023
9f876f7
add route
Jeongjae-0124 Nov 3, 2023
16a4675
card edit
Jeongjae-0124 Nov 13, 2023
d4580ef
card edit
Jeongjae-0124 Nov 14, 2023
8fefaa1
prettier sort
Jish2 Nov 17, 2023
bdf49e6
placeholder
Jish2 Nov 17, 2023
ccd9f07
sam local testing utils
Jish2 Nov 17, 2023
a93fd27
moved deps to devdep
Jish2 Nov 17, 2023
0e628d9
added packages
Jish2 Nov 17, 2023
0223766
inherit tw class
Jish2 Nov 17, 2023
1eed7b5
acm logo
Jish2 Nov 17, 2023
3c6b85e
potential error list
Jish2 Nov 17, 2023
96e83ba
update to svg
Jish2 Nov 17, 2023
d4cd907
rename files
Jish2 Nov 17, 2023
96a5ef6
name changes
Jish2 Nov 17, 2023
3465eec
msal config
Jish2 Nov 17, 2023
6f9696a
skills
Jish2 Nov 17, 2023
aaf3db4
auth providers
Jish2 Nov 17, 2023
fc913ca
toast
Jish2 Nov 17, 2023
a2167ef
moved pages
Jish2 Nov 17, 2023
cf85ec9
auth hook
Jish2 Nov 17, 2023
7438cb8
profile rename
Jish2 Nov 17, 2023
331b8a7
login
Jish2 Nov 17, 2023
d292c38
auth test page
Jish2 Nov 17, 2023
f6e4827
get object_id from graph api
Jish2 Nov 17, 2023
389eede
update
Jish2 Nov 17, 2023
636aee0
test
Jish2 Nov 17, 2023
152a0aa
Merge branch 'client-revamp' of https://github.com/acm-uiuc/resume-bo…
Jeongjae-0124 Nov 17, 2023
68508c5
sorry dev
Jish2 Nov 17, 2023
32efeb0
hide test file
Jish2 Nov 17, 2023
8c4274c
Merge pull request #17 from acm-uiuc/Jeongjae
Jish2 Nov 17, 2023
895ce33
git ignore
Jish2 Nov 17, 2023
fdf71b4
test changes
Jish2 Nov 17, 2023
b55a077
Merge branch 'main' of https://github.com/acm-uiuc/resume-book
Jish2 Nov 17, 2023
711505c
add key
cliarie Nov 17, 2023
3a0ea4e
add key
cliarie Nov 17, 2023
80ecd50
deploy
cliarie Nov 17, 2023
bac343f
update swagger
Jish2 Nov 17, 2023
a75f936
content type
Jish2 Nov 17, 2023
b396c00
fix bugs
cliarie Nov 17, 2023
d7f85c3
Merge branch 'main' of https://github.com/acm-uiuc/resume-book
cliarie Nov 17, 2023
2d76c3e
Merge pull request #18 from acm-uiuc/claire2
Jish2 Nov 17, 2023
02f87ac
github deploy client action
Jish2 Nov 17, 2023
9061ee8
Merge branch 'main' of https://github.com/acm-uiuc/resume-book
Jish2 Nov 17, 2023
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
Binary file removed .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AWS_REGION = us-east-2
68 changes: 68 additions & 0 deletions .github/workflows/deploy-next.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Giithub pages overwrite

on:
push:
path:
- client/**
branches:
# NOTE: You may want to limit the trigger branch to be "main" or "master" etc.
- "prod"
-

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3

- name: Generate your content
run: echo "Optional placeholder. Put your project's static website generator command here."

- name: Publish current workdir (which contains generated content) to GitHub Pages
uses: rayluo/github-pages-overwriter@v1.3

with:
# Optional. Default value "." means the root directory of your project will be published.
# You can use whatever directory your project uses, for example "wwwroot".
# Such a directory does *not* have to already exist in your repo,
# it could be an output directory created dynamically by your static website builder.
source-directory: client/build

# Optional. Default value "gh-pages".
# It specifies the temporary branch which hosts the static website.
# Each build will OVERWRITE this branch.
target-branch: prod

name: Giithub pages overwrite

on:
push:
branches:
# NOTE: You may want to limit the trigger branch to be "main" or "master" etc.
- "prod"

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3

- name: Generate your content
run: echo "Optional placeholder. Put your project's static website generator command here."

- name: Publish current workdir (which contains generated content) to GitHub Pages
uses: rayluo/github-pages-overwriter@v1.3

with:
# Optional. Default value "." means the root directory of your project will be published.
# You can use whatever directory your project uses, for example "wwwroot".
# Such a directory does *not* have to already exist in your repo,
# it could be an output directory created dynamically by your static website builder.
source-directory: client/build

# Optional. Default value "gh-pages".
# It specifies the temporary branch which hosts the static website.
# Each build will OVERWRITE this branch.
target-branch: prod
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.aws-sam/
venv/
__pycache__
__pycache__
.DS_Store
test.json
build
Empty file added build/test
Empty file.
5 changes: 4 additions & 1 deletion client/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": ["next/babel", "next/core-web-vitals"]
// "extends": ["next/babel", "next/core-web-vitals"]
"extends": [
"next"
]
}
17 changes: 17 additions & 0 deletions client/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"printWidth": 80,
"tabWidth": 2,
"trailingComma": "all",
"singleQuote": false,
"semi": true,
"importOrder": [
"^@providers/(.*)$",
"^@config/(.*)$",
"^@styles/(.*)$",
"^@components/(.*)$",
"^[./]"
],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"plugins": ["@trivago/prettier-plugin-sort-imports"]
}
20 changes: 10 additions & 10 deletions client/next.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
images: {
// domains: ["encrypted-tbn2.gstatic.com","corporatephotographerslondon.com"],
// "cultivatedculture.com",
// remotePatterns: [
// {
// protocol: "https",
// hostname: "encrypted-tbn2.gstatic.com",
// },
// ],
},
output: 'export',

// Optional: Change links `/me` -> `/me/` and emit `/me.html` -> `/me/index.html`
// trailingSlash: true,

// Optional: Prevent automatic `/me` -> `/me/`, instead preserve `href`
// skipTrailingSlashRedirect: true,

// Optional: Change the output directory `out` -> `dist`
distDir: 'build',
};

module.exports = nextConfig;
Loading
Loading