Added edition of characters

leoronne · Nov 1, 2020 · 974c304 · 974c304
1 parent 1dd4bbf
commit 974c304
Show file tree

Hide file tree

Showing 14 changed files with 363 additions and 200 deletions.
diff --git a/client/package.json b/client/package.json
@@ -16,7 +16,7 @@
     "@types/react": "^16.9.53",
     "@types/react-dom": "^16.9.8",
     "axios": "^0.21.0",
-    "formik": "^2.1.7",
+    "formik": "^2.2.1",
     "i18next": "^19.7.0",
     "i18next-xhr-backend": "^3.2.2",
     "immer": "^7.0.14",

diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -26,5 +26,6 @@
   "results-3": "are on your favorites list",
   "return": "Return",
   "error-page-1": "Oops, something is wrong",
-  "error-page-2": "We couldn't find the page you are looking for"
+  "error-page-2": "We couldn't find the page you are looking for",
+  "save": "Save"
 }
diff --git a/client/public/locales/pt/translation.json b/client/public/locales/pt/translation.json
@@ -26,5 +26,6 @@
   "results-3": "estão na sua lista de favoritos",
   "return": "Voltar",
   "error-page-1": "Ops, há algo de errado",
-  "error-page-2": "Não foi possível encontrar a página que você esta procurando"
+  "error-page-2": "Não foi possível encontrar a página que você esta procurando",
+  "save": "Salvar"
 }
diff --git a/client/src/@types/index.ts b/client/src/@types/index.ts
@@ -3,7 +3,7 @@ export interface CharacterData {
   aliases: string;
   api_detail_url: string;
   birth: string;
-  count_of_issue_appearances: number;
+  count_of_issue_appearances: number | string;
   // creators: Array<{
   //   api_detail_url: string;
   //   id: number;

diff --git a/client/src/layouts/Default/styles.ts b/client/src/layouts/Default/styles.ts
@@ -18,7 +18,7 @@ export const Container = styled.div`
   }
 
   @media (min-width: 1366px) {
-    /* height: 100%; */
+    height: 100%;
   }
 `;
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ export const Container = styled.div` @@
       }
       @media (min-width: 1366px) {
-        /* height: 100%; */
+        height: 100%;
       }
     `;
@@ Expand Down @@