From 95f49db21d554532d47ba37907df04a5a4b49d7c Mon Sep 17 00:00:00 2001 From: mxaln Date: Tue, 21 May 2019 14:56:08 +0800 Subject: [PATCH 1/6] Added new languages, fixed styling issues --- package.json | 2 +- src/App.js | 6 +- src/js/components/NavBar.js | 1 + .../components/BottomBar/ControlButtons.js | 5 +- .../components/BottomBar/index.js | 6 +- .../components/ReviewColumn/Comments.js | 2 +- src/js/pages/ChapterReview/index.js | 3 +- .../KanbanBoard/components/ReviewDialog.js | 2 +- .../pages/chapters/components/ChapterCard.js | 4 + src/languages/textToDisplay.json | 190 +++++++++++++++++- 10 files changed, 208 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index ac965bf0..8826b8d2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "translationexchange", "author": "mxaln", - "version": "1.1.6", + "version": "1.1.7", "description": "Translation Exchange", "private": true, "homepage": ".", diff --git a/src/App.js b/src/App.js index f7fd19ba..2ae2f441 100644 --- a/src/App.js +++ b/src/App.js @@ -22,8 +22,8 @@ import { default as TouchBackend } from 'react-dnd-touch-backend'; import config from './config/config'; // import and configure the raven client for sentry in order to track errors -import Raven from 'raven-js'; -Raven.config(`http://9183fe1745da4049889061d44d154a4b@${config.domain}:9000/3`).install(); +//import Raven from 'raven-js'; +//Raven.config(`http://9183fe1745da4049889061d44d154a4b@${config.domain}:9000/3`).install(); class App extends Component { @@ -40,7 +40,7 @@ class App extends Component { componentDidCatch(error, info) { this.setState({hasError: true}); - Raven.captureException(error, {extra: info}); //send error to raven client + //Raven.captureException(error, {extra: info}); //send error to raven client } diff --git a/src/js/components/NavBar.js b/src/js/components/NavBar.js index cd66d021..d38e25df 100644 --- a/src/js/components/NavBar.js +++ b/src/js/components/NavBar.js @@ -193,6 +193,7 @@ class NavBar extends Component { const Container = styled.div` background-color: #fff; width: 100%; + height: 5vw; display: flex; flex-direction: row; justify-content: space-between; diff --git a/src/js/pages/ChapterReview/components/BottomBar/ControlButtons.js b/src/js/pages/ChapterReview/components/BottomBar/ControlButtons.js index 65f3da67..d62d69ac 100644 --- a/src/js/pages/ChapterReview/components/BottomBar/ControlButtons.js +++ b/src/js/pages/ChapterReview/components/BottomBar/ControlButtons.js @@ -85,8 +85,11 @@ export default class ControlButtons extends React.Component { const Container = styled.div` display: flex; justify-content: space-evenly; - align-items: center; width: 30%; + + button { + margin-right: 2vw; + } `; Container.displayName = 'Container'; diff --git a/src/js/pages/ChapterReview/components/BottomBar/index.js b/src/js/pages/ChapterReview/components/BottomBar/index.js index 71529573..161550d5 100644 --- a/src/js/pages/ChapterReview/components/BottomBar/index.js +++ b/src/js/pages/ChapterReview/components/BottomBar/index.js @@ -59,7 +59,7 @@ export default class BottomBar extends React.Component { const Container = styled.div` position: fixed; bottom: 0; - height: 7.5vh; + height: 10vh; background: #222B35; display: flex; justify-content: space-between; @@ -84,7 +84,7 @@ const ButtonContainer = styled.div` const ExitButton = styled.button` background: #39414A; width: 10vw; - height: 5vh; + height: 6vh; min-width: 150px; border-radius: 5px; color: white; @@ -102,7 +102,7 @@ ExitButton.displayName = 'ExitButton'; const NextChapterButton = styled.button` background: linear-gradient(to right, #0076FF, #00C5FF ); width: 10vw; - height: 5vh; + height: 6vh; min-width: 150px; border-radius: 5px; color: white; diff --git a/src/js/pages/ChapterReview/components/ReviewColumn/Comments.js b/src/js/pages/ChapterReview/components/ReviewColumn/Comments.js index a7f082dc..cf3946b9 100644 --- a/src/js/pages/ChapterReview/components/ReviewColumn/Comments.js +++ b/src/js/pages/ChapterReview/components/ReviewColumn/Comments.js @@ -32,7 +32,7 @@ export default class Comments extends React.Component { } const CommentContainer = styled.div` - height: 10vh; + height: 11vh; width: 100%; background: ${props => props.active? '#0D4E78' :'#1B2633'}; border-radius: 5px; diff --git a/src/js/pages/ChapterReview/index.js b/src/js/pages/ChapterReview/index.js index b1e71ef6..a13966ec 100644 --- a/src/js/pages/ChapterReview/index.js +++ b/src/js/pages/ChapterReview/index.js @@ -32,6 +32,7 @@ export class ChapterReview extends React.Component { var nextChapter = chapters.find(function(chapter){ return chapter.number == next_chapter_num + && chapter.published_chunks == chapter.total_chunks }) if(nextChapter == undefined) { // if nextChapter is undefined, it means we have reached the last chapter in the book @@ -152,8 +153,6 @@ const Container= styled.div` position: absolute; overflow-y: hidden; overflow-x:hidden; - display: flex; - align-items: center; `; Container.displayName = 'Container'; const ReviewColumnsContainer=styled.div` diff --git a/src/js/pages/KanbanBoard/components/ReviewDialog.js b/src/js/pages/KanbanBoard/components/ReviewDialog.js index c5f00b79..26812bb8 100644 --- a/src/js/pages/KanbanBoard/components/ReviewDialog.js +++ b/src/js/pages/KanbanBoard/components/ReviewDialog.js @@ -146,7 +146,7 @@ Action.displayName = 'Action'; const ChapterReviewButton = styled.button` width: 35%; - height: 30%; + height: 6vh; min-height: 40px; border-radius: 25px; background: linear-gradient(to right, #0076FF, #00C5FF); diff --git a/src/js/pages/chapters/components/ChapterCard.js b/src/js/pages/chapters/components/ChapterCard.js index ed94c76d..410cef6a 100644 --- a/src/js/pages/chapters/components/ChapterCard.js +++ b/src/js/pages/chapters/components/ChapterCard.js @@ -319,6 +319,10 @@ Card.displayName = 'Card'; const CircularTextContainer = styled.div` position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + max-width: 50%; text-align: center; i { color: ${props=> props.dangerSign? '#FF9800': '#E9E9E9' } diff --git a/src/languages/textToDisplay.json b/src/languages/textToDisplay.json index 80021141..b24a08f7 100644 --- a/src/languages/textToDisplay.json +++ b/src/languages/textToDisplay.json @@ -1,4 +1,192 @@ { + "Cebuano": { + "continue": "Padayon", + "githubSignIn":"Sign in sa Github", + "availableUsers": "Pwede gamiton nga mga ngalan", + "newUser": "Bag-o", + "whatIsYourName": "Unsay imong ngalan?", + "privacyText": "Kung adona kay problema sa imong siguridad, Palihug gamita ang imong ang-ga.", + "record": "I-Record", + "isThisOk": "Ok naba kini?", + "yes": "Oo", + "backToLogin": "Balik sa Login", + "redo": "Baliki pag-usab", + "generatingUser": "Gahimo na ug User", + "loading": "Gasulod...", + "pleaseWait": "Palihug hulata...", + "youAreReadyToGo": "Nakasulod na ikaw!", + "goToProjects": "Adto sa mga proyekto", + "review": "I-Review", + "projects": "Mga proyekto", + "logOut": "Gawas", + "chapter": "Kapitolo", + "download": "I-Download", + "chunk": "Bahin-bahinon", + "verse": "Bersikolo", + "dragHere":"Ibutang diri", + "loadMore": "Abrihi ang uban", + "new":"Bag-o", + "noCommentsAvailable":"Walay mga kumento", + "recordYourComment": "I-record imong kumento", + "goBack": "Balik", + "goToNextChunk": "Sunod nga Bahin", + "goToNextVerse": "Sunod nga Bersikolo", + "goToNextChapter":"Sunod nga Kapitolo", + "take":"I-take", + "recording": "Ga-record na...", + "commentSaved": "Nakopya imong kumento.", + "success": "Milampus!", + "uploading": "Ga-upload...", + "languages": "Mga Linguwahe", + "level":"Sunod", + "unavailable": "Dili-pwede", + "selected": "Gipili", + "unpublished": "Wala ma-publish", + "noTakes": "Walay mga Take", + "error": "Naay problema!", + "uhOh":"Agoy...", + "ok":"Ok", + "micError": "Adonay problema ang Microphone", + "micMessage":"Adonay problema sa pag-record sa imong ngalan.", + "micInstructions": "Siguruha nga makagamit ka ug microphone.", + "uploadError":"Adonay problema sa pag-upload", + "uploadErrorInfo":"Adonay problema sa pag-upload ang imong kumento.", + "internetError":"Susiha ang imong internet connection, kung wala ray problema amoa kining sala, ayohon kini namo dayon, pasaylo-a kami.", + "undo": "Baliki", + "confirm": "Kompirmado", + "alreadyPublished": "Adona kay usa ka publised take lamang, I-UNPUBLISH una kini", + "deleteTake": "Sigurado ka nga imo kining palaon nga Take?", + "deletingTake": "Gapala sa Take...", + "deletingComment": "Gapala sa kumento", + "exportProject":"I-export ang Proyekto", + "downloadProject":"I-download ang proyekto", + "editing": "Ga-edit", + "listening":"Gapaminaw", + "downloading": "Ga-download", + "cancel": "Ayaw ipadayon", + "back": "Balik", + "export": "Export", + "select": "Pili-a", + "transfer": "Ibalhin", + "completed":"Human na", + "next": "Sunod", + "done": "Human na", + "generating":"Ginahimo", + "yourFiles": "Gipadayon ug download ang imong mga files, pwede ikaw mubalik sa mga proyekto", + "backToProjects": "Balik sa mga Proyekto", + "progressPage": "Mga palid sa Progreso", + "board": "Board", + "goodJob": "Maayo ang imong trabaho!", + "chapterCompleted": "Nahuman nimo ang Kapitolo", + "reviewChapter": "Gusto nimo susihon ang nahuman nga Kapitolo?", + "goToReview": "Pagsusi sa Kapitolo", + "exitReview": "Gawas sa pagsusi", + "comments": "Mga Kumento", + "projectImport": "I-import ang Proyekto", + "import": "I-import", + "chooseProject": "Pagpili ug Proyekto...", + "noProjects": "Wala nay mga proyekto", + "skipChapter": "Adto sa sunod nga Kapitolo", + "goToChapterReview" : "Adto sa Pagsusi sa Kapitolo", + "selectAll": "Pili-a tanan", + "noDownloads": "Wala nay ma-download :(", + "recommended": "rekomendasyon", + "downloadClients": "I-Download ang client apps" + }, + "Tagalog": { + "continue": "Magpatuloy", + "githubSignIn":"Mag-sign in sa Github", + "availableUsers": "Puwedeng gamiting mga pangalan", + "newUser": "Bagong user", + "whatIsYourName": "Ano ang iyong pangalan?", + "privacyText": "Kung kayo ay nag-aalala sa inyong kaligtasan o privacy, gamitin na lamang ang palayaw o pseudonym.", + "record": "I-Record", + "isThisOk": "okey ba ito?", + "yes": "Oo", + "backToLogin": "Bumalik sa Login", + "redo": "Ulitin", + "generatingUser": "Kasalukuyang lumilikha ng User", + "loading": "Kasalukuyang nag-Loading...", + "pleaseWait": "Maghintay lamang...", + "youAreReadyToGo": "Ikaw ay handa na!", + "goToProjects": "Pumunta sa proyekto", + "review": "I-Review", + "projects": "Proyekto", + "logOut": "Mag Log Out", + "chapter": "Kapitulo", + "download": "I-Download", + "chunk": "Paghati-hati", + "verse": "Bersikulo", + "dragHere":"Dalhin dito", + "loadMore": "Mag-Load pa ng marami", + "new":"Panibago", + "noCommentsAvailable":"walang komentong magagamit", + "recordYourComment": "I-Record ang iyong komento ", + "goBack": "Bumalik", + "goToNextChunk": "Pumunta sa susunod paghati-hati", + "goToNextVerse": "Pumunta sa susunod na bersikulo", + "goToNextChapter":"Pumunta sa susunod na kapitulo", + "take":"Take", + "recording": "Kasalukuyang nag Re-record...", + "commentSaved": "Ang komento mo ay naka-saved na.", + "success": "Tagumpay!", + "uploading": "kasalukuyang nag a-upload...", + "languages": "Wika", + "level":"Level", + "unavailable": "Hind magagamit", + "selected": "Napili", + "unpublished": "Hindi pa na i-published", + "noTakes": "no takes", + "error": "Merong mali!", + "uhOh":"Naku...", + "ok":"Okey", + "micError": "May mali sa microphone", + "micMessage":"mayroong problema sa pag record ng iyong pangalan.", + "micInstructions": "siguraduhing payagan mong maka-access ang microphone.", + "uploadError":"May mali sa pag-upload", + "uploadErrorInfo":"Mayroong problema sa pag-uploading ng iyong komento.", + "internetError":" I-check ang iyong internet connection, kung wala kang problema kami ang may problema, aayusin namin ito sa lalong madaling panahon, paumanhin po.", + "undo": "Tanggalin", + "confirm": "ikumpirma", + "alreadyPublished": "You can only have one publised take, UNPUBLISH first", + "deleteTake": "Ikaw ba ay siguradung I-delete ang Take na ito?", + "deletingTake": "Kasalukuyang nag De-delete Take...", + "deletingComment": "Kasalukuyang nag De-delete komento", + "exportProject":"mag-Export ng proyekto ", + "downloadProject":"mag-Download ng Proyekto", + "editing": "Kasalukuyang nag E-edit", + "listening":"Kasalukuyang Nakikinig", + "downloading": "Kasalukuyang nag Da-download", + "cancel": "I-Cancel", + "back": "Bumalik", + "export": "Export", + "select": "Pinili", + "transfer": "Ilipat", + "completed":"Kompleto na", + "next": "Susunod", + "done": "Tapos na", + "generating":"Kasalukuyang lumilikha", + "yourFiles": "ang iyong files ay patuloy na nag Da-download, puwede kang bumalik sa proyekto", + "backToProjects": "Bumalik sa Proyekto", + "progressPage": "Progressong Pahina", + "board": "Board", + "goodJob": "Ayos!", + "chapterCompleted": "Nakumpleto mo na ang Kapitulo", + "reviewChapter": "Gusto mo bang suriin ulit ang kapitulo?", + "goToReview": "Pumunta sa chapter review", + "exitReview": "Umalis sa review", + "comments": "Mga komento", + "projectImport": "I-Import ang proyekto", + "import": "I-Import", + "chooseProject": "Pumili ng proyekto...", + "noProjects": "Walang magagamit na proyekto", + "skipChapter": "lumaktaw sa susunod na kapitulo", + "goToChapterReview" : "Pumunta sa Chapter review", + "selectAll": "Piliin lahat", + "noDownloads": "Walang ma-download :(", + "recommended": "inirerekomenda", + "downloadClients": "I-Download ang client apps" + }, "English": { "continue": "Continue", "githubSignIn":"Github Sign in", @@ -186,4 +374,4 @@ "recommended": "recomendado", "downloadClients": "Descargar aplicaciones de cliente" } -} \ No newline at end of file +} From eb6c9fc55079f984b0939950b1d40811b43d314b Mon Sep 17 00:00:00 2001 From: mxaln Date: Tue, 21 May 2019 17:12:48 +0800 Subject: [PATCH 2/6] more visual issues fixed --- src/js/pages/tasks/TaskProgressPage.js | 4 +++- src/js/pages/tasks/components/GotoProjectsButton.js | 4 ++++ src/js/pages/tasks/components/TaskItemFinished.js | 11 ++++------- src/js/pages/tasks/components/TaskItemProgress.js | 5 +---- src/js/pages/tasks/components/TaskProgress.js | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/js/pages/tasks/TaskProgressPage.js b/src/js/pages/tasks/TaskProgressPage.js index 60227c16..9ee84e65 100644 --- a/src/js/pages/tasks/TaskProgressPage.js +++ b/src/js/pages/tasks/TaskProgressPage.js @@ -68,7 +68,9 @@ export class TaskProgressPage extends React.Component { } const TaskProgressPageContainer = styled.div` - + position: relative; + height: 100vh; + overflow: hidden; `; TaskProgressPageContainer.displayName = 'TaskProgressPageContainer'; diff --git a/src/js/pages/tasks/components/GotoProjectsButton.js b/src/js/pages/tasks/components/GotoProjectsButton.js index 20222761..44fd2968 100644 --- a/src/js/pages/tasks/components/GotoProjectsButton.js +++ b/src/js/pages/tasks/components/GotoProjectsButton.js @@ -38,5 +38,9 @@ const Button = styled.div` align-items: center; justify-content: center; box-shadow: 0.2vw 0.2vw 0.5vw #888888; + position: fixed; + bottom: 0.5vh; + left: 50%; + transform: translate(-50%, 0); `; Button.displayName = 'Button'; diff --git a/src/js/pages/tasks/components/TaskItemFinished.js b/src/js/pages/tasks/components/TaskItemFinished.js index 8c62bebf..3686db0e 100644 --- a/src/js/pages/tasks/components/TaskItemFinished.js +++ b/src/js/pages/tasks/components/TaskItemFinished.js @@ -62,11 +62,8 @@ const TaskDetails = styled.div` TaskDetails.displayName = 'TaskDetails'; const Picture = styled.div` - display: flex; flex: 1; position: relative; - justify-content: center; - align-items: center; `; Picture.displayName = 'Picture'; @@ -76,7 +73,7 @@ const Img = styled.img` filter: url(#brightness); filter:brightness(70%); width: 100%; - height: 100%; + height: 10vw; object-fit: cover; border-radius: 0.3vw; `; @@ -89,9 +86,9 @@ const Flag = styled.div` height: 4vw; border-radius: 2vw; position: absolute; - display: flex; - justify-content: center; - align-items: center; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); `; Flag.displayName = 'Flag'; diff --git a/src/js/pages/tasks/components/TaskItemProgress.js b/src/js/pages/tasks/components/TaskItemProgress.js index d91f8c66..e26389f6 100644 --- a/src/js/pages/tasks/components/TaskItemProgress.js +++ b/src/js/pages/tasks/components/TaskItemProgress.js @@ -52,17 +52,14 @@ const TaskDetails = styled.div` TaskDetails.displayName = 'TaskDetails'; const Picture = styled.div` - display: flex; flex: 1; position: relative; - justify-content: center; - align-items: center; `; Picture.displayName = 'Picture'; const Img = styled.img` width: 100%; - height: 100%; + height: 10vw; object-fit: cover; border-radius: 0.3vw; `; diff --git a/src/js/pages/tasks/components/TaskProgress.js b/src/js/pages/tasks/components/TaskProgress.js index 80c15c15..6a970ee7 100644 --- a/src/js/pages/tasks/components/TaskProgress.js +++ b/src/js/pages/tasks/components/TaskProgress.js @@ -33,7 +33,7 @@ export default class TaskProgress extends React.Component { const Container = styled.div` flex: 1 flex-direction: column; - max-height: 35vw; + max-height: 75vh; overflow-y: auto; display: flex; flex-wrap: nowrap; From 00eeb728fdb093470a988e8c50d4d89164b0c180 Mon Sep 17 00:00:00 2001 From: mxaln Date: Wed, 22 May 2019 11:29:48 +0800 Subject: [PATCH 3/6] Added Ilokano translation --- src/languages/textToDisplay.json | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/src/languages/textToDisplay.json b/src/languages/textToDisplay.json index b24a08f7..38646b54 100644 --- a/src/languages/textToDisplay.json +++ b/src/languages/textToDisplay.json @@ -93,6 +93,100 @@ "recommended": "rekomendasyon", "downloadClients": "I-Download ang client apps" }, + "Ilocano": { + "continue": "Continue", + "githubSignIn":"Agsign- in idiay Git Hub", + "availableUsers": "Available Users", + "newUser": "Baro nga User", + "whatIsYourName": "Ania ti naganmo?", + "privacyText": "Para iti privacy, mabalin mo nga usaren ti palayawmo", + "record": "Rekord", + "isThisOk": "Ok ba daytoyen?", + "yes": "Wen", + "backToLogin": "Back to Login", + "redo": "Redo", + "generatingUser": "Generating User", + "loading": "Loading pay lang...", + "pleaseWait": "Aguray la biit...", + "youAreReadyToGo": "Ready to go kan!", + "goToProjects": "Go to projects", + "review": "Rebyu", + "projects": "Projects", + "logOut": "Log Out", + "chapter": "Kapitulo", + "download": "i- Download", + "chunk": "Chunk", + "verse": "Bersikulo", + "dragHere":"i- drag ditoy", + "loadMore": "Load More", + "new":"Baro", + "noCommentsAvailable":"Awan pay ti nag comment", + "recordYourComment": "I- rekord mo ti comment mo", + "goBack": "Go Back", + "goToNextChunk": "Inka iti sumaruno a Chunk", + "goToNextVerse": "Inka iti sumaruno a bersikulo ", + "goToNextChapter":"Inka iti sumaruno a Kapitulo", + "take":"Agrekord kan", + "recording": "Recording...", + "commentSaved": "Na- isaved ti comment mo.", + "success": "Ayus, Success!", + "uploading": "Agap aploaden...", + "languages": "Pagsasao", + "level":"Lebel", + "unavailable": "Saan nga available", + "selected": "Na Select", + "unpublished": "Saan pay a nai- published", + "noTakes": "Awan a pulos ti nairekord", + "error": "Adda ti error na!", + "uhOh":"tsk.tsk.tsk...", + "ok":"Ok", + "micError": "Mabalin nga adda ti perdina dayta microphone", + "micMessage":"Kasla adda kamalina ti panangirekord mo iti naganmo.", + "micInstructions": "Sigoradoem a pinidutmo diay microphone access.", + "uploadError":"Adda ti error na iti panagapload", + "uploadErrorInfo":"Adda iti error na ti panagapload mo kadagiti comments mo.", + "internetError":"Paki-tsek ti internet connection mo, no adda ti saan a gumangana, ayusin min to iti mabiit, dispensarendakami.", + "undo": "Undo", + "confirm": "Confirm", + "alreadyPublished": "Maysa laeng a beses ti panang published, i-un published nga umuna", + "deleteTake": "I delete diay immuna a nairekord?", + "deletingTake": "Madama a burburaenna ti nairekord", + "deletingComment": "Madama a burburaenna dagiti comment", + "exportProject":"i- Export ti Project", + "downloadProject":"i- Download ti Project", + "editing": "Editing", + "listening":"Listening", + "downloading": "Madama nga agda download", + "cancel": "Cancel", + "back": "Back", + "export": "Export", + "select": "Pilien", + "transfer": "i-Transfer", + "completed":"Completon", + "next": "Next", + "done": "Nalpasen", + "generating":"Generating", + "yourFiles": "Madownloaden dagiti files mo, mabalinmon iti agsubli idiay projects", + "backToProjects": "Back to Projects", + "progressPage": "Progress Page", + "board": "Board", + "goodJob": "Ayus, Good job!", + "chapterCompleted": "Nakalpas kan ti maysa a kapitulo", + "reviewChapter": "Kayat mo kadi a rebyu-en ti maysa a kapitulo?", + "goToReview": "pindutem ti Chapter Review", + "exitReview": "Exit Review", + "comments": "Comments", + "projectImport": "I- import mo ti maysa a project", + "import": "Import", + "chooseProject": "Agpilika iti Project...", + "noProjects": "Awan pay iti available projects", + "skipChapter": "Ag Skip ka iti sumaruno a Chapter", + "goToChapterReview" : "Inka idiay Chapter Review", + "selectAll": "Piliem amin", + "noDownloads": "Awan pulos ti nadownload :(", + "recommended": "nai- rekomenda", + "downloadClients": "I- Download ti client apps" + }, "Tagalog": { "continue": "Magpatuloy", "githubSignIn":"Mag-sign in sa Github", From 8fac2003e7e733a3dde22b3f8590c568c24c6993 Mon Sep 17 00:00:00 2001 From: mxaln Date: Thu, 20 Jun 2019 09:15:48 -0400 Subject: [PATCH 4/6] login page design improvement --- src/js/pages/Login/LoginPage.js | 4 ++-- src/js/pages/Login/components/WelcomeComponent.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/js/pages/Login/LoginPage.js b/src/js/pages/Login/LoginPage.js index b1d41c6d..8987ee9b 100644 --- a/src/js/pages/Login/LoginPage.js +++ b/src/js/pages/Login/LoginPage.js @@ -62,7 +62,7 @@ export class Welcome extends React.Component { const LoginPage = styled.div` display: flex; align-items: center; - justify-content: center; + justify-content: space-between; flex-direction: column; `; LoginPage.displayName = 'LoginPage'; @@ -77,7 +77,7 @@ const LanguageContainer = styled.div` width:100%; display:flex; justify-content: flex-end; - margin-bottom: 2vw; + margin: 0; `; LanguageContainer.displayName = 'LanguageContainer'; diff --git a/src/js/pages/Login/components/WelcomeComponent.js b/src/js/pages/Login/components/WelcomeComponent.js index 94560cbc..9b99a4b3 100644 --- a/src/js/pages/Login/components/WelcomeComponent.js +++ b/src/js/pages/Login/components/WelcomeComponent.js @@ -113,8 +113,7 @@ const WelcomePage = styled.div` background: white; justify-self: center; min-width: 250px; - min-height: 400px; - height: 66%; + height: 70vh; text-align: center; //border: solid #969595 0.1vw; border-radius: 0.5vw; From a5db83acbd0503939fb594ce479e7ea2723cae03 Mon Sep 17 00:00:00 2001 From: mxaln Date: Mon, 24 Jun 2019 09:27:28 -0400 Subject: [PATCH 5/6] raven is back --- src/App.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 2ae2f441..2b2d2f3b 100644 --- a/src/App.js +++ b/src/App.js @@ -22,8 +22,8 @@ import { default as TouchBackend } from 'react-dnd-touch-backend'; import config from './config/config'; // import and configure the raven client for sentry in order to track errors -//import Raven from 'raven-js'; -//Raven.config(`http://9183fe1745da4049889061d44d154a4b@${config.domain}:9000/3`).install(); +import Raven from 'raven-js'; +Raven.config(`http://9183fe1745da4049889061d44d154a4b@${config.domain}:9000/3`).install(); class App extends Component { From eba4f64adc5e0b10687986403a69698f983e543b Mon Sep 17 00:00:00 2001 From: mxaln Date: Tue, 25 Jun 2019 08:18:03 -0400 Subject: [PATCH 6/6] Raven is back II --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 2b2d2f3b..f7fd19ba 100644 --- a/src/App.js +++ b/src/App.js @@ -40,7 +40,7 @@ class App extends Component { componentDidCatch(error, info) { this.setState({hasError: true}); - //Raven.captureException(error, {extra: info}); //send error to raven client + Raven.captureException(error, {extra: info}); //send error to raven client }