Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
aa3bf91
linting and formatting implementation
JimmyPaolini Jun 29, 2021
64ea757
fixing glob-parent dependency vulnerability
JimmyPaolini Jun 29, 2021
a451f0d
Bugs from linting/formatting fixed, grammar page begun
JimmyPaolini Jun 30, 2021
45c0730
grammar cards, fixed logging, EFK stack working, monitoring
JimmyPaolini Jul 8, 2021
4593c4a
Bug fixing, adding Google analytics, beginning on custom literature i…
JimmyPaolini Jul 10, 2021
e93a6b1
Google analytics, improving search performance
JimmyPaolini Jul 13, 2021
ce3b231
Improving SEO with title and meta tags
JimmyPaolini Jul 13, 2021
56e299b
fixing local bookmarks bug, fixing literature fallback bug, attemptin…
JimmyPaolini Jul 13, 2021
f811de9
adding translation search
JimmyPaolini Jul 13, 2021
3b07754
Squashed commit of the following:
JimmyPaolini Jul 14, 2021
4f20d37
Solidifying k8s arch, fixing single search bug, fixing google analyti…
JimmyPaolini Jul 14, 2021
76b4eed
linting and formatting implementation
JimmyPaolini Jun 29, 2021
a70cdb5
Bugs from linting/formatting fixed, grammar page begun
JimmyPaolini Jun 30, 2021
9515a6f
grammar cards, fixed logging, EFK stack working, monitoring
JimmyPaolini Jul 8, 2021
5cc7c9a
Bug fixing, adding Google analytics, beginning on custom literature i…
JimmyPaolini Jul 10, 2021
ba7b819
Google analytics, improving search performance
JimmyPaolini Jul 13, 2021
3ffef96
Improving SEO with title and meta tags
JimmyPaolini Jul 13, 2021
ace1108
fixing local bookmarks bug, fixing literature fallback bug, attemptin…
JimmyPaolini Jul 13, 2021
0b0c14d
Solidifying k8s arch, fixing single search bug, fixing google analyti…
JimmyPaolini Jul 14, 2021
bd60488
fixing merge issues
JimmyPaolini Jul 14, 2021
99901d8
Merge branch 'v2.0.0' of https://github.com/JimmyPaolini/Lexico into …
JimmyPaolini Jul 14, 2021
eb18ef2
fixing package-lock
JimmyPaolini Jul 14, 2021
145768f
Fixing snackbar action stacking on small screens
JimmyPaolini Jul 14, 2021
ef2884e
reverting snackbars to non persistent
JimmyPaolini Jul 14, 2021
5200120
Suring up logging infra, fully implementing custom literature local
JimmyPaolini Jul 17, 2021
394b83a
Custom texts working initially, more testing needed before release
JimmyPaolini Jul 24, 2021
9ff2470
fixing so that that user custom texts don't appear after logging out
JimmyPaolini Jul 24, 2021
1d4e501
Adding CTA subheader to login card
JimmyPaolini Jul 24, 2021
98ab5df
Implementing custom literature menu hover away close, and alphabetizi…
JimmyPaolini Jul 24, 2021
424dba9
Fixing oauth login bug when using local docker environment
JimmyPaolini Jul 25, 2021
bc90704
Testing and tidying migration for deployment
JimmyPaolini Jul 25, 2021
cebda55
Fixing final bugs, tidying up helpful sql statements
JimmyPaolini Jul 25, 2021
d50296b
Merge branch 'main' into v2.0.0
JimmyPaolini Jul 25, 2021
79af87c
Fixing more merge conflicts
JimmyPaolini Jul 25, 2021
36a858e
Fixing the bottom padding on declined/conjugated entries, renaming se…
JimmyPaolini Jul 25, 2021
aa27ff6
Attempting login bug fix
JimmyPaolini Jul 26, 2021
233c583
Merge branch 'main' into v2.0.0
JimmyPaolini Jul 26, 2021
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@
"author": "Jimmy Paolini",
"description": "Latin Language Interface",
"repository": "https://github.com/JimmyPaolini/Lexico",
"version": "2.0.0",
"version": "2.0.1",
"license": "MIT"
}
9 changes: 5 additions & 4 deletions server/src/authentication/facebook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@ export default async function fetchFacebookUser(
code: string,
hostname: string,
): Promise<FacebookProfile> {
const redirect_uri = hostname.match(/lexicolatin/i)
? "https://www.lexicolatin.com/facebook"
: "http://localhost:3000/facebook"
const {
data: { access_token },
} = await axios
.get("https://graph.facebook.com/v10.0/oauth/access_token", {
params: {
code: code,
code,
client_id: FACEBOOK_ID,
client_secret: FACEBOOK_SECRET,
redirect_uri: hostname.match(/lexicolatin/i)
? "https://www.lexicolatin.com/facebook"
: "http://localhost:3000/facebook",
redirect_uri,
},
})
.catch((error) => {
Expand Down
7 changes: 4 additions & 3 deletions server/src/authentication/google.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export default async function fetchGoogleUser(
code: string,
hostname: string,
): Promise<GoogleProfile> {
const redirect_uri = hostname.match(/lexicolatin/i)
? "https://www.lexicolatin.com/google"
: "http://localhost:3000/google"
const {
data: { access_token },
} = await axios
Expand All @@ -19,9 +22,7 @@ export default async function fetchGoogleUser(
code,
client_id: GOOGLE_ID,
client_secret: GOOGLE_SECRET,
redirect_uri: hostname.match(/lexicolatin/i)
? "https://www.lexicolatin.com/google"
: "http://localhost:3000/google",
redirect_uri,
grant_type: "authorization_code",
},
})
Expand Down