Merge branch 'feat/docker-tweaks' into 'develop'

Docker and branding updates

See merge request webvokestudio/athenahr!11

.env.example

@@ -1,8 +1,8 @@
-APP_NAME=Laravel
+APP_NAME=AthenaHR
 APP_DESCRIPTION="AthenaHR - Your one-stop-shop for your community recruitment needs"
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://localhost
 
 # Please note: Use relative URLs. Absolute URLs will not work.

Dockerfile

@@ -19,13 +19,12 @@ RUN apt-get install -y nodejs
 
 WORKDIR /var/www/html
 
-COPY . .
+COPY --chown=www-data:www-data . .
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN composer update && composer install
 RUN npm ci
 
-# Set Laravel's permissions and setup storage, though this could be done in the COPY command directly
-RUN chown -R www-data:www-data .
+
 RUN chmod -R 755 /var/www/html/storage
 RUN php artisan storage:link
 

composer.json

@@ -34,6 +34,7 @@
         "sentry/sentry-laravel": "3.6.*",
         "socialiteproviders/discord": "^4.1",
         "spatie/laravel-permission": "^5.5",
+        "spatie/laravel-sitemap": "^7.2",
         "ultrono/markdown": "*"
     },
     "require-dev": {

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   athenahr_app:
-    image: gitlab.futuregamers.co:5050/webvokestudio/athenahr:latest
+    image: athenahr:1.1.1
     container_name: athenahr_app
     volumes:
       - ./:/var/www/html

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "html",
+    "name": "athenahr",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {

public/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png?v=10"/>
+            <TileColor>#014aad</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

public/safari-pinned-tab.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="95.000000pt" height="95.000000pt" viewBox="0 0 95.000000 95.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,95.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M343 759 c-117 -56 -178 -152 -178 -284 0 -68 4 -89 28 -137 77 -157
+264 -221 421 -144 185 91 233 333 96 488 -60 69 -128 100 -226 104 -71 2 -87
+-1 -141 -27z"/>
+</g>
+</svg>

public/site.webmanifest

@@ -1 +0,0 @@
-{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

public/sitemap.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset
-      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
-            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
-<url>
-  <loc>https://gamescluboficial.com.br/</loc>
-  <lastmod>2021-12-10T22:38:02+00:00</lastmod>
-  <priority>1.00</priority>
-</url>
-<url>
-  <loc>https://gamescluboficial.com.br/sorteio</loc>
-  <lastmod>2021-12-10T22:38:02+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://gamescluboficial.com.br/auth/register</loc>
-  <lastmod>2021-12-10T22:38:02+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://gamescluboficial.com.br/auth/login</loc>
-  <lastmod>2021-12-10T22:38:02+00:00</lastmod>
-  <priority>0.64</priority>
-</url>
-<url>
-  <loc>https://gamescluboficial.com.br/auth/password/reset</loc>
-  <lastmod>2021-12-10T22:38:02+00:00</lastmod>
-  <priority>0.51</priority>
-</url>
-
-
-</urlset>

resources/views/auth/login.blade.php

@@ -5,8 +5,8 @@
   <div class="container">
       <div class="card login-card">
         <div class="row no-gutters">
-          <div class="col-md-5">
-            <img src="{{ asset(config('customization.authbanner')) }}" alt="login" class="login-card-img">
+          <div class="col-md-5 banner-container">
+            <img src="{{ asset(config('customization.authbanner')) }}" height="200px" alt="login" class="login-card-img">
           </div>
           <div class="col-md-7">
             <div class="card-body">

resources/views/breadcrumbs/header.blade.php

@@ -57,8 +57,6 @@
 
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
 
-    <script src="https://betteruptime.com/widgets/announcement.js" data-id="131937" async="async" type="text/javascript"></script>
-
     <script src="https://www.google.com/recaptcha/api.js" async defer></script>
 
 </head>