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

528: Deploy landing page #536

Merged
merged 119 commits into from
Apr 17, 2024
Merged
Changes from 2 commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
d8e0c34
Auto apply migrations on API startup
jbytes1027 Mar 28, 2024
a7e9938
Setup API container
jbytes1027 Mar 28, 2024
6a5b0a0
Create mock email service
jbytes1027 Mar 28, 2024
4b4d925
Fall back to mock email service
jbytes1027 Mar 28, 2024
432dccd
Create blob storage container if needed
jbytes1027 Mar 28, 2024
3cea674
Add check that new profile image exists in blob storage
jbytes1027 Mar 28, 2024
b66be74
Setup SPA container
jbytes1027 Mar 28, 2024
796ef86
Add containerized test setup
jbytes1027 Mar 29, 2024
c7bd546
Add npm scripts
jbytes1027 Mar 29, 2024
8803582
Update readmes
jbytes1027 Mar 29, 2024
3ab571c
Add setup-tests env var explination
jbytes1027 Mar 29, 2024
f59f7e4
Remove MockEmailService email type check
jbytes1027 Mar 29, 2024
4e47dbd
Fix formatting
jbytes1027 Mar 29, 2024
8de113e
Move avatar url check to controller
jbytes1027 Mar 29, 2024
d738fa0
453: Fix highlighting tags on social
evan-scales Apr 6, 2024
968cc35
467: Fix blank pages
evan-scales Apr 6, 2024
4c46b22
466: Wrong username on chat
evan-scales Apr 6, 2024
40eaf79
fix linter
evan-scales Apr 6, 2024
6964a88
fix linter
evan-scales Apr 6, 2024
f738322
Splash page draft
jbytes1027 Apr 6, 2024
4faf722
Tweak wording
jbytes1027 Apr 7, 2024
76241e5
Fix spacing
jbytes1027 Apr 7, 2024
7ed7204
Merge pull request #476 from SCCapstone/453
jbytes1027 Apr 7, 2024
0b6ed1c
Merge pull request #478 from SCCapstone/466
jbytes1027 Apr 7, 2024
0a95cda
Merge pull request #477 from SCCapstone/467
jbytes1027 Apr 7, 2024
b455da4
detects a new request, and shows badge on pfp in the navbar
Jackson-Williams-15 Apr 7, 2024
da29ca2
Add draft discover screenshot
jbytes1027 Apr 7, 2024
9950348
fixed problem with null/empty times.
AaronKeys Apr 7, 2024
ff5d06a
config
AaronKeys Apr 7, 2024
3d876e3
lint and format
AaronKeys Apr 7, 2024
46b6e44
fixing description length to be 1500 or less for post creation error.
AaronKeys Apr 7, 2024
75b456d
disabling button if the values aren't appropriate
AaronKeys Apr 7, 2024
a395ab7
making sure that game isn't null
AaronKeys Apr 7, 2024
d1a850f
making sure game isn't ''
AaronKeys Apr 7, 2024
cc0bfb2
Merge pull request #480 from SCCapstone/LandingPage
epadams Apr 7, 2024
02e481e
fixed bug with entering correct game value then deleting not disablin…
AaronKeys Apr 7, 2024
70966c6
Update CreatePost.jsx
AaronKeys Apr 7, 2024
d330a0c
Update CreatePost.jsx
AaronKeys Apr 7, 2024
32d2f80
Update CreatePost.jsx
AaronKeys Apr 7, 2024
59491b6
Merge pull request #482 from SCCapstone/emptyTimeWorks
epadams Apr 7, 2024
1e852e8
Merge branch 'main' into ErrorPostCreation
AaronKeys Apr 7, 2024
90b2009
Convert relevant alerts to react notifications
epadams Apr 7, 2024
3efabf1
Load previous DOB value
epadams Apr 8, 2024
24864c6
added friend request button with badge, the badge disappears after ne…
Jackson-Williams-15 Apr 8, 2024
6d3a8e5
added counter to the badge avatar and some styling. i have an idea fo…
Jackson-Williams-15 Apr 8, 2024
2d49626
fixed issue with refresh after viewing the new friend requests
Jackson-Williams-15 Apr 8, 2024
d975ad3
removed the local storage stuff, it caused new friend request to be i…
Jackson-Williams-15 Apr 8, 2024
2a43044
Ignore env files in API container
jbytes1027 Apr 8, 2024
9e1aade
Add db health check to container startup
jbytes1027 Apr 8, 2024
20c7986
Added condition checks
epadams Apr 8, 2024
c9b529e
Remove restarting of API container
epadams Apr 8, 2024
c881d49
Merge main
jbytes1027 Apr 8, 2024
a05385b
fixed small error from editing directly on website.
AaronKeys Apr 8, 2024
3e120db
added decline button
Jackson-Williams-15 Apr 8, 2024
675651b
Merge remote-tracking branch 'origin/main' into FriendRequestNotifica…
Jackson-Williams-15 Apr 8, 2024
715cbac
Merge pull request #450 from SCCapstone/IsolatedTesting
evan-scales Apr 8, 2024
40a87c3
fixed the decline and accept friend request button being connected
Jackson-Williams-15 Apr 8, 2024
f8ca6f4
fixed decline button
Jackson-Williams-15 Apr 8, 2024
f043e50
format
Jackson-Williams-15 Apr 8, 2024
977d82e
Merge pull request #483 from SCCapstone/ErrorPostCreation
evan-scales Apr 8, 2024
2836eb4
Merge remote-tracking branch 'origin/main' into FriendRequestNotifica…
Jackson-Williams-15 Apr 8, 2024
a595b5e
Extract create post form
jbytes1027 Apr 9, 2024
ae713dc
Tweak post form style
jbytes1027 Apr 9, 2024
917b813
Fix #462
jbytes1027 Apr 10, 2024
b3b3159
Add null value handling to post card
jbytes1027 Apr 10, 2024
029fb91
Fix fake form requirements
jbytes1027 Apr 10, 2024
62db981
Add initial value support to PostForm
jbytes1027 Apr 10, 2024
84e1aa4
Chagne edit post to use PostForm
jbytes1027 Apr 10, 2024
b71aad2
Remove console log
jbytes1027 Apr 11, 2024
b091654
Change post search query date range to date and time range
jbytes1027 Apr 11, 2024
8d1e944
Fix formatting
jbytes1027 Apr 11, 2024
e54d274
Merge pull request #503 from SCCapstone/FixBetweenFilter
jbytes1027 Apr 11, 2024
9352e31
Merge pull request #487 from SCCapstone/FriendRequestNotification
evan-scales Apr 11, 2024
9bf7fcf
474: Change size of chat locked text & button
evan-scales Apr 11, 2024
b57dfd4
Merge pull request #504 from SCCapstone/474
jbytes1027 Apr 11, 2024
8de57dd
491: Restrict passwords
evan-scales Apr 11, 2024
d7b1d2c
495: Wrap long words (#505)
evan-scales Apr 11, 2024
13ef641
Fix formatting
jbytes1027 Apr 11, 2024
1272434
Merge pull request #501 from SCCapstone/CombineCreateAndEditPostUi
jbytes1027 Apr 11, 2024
ff35d87
491: Change pw min length to 8
evan-scales Apr 13, 2024
d4e0941
Merge pull request #511 from SCCapstone/prod
evan-scales Apr 13, 2024
7e7201e
508: Change default sort options
evan-scales Apr 13, 2024
e9efbdb
changed query limit to 12 for a more even post/user card layout
Jackson-Williams-15 Apr 14, 2024
4346fb8
Merge from main and fix conflicts
epadams Apr 14, 2024
95846a5
Format and comments
epadams Apr 14, 2024
acadef3
Remove Edit.jsx
epadams Apr 14, 2024
37db806
Updated AccountSettings.jsx
epadams Apr 14, 2024
5ce8ed4
Format
epadams Apr 14, 2024
0ad98b2
Remove nonfunctioning external library
epadams Apr 14, 2024
f000da1
Merge from main
epadams Apr 14, 2024
fada61a
Allow clearing DOB and simplified logic
epadams Apr 14, 2024
6b228ff
Add clear button to DOB picker
epadams Apr 14, 2024
28bb962
Merge pull request #512 from SCCapstone/508
epadams Apr 14, 2024
5186db2
updated query limit to 12
Jackson-Williams-15 Apr 14, 2024
7e21acb
set page to 1 on new search text
Jackson-Williams-15 Apr 14, 2024
328deac
got rid of unnecessary check
Jackson-Williams-15 Apr 14, 2024
da19722
placeholders are a little more descriptive. Added helper text to the …
Jackson-Williams-15 Apr 14, 2024
44c0a4c
Merge pull request #514 from SCCapstone/UserPagination
Jackson-Williams-15 Apr 14, 2024
e250818
517: Convert new tags to lowercase
evan-scales Apr 14, 2024
fa5efd6
517: check for existing lowercase tags
evan-scales Apr 14, 2024
46c75e5
491: Update borken tests
evan-scales Apr 14, 2024
72545cc
set page to 1 after updating search text in social
Jackson-Williams-15 Apr 14, 2024
cd5fdab
Merge remote-tracking branch 'origin/main' into 493
Jackson-Williams-15 Apr 14, 2024
96f5a90
Merge pull request #520 from SCCapstone/493
Jackson-Williams-15 Apr 14, 2024
a75881d
Merge pull request #521 from SCCapstone/518
Jackson-Williams-15 Apr 14, 2024
4a9bdb6
Merge pull request #506 from SCCapstone/491
evan-scales Apr 14, 2024
ca8faaf
ran format
Jackson-Williams-15 Apr 14, 2024
afa4313
Merge pull request #484 from SCCapstone/469
epadams Apr 15, 2024
230b250
Merge pull request #519 from SCCapstone/402
epadams Apr 15, 2024
8a389a9
508: Change dropdown to picker
evan-scales Apr 16, 2024
b782d16
Merge pull request #522 from SCCapstone/517
evan-scales Apr 16, 2024
dff287e
Use MUI variants to distinguish social buttons
jbytes1027 Apr 16, 2024
8fd84c8
Merge pull request #533 from SCCapstone/580-tweak
evan-scales Apr 16, 2024
8acdb14
Merge pull request #531 from SCCapstone/508
jbytes1027 Apr 16, 2024
8b42028
Update screenshots
jbytes1027 Apr 17, 2024
0457b5b
Fix typos
jbytes1027 Apr 17, 2024
763d178
use evans linkedin
evan-scales Apr 17, 2024
559cfed
ran formatter
evan-scales Apr 17, 2024
3572a1e
Merge pull request #535 from SCCapstone/UpdatedScreenshots
evan-scales Apr 17, 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
27 changes: 25 additions & 2 deletions FU.SPA/src/components/pages/Discover.jsx
Original file line number Diff line number Diff line change
@@ -35,6 +35,8 @@ const paramKey = {
games: 'games',
tags: 'tags',
page: 'page',
postSort: 'psort',
userSort: 'usort',
};

const paramToDayjs = (searchParams, paramKey) => {
@@ -78,8 +80,13 @@ export default function Discover() {
const [gameOptions, setGameOptions] = useState([]);
const [tagOptions, setTagOptions] = useState([]);

const [postSortOption, setPostSortOption] = useState(null);
const [userSortOption, setUserSortOption] = useState(null);
const [postSortOption, setPostSortOption] = useState(
searchParams.get(paramKey.postSort) ||
config.POST_SORT_OPTIONS[1].value + ':asc',
);
const [userSortOption, setUserSortOption] = useState(
searchParams.get(paramKey.userSort) || null,
);

const [dateRangeRadioValue, setDateRangeRadioValue] = useState(() => {
const paramValue = searchParams.get(paramKey.dateRadio);
@@ -168,6 +175,20 @@ export default function Discover() {
params.set('o', tabOption);
}

if (postSortOption) {
params.set(paramKey.postSort, postSortOption);
}

if (userSortOption) {
params.set(paramKey.userSort, userSortOption);
}

if (tabOption === tabOptions.Posts) {
params.delete(paramKey.userSort);
} else {
params.delete(paramKey.postSort);
}

return params;
},
{ replace: true },
@@ -316,6 +337,7 @@ export default function Discover() {
const renderPostSortSelector = () => {
return (
<SortOptionsSelector
initialValue={postSortOption}
options={config.POST_SORT_OPTIONS}
onChange={(newValue) => {
setPostSortOption(newValue);
@@ -328,6 +350,7 @@ export default function Discover() {
const renderUserSortSelector = () => {
return (
<SortOptionsSelector
initialValue={userSortOption}
options={config.USER_SORT_OPTIONS}
onChange={(newValue) => {
setUserSortOption(newValue);
6 changes: 4 additions & 2 deletions FU.SPA/src/components/pages/Social.jsx
Original file line number Diff line number Diff line change
@@ -47,10 +47,12 @@ export default function Social() {
const [page, setPage] = useState(initialPage);

const [postSortOption, setPostSortOption] = useState(
searchParams.get('psort') || null,
searchParams.get('psort') ||
config.SOCIAL_POST_SORT_OPTIONS[1].value + ':asc',
);
const [userSortOption, setUserSortOption] = useState(
searchParams.get('usort') || null,
searchParams.get('usort') ||
config.SOCIAL_USER_SORT_OPTIONS[2].value + ':desc',
);

const { user } = useContext(UserContext);