Skip to content

Commit

Permalink
Merge pull request #603 from Lan2Play/dev
Browse files Browse the repository at this point in the history
update to bootstrap 5 and a lot of additional changes (see details)
  • Loading branch information
Apfelwurm committed Nov 5, 2023
2 parents e679a04 + 5540945 commit 51b685c
Show file tree
Hide file tree
Showing 204 changed files with 6,285 additions and 4,845 deletions.
259 changes: 151 additions & 108 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,108 +1,151 @@
# Environment Variables will always override any database variables they match unless ENV_OVERRIDE is set to true.


## User for nginx and php-fpm (only nessecary for development)
UUID=82
GUID=82

## App Settings

APP_KEY=
APP_DEBUG=true
APP_ENV=local

## Eventula Settings - Currently disabled by default since the central eventula service is down most of the time and this results in timeouts of the event admin page. To use the connection to eventula.com, set the env to 'https://eventula.com'

EVENTULA_URL='DISABLE'

## Org Settings

APP_NAME=
APP_TAGLINE=
APP_URL=http://localhost
APP_EMAIL=[email protected]

## Email Server

MAIL_DRIVER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=
MAIL_PASSWORD=
MAIL_ENCRYPTION=tls

## Database

DB_DATABASE=eventula_manager_database
DB_USERNAME=eventula_manager
DB_PASSWORD=password
DB_HOST=eventula_manager_database
DB_SEED=true
DB_CONNECTION=mysql
DB_PORT=3306

MYSQL_DATABASE=eventula_manager_database
MYSQL_USER=eventula_manager
MYSQL_PASSWORD=password
MYSQL_RANDOM_ROOT_PASSWORD=true

##Timezone
TIMEZONE=UTC

## Google Analytics (Optional)
# https://api.google.com

GOOGLE_ANALYTICS_TRACKING_ID=

## Paypal
# https://developer.paypal.com/docs/api/overview/

PAYPAL_USERNAME=
PAYPAL_PASSWORD=
PAYPAL_SIGNATURE=

## Stripe
# https://stripe.com/docs/api

STRIPE_SECRET_KEY=
STRIPE_PUBLIC_KEY=

## Steam (optional)
# https://steamcommunity.com/dev/apikey

STEAM_API_KEY=

## Tournaments (optional)
# https://challonge.com/settings/developer
CHALLONGE_API_KEY=

## Facebook (optional)
# https://developers.facebook.com

FACEBOOK_APP_ID=
FACEBOOK_APP_SECRET=

## File Logger - true/false
# If set to true, the App and Nginx will log to file
LOG_FILES=false

## HTTPS - true/false
# If set to true, the App will redirect all requests to HTTPS
ENABLE_HTTPS=false

## APP HTTPS - true/false
# If set to true, the App will build all links with HTTPS (URL::forceSchema('https');) Useful for productive usage behind a reverse Proxy
FORCE_APP_HTTPS=false

## HTTPS Only Cookies - true/false
# By setting this option to true, session cookies will only be sent back to the server if the browser has a HTTPS connection. This will keep the cookie from being sent to you if it can not be done securely.
SESSION_SECURE_COOKIE=false

## DB Migrate
# If set to true, the App will migrate the database on boot
DB_MIGRATE=true

## ENV Overide
# If set to true, the App will take its API Keys from the ENV instead of the database
ENV_OVERRIDE=false

# !!!!!!!!!!!!! DONT USE THIS ENV EXAMPLE FOR PRODUCTION! GO TO https://eventula.lan2play.de/admin/getting_started.html#create-your-environment-file AND GET THE FILES THERE !!!!!!!!!!!!!

###################
## User Settings ##
###################

## User for nginx and php-fpm. For production this should always be set to 82
UUID=82
GUID=82

##################
## App Settings ##
##################

