Merge pull request #75 from jordanopensource/development

Merge 'development' into 'main'

Author: George Khoury

.drone.yml

@@ -15,6 +15,11 @@ steps:
     image: plugins/docker
     settings:
       repo: josaorg/contributions-web
+      build_args:
+        [
+          CONTRIBUTIONS_API_URL=https://contributions.api.dev.josa.ngo,
+          MATOMO_SITE_ID=11,
+        ]
       tags:
         - ${DRONE_COMMIT_SHA}
         - stable

Dockerfile

@@ -1,4 +1,4 @@
-ARG CONTRIBUTIONS_API_URL=https://contributions.api.dev.josa.ngo HOST=0.0.0.0 PORT=3000 USER=node
+ARG CONTRIBUTIONS_API_URL=https://contributions.api.dev.josa.ngo HOST=0.0.0.0 PORT=3000 USER=node MATOMO_SITE_ID=11
 
 ###########
 # BUILDER #
@@ -8,14 +8,15 @@ FROM node:16-alpine3.14 as builder
 ARG CONTRIBUTIONS_API_URL
 ARG HOST
 ARG PORT
+ARG MATOMO_SITE_ID
 
 # copy build context and install dependencies
 WORKDIR /workspace
 COPY . .
 RUN npm install
 
 # Inject the enviromental variables
-ENV CONTRIBUTIONS_API_URL=${CONTRIBUTIONS_API_URL} HOST=${HOST} PORT=${PORT}
+ENV CONTRIBUTIONS_API_URL=$CONTRIBUTIONS_API_URL HOST=$HOST PORT=$PORT MATOMO_SITE_ID=$MATOMO_SITE_ID
 
 # build NuxtJS project
 RUN npm run build:modern
@@ -29,6 +30,7 @@ ARG CONTRIBUTIONS_API_URL
 ARG HOST
 ARG PORT
 ARG USER
+ARG MATOMO_SITE_ID
 
 # copy builder output to project workdir
 WORKDIR /app
@@ -38,7 +40,7 @@ COPY --from=builder --chown=${USER}:${USER} /workspace/node_modules /app/node_mo
 COPY --from=builder --chown=${USER}:${USER} /workspace/package.json /app/
 
 # Inject the enviromental variables
-ENV CONTRIBUTIONS_API_URL=${CONTRIBUTIONS_API_URL} HOST=${HOST} PORT=${PORT}
+ENV CONTRIBUTIONS_API_URL=$CONTRIBUTIONS_API_URL HOST=$HOST PORT=$PORT MATOMO_SITE_ID=$MATOMO_SITE_ID
 
 # set user context
 USER ${USER}

components/TopDevelopers.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="filter-component">
         <FilterSection class="lg:mt-0 lg:order-2" />
-        <Contributors :users="users" class="lg:flex-grow lg:pl-6" />
+        <Contributors :users="users" class="lg:grow lg:pl-6" />
       </div>
     </article>
   </div>

components/TopOrganizations.vue

@@ -9,7 +9,7 @@
         <OrganizationsFilter class="lg:mt-0 lg:order-2" />
         <Organizations
           :organizations="organizations"
-          class="lg:flex-grow lg:pl-6"
+          class="lg:grow lg:pl-6"
         />
       </div>
     </article>

nuxt.config.js

@@ -39,6 +39,10 @@ export default {
 
   // Modules: https://go.nuxtjs.dev/config-modules
   modules: [
+    [
+      'nuxt-matomo',
+      { matomoUrl: '//track.josa.ngo/', siteId: process.env.MATOMO_SITE_ID },
+    ],
     // https://go.nuxtjs.dev/axios
     '@nuxtjs/axios',
     // https://go.nuxtjs.dev/pwa
@@ -58,6 +62,7 @@ export default {
 
   publicRuntimeConfig: {
     CONTRIBUTIONS_API_URL: process.env.CONTRIBUTIONS_API_URL,
+    siteID: process.env.MATOMO_SITE_ID,
   },
 
   healthcheck: {