Merge pull request #68 from jordanopensource/development

Merge 'development' into 'main

Author: George Khoury

.dockerignore

@@ -0,0 +1,31 @@
+# Git
+.git
+.gitignore
+.gitattributes
+.github
+
+# Docker
+Dockerfile
+docker-compose.yaml
+docker-compose.yml
+.dockerignore
+
+# Documentation
+*.md
+LICENSE
+
+# macOS (optional)
+.DS_Store
+
+# Visual Studio Code (optional)
+.vscode
+
+# Drone
+.drone.yml
+
+.env
+.env.*
+
+# editot configs
+.eslintrc.*
+.prettierrc

.drone.yml

@@ -0,0 +1,32 @@
+# Drone CI File!
+
+kind: pipeline
+type: kubernetes
+name: default
+
+metadata:
+  namespace: builds
+
+node_selector:
+  doks.digitalocean.com/node-pool: josa-cloud-np
+
+steps:
+  - name: build
+    image: plugins/docker
+    settings:
+      repo: josaorg/contributions-web
+      tags:
+        - ${DRONE_COMMIT_SHA}
+        - latest
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+  - name: notify
+    image: plugins/slack
+    settings:
+      webhook:
+        from_secret: slack_webhook
+      channel: heartbeat
+    depends_on:
+      - build

.env.sample

@@ -0,0 +1,2 @@
+# endpoint for API
+CONTRIBUTIONS_API_URL=

.eslintrc.js

@@ -2,19 +2,14 @@ module.exports = {
   root: true,
   env: {
     browser: true,
-    node: true
+    node: true,
   },
   parserOptions: {
     parser: '@babel/eslint-parser',
-    requireConfigFile: false
+    requireConfigFile: false,
   },
-  extends: [
-    '@nuxtjs',
-    'plugin:nuxt/recommended',
-    'prettier'
-  ],
-  plugins: [
-  ],
+  extends: ['@nuxtjs', 'plugin:nuxt/recommended', 'prettier'],
+  plugins: [],
   // add your custom rules here
-  rules: {}
+  rules: {},
 }

.gitignore

@@ -1,11 +1,14 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Node template
 # Logs
-/logs
+logs
 *.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
 # Runtime data
 pids
@@ -18,11 +21,12 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
+*.lcov
 
 # nyc test coverage
 .nyc_output
 
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
 # Bower dependency directory (https://bower.io/)
@@ -38,15 +42,27 @@ build/Release
 node_modules/
 jspm_packages/
 
-# TypeScript v1 declaration files
-typings/
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
 
 # Optional npm cache directory
 .npm
 
 # Optional eslint cache
 .eslintcache
 
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
 # Optional REPL history
 .node_repl_history
 
@@ -56,35 +72,73 @@ typings/
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variables file
+# dotenv environment variable files
 .env
+.env.*
+!.env.sample
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
+.parcel-cache
 
-# next.js build output
+# Next.js build output
 .next
+out
 
-# nuxt.js build output
+# Nuxt.js build / generate output
 .nuxt
-
-# Nuxt generate
+.output
 dist
 
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
 # vuepress build output
 .vuepress/dist
 
-# Serverless directories
-.serverless
-
-# IDE / Editor
-.idea
-
-# Service worker
-sw.*
+# vuepress v2.x temp and cache directory
+.temp
+.cache
 
-# macOS
-.DS_Store
+# Docusaurus cache and generated files
+.docusaurus
 
-# Vim swap files
-*.swp
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+.vscode
+.vscode/*
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Other
+assets/data
+**.adminjs

Dockerfile

@@ -0,0 +1,50 @@
+ARG CONTRIBUTIONS_API_URL=https://contributions.api.dev.josa.ngo HOST=0.0.0.0 PORT=3000 USER=node
+
+###########
+# BUILDER #
+###########
+FROM node:16-alpine3.14 as builder
+
+ARG CONTRIBUTIONS_API_URL
+ARG HOST
+ARG PORT
+
+# 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}
+
+# build NuxtJS project
+RUN npm run build:modern
+
+###########
+# PROJECT #
+###########
+FROM node:16-slim
+
+ARG CONTRIBUTIONS_API_URL
+ARG HOST
+ARG PORT
+ARG USER
+
+# copy builder output to project workdir
+WORKDIR /app
+COPY --from=builder --chown=${USER}:${USER} /workspace/.nuxt /app/.nuxt
+COPY --from=builder --chown=${USER}:${USER} /workspace/nuxt.config.js /app/nuxt.config.js
+COPY --from=builder --chown=${USER}:${USER} /workspace/node_modules /app/node_modules
+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}
+
+# set user context
+USER ${USER}
+
+# expose port
+EXPOSE ${PORT}
+
+# run for production
+CMD [ "npm", "run", "start:modern"]

README.md

@@ -6,7 +6,6 @@
   </a>
 
   <h3 align="center">top-contributors-web</h3>
-
   <p align="center">
      The web client for the Jordan Top Contributors website.
     <br />
@@ -20,9 +19,6 @@
     <a href="https://github.com/jordanopensource/top-contributors-web/issues">Request Feature</a>
   </p>
 </p>
-
-
-
 <!-- TABLE OF CONTENTS -->
 <details open="open">
   <summary><h2 style="display: inline-block">Table of Contents</h2></summary>
@@ -143,4 +139,4 @@ Distributed under the Apache License. See `LICENSE` for more information.
 
 Jordan Open Source Association - [@jo_osa](https://twitter.com/@jo_osa) - [email protected]
 
-Project Link: [https://github.com/jordanopensource/top-contributors-web](https://github.com/jordanopensource/top-contributors-web)
+Project Link: [https://github.com/jordanopensource/top-contributors-web](https://github.com/jordanopensource/top-contributors-web)