# Security key for laravel
APP_KEY=
# debugging mode (never turn on in production, this could leak sensitive information!)
APP_DEBUG=true
# application environment (never set it to something else when than production if used in production)
APP_ENV=local
# If set to true, the App and Nginx will log to a file instead of the docker logs. Its recommended to set this to false in production
LOG_FILES=false
#Laravel HTTPS setting. If you use our example with LE SSL and traefik, set this to false! For Details read the HTTPS/Reverse Proxy sections in the Documentation (https://eventula.lan2play.de/admin/getting_started.html#https)
ENABLE_HTTPS=false
# APP HTTPS force - If you use our example with LE SSL and traefik, set this to true! For Details read the HTTPS/Reverse Proxy sections in the Documentation (https://eventula.lan2play.de/admin/getting_started.html#https)
FORCE_APP_HTTPS=false
# HTTPS Only Cookies - By setting this option to true, session cookies will only be sent back to the server if the browser has a HTTPS connection. This will keep the cookie from being sent to you if it can not be done securely.
SESSION_SECURE_COOKIE=false
# ENV Overide If set to true, the App will take its API Keys from the ENV instead of the database. This includes Paypal, Stripe, Facebook, Challonge, Google Analytics, Facebook Analytics and Steam. With the default setting, you have to configure those credentials below.
ENV_OVERRIDE=false


#######################
## Eventula Settings ##
#######################

# central eventula service url - Currently disabled by default since the central eventula service is down most of the time and this results in timeouts of the event admin page. To use the connection to eventula.com, set the env to 'https://eventula.com'
EVENTULA_URL='DISABLE'


##################
## Org Settings ##
##################

# site name
APP_NAME=
# site tagline
APP_TAGLINE=
# site url, set it to yourdomain.com (without any http[s] infront of!)
APP_URL=http://localhost
# site email
APP_EMAIL=[email protected]


#########################
## Appearance Settings ##
#########################

#this will disable the linking and removal of the user scss. This should be only true if you mount your src folder inside the container, for example while developing. This should be false in a production environment!
APPEAR_DISABLE_CUSTOM_CSS_LINKING=true
#this will disable the editing of the appearance settings in the Admin menu. This should be only true if you mount your custom scss into the container. For Details read the custom styling sections in the Documentation (https://eventula.lan2play.de/admin/getting_started.html#custom-styling)
APPEAR_DISABLE_ADMIN_APPEARANCE_CSS_SETTINGS=false

##################
## Email Server ##
##################

# mail driver, usualy smtp
MAIL_DRIVER=smtp
# mail server host
MAIL_HOST=
# mail server port
MAIL_PORT=
# mail server username
MAIL_USERNAME=
# mail server password
MAIL_PASSWORD=
# mail server encryption, you should use it and set this value to tls
MAIL_ENCRYPTION=


##############
## Database ##
##############

# Database name (should be the same as in MYSQL_DATABASE)
DB_DATABASE=eventula_manager_database
# Database username (should be the same as in MYSQL_USER)
DB_USERNAME=eventula_manager
# Database password (should be the same as in MYSQL_PASSWORD)
DB_PASSWORD=
# Database host (should be the same used in the container_name value of the database container in the docker-compose.yml file)
DB_HOST=eventula_manager_database
# this sets if the databse seeders are running on the start of the instance. Its recommended to set this to true in production
DB_SEED=true
# this sets if the App will migrate the database on boot. Its recommended to set this to true in production
DB_MIGRATE=true
# this sets the databse type, we use mysql in the default docker-compose file.
DB_CONNECTION=mysql
# this sets the databse server port, we use mysql in the default docker-compose file, so the default port is 3306.
DB_PORT=3306

# Database name (should be the same as in DB_DATABASE)
MYSQL_DATABASE=eventula_manager_database
# Database username (should be the same as in DB_USERNAME)
MYSQL_USER=eventula_manager
# Database password (should be the same as in DB_PASSWORD)
MYSQL_PASSWORD=
# this sets if mysql generates a random root password on startup. Its recommended to set this to true in production
MYSQL_RANDOM_ROOT_PASSWORD=true


##############
## Timezone ##
##############

## The Timezone names have to be valid Alpine linux tz names
TIMEZONE=Europe/Berlin
TZ=Europe/Berlin


