Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
6c4341e
Update GenericInput style
broskoski Jul 19, 2018
87eb2e3
Make a new authentication app
broskoski Jul 20, 2018
09c0137
Add AuthFormContainer
broskoski Jul 20, 2018
e6e336c
Add AuthLoginForm
broskoski Jul 20, 2018
31caf3d
Add AuthJoinForm
broskoski Jul 20, 2018
7803eb5
Add AuthForgotPasswordForm
broskoski Jul 20, 2018
98bb23f
Make stories
broskoski Jul 20, 2018
42ca447
Update Button and Input styles
broskoski Jul 20, 2018
e387862
Update fragmentTypes and schema
broskoski Jul 21, 2018
9357b1a
Make requestPasswordReset form functional
broskoski Jul 21, 2018
ce2ed29
Change generic button to actual button
broskoski Jul 21, 2018
dd06ef6
Delete old authentication app
broskoski Jul 22, 2018
add19ca
Add authentication app
broskoski Jul 22, 2018
cec325d
Make client-side js work and add pages
broskoski Jul 22, 2018
9b72230
Add forgot password link
broskoski Jul 22, 2018
bc639c3
Use react-router Link in forms
broskoski Jul 22, 2018
7e55752
Make storybook work with react-router
broskoski Jul 22, 2018
e20adad
Split confirmation routes into their own app
broskoski Jul 25, 2018
2bfec0a
Add server routing to authentication app
broskoski Jul 25, 2018
6c86cfa
Handle logouts
broskoski Jul 25, 2018
86e5026
Working mutation on AuthSignUp
broskoski Jul 25, 2018
acc78a9
Fix confirmation app js
broskoski Jul 25, 2018
d806f83
Add InputWithError
broskoski Jul 25, 2018
f77a774
Add per-field error formatting
broskoski Jul 25, 2018
899f4d3
Capitalize string
broskoski Jul 25, 2018
2fbd692
Updates to base UI components
dzucconi Aug 2, 2018
1b4e66e
Utility for dealing with error objects
dzucconi Aug 2, 2018
5caf738
Refactors auth forms
dzucconi Aug 2, 2018
59675de
Fix some of the fallout from UI changes
dzucconi Aug 2, 2018
2b4d3c1
Fixes whitespace
dzucconi Aug 2, 2018
acfb098
Removes example code
dzucconi Aug 2, 2018
418c918
Uses consistent naming
dzucconi Aug 2, 2018
2af20c9
Adds jest
dzucconi Aug 3, 2018
53cf2a2
Removes old folder
dzucconi Aug 3, 2018
03acf23
Adds compactObject
dzucconi Aug 3, 2018
f8d69b2
Fixes remaining UI issues
dzucconi Aug 3, 2018
082444f
Fixes refresh endpoint (and consequently follows)
dzucconi Aug 3, 2018
9d5eb1f
Handles network errors
dzucconi Aug 3, 2018
75aab8f
Fixes up routes to handle invitations
dzucconi Aug 3, 2018
d0e0032
Forces ssr to always resolve
dzucconi Aug 3, 2018
6d8a13b
Fixes rehydration
dzucconi Aug 3, 2018
0c18bb1
Implements invitation acceptance
dzucconi Aug 3, 2018
5d73863
Reset => Forgot
dzucconi Aug 6, 2018
7bcd33c
Roughs in actual password reset
dzucconi Aug 6, 2018
7aa3dbd
Object may not have extensions
dzucconi Aug 7, 2018
5f7ccdc
Makes development errors easier to read
dzucconi Aug 7, 2018
e58650b
Fixes confirmation app
dzucconi Aug 7, 2018
0470bec
Fixes a couple warnings with passed props
dzucconi Aug 7, 2018
f9367cb
Stories a focusable/ref input
dzucconi Aug 7, 2018
0c20fc2
Allows more flexible styling of inputs
dzucconi Aug 7, 2018
3ead31c
Unwrap search input
dzucconi Aug 7, 2018
3c6f4c0
Appropriate method of setting color conditionally
dzucconi Aug 7, 2018
8e2dcbb
Fixes propagation issues by having the default button export be a link
dzucconi Aug 7, 2018
84c0af0
Fixes incorrect prop type
dzucconi Aug 7, 2018
4f74d08
Adds analytics tracking events
dzucconi Aug 8, 2018
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
Prev Previous commit
Next Next commit
Update fragmentTypes and schema
  • Loading branch information
