diff --git a/src/actions/forms.ts b/src/actions/forms.ts index 075874d..fcfbc05 100644 --- a/src/actions/forms.ts +++ b/src/actions/forms.ts @@ -1,5 +1,5 @@ import { Action } from 'redux' -import { NotificationType } from '../types' +import { NotificationType, FormValue } from '../types' export interface InitFormAction extends Action { type: 'FORMS_INIT' @@ -7,14 +7,17 @@ export interface InitFormAction extends Action { export interface InitFieldAction extends Action { type: 'FORMS_INIT_FIELD' - payload: string + payload: { + name: string + apiName?: string + } } export interface SetFieldValueAction extends Action { type: 'FORMS_SET_FIELD_VALUE' payload: { name: string - value: any + value: FormValue } } @@ -41,12 +44,15 @@ export const initForm = (): InitFormAction => ({ type: 'FORMS_INIT', }) -export const initField = (name: string): InitFieldAction => ({ +export const initField = (name: string, apiName?: string): InitFieldAction => ({ type: 'FORMS_INIT_FIELD', - payload: name, + payload: { + name, + apiName, + }, }) -export const setFieldValue = (name: string, value: any): SetFieldValueAction => ({ +export const setFieldValue = (name: string, value: FormValue): SetFieldValueAction => ({ type: 'FORMS_SET_FIELD_VALUE', payload: { name, diff --git a/src/components/app/app.scss b/src/components/app/app.scss index 7e638a8..6bcfaf8 100644 --- a/src/components/app/app.scss +++ b/src/components/app/app.scss @@ -17,6 +17,7 @@ $family-sans-serif: "Open Sans", sans-serif; $primary: $blue; $title-weight: 400; $body-background-color: $white-ter; +$body-size: 14px; @import "../../../node_modules/bulma/sass/utilities/_all.sass"; @import "../../../node_modules/bulma/sass/base/_all.sass"; @@ -33,11 +34,12 @@ $body-background-color: $white-ter; div#main-menu { background-color: $primary; + border-left: 2px solid $purple; bottom: 0; display: flex; flex-direction: column; - left: 0; position: absolute; + right: 0; top: 0; } @@ -55,6 +57,11 @@ div.centered-content { margin: 1rem auto; padding: 2rem; width: 80%; + + div.centered-content-icon { + margin-top: -20px; + text-align: center; + } } div#navigation { diff --git a/src/components/app/app.tsx b/src/components/app/app.tsx index 92ca44b..6b83ae3 100644 --- a/src/components/app/app.tsx +++ b/src/components/app/app.tsx @@ -28,8 +28,8 @@ interface Props { } const App: FC = ({ collapsed, fetching, fetchSelf }) => { - const mainMenuWidth = 250 - const mainColumnLeftMargin = collapsed ? 0 : mainMenuWidth + const mainMenuWidth = 275 + const mainColumnMargin = collapsed ? 0 : mainMenuWidth useEffect(() => { if (localStorage.getItem(LOCAL_STORAGE_ACCESS_TOKEN_KEY)) { @@ -42,7 +42,7 @@ const App: FC = ({ collapsed, fetching, fetchSelf }) => {
-
+
diff --git a/src/components/create-group-form/create-group-form.tsx b/src/components/create-group-form/create-group-form.tsx index 9103564..4543aa3 100644 --- a/src/components/create-group-form/create-group-form.tsx +++ b/src/components/create-group-form/create-group-form.tsx @@ -28,7 +28,7 @@ const CreateGroupForm: FC = ({ checkAvailability }) => {
-
+