Merge pull request #73 from gwu-libraries/frontend-rework

Frontend rework

Author: alepbloyd

.gitignore

@@ -45,6 +45,8 @@
 
 /rails/node_modules
 
+/node_modules
+
 # -- React --
 /react/dist
 

docker-compose.yml

@@ -10,11 +10,15 @@ services:
       POSTGRES_DB: bookworm_production
       POSTGRES_PASSWORD: $POSTGRES_PASSWORD
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d bookworm_production -U postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -d bookworm_production -U bookworm" ]
       interval: 10s
       timeout: 5s
       retries: 10
+    networks:
+      - bookworm
+    hostname: db
   rails:
+    hostname: rails
     build: ./rails
     container_name: bookworm-rails
     command: "bundle exec rails s -p 3001 -b '0.0.0.0'"
@@ -34,20 +38,24 @@ services:
     depends_on:
       db:
         condition: service_healthy
+    networks:
+      - bookworm
+
   react:
     build: ./react
     container_name: bookworm-react
     env_file: .env
     environment:
       NODE_ENV: production
       RAILS_API_URL: $RAILS_API_URL
-    ports:
-      - 3000:80
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --spider --tries=1 localhost:3000 || exit 1" ]
       interval: 10s
       timeout: 5s
       retries: 10
+    hostname: bookworm-react
+    networks:
+      - bookworm
     depends_on:
       db:
         condition: service_healthy
@@ -68,9 +76,10 @@ services:
         condition: service_healthy
       react:
         condition: service_healthy
+    networks:
+      - bookworm
 
 volumes:
   postgres_data: {}
 networks:
-  default:
-    name: bookworm
+  bookworm:

nginx/conf.d/bookworm-ssl.conf

@@ -1,12 +1,12 @@
 server {
-    listen 443;
+    listen 443 ssl;
     server_name bookworm;
 
     ssl_certificate /etc/ssl/certificate.pem;
     ssl_certificate_key /etc/ssl/key.pem;
 
     location /graphql {
-        proxy_pass http://bookworm-rails:3001/graphql;
+        proxy_pass http://rails:3001/graphql;
         proxy_redirect     default;
         proxy_http_version 1.1;
 

nginx/conf.d/bookworm.conf

@@ -3,7 +3,7 @@ server {
     server_name bookworm;
 
     location /graphql {
-        proxy_pass http://bookworm-rails:3001/graphql;
+        proxy_pass http://rails:3001/graphql;
         proxy_redirect     default;
         proxy_http_version 1.1;
 

rails/app/graphql/book_worm_schema.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BookWormSchema < GraphQL::Schema
-  mutation(Types::MutationType)
+  # mutation(Types::MutationType)
   query(Types::QueryType)
 
   # For batch-loading (see https://graphql-ruby.org/dataloader/overview.html)

rails/app/graphql/types/author_type.rb

@@ -17,19 +17,34 @@ def works
       object.works
     end
 
-    field :authors_ids, Types::AuthorsIdsType
-    def authors_ids
-      object.authors_ids
+    field :datasets, [Types::WorkType]
+    def datasets
+      object.works.where(work_type: "dataset")
+    end
+
+    field :articles, [Types::WorkType]
+    def articles
+      object.works.where(work_type: "article")
+    end
+
+    field :scopus, String
+    def scopus
+      object.authors_ids.scopus
+    end
+
+    field :wikipedia, String
+    def wikipedia
+      object.authors_ids.wikipedia
+    end
+
+    field :mag, String
+    def mag
+      object.authors_ids.mag
     end
 
     field :institutions, [Types::InstitutionType]
     def institutions
       object.institutions.uniq # move this to the Author model probably
     end
-
-    field :authors_counts_by_year, [Types::AuthorsCountsByYearType]
-    def authors_counts_by_year
-      object.authors_counts_by_year
-    end
   end
 end

rails/app/graphql/types/authors_counts_by_year_type.rb

@@ -20,9 +20,53 @@ class InstitutionType < Types::BaseObject
     field :updated_at, GraphQL::Types::ISO8601DateTime, null: false
 
     field :authors, [Types::AuthorType]
-
     def authors
-      object.authors
+      object.authors.uniq
+    end
+
+    field :wikidata, String
+    def wikidata
+      object.institutions_ids.wikidata
+    end
+
+    field :wikipedia, String
+    def wikipedia
+      object.institutions_ids.wikipedia
+    end
+
+    field :mag, String
+    def mag
+      object.institutions_ids.mag
+    end
+
+    field :grid, String
+    def grid
+      object.institutions_ids.grid
+    end
+
+    field :city, String
+    def city
+      object.institutions_geo.city
+    end
+
+    field :region, String
+    def region
+      object.institutions_geo.region
+    end
+
+    field :country, String
+    def country
+      object.institutions_geo.country
+    end
+
+    field :latitude, Float
+    def latitude
+      object.institutions_geo.latitude
+    end
+
+    field :longitude, Float
+    def longitude
+      object.institutions_geo.longitude
     end
   end
 end