-
-
-
-
-
+
+
+ Add or update project details
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
+
);
}
diff --git a/client/src/services/api/index.ts b/client/src/services/api/index.ts
index fff3bf09..7688c197 100644
--- a/client/src/services/api/index.ts
+++ b/client/src/services/api/index.ts
@@ -36,7 +36,7 @@ const API = axios.create({
API.interceptors.request.use(async (config) => {
const MySession = await getSession();
- if(MySession) config.headers.Authorization = `Bearer ${MySession.accessToken}`;
+ if (MySession) config.headers.Authorization = `Bearer ${MySession.accessToken}`;
return config;
});
diff --git a/client/src/store/myProjects/form/index.ts b/client/src/store/myProjects/form/index.ts
index 2b991247..24c3c447 100644
--- a/client/src/store/myProjects/form/index.ts
+++ b/client/src/store/myProjects/form/index.ts
@@ -17,11 +17,11 @@ export interface ProjectFormState {
leadership_demographics_other: string;
recipient_legal_status: string;
leadership_demographics: string[];
- }
+ };
}
const initialState: ProjectFormState = {
- draftProject:{
+ draftProject: {
name: '',
description: '',
logo: null,
@@ -34,8 +34,7 @@ const initialState: ProjectFormState = {
leadership_demographics_other: '',
recipient_legal_status: '',
leadership_demographics: [],
- }
-
+ },
};
const slice = createSlice({
@@ -58,7 +57,7 @@ const slice = createSlice({
clearDraft: (state) => {
state.draftProject = initialState.draftProject;
- }
+ },
},
extraReducers: {
[HYDRATE]: (state, action) => {
diff --git a/client/src/store/myProjects/index.ts b/client/src/store/myProjects/index.ts
index 67b4bd32..8266d08a 100644
--- a/client/src/store/myProjects/index.ts
+++ b/client/src/store/myProjects/index.ts
@@ -11,7 +11,7 @@ export type Sort = {
order: 'asc' | 'desc';
};
-interface MyProjectState{
+interface MyProjectState {
sort?: Sort;
}
@@ -19,8 +19,8 @@ export const initialState: MyProjectState = {
sort: {
field: 'name',
order: 'asc',
- }
-}
+ },
+};
export const slice = createSlice({
name: '/myProjects',
@@ -36,17 +36,16 @@ export const slice = createSlice({
return {
...state,
...action.payload['/myProjects'],
- }
- }
- }
-})
+ };
+ },
+ },
+});
export const { setSort } = slice.actions;
-export function getReduxStateFromQuery(getServerSidePropsFunc?: Function){
- return STORE_WRAPPER.getServerSideProps((store) =>async (ctx) => {
-
- const {resolvedUrl} = ctx;
+export function getReduxStateFromQuery(getServerSidePropsFunc?: Function) {
+ return STORE_WRAPPER.getServerSideProps((store) => async (ctx) => {
+ const { resolvedUrl } = ctx;
const { query } = qs.parseUrl(decodeURIComponent(resolvedUrl), {
arrayFormat: 'bracket-separator',
arrayFormatSeparator: ',',
@@ -54,10 +53,7 @@ export function getReduxStateFromQuery(getServerSidePropsFunc?: Function){
parseBooleans: true,
});
- const {
- sortField,
- sortOrder,
- } = query;
+ const { sortField, sortOrder } = query;
if (sortField && sortOrder) {
await store.dispatch(setSort({ field: sortField, order: sortOrder } as Sort));
@@ -76,11 +72,11 @@ export function getReduxStateFromQuery(getServerSidePropsFunc?: Function){
return {
props: {},
};
- })
+ });
}
export const setQueryFromReduxState = (pathname: string, state: any) => {
- const {sort} = state;
+ const { sort } = state;
const url = qs.stringifyUrl(
{
url: pathname,
@@ -89,14 +85,14 @@ export const setQueryFromReduxState = (pathname: string, state: any) => {
sortField: sort.field,
sortOrder: sort.order,
}),
- }
+ },
},
{
arrayFormat: 'bracket-separator',
arrayFormatSeparator: ',',
}
- )
+ );
- router.replace(url, null, {shallow: true});
-}
+ router.replace(url, null, { shallow: true });
+};
export default slice.reducer;
diff --git a/client/src/styles/flicking.css b/client/src/styles/flicking.css
index 1e9d388b..f6a01f0b 100644
--- a/client/src/styles/flicking.css
+++ b/client/src/styles/flicking.css
@@ -1,2 +1,38 @@
/* FLICKING */
-.flicking-viewport{position:relative;overflow:hidden}.flicking-viewport:not(.vertical){width:100%;height:100%}.flicking-camera{width:100%;height:100%;position:relative;z-index:1;white-space:nowrap;will-change:transform}.flicking-camera>*{display:inline-block;white-space:normal;vertical-align:top}.flicking-viewport.vertical,.flicking-viewport.vertical>.flicking-camera{display:inline-block}.flicking-viewport.vertical.middle>.flicking-camera>*{vertical-align:middle}.flicking-viewport.vertical.bottom>.flicking-camera>*{vertical-align:bottom}.flicking-viewport.vertical>.flicking-camera>*{display:block}.flicking-viewport.flicking-hidden>.flicking-camera>*{visibility:hidden}
+.flicking-viewport {
+ position: relative;
+ overflow: hidden;
+}
+.flicking-viewport:not(.vertical) {
+ width: 100%;
+ height: 100%;
+}
+.flicking-camera {
+ width: 100%;
+ height: 100%;
+ position: relative;
+ z-index: 1;
+ white-space: nowrap;
+ will-change: transform;
+}
+.flicking-camera > * {
+ display: inline-block;
+ white-space: normal;
+ vertical-align: top;
+}
+.flicking-viewport.vertical,
+.flicking-viewport.vertical > .flicking-camera {
+ display: inline-block;
+}
+.flicking-viewport.vertical.middle > .flicking-camera > * {
+ vertical-align: middle;
+}
+.flicking-viewport.vertical.bottom > .flicking-camera > * {
+ vertical-align: bottom;
+}
+.flicking-viewport.vertical > .flicking-camera > * {
+ display: block;
+}
+.flicking-viewport.flicking-hidden > .flicking-camera > * {
+ visibility: hidden;
+}
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
index 425df26c..c9f362e6 100644
--- a/client/tailwind.config.js
+++ b/client/tailwind.config.js
@@ -88,46 +88,7 @@ module.exports = {
},
],
},
- backgroundColor: {
- transparent: 'transparent',
- current: 'currentColor',
- black: '#000000',
- white: '#FFFFFF',
- green: {
- 0: '#E3EBC4',
- 10: '#A3BC3B',
- 20: '#B5C962',
- 40: '#C8D789',
- 60: '#DAE4B1',
- 80: '#E3EBC4',
- 100: '#EDF2D8',
- },
- yellow: {
- 0: '#D8BE27',
- 20: '#E0CB52',
- 40: '#E8D87D',
- 60: '#EFE5A9',
- 80: '#F3ECBE',
- 100: '#F7F2D4',
- },
- blue: {
- 0: '#00548E',
- 20: '#2570A5',
- 40: '#498DBB',
- 60: '#6EA9D2',
- 80: '#92C6E8',
- 100: '#B7E2FF',
- },
- grey: {
- 0: '#1B1B1B',
- 20: '#707070',
- 40: '#CDCDCD',
- 60: '#F8F8F8',
- },
- red: {
- 0: '#CC503E',
- },
- },
+
colors: {
transparent: 'transparent',
current: 'currentColor',
diff --git a/client/tsconfig.json b/client/tsconfig.json
index e43bbf95..3595f0c3 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -2,11 +2,7 @@
"compilerOptions": {
"baseUrl": "./src",
"target": "es5",
- "lib": [
- "dom",
- "dom.iterable",
- "esnext"
- ],
+ "lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
@@ -20,14 +16,6 @@
"jsx": "preserve",
"incremental": true
},
- "include": [
- "next-env.d.ts",
- "**/*.ts",
- "**/*.tsx",
- "**/*.d.ts"
- ],
- "exclude": [
- "node_modules",
- "cypress"
- ]
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
+ "exclude": ["node_modules", "cypress"]
}