general cleanup

2021-05-22 16:44:53 +02:00 · 2021-05-22 16:44:53 +02:00 · 8221c7844b
parent 5ecaf5587b
commit 8221c7844b
7 changed files with 1837 additions and 3763 deletions
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -1,19 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - enhancement
-  - bug
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,42 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-
-  build:
-    name: Build, push, and deploy
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Checkout master
-      uses: actions/checkout@v2
-
-    - name: Build PostgreSQL container image
-      run: | 
-        docker build --build-arg DATABASE_TYPE=postgresql \
-        --tag ghcr.io/$GITHUB_ACTOR/umami:postgresql-$(echo $GITHUB_SHA | head -c7) \
-        --tag ghcr.io/$GITHUB_ACTOR/umami:postgresql-latest \
-        .
-
-    - name: Build MySQL container image
-      run: |
-        docker build --build-arg DATABASE_TYPE=mysql \
-        --tag ghcr.io/$GITHUB_ACTOR/umami:mysql-$(echo $GITHUB_SHA | head -c7) \
-        --tag ghcr.io/$GITHUB_ACTOR/umami:mysql-latest \
-        .
-
-    - name: Docker login
-      run: >-
-        echo "${{ secrets.GITHUB_TOKEN }}"
-        | docker login -u "${{ github.actor }}" --password-stdin ghcr.io
-      
-    - name: Push image to GitHub
-      run: |
-        # Push each image individually, avoiding pushing to umami:latest
-        # as MySQL or PostgreSQL are required
-        docker push ghcr.io/$GITHUB_ACTOR/umami:postgresql-$(echo $GITHUB_SHA | head -c7)
-        docker push ghcr.io/$GITHUB_ACTOR/umami:postgresql-latest
-        docker push ghcr.io/$GITHUB_ACTOR/umami:mysql-$(echo $GITHUB_SHA | head -c7)
-        docker push ghcr.io/$GITHUB_ACTOR/umami:mysql-latest
--- a/8
+++ b/8
@ -1,5 +1,5 @@
 # Build image
-FROM node:12.18-alpine AS build
+FROM node:16.2.0-alpine3.13 AS build
 ARG DATABASE_TYPE
 ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" \
    DATABASE_TYPE=$DATABASE_TYPE
@ -9,20 +9,20 @@ RUN yarn config set --home enableTelemetry 0
 COPY package.json yarn.lock /build/

 # Install only the production dependencies
-RUN yarn install --production --frozen-lockfile
+RUN yarn --production --frozen-lockfile

 # Cache these modules for production
 RUN cp -R node_modules/ prod_node_modules/

 # Install development dependencies
-RUN yarn install --frozen-lockfile
+RUN yarn --frozen-lockfile

 COPY . /build
 RUN yarn next telemetry disable
 RUN yarn build

 # Production image
-FROM node:12.18-alpine AS production
+FROM node:16.2.0-alpine3.13 AS production
 WORKDIR /app

 # Copy cached dependencies
--- a/1
+++ b/1
@ -1 +0,0 @@
-web: npm run start-env
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -2,23 +2,23 @@
 version: '3'
 services:
  umami:
-    image: ghcr.io/mikecao/umami:postgresql-latest
+    build: .
    ports:
      - "3000:3000"
    environment:
-      DATABASE_URL: postgresql://umami:umami@db:5432/umami
-      DATABASE_TYPE: postgresql
-      HASH_SALT: replace-me-with-a-random-string
+      DATABASE_URL: sqlite://umami:umami@db:5432/umami
+      DATABASE_TYPE: sqlite
+      HASH_SALT: xSSHW4A2w0e3vxLUp46XL9OzCGKvxEnA
    depends_on:
      - db
