Merge pull request #575 from WycliffeAssociates/mm_new_langs

Mm new langs
WycliffeAssociates · Jun 25, 2019 · 23ae29e · 23ae29e
2 parents 1983794 + eba4f64
commit 23ae29e
Show file tree

Hide file tree

Showing 16 changed files with 315 additions and 27 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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;

diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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;