#######################
## Payment Providers ##
#######################

## Paypal - https://developer.paypal.com/docs/api/overview/
PAYPAL_USERNAME=
PAYPAL_PASSWORD=
PAYPAL_SIGNATURE=

## Stripe - https://stripe.com/docs/api
STRIPE_SECRET_KEY=
STRIPE_PUBLIC_KEY=


##########################
## Third Party Services ##
##########################

## Google Analytics (Optional) - https://api.google.com
GOOGLE_ANALYTICS_TRACKING_ID=

## Steam (optional) - https://steamcommunity.com/dev/apikey
STEAM_API_KEY=

## Tournaments (optional) - https://challonge.com/settings/developer
CHALLONGE_API_KEY=

## Facebook (optional) - https://developers.facebook.com
FACEBOOK_APP_ID=
FACEBOOK_APP_SECRET=
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
resources/certs/*
resources/wait

\.env
\.env*

src/vendor
src/node_modules
Expand All @@ -21,7 +21,11 @@ src/public/uploads/gallery/*
src/public/storage
src/public/css/*.css
src/public/css/images/*.png
src/public/css/images/*.gif
src/public/js/*.js
src/public/js/*.js.map
src/storage/user/scss/*.scss
src/storage/user/scss/*.css

docs/build
docker-compose.local.yml
Expand Down
19 changes: 17 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ ifeq ($(shell docker network ls --filter=NAME=lan | wc -l),1)
endif
endif

local-prd-build-up:
$(DOCKER_COMPOSE) -f docker-compose-local-prd.yml up --build

local-prd-up:
$(DOCKER_COMPOSE) -f docker-compose-local-prd.yml up

local-prd-stop:
$(DOCKER_COMPOSE) -f docker-compose-local-prd.yml stop

# Make .env
logs:
Expand Down Expand Up @@ -166,6 +174,10 @@ generate-images:
generate-testuser:
docker exec eventula_manager_app php artisan db:seed --class=TestUserSeeder

# Generate event - This will generate a sample event!
generate-event:
docker exec eventula_manager_app php artisan db:seed --class=EventsSeeder

# Generate requireddatabase - This will erase your current settings!
generate-requireddatabase:
docker exec eventula_manager_app php artisan db:seed --class=RequiredDatabaseSeeder --force
Expand Down Expand Up @@ -194,7 +206,7 @@ folder-structure-prd:
mkdir -p /src/storage/app/public/images/venues/ && \
mkdir -p /src/storage/app/public/images/main/ && \
mkdir -p /src/storage/app/public/images/shop/ && \
mkdir -p /src/storage/app/public/attachments/help/ "
mkdir -p /src/storage/app/public/attachments/help/"

folder-structure-dev:
docker run --rm --name compkeygen --interactive \
Expand All @@ -205,7 +217,7 @@ folder-structure-dev:
mkdir -p /src/storage/app/public/images/venues/ && \
mkdir -p /src/storage/app/public/images/main/ && \
mkdir -p /src/storage/app/public/images/shop/ && \
mkdir -p /src/storage/app/public/attachments/help/ "
mkdir -p /src/storage/app/public/attachments/help/"

# Create SSL Keypair for Development
ssl-keygen:
Expand Down Expand Up @@ -363,6 +375,7 @@ purge-containers:
docker rm eventula_manager_app || true
docker rm eventula_manager_database || true
docker volume rm eventula_manager_database || true
docker volume rm eventula_manager_storage || true

# Purge Caches
purge-cache:
Expand Down Expand Up @@ -391,6 +404,8 @@ purge-files:
rm -rf /src/storage/app/public/images/events ; \
rm -rf /src/storage/app/public/images/venues ; \
rm -rf /src/storage/app/public/images/main ; \
rm -rf /src/storage/user/scss/*.css ; \
rm -rf /src/storage/user/scss/*.scss ; \
rm -rf /src/storage/logs/* ; \
rm -rf /src/public/storage || true"

Expand Down
Loading

0 comments on commit 51b685c

Please sign in to comment.