Skip to content

Commit d040763

Browse files
author
Alex Tharp
authored
Merge pull request #536 from cbdr/topic/CE-307-GraphQL
CE-307 + CE-160: GraphQL + ElasticSearch
2 parents dd62b16 + 4275e18 commit d040763

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+664
-268
lines changed

.env.example

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,25 @@ S3_SECRET_ACCESS_KEY=
1414
S3_BUCKET_NAME=
1515
S3_REGION=
1616

17+
#
18+
# GraphQL
19+
#
20+
GRAPHQL_URL=http://localhost:4000/graphql
21+
1722
#
1823
# Monitoring
1924
#
2025
NEW_RELIC_LICENSE_KEY=
2126
SENTRY_RAVEN_DSN=
2227

28+
# Apollo Engine
29+
APOLLO_ENGINE_PROXY_API_KEY=service:YOUR_ENGINE_API_KEY
30+
APOLLO_ENGINE_PROXY_LOGGING_LEVEL=INFO
31+
APOLLO_ENGINE_PROXY_ORIGIN_HTTP_URL=http://localhost:3000/graphql
32+
APOLLO_ENGINE_PROXY_FRONTEND_HOST=localhost
33+
APOLLO_ENGINE_PROXY_FRONTEND_PORT=4000
34+
APOLLO_ENGINE_PROXY_FRONTEND_ENDPOINT=/graphql
35+
2336
#
2437
# Email Configuration
2538
#

Gemfile

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,18 @@ gem 'puma', '~> 3.10.0'
1212
# Rails
1313
gem 'rails', '~> 5.1.4'
1414

15+
# API
16+
gem 'graphql', '~> 1.7.5'
17+
gem 'graphiql-rails', '~> 1.4.7'
18+
gem 'apollo-tracing', '~> 1.3.0'
19+
1520
# Cortex-specific
1621
gem 'cortex-exceptions', '= 0.0.4'
17-
gem 'cortex-plugins-core', '= 2.0.1'
22+
gem 'cortex-plugins-core', '= 2.1.1'
1823

1924
# Service Layer
20-
gem 'dry-types', '~> 0.12.0'
21-
gem 'dry-struct', '~> 0.3.1'
25+
gem 'dry-types', '~> 0.12.2'
26+
gem 'dry-struct', '~> 0.4.0'
2227
gem 'dry-transaction', '~> 0.10.2'
2328

2429
# Authentication
@@ -31,17 +36,18 @@ gem 'pundit', '~> 1.1.0'
3136
# Data
3237
gem 'awesome_nested_set', '~> 3.1.3'
3338
gem 'bcrypt', '~> 3.1.11'
34-
gem 'kaminari', '~> 1.0.1'
39+
gem 'kaminari', '~> 1.1.1'
3540
gem 'elasticsearch-model', '~> 5.0'
3641
gem 'elasticsearch-rails', '~> 5.0'
37-
gem 'paranoia', '~> 2.3'
42+
gem 'elasticsearch-dsl', '~> 0.1'
43+
gem 'paranoia', '~> 2.4'
3844
gem 'pg', '~> 0.21.0'
3945
gem 'redis-rails', '~> 5.0'
4046
gem 'pomona', '~> 0.7'
4147
gem 'transitions', '~> 1.2', require: %w(transitions active_model/transitions)
4248

4349
# Middleware
44-
gem 'rack-cors', '~> 1.0.1', require: 'rack/cors'
50+
gem 'rack-cors', '~> 1.0.2', require: 'rack/cors'
4551

4652
# Utility
4753
gem 'hashie', '~> 3.5.6'
@@ -88,14 +94,13 @@ gem 'bootstrap-tagsinput-rails', '~> 0.4.2'
8894
gem 'dialog-polyfill-rails', '~> 0.4.5'
8995

9096
# Feature Flagging
91-
gem 'flipper', '~> 0.10'
92-
gem 'flipper-ui', '~> 0.10'
93-
gem 'flipper-active_record', '~> 0.10'
97+
gem 'flipper', '~> 0.11'
98+
gem 'flipper-ui', '~> 0.11'
99+
gem 'flipper-active_record', '~> 0.11'
94100

95101
group :development, :test do
96102
# Environment
97103
gem 'dotenv-rails', require: 'dotenv/rails-now'
98-
gem 'foreman'
99104

100105
# Cache/Sidekiq
101106
gem 'redis-namespace'
@@ -153,7 +158,7 @@ group :test do
153158
end
154159

155160
group :test, :development do
156-
gem 'factory_girl_rails', '~> 4.8'
161+
gem 'factory_girl_rails', '~> 4.8' # TODO: upgrade to factory_bot
157162
gem 'faker', '~> 1.8'
158163
gem 'phantomjs', '~> 2.1'
159164
gem 'jasmine-rails', '~> 0.14'

0 commit comments

Comments
 (0)