Skip to content

Commit 8d9d559

Browse files
authored
Misc styles & GraphQL fixes (#1374)
1 parent d6993ff commit 8d9d559

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v1
3434
- uses: actions/setup-node@v3
3535
with:
36-
node-version-file: package.json
36+
node-version-file: package.json
3737
cache: 'npm'
3838
- name: Install dependencies
3939
run: CYPRESS_INSTALL_BINARY=0 npm ci

app/components/LoggedInUser/Notifications.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import React from 'react'
66
import { withRouter } from 'react-router-dom'
77

88
const loggedInUserNotificationsQuery = gql`
9-
query LoggedInUserNotifications($page: Int! = 1, $pageSize: Int! = 30, $filter: String = ALL) {
9+
query LoggedInUserNotifications(
10+
$page: Int! = 1
11+
$pageSize: Int! = 30
12+
$filter: NotificationsFilter = ALL
13+
) {
1014
loggedInUser {
1115
id
1216
notifications(page: $page, pageSize: $pageSize, filter: $filter) {
@@ -50,7 +54,7 @@ const loggedInUserNotificationsQuery = gql`
5054
`
5155

5256
const markAsSeenMutation = gql`
53-
mutation UpdateNotification($ids: [Int!], $seen: Boolean!) {
57+
mutation UpdateNotification($ids: [ID]!, $seen: Boolean!) {
5458
updateNotifications(ids: $ids, seen: $seen) {
5559
id
5660
seenAt

app/components/Notifications/SubscribeBtn.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Bell, BellSlash } from 'styled-icons/fa-solid'
77
import Action from '../VideoDebate/Actions/ActionButton'
88

99
const updateSubscriptionQuery = gql`
10-
mutation UpdateSubscription($entityId: Int!, $scope: String!, $isSubscribed: Boolean!) {
10+
mutation UpdateSubscription($entityId: ID!, $scope: String!, $isSubscribed: Boolean!) {
1111
updateSubscription(entityId: $entityId, scope: $scope, isSubscribed: $isSubscribed) {
1212
id
1313
isSubscribed

app/components/SupportUs/index.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from 'react'
33
import { JS_ENV } from '../../config'
44
import { optionsToQueryString } from '../../lib/url_utils'
55
import { useLoggedInUser } from '../LoggedInUser/UserProvider'
6-
import Container from '../StyledUtils/Container'
76
import { LoadingFrame } from '../Utils/LoadingFrame'
87

98
const getIframeURLParams = (isAuthenticated, loggedInUser) => {
@@ -17,7 +16,7 @@ const getIframeURLParams = (isAuthenticated, loggedInUser) => {
1716
}
1817

1918
const OPENCOLLECTIVE_DOMAINS = {
20-
dev: 'http://localhost:3000',
19+
dev: 'https://opencollective.com',
2120
staging: 'https://staging.opencollective.com',
2221
prod: 'https://opencollective.com',
2322
}
@@ -29,7 +28,7 @@ const SupportUs = () => {
2928
const ocDomain = OPENCOLLECTIVE_DOMAINS[JS_ENV] || OPENCOLLECTIVE_DOMAINS.prod
3029
const iframeUrlParams = getIframeURLParams(isAuthenticated, loggedInUser)
3130
return (
32-
<Container display="flex" width="100%" height="100%" justifyContent="center">
31+
<div className="flex justify-center items-center h-[--main-height] w-full overflow-y-auto">
3332
{isLoading && <LoadingFrame />}
3433
<iframe
3534
ref={iframeRef}
@@ -38,7 +37,7 @@ const SupportUs = () => {
3837
onLoad={() => setLoading(false)}
3938
title="Support us on Open Collective"
4039
/>
41-
</Container>
40+
</div>
4241
)
4342
}
4443

app/components/VideoDebate/ActionBubbleMenu.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { hasStatementForm } from '../../state/video_debate/statements/selectors'
1616
import { withLoggedInUser } from '../LoggedInUser/UserProvider'
1717

1818
const startAutomaticStatementsExtractionMutation = gql`
19-
mutation StartAutomaticStatementsExtraction($videoId: Int!) {
19+
mutation StartAutomaticStatementsExtraction($videoId: ID!) {
2020
startAutomaticStatementsExtraction(videoId: $videoId) {
2121
id
2222
}

app/components/Videos/EditVideoModal.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { StyledH3 } from '../StyledUtils/Title'
1717
import { Separator } from '../ui/separator'
1818

1919
const editVideoMutation = gql`
20-
mutation editVideo($id: ID!, $unlisted: Boolean) {
20+
mutation editVideo($id: ID!, $unlisted: Boolean!) {
2121
editVideo(id: $id, unlisted: $unlisted) {
2222
id
2323
unlisted

0 commit comments

Comments
 (0)