-  db:
-    image: postgres:12-alpine
-    environment:
-      POSTGRES_DB: umami
-      POSTGRES_USER: umami
-      POSTGRES_PASSWORD: umami
-    volumes:
-      - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
-      - umami-db-data:/var/lib/postgresql/data
+  # db:
+  #   image: postgres:13.3-alpine
+  #   environment:
+  #     POSTGRES_DB: umami
+  #     POSTGRES_USER: umami
+  #     POSTGRES_PASSWORD: umami
+  #   volumes:
+  #     - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
+  #     - umami-db-data:/var/lib/postgresql/data
 volumes:
  umami-db-data:
--- a/lib/lang.js
+++ b/lib/lang.js
@ -1,164 +1,12 @@
-import {
-  cs,
-  sk,
-  da,
-  de,
-  el,
-  enUS,
-  es,
-  fi,
-  fr,
-  faIR,
-  he,
-  hi,
-  id,
-  it,
-  ja,
-  ms,
-  nb,
-  nl,
-  pl,
-  pt,
-  ptBR,
-  ro,
-  ru,
-  sv,
-  ta,
-  tr,
-  uk,
-  zhCN,
-  zhTW,
-} from 'date-fns/locale';
+import { enUS } from 'date-fns/locale';
 import enMessages from 'lang-compiled/en-US.json';
-import nlMessages from 'lang-compiled/nl-NL.json';
-import zhCNMessages from 'lang-compiled/zh-CN.json';
-import zhTWMessages from 'lang-compiled/zh-TW.json';
-import trTRMessages from 'lang-compiled/tr-TR.json';
-import ruRUMessages from 'lang-compiled/ru-RU.json';
-import deDEMessages from 'lang-compiled/de-DE.json';
-import jaMessages from 'lang-compiled/ja-JP.json';
-import esMXMessages from 'lang-compiled/es-MX.json';
-import frMessages from 'lang-compiled/fr-FR.json';
-import mnMNMessages from 'lang-compiled/mn-MN.json';
-import daMessages from 'lang-compiled/da-DK.json';
-import svMessages from 'lang-compiled/sv-SE.json';
-import grMessages from 'lang-compiled/el-GR.json';
-import foMessages from 'lang-compiled/fo-FO.json';
-import ptMessages from 'lang-compiled/pt-PT.json';
-import ptBRMessages from 'lang-compiled/pt-BR.json';
-import roMessages from 'lang-compiled/ro-RO.json';
-import nbNOMessages from 'lang-compiled/nb-NO.json';
-import idMessages from 'lang-compiled/id-ID.json';
-import ukMessages from 'lang-compiled/uk-UA.json';
-import fiMessages from 'lang-compiled/fi-FI.json';
-import csMessages from 'lang-compiled/cs-CZ.json';
-import skMessages from 'lang-compiled/sk-SK.json';
-import plMessages from 'lang-compiled/pl-PL.json';
-import taMessages from 'lang-compiled/ta-IN.json';
-import hiMessages from 'lang-compiled/hi-IN.json';
-import heMessages from 'lang-compiled/he-IL.json';
-import itMessages from 'lang-compiled/it-IT.json';
-import faIRMessages from 'lang-compiled/fa-IR.json';
-import msMYMessages from 'lang-compiled/ms-MY.json';

 export const messages = {
-  'en-US': enMessages,
-  'nl-NL': nlMessages,
-  'zh-CN': zhCNMessages,
-  'zh-TW': zhTWMessages,
-  'de-DE': deDEMessages,
-  'ru-RU': ruRUMessages,
-  'tr-TR': trTRMessages,
-  'ja-JP': jaMessages,
-  'es-MX': esMXMessages,
-  'fr-FR': frMessages,
-  'mn-MN': mnMNMessages,
-  'da-DK': daMessages,
-  'sv-SE': svMessages,
-  'el-GR': grMessages,
-  'fo-FO': foMessages,
-  'pt-PT': ptMessages,
-  'pt-BR': ptBRMessages,
-  'ro-RO': roMessages,
-  'nb-NO': nbNOMessages,
-  'id-ID': idMessages,
-  'uk-UA': ukMessages,
-  'fi-FI': fiMessages,
-  'cs-CZ': csMessages,
-  'sk-SK': skMessages,
-  'pl-PL': plMessages,
-  'ta-IN': taMessages,
-  'hi-IN': hiMessages,
-  'he-IL': heMessages,
-  'it-IT': itMessages,
-  'fa-IR': faIRMessages,
-  'ms-MY': msMYMessages,
+	'en-US': enMessages
 };

 export const dateLocales = {
-  'en-US': enUS,
-  'nl-NL': nl,
-  'zh-CN': zhCN,
-  'zh-TW': zhTW,
-  'de-DE': de,
-  'da-DK': da,
-  'ru-RU': ru,
-  'sv-SE': sv,
-  'tr-TR': tr,
-  'ja-JP': ja,
-  'es-MX': es,
-  'fr-FR': fr,
-  'mn-MN': enUS,
-  'el-GR': el,
-  'fo-FO': da,
-  'pt-PT': pt,
-  'pt-BR': ptBR,
-  'ro-RO': ro,
-  'nb-NO': nb,
-  'id-ID': id,
-  'uk-UA': uk,
-  'fi-FI': fi,
-  'cs-CZ': cs,
-  'sk-SK': sk,
-  'pl-PL': pl,
-  'ta-In': ta,
-  'hi-IN': hi,
-  'he-IL': he,
-  'it-IT': it,
-  'fa-IR': faIR,
-  'ms-MY': ms,
+	'en-US': enUS
 };

