Remove page descriptions where they are not needed #550 (#567)

* remove page description_ * keep the linter happy * take out the test for the removed element from test/frontend.js and see if it passes ci Closes #550
okTurtles · May 11, 2019 · 94e5f84 · 94e5f84
1 parent fd0c8e6
commit 94e5f84
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/.Gruntfile.babel.js b/.Gruntfile.babel.js
@@ -134,7 +134,6 @@ module.exports = (grunt) => {
       eslint: 'node ./node_modules/eslint/bin/eslint.js "**/*.{js,vue}"',
       eslintgrunt: "./node_modules/.bin/eslint --ignore-pattern '!.*.js' .Gruntfile.babel.js Gruntfile.js",
       stylelint: 'node ./node_modules/stylelint/bin/stylelint.js "frontend/**/*.{css,scss,vue}"',
-
 
       flow: './node_modules/.bin/flow'
     },

diff --git a/frontend/views/Contributions.vue b/frontend/views/Contributions.vue
@@ -5,7 +5,6 @@
         <i18n tag="h1" class="title is-1 is-marginless">
           Contributions
         </i18n>
-        <i18n tag="p">See everyone’s contributions to the group and manage yours.</i18n>
       </div>
       <div>
         <groups-min-income :group="currentGroupState" />

diff --git a/frontend/views/GroupDashboard.vue b/frontend/views/GroupDashboard.vue
@@ -8,9 +8,6 @@
       <h1 class="title is-1 is-marginless" data-test="groupName">
         {{ currentGroupState.groupName }}
       </h1>
-      <p data-test="sharedValues">
-        {{ currentGroupState.sharedValues }}
-      </p>
     </div>
 
     <dashboard-section title="Proposals">

diff --git a/frontend/views/PayGroup.vue b/frontend/views/PayGroup.vue
@@ -4,7 +4,6 @@
       <i18n tag="h1" class="title is-1 is-marginless">
         Pay Group
       </i18n>
-      <i18n tag="p">What’s this page about, so the user understands the context.</i18n>
     </div>
 
     <section class="section columns is-desktop is-multiline c-invoice">

diff --git a/frontend/views/components/Settings/theme.vue b/frontend/views/components/Settings/theme.vue
@@ -34,7 +34,7 @@ import Themes from '../../data/colors.json'
 
 export default {
   name: 'SelectorTheme',
-  
+
   data () {
     return {
       themes: Themes
@@ -50,8 +50,8 @@ export default {
   computed: {
     ...mapGetters([
       'colors'
-    ]),
-  },
+    ])
+  }
 }
 </script>
 

diff --git a/frontend/views/containers/NavBar.vue b/frontend/views/containers/NavBar.vue
@@ -91,7 +91,6 @@
         </div>
       </div>
       <time-travel v-show="ephemeral.showTimeTravel" :toggleVisibility="toggleTimeTravel" />
-    </div>
   </nav>
 </template>
 <style lang="scss" scoped>

diff --git a/scripts/i18n.js b/scripts/i18n.js
@@ -6,11 +6,12 @@ const pth = require('path')
 let localeObject = {}
 function parseJS (text) {
   let functionEx = /\bL\(\s*['"](.*?)['"]\s*(?:,\s*['"](.*?)['"]\s*)?\)/mg
-  let matches
-  while (matches = functionEx.exec(text)) {
+  let matches = functionEx.exec(text)
+  while (matches) {
     let text = matches[ 1 ]
     let comment = matches[ 2 ]
     localeObject[ text ] = { text: text, comment: comment || '' }
+    matches = functionEx.exec(text)
   }
 }
 function parseHtml (text) {

diff --git a/shared/declarations.js b/shared/declarations.js
@@ -172,8 +172,8 @@ declare module '../shared/sbp.js' { declare module.exports: Function }
 declare module '../../shared/sbp.js' { declare module.exports: Function }
 declare module '../../../shared/sbp.js' { declare module.exports: Function }
 declare module '../shared/domains/okTurtles/data/index.js' { declare module.exports: Object }
-declare module  '../shared/GIMessage.js' { declare module.exports: Object }
-declare module  '../../shared/GIMessage.js' { declare module.exports: Object }
+declare module '../shared/GIMessage.js' { declare module.exports: Object }
+declare module '../../shared/GIMessage.js' { declare module.exports: Object }
 declare module './server.js' { declare module.exports: any }
 declare module './constants.js' { declare module.exports: Object }
 declare module '../shared/constants.js' { declare module.exports: Object }

diff --git a/test/frontend.js b/test/frontend.js
@@ -262,14 +262,12 @@ describe('Frontend', function () {
 
       const created = await n.evaluate(() => ({
         groupName: document.querySelector('[data-test="groupName"]').innerText,
-        sharedValues: document.querySelector('[data-test="sharedValues"]').innerText,
         incomeProvided: document.querySelector('[data-test="minIncome"]').innerText,
         changePercentage: document.querySelector('[data-test="changePercentage"]').innerText,
         memberApprovalPercentage: document.querySelector('[data-test="approvePercentage"]').innerText,
         memberRemovalPercentage: document.querySelector('[data-test="removePercentage"]').innerText
       }))
       should(created.groupName).equal(testName)
-      should(created.sharedValues).equal(testValues)
       // BUG: TODO: this field should not include the currency
       //      TODO: the currency should be checked separately via data-test="incomeCurrency"
       should(created.incomeProvided).equal('$' + testIncome)
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,6 @@ @@
             </div>
           </div>
           <time-travel v-show="ephemeral.showTimeTravel" :toggleVisibility="toggleTimeTravel" />
-        </div>
       </nav>
     </template>
     <style lang="scss" scoped>
@@ Expand Down @@