Merge pull request #324 from changeweb/version2

Upgrade to v2.X

.editorconfig

@@ -1,19 +1,18 @@
+root = true
+
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
-
-[*.php]
 indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true
 
-[Makefile]
-indent_style = tab
-indent_size = 4
+[*.md]
+trim_trailing_whitespace = false
 
-[.html]
-indent_style = space
+[*.{yml,yaml}]
 indent_size = 2
 
-[{composer.json}]
-indent_style = space
-indent_size = 4
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -1,41 +1,51 @@
-APP_NAME=UnifiedTransform
+APP_NAME=Unifiedtransform
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
 DB_CONNECTION=mysql
 DB_HOST=db
 DB_PORT=3306
-DB_DATABASE=schoolapp
-DB_USERNAME=schoolapp
-DB_PASSWORD=schoolapp
-
-DOCKER_WEBSERVER_HOST=4049
-DOCKER_PHPMYADMIN_HOST=5051
+DB_DATABASE=unifiedtransform
+DB_USERNAME=unifiedtransform
+DB_PASSWORD=secret
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
+
+MEMCACHED_HOST=127.0.0.1
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
-STRIPE_KEY=
-STRIPE_SECRET=
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

@@ -3,15 +3,13 @@
 /public/storage
 /storage/*.key
 /vendor
-/.idea
-/.vagrant
+.env
+.env.backup
+.phpunit.result.cache
+docker-compose.override.yml
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-.env
-.php_cs.cache
-.rnd
-/database/database.*
-.env.dusk.local
-_ide_helper.php
+/.idea
+/.vscode

.styleci.yml

@@ -0,0 +1,13 @@
+php:
+  preset: laravel
+  disabled:
+    - no_unused_imports
+  finder:
+    not-name:
+      - index.php
+      - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
+css: true

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 php:
 - 7.4
-- 7.3
 before_script:
 - cp .env.example .env
 - composer install
 - php artisan key:generate
-script: vendor/bin/phpunit -c phpunit.xml
+script: php artisan test

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at kishorpasha870@yahoo.com. All
+reported by contacting the project team at robinmilford870@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Dockerfile

@@ -0,0 +1,60 @@
+FROM php:7.4-fpm
+
+# Copy composer.lock and composer.json
+COPY composer.lock composer.json /var/www/
+
+# Set working directory
+WORKDIR /var/www
+
+# Install dependencies
+# RUN apt-get update && apt-get install -y \
+#     build-essential \
+#     libpng-dev \
+#     libjpeg62-turbo-dev \
+#     libfreetype6-dev \
+#     locales \
+#     zip \
+#     jpegoptim optipng pngquant gifsicle \
+#     unzip \
+#     git \
+#     curl \
+#     libzip-dev
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    libzip-dev \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libxml2 \
+    wget
+
+# RUN pecl install xdebug-2.9.2 \
+# 	&& docker-php-ext-enable xdebug \
+#     && echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+# Clear cache
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install extensions
+RUN docker-php-ext-install pdo_mysql zip exif pcntl
+RUN docker-php-ext-install gd && docker-php-ext-enable gd
+
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Add user for laravel application
+RUN groupadd -g 1000 www
+RUN useradd -u 1000 -ms /bin/bash -g www www
+
+# Copy existing application directory contents
+COPY . /var/www
+
+# Copy existing application directory permissions
+COPY --chown=www:www . /var/www
+
+# Change current user to www
+USER www
+
+# Expose port 9000 and start php-fpm server
+EXPOSE 9000
+CMD ["php-fpm"]