🖕 Fix Conflicts

.github/FUNDING.yml

@@ -1,2 +1 @@
-patreon: KaizKhatri
 custom: https://www.paypal.me/kaizkhatri

.github/workflows/build.yml

@@ -0,0 +1,96 @@
+name: build
+
+on:
+  push:
+    paths-ignore:
+      - "**.md"
+      - "**.bbcode"
+      - LICENSE
+    branches: [main, dev]
+
+  pull_request:
+    paths-ignore:
+      - "**.md"
+      - "**.bbcode"
+      - LICENSE
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install build dependencies (apt)
+        run: |
+          sudo apt install libx11-dev libxcursor-dev libpng-dev
+        continue-on-error: false
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "12.x"
+      - run: yarn install
+      - run: yarn render:bibata-modern
+      - run: yarn render:bibata-original
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.x"
+
+      - name: Cache pip dependencies
+        uses: actions/cache@v2
+        with:
+          # This path is specific to Ubuntu
+          path: ~/.cache/pip
+          # Look to see if there is a cache hit for the corresponding requirements file
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+      - name: Install pip dependencies
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        continue-on-error: false
+
+      - name: Generating `Bibata` Cursor Theme
+        run: python build.py
+
+      - name: Compressing Artifacts
+        run: |
+          tar -cvzf logs.tar.gz build.log
+          tar -cvzf bitmaps.tar.gz bitmaps
+          tar -cvzf Bibata.tar.gz themes
+
+      - name: Uploading `Bibata` Build Log artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: logs
+          path: logs.tar.gz
+
+      - name: Uploading `bitmaps` artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: bitmaps
+          path: bitmaps.tar.gz
+
+      - name: Uploading `Bibata` Theme artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bibata
+          path: Bibata.tar.gz

.gitignore

@@ -1,2 +1,259 @@
-env
+########## Custom
-.vscode
+# Out Dir
+bitmaps
+themes
+
+# Logs Files
+build.log
+
+########## Python
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+
+######### Node
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+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/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "trailingComma": "none"
+}

.travis.yml

@@ -1,11 +0,0 @@
-branches:
-  only:
-    - master
-    - devlopment
-    - test
-language: minimal
-sudo: required
-services:
-  - docker
-before_install:
-  - docker build --rm -f "Dockerfile" -t bibata_cursor:latest .

Bibata.sh

@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Default settings
-BIBATA=${BIBATA:-/tmp/Bibata}
-REPO=${REPO:-KaizIqbal/Bibata_Cursor}
-REMOTE=${REMOTE:-https://github.com/${REPO}.git}
-BRANCH=${BRANCH:-master}
-
-command_exists() {
-	command -v "$@" >/dev/null 2>&1
-}
-
-error() {
-	echo ${RED}"Error: $@"${RESET} >&2
-}
-
-setup_color() {
-	# Only use colors if connected to a terminal
-	if [ -t 1 ]; then
-		RED=$(printf '\033[31m')
-		GREEN=$(printf '\033[32m')
-		YELLOW=$(printf '\033[33m')
-		BLUE=$(printf '\033[34m')
-		BOLD=$(printf '\033[1m')
-		RESET=$(printf '\033[m')
-	else
-		RED=""
-		GREEN=""
-		YELLOW=""
-		BLUE=""
-		BOLD=""
-		RESET=""
-	fi
-}
-
-setup_bibata_repo() {
-
-	echo "${BLUE}Cloning Bibata Cursor...${RESET}"
-
-	command_exists git || {
-		error "git is not installed"
-		exit 1
-	}
-
-	git clone -c core.eol=lf -c core.autocrlf=false \
-		-c fsck.zeroPaddedFilemode=ignore \
-		-c fetch.fsck.zeroPaddedFilemode=ignore \
-		-c receive.fsck.zeroPaddedFilemode=ignore \
-		--depth=1 --branch "$BRANCH" "$REMOTE" "$BIBATA" || {
-		error "git clone of bibata_cursor repo failed"
-		exit 1
-	}
-
-	echo
-}
-
-setup_bibata() {
-    cd /tmp/Bibata/
-	./install.sh
-    rm -rf /tmp/Bibata
-	echo
-}
-
-main() {
-
-	printf "$GREEN"
-	cat <<-'EOF'
-
-    ██████╗ ██╗██████╗  █████╗ ████████╗ █████╗ 
-    ██╔══██╗██║██╔══██╗██╔══██╗╚══██╔══╝██╔══██╗ 
-    ██████╔╝██║██████╔╝███████║   ██║   ███████║  
-    ██╔══██╗██║██╔══██╗██╔══██║   ██║   ██╔══██║  
-    ██████╔╝██║██████╔╝██║  ██║   ██║   ██║  ██║  
-    ╚═════╝ ╚═╝╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚═╝  ╚═╝ 
-
-	EOF
-
-	setup_color
-	setup_bibata_repo
-	setup_bibata
-
-    rm -rf /tmp/Bibata
-	printf "$RESET"
-}
-
-main "$@"