From f05479865c2f4d071a36912573e6d703ff0d1151 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 21 May 2019 11:17:25 +0100
Subject: [PATCH] chore: tx main repo, merge gitignores and circle

---
 .circleci/config.yml          |  5 -----
 .gitignore                    | 22 ++++++++++++++++++++++
 {frontend/.tx => .tx}/config  |  4 ++--
 frontend/.circleci/config.yml | 15 ---------------
 frontend/.gitignore           | 21 ---------------------
 frontend/README.md            | 26 --------------------------
 wizard.sh                     |  1 +
 7 files changed, 25 insertions(+), 69 deletions(-)
 rename {frontend/.tx => .tx}/config (69%)
 delete mode 100644 frontend/.circleci/config.yml
 delete mode 100644 frontend/.gitignore
 delete mode 100644 frontend/README.md

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3fd4d33b..cfcf5557 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,11 +11,6 @@ jobs:
       - image: circleci/node
     steps:
       - checkout
-      - run:
-          name: "Pull Submodules"
-          command: |
-            git submodule init
-            git submodule update --remote
       - run:
           name: "Build"
           command: ./wizard.sh -a
diff --git a/.gitignore b/.gitignore
index d58c6e54..d1e7844e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,25 @@ _old
 rice-box.go
 .idea/
 filebrowser
+
+.DS_Store
+node_modules
+/frontend/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
diff --git a/frontend/.tx/config b/.tx/config
similarity index 69%
rename from frontend/.tx/config
rename to .tx/config
index cf89909b..6b7310df 100644
--- a/frontend/.tx/config
+++ b/.tx/config
@@ -3,8 +3,8 @@ host = https://www.transifex.com
 lang_map = pt_BR: pt-br, zh_CN: zh-cn, zh_HK: zh-hk, zh_TW: zh-tw
 
 [file-browser.file-browser]
-file_filter = src/i18n/<lang>.json
+file_filter = frontend/src/i18n/<lang>.json
 minimum_perc = 50
-source_file = src/i18n/en.json
+source_file = frontend/src/i18n/en.json
 source_lang = en
 type = KEYVALUEJSON
diff --git a/frontend/.circleci/config.yml b/frontend/.circleci/config.yml
deleted file mode 100644
index ea1a8c07..00000000
--- a/frontend/.circleci/config.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/node
-    steps:
-      - checkout
-      - run: npm install
-      - run: npm run lint
-      - run: npm run build
-workflows:
-  version: 2
-  build:
-    jobs:
-      - build
diff --git a/frontend/.gitignore b/frontend/.gitignore
deleted file mode 100644
index 185e6631..00000000
--- a/frontend/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw*
diff --git a/frontend/README.md b/frontend/README.md
deleted file mode 100644
index 1db8c1b7..00000000
--- a/frontend/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# File Browser Front-end
-
-[![CircleCI](https://img.shields.io/circleci/project/github/filebrowser/frontend.svg?style=flat-square)](https://circleci.com/gh/filebrowser/frontend)
-[![npm](https://img.shields.io/npm/v/filebrowser-frontend.svg?style=flat-square)]()
-[![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
-[![Chat IRC](https://img.shields.io/badge/freenode-%23filebrowser-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23filebrowser)
-
-> This is an example file with default selections.
-
-## Install
-
-```
-npm install filebrowser-frontend
-```
-
-## Usage
-
-This package is not prepared to be used by other projects than [File Browser](https://github.com/filebrowser/filebrowser) itself.
-
-## Contribute
-
-Check the [community repository](https://github.com/filebrowser/community) for more information.
-
-## License
-
-[Apache 2.0](./LICENSE) File Browser Contributors
diff --git a/wizard.sh b/wizard.sh
index 393d914b..e4863f54 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -29,6 +29,7 @@ buildAssets () {
     npm install
   fi
 
+  npm run lint
   npm run build
 }