diff --git a/twenty-server/.rubocop.yml b/twenty-server/.rubocop.yml index f849f2e..bf6966d 100644 --- a/twenty-server/.rubocop.yml +++ b/twenty-server/.rubocop.yml @@ -15,6 +15,9 @@ AllCops: Include: - lib/*.rb - lib/**/*.rb + - libexec/* + - libexec/twenty/* + - bin/* - test/*_test.rb ## diff --git a/twenty-server/lib/twenty-server/graphql.rb b/twenty-server/lib/twenty-server/graphql.rb index 637b0aa..35a2bda 100644 --- a/twenty-server/lib/twenty-server/graphql.rb +++ b/twenty-server/lib/twenty-server/graphql.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL require "graphql" require_relative "graphql/input" diff --git a/twenty-server/lib/twenty-server/graphql/input.rb b/twenty-server/lib/twenty-server/graphql/input.rb index fe32cd4..83033f9 100644 --- a/twenty-server/lib/twenty-server/graphql/input.rb +++ b/twenty-server/lib/twenty-server/graphql/input.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Input include GraphQL::Types require_relative "input/task_input" diff --git a/twenty-server/lib/twenty-server/graphql/input/task_input.rb b/twenty-server/lib/twenty-server/graphql/input/task_input.rb index 4b85045..2f9c6d1 100644 --- a/twenty-server/lib/twenty-server/graphql/input/task_input.rb +++ b/twenty-server/lib/twenty-server/graphql/input/task_input.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Input class TaskInput < GraphQL::Schema::InputObject require_relative "../type/task_status" diff --git a/twenty-server/lib/twenty-server/graphql/mutation.rb b/twenty-server/lib/twenty-server/graphql/mutation.rb index 7d26af9..4a201aa 100644 --- a/twenty-server/lib/twenty-server/graphql/mutation.rb +++ b/twenty-server/lib/twenty-server/graphql/mutation.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL module Mutation require_relative "mutation/destroy_task" diff --git a/twenty-server/lib/twenty-server/graphql/mutation/complete_task.rb b/twenty-server/lib/twenty-server/graphql/mutation/complete_task.rb index 9e4d2ea..d1d3f22 100644 --- a/twenty-server/lib/twenty-server/graphql/mutation/complete_task.rb +++ b/twenty-server/lib/twenty-server/graphql/mutation/complete_task.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Mutation class CompleteTask < GraphQL::Schema::Mutation argument :task_id, Int diff --git a/twenty-server/lib/twenty-server/graphql/mutation/create_task.rb b/twenty-server/lib/twenty-server/graphql/mutation/create_task.rb index 28002e2..cd7fdd3 100644 --- a/twenty-server/lib/twenty-server/graphql/mutation/create_task.rb +++ b/twenty-server/lib/twenty-server/graphql/mutation/create_task.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Mutation class CreateTask < GraphQL::Schema::Mutation field :errors, [String], null: false diff --git a/twenty-server/lib/twenty-server/graphql/mutation/destroy_task.rb b/twenty-server/lib/twenty-server/graphql/mutation/destroy_task.rb index c237371..c801d55 100644 --- a/twenty-server/lib/twenty-server/graphql/mutation/destroy_task.rb +++ b/twenty-server/lib/twenty-server/graphql/mutation/destroy_task.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Mutation class DestroyTask < GraphQL::Schema::Mutation argument :task_id, Int diff --git a/twenty-server/lib/twenty-server/graphql/mutation/set_random_project_color.rb b/twenty-server/lib/twenty-server/graphql/mutation/set_random_project_color.rb index 2eb6263..e9f7ccf 100644 --- a/twenty-server/lib/twenty-server/graphql/mutation/set_random_project_color.rb +++ b/twenty-server/lib/twenty-server/graphql/mutation/set_random_project_color.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Mutation class SetRandomProjectColor < ::GraphQL::Schema::Mutation require_relative "../type/project" diff --git a/twenty-server/lib/twenty-server/graphql/mutation/update_task.rb b/twenty-server/lib/twenty-server/graphql/mutation/update_task.rb index 01da452..86c15af 100644 --- a/twenty-server/lib/twenty-server/graphql/mutation/update_task.rb +++ b/twenty-server/lib/twenty-server/graphql/mutation/update_task.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Mutation class UpdateTask < GraphQL::Schema::Mutation field :errors, [String], null: false diff --git a/twenty-server/lib/twenty-server/graphql/schema.rb b/twenty-server/lib/twenty-server/graphql/schema.rb index d739346..76845a1 100644 --- a/twenty-server/lib/twenty-server/graphql/schema.rb +++ b/twenty-server/lib/twenty-server/graphql/schema.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL class Schema < GraphQL::Schema query Type::Query diff --git a/twenty-server/lib/twenty-server/graphql/type.rb b/twenty-server/lib/twenty-server/graphql/type.rb index 35c2317..d418bb2 100644 --- a/twenty-server/lib/twenty-server/graphql/type.rb +++ b/twenty-server/lib/twenty-server/graphql/type.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL module Type include ::GraphQL::Types diff --git a/twenty-server/lib/twenty-server/graphql/type/mutation.rb b/twenty-server/lib/twenty-server/graphql/type/mutation.rb index 08929a6..d8a2a0a 100644 --- a/twenty-server/lib/twenty-server/graphql/type/mutation.rb +++ b/twenty-server/lib/twenty-server/graphql/type/mutation.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Type class Mutation < GraphQL::Schema::Object require_relative "../mutation/destroy_task" diff --git a/twenty-server/lib/twenty-server/graphql/type/project.rb b/twenty-server/lib/twenty-server/graphql/type/project.rb index 926d114..25d89fa 100644 --- a/twenty-server/lib/twenty-server/graphql/type/project.rb +++ b/twenty-server/lib/twenty-server/graphql/type/project.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Type class Project < GraphQL::Schema::Object require_relative "task" diff --git a/twenty-server/lib/twenty-server/graphql/type/query.rb b/twenty-server/lib/twenty-server/graphql/type/query.rb index 14a4af2..45a6440 100644 --- a/twenty-server/lib/twenty-server/graphql/type/query.rb +++ b/twenty-server/lib/twenty-server/graphql/type/query.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Type class Query < GraphQL::Schema::Object field :find_task, Task, null: true do diff --git a/twenty-server/lib/twenty-server/graphql/type/task.rb b/twenty-server/lib/twenty-server/graphql/type/task.rb index 6fe9b3c..969126a 100644 --- a/twenty-server/lib/twenty-server/graphql/type/task.rb +++ b/twenty-server/lib/twenty-server/graphql/type/task.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Type class Task < GraphQL::Schema::Object require_relative "project" diff --git a/twenty-server/lib/twenty-server/graphql/type/task_status.rb b/twenty-server/lib/twenty-server/graphql/type/task_status.rb index cbf5e59..80b0df3 100644 --- a/twenty-server/lib/twenty-server/graphql/type/task_status.rb +++ b/twenty-server/lib/twenty-server/graphql/type/task_status.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::GraphQL::Type class TaskStatus < GraphQL::Schema::Enum value :backlog diff --git a/twenty-server/lib/twenty-server/migration/3_add_color_to_projects.rb b/twenty-server/lib/twenty-server/migration/3_add_color_to_projects.rb index 21b6c19..40af3f5 100644 --- a/twenty-server/lib/twenty-server/migration/3_add_color_to_projects.rb +++ b/twenty-server/lib/twenty-server/migration/3_add_color_to_projects.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddColorToProjects < ActiveRecord::Migration[7.1] def up default = Twenty::ColorableMixin.random_color diff --git a/twenty-server/lib/twenty-server/model/mixin/colorable_mixin.rb b/twenty-server/lib/twenty-server/model/mixin/colorable_mixin.rb index 3404a99..79f3496 100644 --- a/twenty-server/lib/twenty-server/model/mixin/colorable_mixin.rb +++ b/twenty-server/lib/twenty-server/model/mixin/colorable_mixin.rb @@ -1,15 +1,17 @@ +# frozen_string_literal: true + module Twenty::ColorableMixin extend self COLORS = [ - '#222222', '#333333', '#444444', '#555555', '#666666', - '#777777', '#888888', '#999999', '#AA2222', '#22AA22', - '#2222AA', '#AA22AA', '#CC9900', '#0099CC', '#9900CC', - '#FF9900', '#00CC99', '#99CC00', '#CC0099', '#990000', - '#112233', '#445566', '#778899', '#AA4455', '#5544AA', - '#88AA44', '#AA88AA', '#CCBB00', '#1155CC', '#9900BB', - '#DD6600', '#00BBCC', '#CC0099', '#BB3300', '#006688', - '#993366', '#2200AA', '#557788', '#998877', '#BB4400' + "#222222", "#333333", "#444444", "#555555", "#666666", + "#777777", "#888888", "#999999", "#AA2222", "#22AA22", + "#2222AA", "#AA22AA", "#CC9900", "#0099CC", "#9900CC", + "#FF9900", "#00CC99", "#99CC00", "#CC0099", "#990000", + "#112233", "#445566", "#778899", "#AA4455", "#5544AA", + "#88AA44", "#AA88AA", "#CCBB00", "#1155CC", "#9900BB", + "#DD6600", "#00BBCC", "#CC0099", "#BB3300", "#006688", + "#993366", "#2200AA", "#557788", "#998877", "#BB4400" ] def self.included(klass) diff --git a/twenty-server/lib/twenty-server/servlet/graphql.rb b/twenty-server/lib/twenty-server/servlet/graphql.rb index 2d0a23e..bfb2f93 100644 --- a/twenty-server/lib/twenty-server/servlet/graphql.rb +++ b/twenty-server/lib/twenty-server/servlet/graphql.rb @@ -1,14 +1,16 @@ +# frozen_string_literal: true + class Twenty::Servlet::GraphQL < Twenty::Servlet ## # POST /servlet/graphql/ def do_POST(req, res) params = JSON.parse(req.body) result = Twenty::GraphQL::Schema.execute( - params['query'], - variables: params['variables'], + params["query"], + variables: params["variables"], context: {} ) - res['content_type'] = 'application/json' + res["content_type"] = "application/json" res.status = 200 res.body = result.to_json end