Serve all libs locally and add favicon

SimplyServers · Dec 22, 2018 · f14656b · f14656b
1 parent 678f839
commit f14656b
Show file tree

Hide file tree

Showing 27 changed files with 38 additions and 19 deletions.
diff --git a/angular.json b/angular.json
@@ -31,6 +31,9 @@
               "src/themes.scss"
             ],
             "scripts": [
+              "node_modules/jquery/dist/jquery.js",
+              "node_modules/tether/dist/js/tether.js",
+              "node_modules/bootstrap/dist/js/bootstrap.js"
             ]
           },
           "configurations": {

diff --git a/package.json b/package.json
@@ -26,8 +26,10 @@
     "angular-notifier": "^4.1.1",
     "bootstrap": "^4.0.0-alpha.6",
     "core-js": "^2.5.4",
+    "jquery": "^3.3.1",
     "rxjs": "~6.2.0",
     "socket.io-client": "^2.2.0",
+    "tether": "^1.4.5",
     "zone.js": "~0.8.26",
     "zxcvbn": "^4.4.2"
   },

diff --git a/src/app/controllers/navbar/navbar.component.html b/src/app/controllers/navbar/navbar.component.html
@@ -1,6 +1,6 @@
 
 <nav class="navbar navbar-toggleable-md navbar-inverse">
-  <a href="/" class="navbar-brand text-primary">Simply Servers Alpha</a>
+  <a routerLink="/" class="navbar-brand text-primary">Simply Servers Alpha</a>
   <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
           data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
           aria-label="Toggle navigation">
@@ -23,6 +23,9 @@
       <li class="nav-item" *ngIf="!login">
         <a class="nav-link text-primary" routerLink="/login">Login</a>
       </li>
+      <li class="nav-item" *ngIf="!login">
+        <a class="nav-link text-primary" routerLink="/register">Register</a>
+      </li>
       <li class="nav-item dropdown" *ngIf="login">
         <a class="nav-link dropdown-toggle text-primary" href="#" id="navbarAccountDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           {{username}}

diff --git a/src/app/controllers/panel/panel-frame/panel-frame.component.html b/src/app/controllers/panel/panel-frame/panel-frame.component.html
@@ -31,7 +31,7 @@
       <li class="srv-mgt end" *ngIf="isOwner" [class.selected]="currentUrl == '/panel/settings'">
         <a routerLink="/panel/settings"><i class="material-icons">settings</i>Settings</a>
       </li>
-      <li *ngIf="!isMinecraft" class="srv-mgt end" [class.selected]="currentUrl == '/panel/plugins'">
+      <li *ngIf="!hidePlugins" class="srv-mgt end" [class.selected]="currentUrl == '/panel/plugins'">
         <a routerLink="/panel/settings"><i class="material-icons">developer_board</i>Mods</a>
       </li>
       <div *ngIf="isMinecraft" class="plugin-viewer">

diff --git a/src/app/controllers/panel/panel-frame/panel-frame.component.ts b/src/app/controllers/panel/panel-frame/panel-frame.component.ts
@@ -19,6 +19,7 @@ export class PanelFrameComponent implements OnInit, OnDestroy {
 
   isMinecraft = false;
   isOwner = false;
+  hidePlugins = false;
 
   currentUrl: string;
 
@@ -46,6 +47,7 @@ export class PanelFrameComponent implements OnInit, OnDestroy {
     //Typescript can be super dumb sometimes
     const views = <any>this.currentServer.preset.special.views;
     this.isMinecraft = views.indexOf("minecraft") > -1;
+    this.hidePlugins = views.indexOf("no_plugin_viewer") > -1;
     this.isOwner = this.currentServer.isOwner;
   }
 

diff --git a/src/assets/apple-touch-icon-114x114.png b/src/assets/apple-touch-icon-114x114.png
diff --git a/src/assets/apple-touch-icon-120x120.png b/src/assets/apple-touch-icon-120x120.png
diff --git a/src/assets/apple-touch-icon-144x144.png b/src/assets/apple-touch-icon-144x144.png
diff --git a/src/assets/apple-touch-icon-152x152.png b/src/assets/apple-touch-icon-152x152.png
diff --git a/src/assets/apple-touch-icon-57x57.png b/src/assets/apple-touch-icon-57x57.png
diff --git a/src/assets/apple-touch-icon-60x60.png b/src/assets/apple-touch-icon-60x60.png
diff --git a/src/assets/apple-touch-icon-72x72.png b/src/assets/apple-touch-icon-72x72.png
diff --git a/src/assets/apple-touch-icon-76x76.png b/src/assets/apple-touch-icon-76x76.png
diff --git a/src/assets/favicon-128.png b/src/assets/favicon-128.png
diff --git a/src/assets/favicon-16x16.png b/src/assets/favicon-16x16.png
diff --git a/src/assets/favicon-196x196.png b/src/assets/favicon-196x196.png
diff --git a/src/assets/favicon-32x32.png b/src/assets/favicon-32x32.png
diff --git a/src/assets/favicon-96x96.png b/src/assets/favicon-96x96.png
diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico
diff --git a/src/assets/mstile-144x144.png b/src/assets/mstile-144x144.png
diff --git a/src/assets/mstile-150x150.png b/src/assets/mstile-150x150.png
diff --git a/src/assets/mstile-310x150.png b/src/assets/mstile-310x150.png
diff --git a/src/assets/mstile-310x310.png b/src/assets/mstile-310x310.png
diff --git a/src/assets/mstile-70x70.png b/src/assets/mstile-70x70.png
diff --git a/src/index.html b/src/index.html
@@ -1,25 +1,32 @@
-<!--
-Simply Servers: Free, optimized, and DDOS protected servers. All at no cost.
-Built with <3 by the Simply Servers team.
--->
 <!doctype html>
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <title>Simply Servers</title>
   <base href="/">
-
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-
-  <link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+  <link rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/apple-touch-icon-57x57.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/apple-touch-icon-114x114.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/assets/apple-touch-icon-72x72.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/assets/apple-touch-icon-144x144.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="60x60" href="/assets/apple-touch-icon-60x60.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="/assets/apple-touch-icon-120x120.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="76x76" href="/assets/apple-touch-icon-76x76.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/assets/apple-touch-icon-152x152.png" />
+  <link rel="icon" type="image/png" href="/assets/favicon-196x196.png" sizes="196x196" />
+  <link rel="icon" type="image/png" href="/assets/favicon-96x96.png" sizes="96x96" />
+  <link rel="icon" type="image/png" href="/assets/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="/assets/favicon-16x16.png" sizes="16x16" />
+  <link rel="icon" type="image/png" href="/assets/favicon-128.png" sizes="128x128" />
+  <meta name="application-name" content="Simply Servers"/>
+  <meta name="msapplication-TileColor" content="#FFFFFF" />
+  <meta name="msapplication-TileImage" content="/assets/mstile-144x144.png" />
+  <meta name="msapplication-square70x70logo" content="/assets/mstile-70x70.png" />
+  <meta name="msapplication-square150x150logo" content="/assets/mstile-150x150.png" />
+  <meta name="msapplication-wide310x150logo" content="/assets/mstile-310x150.png" />
+  <meta name="msapplication-square310x310logo" content="/assets/mstile-310x310.png" />
 </head>
 <body>
 <app-root></app-root>
-<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 </body>
 </html>
-<!-- frontend deploy: Robin -->
diff --git a/src/main.ts b/src/main.ts
@@ -4,10 +4,10 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
-console.log(`%c                                    ________________________________________
-                                  Want to help change the way game servers work?
-                                       < https://simplyservers.io/apply >
-                                    ________________________________________
+console.log(`%c                                        ________________________________________
+
+                                         Made with <3 by the SimplyServers Team.
+                                        ________________________________________
                      .__               .__                                                           .__        
                 _____|__| _____ ______ |  | ___.__. ______ ______________  __ ___________  ______    |__| ____  
                /  ___/  |/     \\\\____ \\|  |<   |  |/  ___// __ \\_  __ \\  \\/ // __ \\_  __ \\/  ___/    |  |/  _ \\ 

diff --git a/src/themes.scss b/src/themes.scss
@@ -77,3 +77,5 @@ body{
 }
 
 @import "../node_modules/angular-notifier/styles";
+@import url('https://fonts.googleapis.com/css?family=Raleway');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');