-export const menuOptions = [
-  { label: '中文', value: 'zh-CN', display: 'cn' },
-  { label: '中文(繁體)', value: 'zh-TW', display: 'tw' },
-  { label: 'Čeština', value: 'cs-CZ', display: 'cs' },
-  { label: 'Dansk', value: 'da-DK', display: 'da' },
-  { label: 'Deutsch', value: 'de-DE', display: 'de' },
-  { label: 'English', value: 'en-US', display: 'en' },
-  { label: 'Español', value: 'es-MX', display: 'es' },
-  { label: 'فارسی', value: 'fa-IR', display: 'fa' },
-  { label: 'Føroyskt', value: 'fo-FO', display: 'fo' },
-  { label: 'Français', value: 'fr-FR', display: 'fr' },
-  { label: 'Ελληνικά', value: 'el-GR', display: 'el' },
-  { label: 'עברית', value: 'he-IL', display: 'he' },
-  { label: 'हिन्दी', value: 'hi-IN', display: 'hi' },
-  { label: 'Italiano', value: 'it-IT', display: 'it' },
-  { label: 'Bahasa Indonesia', value: 'id-ID', display: 'id' },
-  { label: '日本語', value: 'ja-JP', display: 'ja' },
-  { label: 'Malay', value: 'ms-MY', display: 'ms' },
-  { label: 'Монгол', value: 'mn-MN', display: 'mn' },
-  { label: 'Nederlands', value: 'nl-NL', display: 'nl' },
-  { label: 'Norsk Bokmål', value: 'nb-NO', display: 'nb' },
-  { label: 'Polski', value: 'pl-PL', display: 'pl' },
-  { label: 'Português', value: 'pt-PT', display: 'pt' },
-  { label: 'Português do Brasil', value: 'pt-BR', display: 'pt-BR' },
-  { label: 'Русский', value: 'ru-RU', display: 'ru' },
-  { label: 'Română', value: 'ro-RO', display: 'ro' },
-  { label: 'Slovenčina', value: 'sk-SK', display: 'sk' },
-  { label: 'Suomi', value: 'fi-FI', display: 'fi' },
-  { label: 'Svenska', value: 'sv-SE', display: 'sv' },
-  { label: 'தமிழ்', value: 'ta-IN', display: 'ta' },
-  { label: 'Türkçe', value: 'tr-TR', display: 'tr' },
-  { label: 'українська', value: 'uk-UA', display: 'uk' },
-];
+export const menuOptions = [ { label: 'English', value: 'en-US', display: 'en' } ];
--- a/yarn.lock
+++ b/yarn.lock