diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..0b2d858 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +ruby 3.1.2 diff --git a/Gemfile.lock b/Gemfile.lock index 05d6373..32493df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,6 +194,8 @@ GEM net-protocol timeout nio4r (2.5.8) + nokogiri (1.13.7-arm64-darwin) + racc (~> 1.4) nokogiri (1.13.7-x86_64-linux) racc (~> 1.4) oauth2 (1.4.10) @@ -335,6 +337,7 @@ GEM zeitwerk (2.6.0) PLATFORMS + arm64-darwin-21 x86_64-linux DEPENDENCIES diff --git a/app/javascript/components/Appbar/AppbarTabs.tsx b/app/javascript/components/Appbar/AppbarTabs.tsx index 1a0a6e0..5b0bfb0 100644 --- a/app/javascript/components/Appbar/AppbarTabs.tsx +++ b/app/javascript/components/Appbar/AppbarTabs.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import { useDispatch, useSelector } from "react-redux"; import { useHistory, useLocation } from 'react-router'; -import { DashboardRoutePaths, QuestionRoutePaths } from "../../routes"; +import { AssessmentRoutePaths, DashboardRoutePaths, QuestionRoutePaths } from "../../routes"; import { RootState } from "../../services/store"; import { turnOff } from "../../services/store/unsavedChanges"; import { Dialog } from '../Dialog'; @@ -49,7 +49,7 @@ export const AppbarTabs = () => { { icon: , tabel: 'Avaliações', - pathname: QuestionRoutePaths.index, + pathname: AssessmentRoutePaths.index, isCurrent: false, } ] diff --git a/app/javascript/pages/assessment/Assessment.tsx b/app/javascript/pages/assessment/Assessment.tsx new file mode 100644 index 0000000..56900b1 --- /dev/null +++ b/app/javascript/pages/assessment/Assessment.tsx @@ -0,0 +1,9 @@ +import React from 'react' + +export const Assessment = () => { + return ( +
+

Assessment

+
+ ) +} \ No newline at end of file diff --git a/app/javascript/pages/assessment/index.ts b/app/javascript/pages/assessment/index.ts new file mode 100644 index 0000000..3da8848 --- /dev/null +++ b/app/javascript/pages/assessment/index.ts @@ -0,0 +1 @@ +export * from './Assessment' \ No newline at end of file diff --git a/app/javascript/pages/question/Edit/Edit.tsx b/app/javascript/pages/question/Edit/Edit.tsx index fe998ee..127bf70 100644 --- a/app/javascript/pages/question/Edit/Edit.tsx +++ b/app/javascript/pages/question/Edit/Edit.tsx @@ -32,7 +32,7 @@ const UPDATE_QUESTION_MUTATOIN = gql` } ` -export const Edit: FC = () => { +export const Edit = () => { const history = useHistory() const [alert, setAlert] = useState() const params = useParams<{ id: string }>() diff --git a/app/javascript/pages/question/List/List.tsx b/app/javascript/pages/question/List/List.tsx index 7846f31..0cea382 100644 --- a/app/javascript/pages/question/List/List.tsx +++ b/app/javascript/pages/question/List/List.tsx @@ -6,7 +6,7 @@ import { QuestionsFilter } from "./QuestionFilter"; import { QuestionsPainel } from "./QuestionsPainel"; import { FiltersProvider } from './QuestionFilter/QuestionsFilterProvider' -export const List: FC = () => { +export const List = () => { const [filterOpen, setFilterOpen] = useState(false); return ( diff --git a/app/javascript/pages/question/Review/Review.tsx b/app/javascript/pages/question/Review/Review.tsx index e891059..c8e6505 100644 --- a/app/javascript/pages/question/Review/Review.tsx +++ b/app/javascript/pages/question/Review/Review.tsx @@ -21,7 +21,7 @@ export const GET_QUESTION = gql` } ` -export const Review: FC = () => { +export const Review = () => { const { id } = useParams<{ id: string }>() const { loading, data, refetch } = useQuery(GET_QUESTION, { variables: { diff --git a/app/javascript/pages/question/Show/Show.tsx b/app/javascript/pages/question/Show/Show.tsx index 28e60b8..1fcfbe0 100644 --- a/app/javascript/pages/question/Show/Show.tsx +++ b/app/javascript/pages/question/Show/Show.tsx @@ -54,7 +54,7 @@ const DESTROY_QUESTION = gql` } ` -export const Show: FC = () => { +export const Show = () => { const history = useHistory(); const {id} = useParams<{ id: string }>(); const [confirmRegister, setConfirmRegister] = useState(false) diff --git a/app/javascript/routes/paths.ts b/app/javascript/routes/paths.ts index 81d6b1a..7223f3c 100644 --- a/app/javascript/routes/paths.ts +++ b/app/javascript/routes/paths.ts @@ -16,3 +16,8 @@ export const SessionRoutePaths = { export const DashboardRoutePaths = { index: "/dashboard", }; + + +export const AssessmentRoutePaths = { + index: "/assessments", +} \ No newline at end of file diff --git a/app/javascript/routes/routes.tsx b/app/javascript/routes/routes.tsx index 5fbe156..b0d8a58 100644 --- a/app/javascript/routes/routes.tsx +++ b/app/javascript/routes/routes.tsx @@ -1,10 +1,12 @@ import React from "react"; import { Switch, Route, Redirect } from "react-router-dom"; +import { Profile } from "../pages/session"; import { Dashboard } from '../pages/dashboard' import { List, New, Show, Review, Edit } from "../pages/question"; -import { Profile } from "../pages/session"; -import { QuestionRoutePaths, SessionRoutePaths, DashboardRoutePaths } from './paths' +import { Assessment } from "../pages/assessment"; + +import { QuestionRoutePaths, SessionRoutePaths, DashboardRoutePaths, AssessmentRoutePaths } from './paths' export const PrivateRoutes = () => ( @@ -18,5 +20,6 @@ export const PrivateRoutes = () => ( + );