Merge branch 'dev' into 'master'

Dev

See merge request TheGamecraft/c-cms!19

.env.example

@@ -1,6 +1,6 @@
 APP_NAME=C-CMS
 APP_ENV=local
-APP_KEY=base64:FQH+yWnhFyB+2gpByIg2Rybmqn5EXkL7VeFawzSJ/Lc=
+APP_KEY=
 APP_DEBUG=true
 APP_URL=https://dev.c-cms.cf/
 
@@ -12,9 +12,9 @@ LOG_CHANNEL=stack
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=ddb_dev
-DB_USERNAME=root
-DB_PASSWORD=nHpz39lp
+DB_DATABASE=
+DB_USERNAME=
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -33,8 +33,8 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-NEXMO_KEY=f52074e0
-NEXMO_SECRET=lXK9GasDUdotWqL3
+NEXMO_KEY=
+NEXMO_SECRET=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

.env.testing

@@ -1,45 +0,0 @@
-APP_NAME=C-CMS
-APP_ENV=local
-APP_KEY=base64:FQH+yWnhFyB+2gpByIg2Rybmqn5EXkL7VeFawzSJ/Lc=
-APP_DEBUG=true
-APP_URL=https://dev.c-cms.cf/
-
-SQN_NUMBER=000
-SQN_FULLNAME="TESTING SQUADRON" 
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=ddb_dev
-DB_USERNAME=root
-DB_PASSWORD=nHpz39lp
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=mailgun
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-NEXMO_KEY=f52074e0
-NEXMO_SECRET=lXK9GasDUdotWqL3
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

@@ -11,5 +11,6 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
+.env.testing
 /public/assets/public
 /resources/views/public.blade.php