1.14.0

Merge pull request #169 from 67P/feature/163-small_screen_details_new
Show contributor/contribution details on mobile
2019-12-02 15:59:30 +01:00 · 2019-12-02 15:57:22 +01:00 · 2019-11-29 21:07:35 +01:00 · 2019-11-29 18:06:32 +01:00 · 2019-11-29 18:05:52 +01:00 · 2019-11-29 17:44:22 +01:00
17 changed files with 95 additions and 27 deletions
@@ -8,7 +8,7 @@
        <span class="core-flag">(core)</span>
      {{/if}}
    {{else}}
-      Anonymous
+      <span class="anonymous">Anonymous</span>
      <button {{action "signup"}} class="small">Sign up</button>
      {{#if showConnectButton}}
        <button {{action "connectAccount"}} class="small green">Connect account</button>
@@ -33,6 +33,10 @@ export default Controller.extend({
  showQuickFilterUnconfirmed: false,
  showQuickFilterConfirmed: false,

+  showIntroText: computed('kredits.{hasAccounts,currentUser}', function(){
+    return (!this.kredits.hasAccounts || !this.kredits.currentUser);
+  }),
+
  actions: {

    vetoContribution (contributionId) {
@@ -10,6 +10,7 @@ button, input[type=submit], .button {
  text-transform: uppercase;
  cursor: pointer;
  letter-spacing: 0.1em;
+  -webkit-appearance: none;

  &+button, &+input[type=submit], &+.button {
    margin-left: 0.5rem;
@@ -8,8 +8,3 @@ $red: #fb6868;
 $primary-color: $blue;

 $body-text-color: #fff;
-
-#topbar {
-  background-color: rgba(255, 0, 255, .2);
-}
-
@@ -61,6 +61,40 @@ main {
  }
 }

+#intro {
+  padding: 2rem;
+  background-color: rgba(0,0,0,.2);
+  font-size: 1.6rem;
+
+  @include media-max(small) {
+    padding: 2rem 1rem;
+    font-size: 1.4rem;
+  }
+
+  h2 {
+    font-size: inherit;
+    margin-bottom: 1em;
+  }
+
+  p {
+    margin-bottom: 1em;
+    line-height: 1.5em;
+    font-size: 1.2rem;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  a {
+    text-decoration: none;
+
+    &:hover, &:active {
+      text-decoration: underline;
+    }
+  }
+}
+
@media (min-width: 550px) {
  main {
    &#dashboard {
@@ -84,5 +84,17 @@ section#contribution-details {
      }
    }
  }
-
+}
+
+// On small screens, hide intro text, contributor and contributions list when
+// showing details
+@include media-max(small) {
+  #dashboard.with-details {
+    #contributions, #stats {
+      display: none;
+    }
+  }
+  #intro.with-details {
+    display: none;
+  }
 }
@@ -8,4 +8,10 @@ header#topbar section#user-account {
    margin-left: 0.6rem;
  }

+  @include media-max(small) {
+    .anonymous {
+      display: none;
+    }
+  }
+
 }