broskoski authored and dzucconi committed Jul 30, 2018
commit e38786234635cc3155bee0308872a8b67e211bd9
2 changes: 1 addition & 1 deletion react/apollo/fragmentTypes.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"kind":"INTERFACE","name":"Model","possibleTypes":[{"name":"Attachment"},{"name":"Channel"},{"name":"ChannelMembership"},{"name":"ChannelTransferRequest"},{"name":"Comment"},{"name":"Connectable"},{"name":"Connection"},{"name":"Customer"},{"name":"Deed"},{"name":"Embed"},{"name":"Group"},{"name":"GroupMembership"},{"name":"Image"},{"name":"Link"},{"name":"Me"},{"name":"PendingBlock"},{"name":"Text"},{"name":"User"}]},{"kind":"INTERFACE","name":"Followable","possibleTypes":[{"name":"Channel"},{"name":"User"}]},{"kind":"INTERFACE","name":"Mutable","possibleTypes":[{"name":"Channel"},{"name":"Connectable"}]},{"kind":"INTERFACE","name":"UserInterface","possibleTypes":[{"name":"Me"},{"name":"User"}]},{"kind":"UNION","name":"ConnectableKind","possibleTypes":[{"name":"Text"},{"name":"Image"},{"name":"Link"},{"name":"Embed"},{"name":"Attachment"},{"name":"Channel"},{"name":"PendingBlock"}]},{"kind":"INTERFACE","name":"Block","possibleTypes":[{"name":"Attachment"},{"name":"Embed"},{"name":"Image"},{"name":"Link"},{"name":"PendingBlock"},{"name":"Text"}]},{"kind":"UNION","name":"Commentable","possibleTypes":[{"name":"Text"},{"name":"Image"},{"name":"Link"},{"name":"Embed"},{"name":"Attachment"}]},{"kind":"UNION","name":"Member","possibleTypes":[{"name":"Group"},{"name":"User"}]},{"kind":"UNION","name":"SearchResult","possibleTypes":[{"name":"Connectable"},{"name":"Channel"},{"name":"User"},{"name":"Null"}]},{"kind":"UNION","name":"FollowableType","possibleTypes":[{"name":"Channel"},{"name":"User"}]},{"kind":"UNION","name":"MutableType","possibleTypes":[{"name":"Channel"},{"name":"Connectable"}]},{"kind":"UNION","name":"DeedKind","possibleTypes":[{"name":"Connectable"},{"name":"Channel"},{"name":"User"},{"name":"Comment"},{"name":"Null"}]}]
[{"kind":"INTERFACE","name":"Model","possibleTypes":[{"name":"Attachment"},{"name":"Channel"},{"name":"ChannelMembership"},{"name":"ChannelTransferRequest"},{"name":"Comment"},{"name":"Connectable"},{"name":"Connection"},{"name":"Customer"},{"name":"Deed"},{"name":"Embed"},{"name":"Group"},{"name":"GroupMembership"},{"name":"Image"},{"name":"Link"},{"name":"Me"},{"name":"PendingBlock"},{"name":"Text"},{"name":"User"}]},{"kind":"INTERFACE","name":"Followable","possibleTypes":[{"name":"Channel"},{"name":"User"}]},{"kind":"INTERFACE","name":"Mutable","possibleTypes":[{"name":"Channel"},{"name":"Connectable"}]},{"kind":"INTERFACE","name":"UserInterface","possibleTypes":[{"name":"Me"},{"name":"User"}]},{"kind":"UNION","name":"ConnectableKind","possibleTypes":[{"name":"Text"},{"name":"Image"},{"name":"Link"},{"name":"Embed"},{"name":"Attachment"},{"name":"Channel"},{"name":"PendingBlock"}]},{"kind":"INTERFACE","name":"Block","possibleTypes":[{"name":"Attachment"},{"name":"Embed"},{"name":"Image"},{"name":"Link"},{"name":"PendingBlock"},{"name":"Text"}]},{"kind":"UNION","name":"Commentable","possibleTypes":[{"name":"Text"},{"name":"Image"},{"name":"Link"},{"name":"Embed"},{"name":"Attachment"}]},{"kind":"UNION","name":"Member","possibleTypes":[{"name":"Group"},{"name":"User"}]},{"kind":"UNION","name":"SearchResult","possibleTypes":[{"name":"Connectable"},{"name":"Channel"},{"name":"User"},{"name":"Null"}]},{"kind":"UNION","name":"FollowableType","possibleTypes":[{"name":"Channel"},{"name":"User"},{"name":"Group"}]},{"kind":"UNION","name":"MutableType","possibleTypes":[{"name":"Channel"},{"name":"Connectable"}]},{"kind":"UNION","name":"DeedKind","possibleTypes":[{"name":"Connectable"},{"name":"Channel"},{"name":"User"},{"name":"Comment"},{"name":"Null"}]},{"kind":"UNION","name":"Identifiable","possibleTypes":[{"name":"User"},{"name":"Group"}]}]
63 changes: 58 additions & 5 deletions react/apollo/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -575,11 +575,12 @@ interface Followable {
}

