Skip to content

C
contribute
Commit 0af7c1ae authored by Agate's avatar Agate 💬
Browse files
Options

Merge branch 'mv-front' into 'master' 

Mv front

See merge request !1
parents ada7b01c 1e924485
Pipeline #2405 passed with stages
      in 1 minute and 36 seconds
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2237 deletions
      .coveragerc deleted 100644 → 0
      View file @ ada7b01c
      [run]
      include = contributions/*
      omit = *migrations*, *tests*
      plugins =
      django_coverage_plugin
      .dockerignore deleted 100644 → 0
      View file @ ada7b01c
      .*
      !.coveragerc
      !.env
      !.pylintrc
      *.pyc
      ### OSX ###
      .DS_Store
      .AppleDouble
      .LSOverride
      ### SublimeText ###
      # cache files for sublime text
      *.tmlanguage.cache
      *.tmPreferences.cache
      *.stTheme.cache
      # workspace files are user-specific
      *.sublime-workspace
      # project files should be checked into the repository, unless a significant
      # proportion of contributors will probably not be using SublimeText
      # *.sublime-project
      # sftp configuration file
      sftp-config.json
      # Basics
      *.py[cod]
      __pycache__
      # Logs
      *.log
      api/pip-log.txt
      # Unit test / coverage reports
      .coverage
      .tox
      nosetests.xml
      htmlcov
      # Translations
      *.mo
      *.pot
      # Pycharm
      .idea
      # Vim
      *~
      *.swp
      *.swo
      # npm
      front/node_modules/
      # Compass
      .sass-cache
      # virtual environments
      .env
      .gitlab-ci.yml
      View file @ 0af7c1ae
      ......@@ -8,15 +8,14 @@ pages:
      before_script:
      - apt-get update
      - apt-get install -y jq gettext
      - cd front
      - yarn install
      script:
      - yarn build
      - mv dist ../public
      - mv dist public
      cache:
      key: front_node_modules
      paths:
      - "front/node_modules"
      - "node_modules"
      artifacts:
      paths:
      - public/
      ......
      .pylintrc deleted 100644 → 0
      View file @ ada7b01c
      [MASTER]
      load-plugins=pylint_common, pylint_django
      [FORMAT]
      max-line-length=120
      [MESSAGES CONTROL]
      disable=missing-docstring,invalid-name
      [DESIGN]
      max-parents=13
      [TYPECHECK]
      generated-members=REQUEST,acl_users,aq_parent,"[a-zA-Z]+_set{1,2}",save,delete
      README.rst deleted 100644 → 0
      View file @ ada7b01c
      Contributions
      =============
      A tribute to our awesome contributors
      .. image:: https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg
      :target: https://github.com/pydanny/cookiecutter-django/
      :alt: Built with Cookiecutter Django
      :License: GPLv3
      Goals:
      - have a log of contributions happening in various area:
      - Gitlab: MR, comments
      - Weblate: translations (comments?)
      - Financial contributions (open collective)
      - Opened instances
      - Other contributions: blog entries, comunication around the project, third party-project, support, whatever
      - store a list of tasks awaiting contributions
      - provide easy and clear instructions on how to contribute (for each type of contributions)
      - model:
      - Contributor table: contributor id, name, links to contributions platforms, creation_date, is_visible
      - Contribution table: id, platform id, json metadata, url, creation_date, import_date, is_visible, title, type
      - Task table: id, type, name, url,
      Settings
      --------
      Moved to settings_.
      .. _settings: http://cookiecutter-django.readthedocs.io/en/latest/settings.html
      Basic Commands
      --------------
      Setting Up Your Users
      ^^^^^^^^^^^^^^^^^^^^^
      * To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go.
      * To create an **superuser account**, use this command::
      $ python manage.py createsuperuser
      For convenience, you can keep your normal user logged in on Chrome and your superuser logged in on Firefox (or similar), so that you can see how the site behaves for both kinds of users.
      Type checks
      ^^^^^^^^^^^
      Running type checks with mypy:
      ::
      $ mypy contributions
      Test coverage
      ^^^^^^^^^^^^^
      To run the tests, check your test coverage, and generate an HTML coverage report::
      $ coverage run -m pytest
      $ coverage html
      $ open htmlcov/index.html
      Running tests with py.test
      ~~~~~~~~~~~~~~~~~~~~~~~~~~
      ::
      $ pytest
      Live reloading and Sass CSS compilation
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      Moved to `Live reloading and SASS compilation`_.
      .. _`Live reloading and SASS compilation`: http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html
      Deployment
      ----------
      The following details how to deploy this application.
      Docker
      ^^^^^^
      See detailed `cookiecutter-django Docker documentation`_.
      .. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html
      compose/local/django/Dockerfile deleted 100644 → 0
      View file @ ada7b01c
      FROM python:3.6-alpine
      ENV PYTHONUNBUFFERED 1
      RUN apk update \
      # psycopg2 dependencies
      && apk add --virtual build-deps gcc python3-dev musl-dev \
      && apk add postgresql-dev \
      # Pillow dependencies
      && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
      # CFFI dependencies
      && apk add libffi-dev py-cffi \
      # Translations dependencies
      && apk add gettext \
      # https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell
      && apk add postgresql-client
      # Requirements are installed here to ensure they will be cached.
      COPY ./requirements/base.txt /requirements/base.txt
      RUN pip install -r /requirements/base.txt
      COPY ./requirements/local.txt /requirements/local.txt
      RUN pip install -r /requirements/local.txt
      COPY ./compose/production/django/entrypoint /entrypoint
      RUN sed -i 's/\r//' /entrypoint
      RUN chmod +x /entrypoint
      COPY ./compose/local/django/start /start
      RUN sed -i 's/\r//' /start
      RUN chmod +x /start
      WORKDIR /app
      ENTRYPOINT ["/entrypoint"]
      compose/local/django/start deleted 100644 → 0
      View file @ ada7b01c
      #!/bin/sh
      set -o errexit
      set -o pipefail
      set -o nounset
      python manage.py migrate
      python manage.py runserver_plus 0.0.0.0:8000
      compose/production/caddy/Caddyfile deleted 100644 → 0
      View file @ ada7b01c
      www.{$DOMAIN_NAME} {
      redir https://{$DOMAIN_NAME}
      }
      {$DOMAIN_NAME} {
      proxy / django:5000 {
      header_upstream Host {host}
      header_upstream X-Real-IP {remote}
      header_upstream X-Forwarded-Proto {scheme}
      }
      log stdout
      errors stdout
      gzip
      }
      compose/production/caddy/Dockerfile deleted 100644 → 0
      View file @ ada7b01c
      FROM abiosoft/caddy:0.11.0
      COPY ./compose/production/caddy/Caddyfile /etc/Caddyfile
      compose/production/django/Dockerfile deleted 100644 → 0
      View file @ ada7b01c
      FROM python:3.6-alpine
      ENV PYTHONUNBUFFERED 1
      RUN apk update \
      # psycopg2 dependencies
      && apk add --virtual build-deps gcc python3-dev musl-dev \
      && apk add postgresql-dev \
      # Pillow dependencies
      && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
      # CFFI dependencies
      && apk add libffi-dev py-cffi
      RUN addgroup -S django \
      && adduser -S -G django django
      # Requirements are installed here to ensure they will be cached.
      COPY ./requirements /requirements
      RUN pip install --no-cache-dir -r /requirements/production.txt \
      && rm -rf /requirements
      COPY ./compose/production/django/entrypoint /entrypoint
      RUN sed -i 's/\r//' /entrypoint
      RUN chmod +x /entrypoint
      RUN chown django /entrypoint
      COPY ./compose/production/django/start /start
      RUN sed -i 's/\r//' /start
      RUN chmod +x /start
      RUN chown django /start
      COPY . /app
      RUN chown -R django /app
      USER django
      WORKDIR /app
      ENTRYPOINT ["/entrypoint"]
      compose/production/django/entrypoint deleted 100644 → 0
      View file @ ada7b01c
      #!/bin/sh
      set -o errexit
      set -o pipefail
      set -o nounset
      # N.B. If only .env files supported variable expansion...
      export CELERY_BROKER_URL="${REDIS_URL}"
      if [ -z "${POSTGRES_USER}" ]; then
      base_postgres_image_default_user='postgres'
      export POSTGRES_USER="${base_postgres_image_default_user}"
      fi
      export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
      postgres_ready() {
      python << END
      import sys
      import psycopg2
      try:
      psycopg2.connect(
      dbname="${POSTGRES_DB}",
      user="${POSTGRES_USER}",
      password="${POSTGRES_PASSWORD}",
      host="${POSTGRES_HOST}",
      port="${POSTGRES_PORT}",
      )
      except psycopg2.OperationalError:
      sys.exit(-1)
      sys.exit(0)
      END
      }
      until postgres_ready; do
      >&2 echo 'Waiting for PostgreSQL to become available...'
      sleep 1
      done
      >&2 echo 'PostgreSQL is available'
      exec "$@"
      compose/production/django/start deleted 100644 → 0
      View file @ ada7b01c
      #!/bin/sh
      set -o errexit
      set -o pipefail
      set -o nounset
      python /app/manage.py collectstatic --noinput
      /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
      compose/production/postgres/Dockerfile deleted 100644 → 0
      View file @ ada7b01c
      FROM postgres:10.4
      COPY ./compose/production/postgres/maintenance /usr/local/bin/maintenance
      RUN chmod +x /usr/local/bin/maintenance/*
      RUN mv /usr/local/bin/maintenance/* /usr/local/bin \
      && rmdir /usr/local/bin/maintenance
      compose/production/postgres/maintenance/_sourced/constants.sh deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      BACKUP_DIR_PATH='/backups'
      BACKUP_FILE_PREFIX='backup'
      compose/production/postgres/maintenance/_sourced/countdown.sh deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      countdown() {
      declare desc="A simple countdown. Source: https://superuser.com/a/611582"
      local seconds="${1}"
      local d=$(($(date +%s) + "${seconds}"))
      while [ "$d" -ge `date +%s` ]; do
      echo -ne "$(date -u --date @$(($d - `date +%s`)) +%H:%M:%S)\r";
      sleep 0.1
      done
      }
      compose/production/postgres/maintenance/_sourced/messages.sh deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      message_newline() {
      echo
      }
      message_debug()
      {
      echo -e "DEBUG: ${@}"
      }
      message_welcome()
      {
      echo -e "\e[1m${@}\e[0m"
      }
      message_warning()
      {
      echo -e "\e[33mWARNING\e[0m: ${@}"
      }
      message_error()
      {
      echo -e "\e[31mERROR\e[0m: ${@}"
      }
      message_info()
      {
      echo -e "\e[37mINFO\e[0m: ${@}"
      }
      message_suggestion()
      {
      echo -e "\e[33mSUGGESTION\e[0m: ${@}"
      }
      message_success()
      {
      echo -e "\e[32mSUCCESS\e[0m: ${@}"
      }
      compose/production/postgres/maintenance/_sourced/yes_no.sh deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      yes_no() {
      declare desc="Prompt for confirmation. \$\"\{1\}\": confirmation message."
      local arg1="${1}"
      local response=
      read -r -p "${arg1} (y/[n])? " response
      if [[ "${response}" =~ ^[Yy]$ ]]
      then
      exit 0
      else
      exit 1
      fi
      }
      compose/production/postgres/maintenance/backup deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      ### Create a database backup.
      ###
      ### Usage:
      ### $ docker-compose -f <environment>.yml (exec |run --rm) postgres backup
      set -o errexit
      set -o pipefail
      set -o nounset
      working_dir="$(dirname ${0})"
      source "${working_dir}/_sourced/constants.sh"
      source "${working_dir}/_sourced/messages.sh"
      message_welcome "Backing up the '${POSTGRES_DB}' database..."
      if [[ "${POSTGRES_USER}" == "postgres" ]]; then
      message_error "Backing up as 'postgres' user is not supported. Assign 'POSTGRES_USER' env with another one and try again."
      exit 1
      fi
      export PGHOST="${POSTGRES_HOST}"
      export PGPORT="${POSTGRES_PORT}"
      export PGUSER="${POSTGRES_USER}"
      export PGPASSWORD="${POSTGRES_PASSWORD}"
      export PGDATABASE="${POSTGRES_DB}"
      backup_filename="${BACKUP_FILE_PREFIX}_$(date +'%Y_%m_%dT%H_%M_%S').sql.gz"
      pg_dump | gzip > "${BACKUP_DIR_PATH}/${backup_filename}"
      message_success "'${POSTGRES_DB}' database backup '${backup_filename}' has been created and placed in '${BACKUP_DIR_PATH}'."
      compose/production/postgres/maintenance/backups deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      ### View backups.
      ###
      ### Usage:
      ### $ docker-compose -f <environment>.yml (exec |run --rm) postgres backups
      set -o errexit
      set -o pipefail
      set -o nounset
      working_dir="$(dirname ${0})"
      source "${working_dir}/_sourced/constants.sh"
      source "${working_dir}/_sourced/messages.sh"
      message_welcome "These are the backups you have got:"
      ls -lht "${BACKUP_DIR_PATH}"
      compose/production/postgres/maintenance/restore deleted 100644 → 0
      View file @ ada7b01c
      #!/usr/bin/env bash
      ### Restore database from a backup.
      ###
      ### Parameters:
      ### <1> filename of an existing backup.
      ###
      ### Usage:
      ### $ docker-compose -f <environment>.yml (exec |run --rm) postgres restore <1>
      set -o errexit
      set -o pipefail
      set -o nounset
      working_dir="$(dirname ${0})"
      source "${working_dir}/_sourced/constants.sh"
      source "${working_dir}/_sourced/messages.sh"
      if [[ -z ${1+x} ]]; then
      message_error "Backup filename is not specified yet it is a required parameter. Make sure you provide one and try again."
      exit 1
      fi
      backup_filename="${BACKUP_DIR_PATH}/${1}"
      if [[ ! -f "${backup_filename}" ]]; then
      message_error "No backup with the specified filename found. Check out the 'backups' maintenance script output to see if there is one and try again."
      exit 1
      fi
      message_welcome "Restoring the '${POSTGRES_DB}' database from the '${backup_filename}' backup..."
      if [[ "${POSTGRES_USER}" == "postgres" ]]; then
      message_error "Restoring as 'postgres' user is not supported. Assign 'POSTGRES_USER' env with another one and try again."
      exit 1
      fi
      export PGHOST="${POSTGRES_HOST}"
      export PGPORT="${POSTGRES_PORT}"
      export PGUSER="${POSTGRES_USER}"
      export PGPASSWORD="${POSTGRES_PASSWORD}"
      export PGDATABASE="${POSTGRES_DB}"
      message_info "Dropping the database..."
      dropdb "${PGDATABASE}"
      message_info "Creating a new database..."
      createdb --owner="${POSTGRES_USER}"
      message_info "Applying the backup to the new database..."
      gunzip -c "${backup_filename}" | psql "${POSTGRES_DB}"
      message_success "The '${POSTGRES_DB}' database has been restored from the '${backup_filename}' backup."
      config/settings/base.py deleted 100644 → 0
      View file @ ada7b01c
      """
      Base settings to build other settings files upon.
      """
      import environ
      ROOT_DIR = (
      environ.Path(__file__) - 3
      ) # (contributions/config/settings/base.py - 3 = contributions/)
      APPS_DIR = ROOT_DIR.path("contributions")
      env = environ.Env()
      READ_DOT_ENV_FILE = env.bool("DJANGO_READ_DOT_ENV_FILE", default=False)
      if READ_DOT_ENV_FILE:
      # OS environment variables take precedence over variables from .env
      env.read_env(str(ROOT_DIR.path(".env")))
      SECRET_KEY = env("DJANGO_SECRET_KEY")
      ALLOWED_HOSTS = env.list(
      "DJANGO_ALLOWED_HOSTS", default=["contributions.funkwhale.audio"]
      )
      # GENERAL
      # ------------------------------------------------------------------------------
      # https://docs.djangoproject.com/en/dev/ref/settings/#debug
      DEBUG = env.bool("DJANGO_DEBUG", False)
      # Local time zone. Choices are
      # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
      # though not all of them may be available with every OS.
      # In Windows, this must be set to your system time zone.
      TIME_ZONE = "UTC"
      # https://docs.djangoproject.com/en/dev/ref/settings/#language-code
      LANGUAGE_CODE = "en-us"
      # https://docs.djangoproject.com/en/dev/ref/settings/#site-id
      SITE_ID = 1
      # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
      USE_I18N = True
      # https://docs.djangoproject.com/en/dev/ref/settings/#use-l10n
      USE_L10N = True
      # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
      USE_TZ = True
      # DATABASES
      # ------------------------------------------------------------------------------
      # https://docs.djangoproject.com/en/dev/ref/settings/#databases
      DATABASES = {"default": env.db("DATABASE_URL")}
      DATABASES["default"]["ATOMIC_REQUESTS"] = True
      DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60) # noqa F405
      CACHES = {
      "default": {
      "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
      "LOCATION": "",
      }
      }
      # URLS
      # ------------------------------------------------------------------------------
      # https://docs.djangoproject.com/en/dev/ref/settings/#root-urlconf
      ROOT_URLCONF = "config.urls"
      # https://docs.djangoproject.com/en/dev/ref/settings/#wsgi-application
      WSGI_APPLICATION = "config.wsgi.application"
      # APPS
      # ------------------------------------------------------------------------------
      DJANGO_APPS = [
      "django.contrib.auth",
      "django.contrib.contenttypes",
      "django.contrib.sessions",
      "django.contrib.sites",
      "django.contrib.messages",
      "django.contrib.staticfiles",
      # 'django.contrib.humanize', # Handy template tags
      "django.contrib.admin",
      ]
      THIRD_PARTY_APPS = [
      "allauth",
      "allauth.account",
      "allauth.socialaccount",
      "rest_framework",
      "corsheaders",
      "django_filters",
      ]
      LOCAL_APPS = [
      "contributions.users.apps.UsersAppConfig",
      # Your stuff: custom apps go here
      "contributions.core",
      ]
      # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
      INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
      # AUTHENTICATION
      # ------------------------------------------------------------------------------
      # https://docs.djangoproject.com/en/dev/ref/settings/#authentication-backends
      AUTHENTICATION_BACKENDS = [
      "django.contrib.auth.backends.ModelBackend",
      "allauth.account.auth_backends.AuthenticationBackend",
      ]
      # https://docs.djangoproject.com/en/dev/ref/settings/#auth-user-model
      AUTH_USER_MODEL = "users.User"
      # https://docs.djangoproject.com/en/dev/ref/settings/#login-redirect-url
      LOGIN_REDIRECT_URL = "users:redirect"
      # https://docs.djangoproject.com/en/dev/ref/settings/#login-url
      LOGIN_URL = "account_login"
      # PASSWORDS