@@ -1,3 +1,19 @@
+{{#if showIntroText}}
+  <div id="intro" class={{if showDetailsPane "with-details"}}>
+    <h2>
+      Welcome to the contribution dashboard of the
+      <a href="https://kosmos.org" target="_blank" rel="noopener">Kosmos</a> project!
+    </h2>
+    <p>
+      If you want to learn more about what the numbers mean and how this works,
+      check out the
+      <a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noopener">Kredits documentation</a>.
+      If you want to start earning kredits for your contributions,
+      {{link-to "create a contributor profile" "signup"}}.
+    </p>
+  </div>
+{{/if}}
+
 <main id="dashboard" class={{if showDetailsPane "with-details"}}>

  <div id="stats">
@@ -41,12 +57,12 @@
      <section id="contributions-unconfirmed">
        <header class="with-nav">
          <h2>Latest Contributions</h2>
-          {{#if kredits.hasAccounts}}
          <nav>
            <button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
+            {{#if kredits.hasAccounts}}
              {{link-to "add" "contributions.new" title="Submit a contribution" class="button small green"}}
-            </nav>
            {{/if}}
+          </nav>
        </header>
        <div class="content">
          {{!-- TODO: We need a better naming for kredits.hasAccounts --}}
@@ -42,7 +42,7 @@
          kredits will be issued.
        </p>
        <p>
-          {{link-to "Re-submit contribution …" "contributions.resubmit" model class="button small green"}}.
+          {{link-to "Re-submit contribution …" "contributions.resubmit" model class="button small green"}}
        </p>
      </div>
    {{/if}}
@@ -50,7 +50,7 @@

  <div class="actions">
    <p>
-      {{link-to "Copy & edit as new" "contributions.resubmit" model class="button small"}}.
+      {{link-to "Copy & edit as new" "contributions.resubmit" model class="button small"}}
      {{#if model.ipfsHash}}
        <a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}"
           class="button small" target="_blank" rel="noopener">
@@ -1,6 +1,6 @@
 {
  "name": "kredits-web",
-  "version": "1.12.0",
+  "version": "1.14.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1,6 +1,6 @@
 {
  "name": "kredits-web",
-  "version": "1.12.0",
+  "version": "1.14.0",
  "private": true,
  "description": "Contribution dashboard of the Kosmos project",
  "repository": "https://github.com/67P/kredits-web",
@@ -8,10 +8,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

    
-<meta name="kredits-web/config/environment" content="%7B%22modulePrefix%22%3A%22kredits-web%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_JQUERY_INTEGRATION%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.12.0%2B5a618f7e%22%7D%2C%22browserify%22%3A%7B%22tests%22%3Atrue%2C%22transform%22%3A%5B%5B%22babelify%22%2C%7B%22presets%22%3A%5B%22es2015%22%5D%2C%22global%22%3Atrue%7D%5D%5D%7D%2C%22web3ProviderUrl%22%3A%22https%3A%2F%2Frinkeby.infura.io%2Fv3%2Fd4f788b7a6584f7db2fc3c268d4d09e9%22%2C%22web3RequiredNetwork%22%3A%22rinkeby%22%2C%22githubConnectUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fconnect%2Fgithub%22%2C%22githubSignupUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fgithub%22%2C%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%2C%22gatewayUrl%22%3A%22https%3A%2F%2Fipfs.kosmos.org%2Fipfs%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<meta name="kredits-web/config/environment" content="%7B%22modulePrefix%22%3A%22kredits-web%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_JQUERY_INTEGRATION%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.14.0%2B9c063b82%22%7D%2C%22browserify%22%3A%7B%22tests%22%3Atrue%2C%22transform%22%3A%5B%5B%22babelify%22%2C%7B%22presets%22%3A%5B%22es2015%22%5D%2C%22global%22%3Atrue%7D%5D%5D%7D%2C%22web3ProviderUrl%22%3A%22https%3A%2F%2Frinkeby.infura.io%2Fv3%2Fd4f788b7a6584f7db2fc3c268d4d09e9%22%2C%22web3RequiredNetwork%22%3A%22rinkeby%22%2C%22githubConnectUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fconnect%2Fgithub%22%2C%22githubSignupUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fgithub%22%2C%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%2C%22gatewayUrl%22%3A%22https%3A%2F%2Fipfs.kosmos.org%2Fipfs%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />

    <link integrity="" rel="stylesheet" href="/assets/vendor-179cf27a97ea5bbb0ce72403a401cc8c.css">
-    <link integrity="" rel="stylesheet" href="/assets/kredits-web-a1a46af359f6abc5253690f6a7b29c6b.css">
+    <link integrity="" rel="stylesheet" href="/assets/kredits-web-29c0dd0eeecfecc400ab5919e55a8362.css">

    

@@ -25,7 +25,7 @@
    

    <script src="/assets/vendor-21c31ba5343c7b72f638899d335a0531.js" integrity="sha256-5QKR4/TvbS9UoThtAlcyvj54wU+Bcn0hnM0FzjUbvfA= sha512-tHxWM5t9FYFz6DBnXuzWiIMPPW/gNwPaFDOdUL32cWvWcMfjyrhIEPM5I1D6+HQE1kXCEd64a+7UiMdU2hH5JQ==" ></script>
-    <script src="/assets/kredits-web-afbc29b08c72e5915f60326c02c8aaf0.js" integrity="sha256-7NimDs4gj3uLie/5x8Y5dQZDjLbYaxqwWOn8eCQMZ84= sha512-L4P1fbUTM9zXge/og2OyK7pKHEG81XUFSWJMeBfMEvamlttklZqZCLXHHfrKyEip8RKPX1/ud7BUGvw01weptQ==" ></script>
+    <script src="/assets/kredits-web-5a80f454037be98f10b521243c18f375.js" integrity="sha256-/u89bvyhfTs5ADerxtWsWB50nJaU5f2a+n+n1GlkeT8= sha512-PcHQovpgVHkaTZkWjgwdOy3RSG1wl3C7V4825v6g/ArPoOhFtYSU6O33ne0aNUqoNObovg1SGI9QEgmmYn5dbw==" ></script>

    
  </body>
Author	SHA1	Message	Date
basti	314cf58c29	1.14.0	2019-12-02 15:59:30 +01:00
basti	9c063b82f1	Merge pull request #169 from 67P/feature/163-small_screen_details_new Show contributor/contribution details on mobile	2019-12-02 15:57:22 +01:00
basti	b397e4faf6	Merge pull request #168 from 67P/bugfix/ios_button_styling Reset iOS button styling	2019-11-29 21:07:35 +01:00
galfert	256197094e	Don't show intro text on details page	2019-11-29 18:06:32 +01:00
galfert	9898d4bb1d	Show contributor/contribution details on mobile Refs #163 On small screens, when selecting a contribution or contributor, the lists are hidden and only the details are shown.	2019-11-29 18:05:52 +01:00
galfert	c321dc51b0	Reset iOS button styling Removes the pill shaped, shaded button styling on iOS.	2019-11-29 17:44:22 +01:00
basti	8c759601ca	1.13.0	2019-11-27 15:22:02 +01:00
galfert	15e5d3c2fb	Merge pull request #166 from 67P/feature/welcome_text Add intro, fix topbar on mobile, fix filter button	2019-11-27 13:50:31 +01:00
basti	47b7a6501b	Add intro text for new users closes #164	2019-11-27 12:39:49 +01:00
basti	42304a8e27	Fix account panel breaking out of topbar on mobile refs #163	2019-11-27 11:55:08 +01:00
basti	9a4db6daf6	Do not require account for filtering contributions	2019-11-27 11:00:10 +01:00