# Followable object
union FollowableType = Channel | User
union FollowableType = Channel | Group | User

# Types of followable objects
enum FollowableTypeEnum {
CHANNEL
GROUP
USER
}

Expand All @@ -600,6 +601,7 @@ type Group implements Model {
manageable_user_ids: [Int]
memberships: [GroupMembership]
name: String
slug: String
updated_at(format: String, relative: Boolean): String
user: User
users: [User]
Expand Down Expand Up @@ -634,6 +636,15 @@ type GroupMembershipCan {
manage: Boolean
}

union Identifiable = Group | User

# An object which exposes and names Users and Groups
type Identity {
identifiable: Identifiable!
name: String!
slug: String!
}

# An image block
type Image implements Block & Model {
counts: BlockCounts
Expand Down Expand Up @@ -747,13 +758,14 @@ type Me implements Model & UserInterface {
bio(format: Format, no_links: Boolean = false): String
can: UserCan
connection_search(direction: Directions = DESC, per: Int = 5, q: String = null): [Channel]
contents(direction: Directions = DESC, page: Int = 1, per: Int = 1, q: String = null, seed: Int = 173, sort_by: SearchSorts = UPDATED_AT, type: ConnectableTypeEnum = null): [Connectable]
contents(direction: Directions = DESC, page: Int = 1, per: Int = 1, q: String = null, seed: Int = 202, sort_by: SearchSorts = UPDATED_AT, type: ConnectableTypeEnum = null): [Connectable]
counts: MeCounts
created_at(format: String, relative: Boolean): String
customer: Customer
email: String
feed(end: String = "-inf", limit: Int = 50, offset: Int = 0, start: String = "+inf", type: String = "User"): Feed
first_name: String
flags: MeFlags
hidden_email: String
home_path: String
href: String
Expand Down Expand Up @@ -788,10 +800,15 @@ type MeCounts {
private_connections_limit: Int
}

type MeFlags {
has_seen_mute_announcement: Boolean
}

type MeSettings {
exclude_from_indexes: Boolean
receive_email: String
receive_newsletter: Boolean
receive_tips_emails: Boolean
show_tour: Boolean
}

Expand Down Expand Up @@ -857,6 +874,8 @@ type Mutation {
remove_collaborators(input: RemoveCollaboratorInput!): RemoveCollaboratorPayload @deprecated(reason: "Use `remove_channel_member` instead")
remove_connection(input: RemoveConnectionInput!): RemoveConnectionPayload
remove_group_users(input: RemoveGroupUsersInput!): RemoveGroupUsersPayload
request_password_reset(input: RequestPasswordResetInput!): RequestPasswordResetPayload
reset_password(input: ResetPasswordInput!): ResetPasswordPayload
share_channel(input: ShareChannelInput!): ShareChannelPayload
unfollow(input: UnfollowInput!): UnfollowPayload
unmute(input: UnmuteInput!): UnmutePayload
Expand Down Expand Up @@ -942,13 +961,15 @@ type Query {
# Interface for getting the follow status of users or channels
followable(id: ID, type: FollowableTypeEnum): FollowableType
group(id: ID!): Group
identity(id: ID!): Identity

# The current logged in user
me: Me

# Interface for getting the mute status of blocks or channels
mutable(id: ID!, type: MutableTypeEnum!): MutableType
search(direction: Directions = DESC, object_id: String = null, object_type: ObjectType = null, page: Int = 1, per: Int = 1, q: String! = null, seed: Int = 173, sort_by: SearchSorts = null, type: SearchType = null): [SearchResult]
password_token(token: ID!): User
search(direction: Directions = DESC, object_id: String = null, object_type: ObjectType = null, page: Int = 1, per: Int = 1, q: String! = null, seed: Int = 202, sort_by: SearchSorts = null, type: SearchType = null): [SearchResult]
searches: Searches

# Is this endpoint operational?
Expand Down Expand Up @@ -981,6 +1002,8 @@ input RegistrationInput {
last_name: String!
password: String!
password_confirmation: String!
receive_newsletter: Boolean
receive_tips_emails: Boolean
}

# Autogenerated return type of Registration
Expand Down Expand Up @@ -1070,6 +1093,36 @@ type RemoveGroupUsersPayload {
group: Group
}

# Autogenerated input type of RequestPasswordReset
input RequestPasswordResetInput {
# A unique identifier for the client performing the mutation.
clientMutationId: String
email: String!
}

# Autogenerated return type of RequestPasswordReset
type RequestPasswordResetPayload {
# A unique identifier for the client performing the mutation.
clientMutationId: String
email: String
}

# Autogenerated input type of ResetPassword
input ResetPasswordInput {
# A unique identifier for the client performing the mutation.
clientMutationId: String
password: String!
password_confirmation: String!
token: String!
}

# Autogenerated return type of ResetPassword
type ResetPasswordPayload {
# A unique identifier for the client performing the mutation.
clientMutationId: String
me: Me
}

# Possible types for search results
union SearchResult = Channel | Connectable | Null | User

Expand Down Expand Up @@ -1257,7 +1310,7 @@ type User implements Followable & Model & UserInterface {
badge: String
bio(format: Format, no_links: Boolean = false): String
can: UserCan
contents(direction: Directions = DESC, page: Int = 1, per: Int = 1, q: String = null, seed: Int = 173, sort_by: SearchSorts = UPDATED_AT, type: ConnectableTypeEnum = null): [Connectable]
contents(direction: Directions = DESC, page: Int = 1, per: Int = 1, q: String = null, seed: Int = 202, sort_by: SearchSorts = UPDATED_AT, type: ConnectableTypeEnum = null): [Connectable]
counts: UserCounts
created_at(format: String, relative: Boolean): String
first_name: String
Expand Down Expand Up @@ -1293,7 +1346,7 @@ interface UserInterface {
badge: String
bio(format: Format, no_links: Boolean = false): String
can: UserCan
contents(direction: Directions = DESC, page: Int = 1, per: Int = 1, q: String = null, seed: Int = 173, sort_by: SearchSorts = UPDATED_AT, type: ConnectableTypeEnum = null): [Connectable]
contents(direction: Directions = DESC, page: Int = 1, per: Int = 1, q: String = null, seed: Int = 202, sort_by: SearchSorts = UPDATED_AT, type: ConnectableTypeEnum = null): [Connectable]
first_name: String
hidden_email: String
href: String
Expand Down