Fix CSS bug, refactor folder structure

app/Factories/PlanetServiceFactory.php

@@ -124,10 +124,11 @@ public function determineNewPlanetPosition() : array {
      * Creates a new random planet and then return the planetService instance for it.
      *
      * @param PlayerService $player
+     * @param string $planetName
      * @return PlanetService
      * @throws BindingResolutionException
      */
-    public function createForPlayer(PlayerService $player): PlanetService
+    public function createForPlayer(PlayerService $player, string $planetName = 'Colony'): PlanetService
     {
         $new_position = $this->determineNewPlanetPosition();
         if (empty($new_position['galaxy']) || empty($new_position['system']) || empty($new_position['position'])) {
@@ -138,7 +139,7 @@ public function createForPlayer(PlayerService $player): PlanetService
         // Position is available
         $planet = new Planet;
         $planet->user_id = $player->getId();
-        $planet->name = 'MyPlanet';
+        $planet->name = $planetName;
         $planet->galaxy = $new_position['galaxy'];
         $planet->system = $new_position['system'];
         $planet->planet = $new_position['position'];

app/Services/PlanetListService.php

@@ -63,9 +63,10 @@ public function load(int $id) : void
             // TODO: move this logic to the user creation logic as well as the tech records.
             // As a test: give all players two random planets. (this should be just one, uncomment the below after dev)
 
+            $planetNames = ['Homeworld', 'Colony'];
             for ($i = 0; $i < 2; $i++) {
                 $planetServiceFactory = app()->make(PlanetServiceFactory::class);
-                $planetService = $planetServiceFactory->createForPlayer($this->player);
+                $planetService = $planetServiceFactory->createForPlayer($this->player, $planetNames[$i]);
 
                 $this->planets[] = $planetService;
             }

docker-compose.prod.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
 
   #PHP Service

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
 
   #PHP Service

public/css/ingame.css

@@ -3730,11 +3730,11 @@ ul#storage li a:link,ul#storage li a:visited,ul#den li a:link,ul#den li a:visite
     text-decoration: none
 }
 
-ul#storage li a:focus,ul#storage li a:active,ul#den li a:focus,ul#den li a:active {
+/*ul#storage li a:focus,ul#storage li a:active,ul#den li a:focus,ul#den li a:active {
     background: url("/img/icons/e3d481656bab1b216428a98a2e022e.gif") no-repeat;
     color: #ff9600;
     text-decoration: none
-}
+}*/
 
 ul#storage li#button7 {
     left: 11px
@@ -27786,6 +27786,7 @@ AJAX LOADING INDICATOR
 .fleetStatus .newWindow { top:6px; right:35px; }
 .fleetStatus .newWindow a img { margin:0;}
 
+@font-face{font-family:'Play';src:url("/fonts/26d15fc1540e9f44ba1084693d1f7e.eot'");src:url("/fonts/26d15fc1540e9f44ba1084693d1f7e.eot?#iefix") format("embedded-opentype"),url("/img/icons/c4925f972de2c4799082c57c89e1c1.woff") format("woff"),url("/img/icons/f6ce847a7441c579e0ce2e47a11fd3.ttf") format("truetype"),url("/img/icons/558a44d541018677da28adb8598e98.svg#play-regular") format("svg");font-weight:normal;font-style:normal}#advice-bar .announcement img{border-radius:3px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent}#advice-bar .announcement img:hover{border-color:#d18433 #e7b15a #f0c36a #db9845}#eventBirthday{background:black}#eventBDayWrapper{background:black url("/img/icons/1917940f65f1c1eb16b130f2991db4.jpg") no-repeat;color:#fff;font:14px/140% Verdana,Arial,SunSans-Regular,sans-serif;height:748px;width:1024px}#BDayHeader{height:201px;padding:10px 0 0 0}#BDayHeader .bday_txt{margin:0 20px 0 320px}#BDayHeader .bday_heading{color:#b3c1cc;font:45px/60px Play,Helvetica,sans-serif;margin:10px 0 5px 320px;text-shadow:0 -1px 1px white,0 1px 2px #042c49,0 0 20px #8cb9d9,0 0 35px #336f99}#BDayHeader .bday_txt{line-height:22px;font-size:16px}#eventBirthday #mobileHeader{background:#000;font-family:Verdana,Arial,SunSans-Regular,sans-serif;height:44px;margin:0;padding:3px;width:1024px}#BDayLogo{background:url("/img/icons/9e593bff20df08d77b2569daa374b5.png") 0 0 no-repeat;float:left;height:95px;margin:5px 0 0 20px;width:275px}#BDayContent{height:537px;width:1024px;position:relative}.bday_box{position:absolute;border-radius:5px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;opacity:.7;-moz-opacity:.7;-khtml-opacity:.7;filter:alpha(opacity=70);transition:opacity ease .5s}.bday_box:hover,.bday_box:active,.bday_box.active{opacity:1;-moz-opacity:1;-khtml-opacity:1;filter:alpha(opacity=100)}#ChristmasContent .current .eventImage,.box_current{border:2px solid;border-color:#65dbd6 #27b1a0 #0f7c73 #27b1a0;box-shadow:1px 1px 2px 0 #141b1f;opacity:.9;-moz-opacity:.9;-khtml-opacity:.9;filter:alpha(opacity=90)}#ChristmasContent .next .eventImage,#ChristmasContent .past .eventImage,.box_past{border:2px solid #3a4c58;box-shadow:1px 1px 2px 0 #141b1f;opacity:.8;-moz-opacity:.8;-khtml-opacity:.8;filter:alpha(opacity=80)}.box_permanent{border:2px solid #9370db;box-shadow:1px 1px 2px 0 #800080;opacity:.8;-moz-opacity:.8;-khtml-opacity:.8;filter:alpha(opacity=80)}.box_permanent:hover,.box_permanent:active,.box_permanent.active,.box_current:hover,.box_current:active,.box_current.active,.box_past:hover,.box_past:active,.box_past.active{border-color:#d18533 #e7b15a #f0c46a #db9643;box-shadow:1px 1px 4px 0 #1f1a14}.event_box.past .img_effects,.box_past .img_effects{box-shadow:inset 0 0 20px 0 #051e2e;background:transparent url("/img/icons/e467c89d5660b34ae0d549e5bb6a44.png") repeat;background:rgba(16,20,26,0.5)}.img_effects{border-radius:3px;box-shadow:inset 0 0 10px 0 #103552;width:120px;height:120px;position:absolute;top:0}.bday_box:hover .img_effects,.img_effects:hover,.img_effects:active,.active .img_effects{box-shadow:inset 0 0 3px 0 #e6a219}.bday_box .img_effects,.bday_box img{display:block;height:100%;width:100%}.box_next .img_effects,.box_future .img_effects{display:none}.bday_box img{border-radius:3px}#box0,#box1,#box2,#box4,#box5,#box15,#box9{height:60px;width:60px}#box3,#box6,#box7,#box8,#box10{height:90px;width:90px}#box11,#box12,#box13,#box14{height:120px;width:120px}#box0{left:549px;top:18px}#box1{left:401px;top:46px}#box2{left:277px;top:86px}#box3{left:466px;top:291px}#box4{left:712px;top:24px}#box5{left:894px;top:65px}#box6{left:724px;top:233px}#box7{left:33px;top:213px}#box8{left:257px;top:266px}#box9{left:794px;top:96px}#box10{left:903px;top:165px}#box11{left:105px;top:329px}#box12{left:305px;top:392px}#box13{left:605px;top:373px}#box14{left:811px;top:325px}#box15{left:165px;top:145px}.event_box{display:none;position:relative;top:145px;width:700px}.event_box.past{color:#a7bdc7}.event_box .bday_h2{background:transparent url("/img/icons/9e593bff20df08d77b2569daa374b5.png") 0 -94px no-repeat;color:#fff;font:23px/36px Play,Helvetica,sans-serif;margin:0;text-shadow:0 2px 0 #283746;height:50px;opacity:.96;-moz-opacity:.96;-khtml-opacity:.96;filter:alpha(opacity=96);padding:25px 40px 0 40px;width:710px}#BDayEventDate{font-size:18px}.event_box_content{background:transparent url("/img/icons/32bd652549f0007e906dcf934c0f49.png") repeat-y;min-height:200px;opacity:.96;-moz-opacity:.96;-khtml-opacity:.96;filter:alpha(opacity=96);padding:5px 31px;position:relative;width:721px;z-index:1}.event_box_content_inner{background:transparent url("/img/icons/2eef90c85d02712d9588fe35e5757b.png") repeat-x;background-size:contain;padding:0 10px;width:701px}.event_box_footer{background:transparent url("/img/icons/9e593bff20df08d77b2569daa374b5.png") 0 -222px no-repeat;bottom:-25px;height:25px;opacity:.96;-moz-opacity:.96;-khtml-opacity:.96;filter:alpha(opacity=96);padding:0 30px;position:absolute;width:723px;pointer-events:none}.event_box .close{float:right;display:inline-block;height:44px;margin:-2px -10px 0 0;width:44px}.event_box .close:hover,.event_box .close:active{background:transparent url("/img/icons/9e593bff20df08d77b2569daa374b5.png") -277px 0 no-repeat}#BDayChronic{background:transparent url("/img/icons/cc143902618d85df8743bcc186409c.png") repeat;background:rgba(50,58,69,0.7);border:1px solid #323a45;border-color:#2f3641 #29313c #1c232c #29313c;border-radius:5px;color:#6f9fc8;margin:0 0 12px 0;min-height:42px;padding:5px;width:691px}#BDayofficerImg{border-radius:5px;float:left}#BDayEventTxtChronic{margin:0 0 0 47px}.event_txt{color:#a8a8a8;min-height:160px;margin:0 0 0 212px;width:480px;position:relative;z-index:1}.event_txt b{color:#fff}#BDayEventImgBox{border:2px solid;border-color:#d18533 #e7b15a #f0c46a #db9643;border-radius:5px;box-shadow:1px 1px 4px 0 #1f1a14;float:left;height:200px;position:relative;width:200px;z-index:1}.next #BDayEventImgBox,.future #BDayEventImgBox{border:0;box-shadow:none}#BDayEventImgBox .img_effects{border-radius:3px;box-shadow:inset 0 0 3px 0 #e6a219;height:200px;width:200px;position:absolute;top:0}.next #BDayEventImgBox .img_effects,.future #BDayEventImgBox .img_effects{box-shadow:none}#BDayEventImg{border-radius:5px}#BDayEventTxtEffect{font-weight:bold;margin:0 0 5px 0}.next #BDayEventTxtDesc,.future #BDayEventTxtDesc{padding:30px 0 0}#BDayEventPastTxt{font-weight:700;margin:15px 0 0 0}#eventBox1 .event_img{background-position:-72px -52px}#eventBox2 .event_img{background-position:-72px -232px}#BDayEventBtnCTA{background:#62b211;background:linear-gradient(to bottom,#62b211 0,#26990f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62b211',endColorstr='#26990f',GradientType=0);border:1px solid #61b045;border-color:#c4dbbd #75bf5a #5ba540 #75bf5a;border-radius:3px;box-shadow:inset 0 1px 5px -2px white,0 2px 5px 1px #000;color:#fff;float:right;font:20px/100% Play,Helvetica,sans-serif;padding:10px 25px 12px 25px;text-decoration:none;text-shadow:0 1px 3px hsl(110,60%,15%)}#BDayEventBtnCTA:hover,#BDayEventBtnCTA:active{background:#72cf15;background:linear-gradient(to bottom,#72cf15 0,#2eb713 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#72cf15',endColorstr='#2eb713',GradientType=0);text-shadow:0 1px 3px hsl(110,60%,15%),0 0 10px hsl(110,30%,90%)}#eventBox0{left:118px;top:66px}#eventBox1{left:26px;top:99px}#eventBox2{left:147px;top:129px}#eventBox3{left:118px;top:-16px}#eventBox4{left:232px;top:88px}#eventBox5{left:118px;top:-25px}#eventBox6{left:229px;top:-72px}#eventBox7{left:101px;top:158px}#eventBox8{left:5px;top:-56px}#eventBox9{top:21px;left:25px}#eventBox10{left:133px;top:89px}#eventBox11{left:-21px;top:16px}#eventBox12{left:34px;top:74px}#eventBox13{left:205px;top:55px}#eventBox14{left:232px;top:-1px}#eventBox15{left:211px;top:27px}#galaxy #galaxytable tr.bdaySlot td{background:0}.bdaySlotBox{background:#090d12 url("/img/icons/5fbbb1876fcff20a8a265c06862495.png") 0 -590px repeat-x;background:linear-gradient(top,rgba(20,29,37,0.8) 0,rgba(9,13,18,0.8) 100%);border:1px solid #23303a;border-color:#24323d #131a20 #131a20 #131a20;border-radius:3px;box-shadow:0 0 2px 1px black,inset 0 1px 2px 1px hsl(205,33%,11%);font-size:11px;line-height:30px;margin:6px 7px 5px 7px;min-height:44px;padding:4px 4px 5px 4px}.bdaySlotBox .title{color:#3a7fb4;font-weight:700;padding:6px 10px;text-align:left;text-shadow:1px 1px 1px black,0 0 7px hsl(200,60%,35%);width:205px}.bdaySlotBox img{margin:0 5px 0 0}.bdaySlotBox .name{padding:6px 10px}#ChristmasWrapper,.ui-dialog .ui-dialog-content.overlayDiv.christmasOverlay{background:black url("/img/icons/1917940f65f1c1eb16b130f2991db4.jpg") no-repeat;padding:0;color:white;font-family:Verdana,Arial,SunSans-Regular,sans-serif}#ChristmasHeader{height:180px;padding:10px 0 0 0}#ChristmasHeader .christmas_heading{color:#b3c1cc;font:45px/60px Play,Helvetica,sans-serif;margin:10px 0 5px 320px;text-shadow:0 -1px 1px white,0 1px 2px #042c49,0 0 20px #8cb9d9,0 0 35px #336f99}#ChristmasHeader .christmas_txt{line-height:22px;font-size:16px;margin:0 20px 0 320px}#ChristmasLogo{background:url("/img/icons/04d5b9e17f0784abaf3dba9f6257a8.png") 0 0 no-repeat;float:left;height:95px;margin:10px 0 0 30px;width:275px}#ChristmasContent{height:385px;position:relative;text-align:center;width:945px}#eventBirthday #ChristmasWrapper{width:1024px;height:724px}#eventBirthday #ChristmasContent{margin-left:37px}#ChristmasContent .eventImage{width:150px;height:150px;border-radius:5px;position:absolute;left:70px;top:62px}#ChristmasContent .eventBox{padding:0;float:left;height:370px;width:290px;margin:0 10px;position:relative}#ChristmasContent h3,#ChristmasContent .eventBox div{padding-left:5px;padding-right:5px}#ChristmasContent h3{font-weight:700;font-size:15px;margin-top:8px}#ChristmasContent .eventTime{margin-bottom:10px;font-size:12px}#ChristmasContent .overlay{position:absolute;width:100%;height:100%;background:black;border-radius:10px;filter:alpha(opacity=40);-moz-opacity:.4;-khtml-opacity:.4;opacity:.4}#ChristmasContent .callToAction{background:#62b211;background:linear-gradient(to bottom,#62b211 0,#26990f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62b211',endColorstr='#26990f',GradientType=0);border:1px solid #61b045;border-color:#c4dbbd #75bf5a #5ba540 #75bf5a;border-radius:3px;box-shadow:inset 0 1px 5px -2px white,0 2px 5px 1px #000;color:#fff;font:14px/100% Play,Helvetica,sans-serif;padding:8px 15px 10px 15px;text-decoration:none;text-shadow:0 1px 3px hsl(110,60%,15%);position:absolute;bottom:10px;right:0}#ChristmasContent .callToAction:hover,#ChristmasContent .callToAction:active{background:#72cf15;background:linear-gradient(to bottom,#72cf15 0,#2eb713 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#72cf15',endColorstr='#2eb713',GradientType=0);text-shadow:0 1px 3px hsl(110,60%,15%),0 0 10px hsl(110,30%,90%)}#ChristmasContent .eventDescription{text-align:left;font-size:12px;position:absolute;bottom:45px;height:105px}@media only screen and (-webkit-min-device-pixel-ratio:2){.ui-dialog .ui-dialog-content.overlayDiv.christmasOverlay{background:black url("/img/icons/a2e86e94c046f924e252d47e3bcad1.jpg") no-repeat}}@media only screen and (-webkit-min-device-pixel-ratio:2){#eventBDayWrapper{background:black url("/img/icons/a2e86e94c046f924e252d47e3bcad1.jpg") no-repeat}#BDayLogo,.event_box .bday_h2,.event_box_content,.event_box .close:active,.event_box_footer{background-image:url("/img/icons/fabb423c3dc8241f2d154a0372c846.png");background-repeat:no-repeat;background-size:800px 500px}.event_box_content{background:transparent url("/img/icons/ac510a996c6421f3d3ef46e2b60bc6.png") repeat-y;background-size:773px 5px}.reducement25{background-image:url("/img/icons/cc6b939510b6ed8a3cc444477a33be.png");background-repeat:no-repeat;background-size:275px 50px}}.clearfix:after{clear:both;content:".";display:block;height:0;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}
 /* New style overrides that conflict with some existing styles, implement later */
 /*
 @import "base/990d5d349ed6e981658ff4e2e3444c.css";

public/mix-manifest.json

@@ -1,8 +1,8 @@
 {
-    "/css/outgame.css": "/css/outgame.css?id=0edfd34484fc3ec74eca0604a470461f",
-    "/css/ingame.css": "/css/ingame.css?id=713416e94f178b1b3d7334376350c4b5",
+    "/css/ingame.css": "/css/ingame.css?id=c31cccc01e507f29fc05302c7d6938b9",
     "/js/ingame.js": "/js/ingame.js?id=b84a174c8a7768b819c85674d4353c98",
     "/js/ingame.min.js": "/js/ingame.min.js?id=b84a174c8a7768b819c85674d4353c98",
     "/js/outgame.js": "/js/outgame.js?id=5fa6ee5cdc34001db0bdccd06a7f676c",
-    "/js/outgame.min.js": "/js/outgame.min.js?id=5fa6ee5cdc34001db0bdccd06a7f676c"
+    "/js/outgame.min.js": "/js/outgame.min.js?id=5fa6ee5cdc34001db0bdccd06a7f676c",
+    "/css/outgame.css": "/css/outgame.css?id=0edfd34484fc3ec74eca0604a470461f"
 }

resources/css/ingame.css

@@ -1,8 +1,9 @@
-@import "base/base1.css";
-@import "base/base2.css";
-@import "base/jquery.ui.css";
+@import "ingame/base1.css";
+@import "ingame/base2.css";
+@import "ingame/jquery.ui.css";
+@import "ingame/modules/fleets.css";
+@import "ingame/22b955f43c237ad23d644e8e52272a.css";
 
-@import "modules/fleets.css";
 
 /* New style overrides that conflict with some existing styles, implement later */
 /*