Merge pull request #997 from rstacruz/rstacruz/2019-01-20-codefund-update

Update Docker setup and sponsor code

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "jsxSingleQuote": true
+}

Dockerfile

@@ -1,9 +1,11 @@
-FROM ruby:2.5.1-alpine3.7
+FROM ruby:2.5.1
-RUN apk update && apk add --no-cache nodejs build-base
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-RUN apk add yarn --no-cache --repository http://dl-3.alpinelinux.org/alpine/v3.8/community/ --allow-untrusted
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
+    nodejs \
+    yarn \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 RUN mkdir -p /app
 WORKDIR /app
-# COPY Gemfile Gemfile.lock ./
-# RUN bundle install -j 4
-# COPY package.json yarn.lock ./
-# RUN yarn

_data/codefund.yml

@@ -1,2 +1,2 @@
 enabled: true
-token: "c2c8bc62-c275-4c7a-a304-74335c5a1cd0"
+# token: "c2c8bc62-c275-4c7a-a304-74335c5a1cd0"

_includes/2017/berry-sponsor.html

@@ -1,13 +0,0 @@
-{% assign pixel_href = 'https://codefund.io/t/l/TOKEN/pixel.png' | replace: 'TOKEN', site.data.berry.token %}
-{% assign link_href = 'https://codefund.io/t/c/TOKEN/' | replace: 'TOKEN', site.data.berry.token %}
-
-<aside class='berry-sponsor' data-js-no-preview>
-  <div class='cs__wrapper'>
-    <div class='cs__header'>Proudly sponsored by</div>
-    <a href='{{ link_href }}' class='cs__blurb' target='_blank' rel='noopener'>
-      <strong>{{ site.data.berry.title }}</strong>
-      <span>{{ site.data.berry.description }}</span>
-    </a>
-    <img class='cs__pixel' src='{{ pixel_href }}' />
-  </div>
-</aside>

_includes/2017/codefund.html

@@ -1,4 +1,7 @@
 <aside class='codefund-sponsor' data-js-no-preview>
-  <script src='https://codefund.io/scripts/{{ site.data.codefund.token }}/embed.js?template=centered'></script>
+  <div id="codefund"><!-- fallback content --></div>
-  <div id='codefund_ad'></div>
+  <script src="https://codefund.io/properties/51/funder.js" async="async"></script>
+  <script type="text/javascript">var abp;</script>
+  <script type="text/javascript" src="https://cdn2.codefund.app/assets/px.js?ch=1"></script>
+  <script type="text/javascript" src="https://cdn2.codefund.app/assets/px.js?ch=2"></script>
 </aside>

_layouts/2017/home.html

@@ -31,12 +31,6 @@
 
     {% include 2017/search-form.html live=true %}
 
-    {% if site.data.berry.enabled %}
-    <div class='adbox' role='complementary'>
-      {% include 2017/berry-sponsor.html %}
-    </div>
-    {% endif %}
-
     {% if site.data.codefund.enabled %}
     <div class='adbox' role='complementary'>
       {% include 2017/codefund.html %}

_layouts/2017/sheet.html

@@ -13,12 +13,6 @@
     <h1 class='h1'>{{ page.title }} <em>{{ site.data.content.sheet.suffix }}</em></h1>
 
     <div class='adbox' data-js-no-preview>
-      {% if site.data.berry.enabled %}
-      <div class='ad -berry' role='complementary'>
-        {% include 2017/berry-sponsor.html %}
-      </div>
-      {% endif %}
-
       {% if site.data.codefund.enabled %}
       <div class='ad -codefund' role='complementary'>
         {% include 2017/codefund.html %}

_sass/2017/base/fade.scss

@@ -1,7 +1,7 @@
-$bounce: cubic-bezier(.75,-0.5,0,1.75);
+$bounce: cubic-bezier(0.75, -0.5, 0, 1.75);
 
 /*
- * "Preloader":
+/* "Preloader":
  * This makes the content semi-transparent before the page ad loads.
  */
 
@@ -11,23 +11,6 @@ $bounce: cubic-bezier(.75,-0.5,0,1.75);
   }
 }
 
-/*
- * Pop it in as the page loads
- */
-
-.berry-sponsor {
-  html.WithJs & {
-    transform: scale(0.9) translate3d(0, -16px, 0);
-    opacity: 0;
-  }
-
-  html.WithJs.LoadDone & {
-    transform: scale(1) translate3d(0, 0, 0);
-    opacity: 1;
-    transition: transform 500ms $bounce, opacity 500ms linear;
-  }
-}
-
 /*
  * Defer "loading" until page's onload event fires.
  * (The page actually already loaded, we just pretend like it hasn't)

_sass/2017/components/berry-sponsor.scss

@@ -1,62 +0,0 @@
-.berry-sponsor {
-  text-align: center;
-  position: relative;
-  overflow: hidden;
-  max-width: 320px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-/*
- * Berry styles
- */
-
-.cs__header {
-  color: $base-mute;
-  @include font-size(-1);
-  display: block;
-  margin-bottom: 8px;
-
-  &::before,
-  &::after {
-    content: '—';
-    margin: 0 0.5em;
-    opacity: 0.5;
-  }
-}
-
-.cs__blurb {
-  &,
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-
-  & {
-    color: $base-text;
-    display: block;
-  }
-
-  & > strong {
-    color: $base-head;
-    font-weight: bold;
-  }
-
-  &:hover,
-  &:focus {
-    & > strong {
-      color: $base-text;
-    }
-
-    & > span {
-      color: $base-mute;
-    }
-  }
-}
-
-.cs__pixel {
-  position: absolute;
-  left: 0;
-  top: 0;
-  pointer-events: none;
-}

_sass/2017/style.scss

@@ -22,7 +22,6 @@
 @import './components/announcements-item';
 @import './components/announcements-list';
 @import './components/back-button';
-@import './components/berry-sponsor';
 @import './components/body-area';
 @import './components/codefund-sponsor';
 @import './components/comments-area';

docker-compose.yml

@@ -5,6 +5,7 @@ services:
     volumes:
       - .:/app
       - rubygems:/usr/local/bundle
+      - node_modules:/app/node_modules
     ports:
       - '4001:4001'
       - '35729:35729'
@@ -12,3 +13,4 @@ services:
 
 volumes:
   rubygems:
+  node_modules: