Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
add some unique favicons for dev/prod and gateway - some cleanup
  • Loading branch information
Cloverstone committed Nov 2, 2022
1 parent 6754cb1 commit 04eadb2
Show file tree
Hide file tree
Showing 30 changed files with 1,828 additions and 713 deletions.
2 changes: 1 addition & 1 deletion _docs/templates/layouts/_page.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="Adam Smallcomb">
<link rel="icon" href="../assets/favicon.png">
<link rel="icon" href="../assets/favicon{{#debug}}_debug{{/debug}}.png">
<style>
.issue + .issue::before{
content:", ";
Expand Down
2 changes: 1 addition & 1 deletion _docs/templates/layouts/default.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="Adam Smallcomb">
<link rel="icon" href="../assets/favicon.png">
<link rel="icon" href="../assets/favicon{{#debug}}_debug{{/debug}}.png">

<title>Graphene</title>

Expand Down
2 changes: 1 addition & 1 deletion app/Libraries/CustomAuth.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class CustomAuth {

public function __construct()
{
if (config('app.site')->auth == 'CAS') {
if (config('app.site') !== NULL && config('app.site')->auth == 'CAS') {
$this->cas = new CASAuth();
}
}
Expand Down
137 changes: 71 additions & 66 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,73 @@
{
"name": "escherlabs/graphene",
"type": "project",
"description": "Graphene Framework",
"keywords": ["framework", "graphene"],
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"doctrine/dbal": "^3.3",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"gumlet/php-image-resize": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.40",
"laravel/helpers": "^1.4",
"laravel/tinker": "^2.5",
"laravel/ui": "^3.3",
"matthiasmullie/minify": "^1.3",
"mustache/mustache": "^2.13",
"stechstudio/laravel-zipstream": "^4.2",
"subfission/cas": "^4.1"
},
"require-dev": {
"facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.3.3"
},
"autoload": {
"psr-4": {
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
]
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"platform": {"php": "8.0.0"}
},
"minimum-stability": "dev",
"prefer-stable": true
"name": "escherlabs/graphene",
"type": "project",
"description": "Graphene Framework",
"keywords": [
"framework",
"graphene"
],
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"doctrine/dbal": "^3.3",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"gumlet/php-image-resize": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.40",
"laravel/helpers": "^1.4",
"laravel/tinker": "^2.5",
"laravel/ui": "^3.3",
"matthiasmullie/minify": "^1.3",
"mustache/mustache": "^2.13",
"stechstudio/laravel-zipstream": "^4.2",
"subfission/cas": "^4.1"
},
"require-dev": {
"facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.3.3"
},
"autoload": {
"psr-4": {
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
]
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "8.0.20"
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
5 changes: 5 additions & 0 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

/* Master CrazyStairs Site */
'master_site' => 'graphene.escherlabs.com',
'site' => (object)[
'auth'=>false,
'id'=>NULL,
'name'=>""
],

/*
|--------------------------------------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion docs/07_14_2022.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="" />
<meta name="author" content="Adam Smallcomb" />
<link rel="icon" href="../assets/favicon.png" />
<link
rel="icon"
href="../assets/favicon{{IF APP_DEBUG}}_debug{{ENDIF}}.png"
/>
<style>
.issue + .issue::before {
content: ", ";
Expand Down
Binary file modified public/.DS_Store
Binary file not shown.
Binary file modified public/assets/.DS_Store
Binary file not shown.
Loading

0 comments on commit 04eadb2

Please sign in to comment.