projects/fipamo
projects/fipamo
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 24 Packages Wiki Activity Actions

Replaced Moment with Carbon #84

Merged
Ghost merged 148 commits from develop into beta 2022-09-22 05:53:36 +02:00
Conversation 1 Commits 148 Files changed 306 +83 -41
5 changed files with 83 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 770959137a - Show all commits

22
public/assets/css/dash/frame.css
View file

@ -31,6 +31,28 @@ a.secondary {
transition: all 0.2s linear; transition: all 0.2s linear;
} }
a.main-nav-primary {
height: 24px;
background: var(--primary);
display: inline-block;
vertical-align: top;
border-radius: 3px;
padding: 8px 0;
width: 40px;
text-align: center;
}
a.main-nav-secondary-highlight {
height: 24px;
background: var(--secondary-highlight);
display: inline-block;
vertical-align: top;
border-radius: 3px;
padding: 8px 0;
width: 40px;
text-align: center;
}
img.logo-medium { img.logo-medium {
width: 140px; width: 140px;
} }

1
public/assets/css/dash/icons.css
View file

@ -3,7 +3,6 @@ svg.icon {
fill: var(--secondary); fill: var(--secondary);
width: 25px; width: 25px;
height: 25px; height: 25px;
padding-top: 5px;
color: var(--secondary); color: var(--secondary);
} }

52
resources/views/includes/nav.blade.php
View file

@ -4,26 +4,20 @@
@elseif($title == "Start" ) @elseif($title == "Start" )
@include('includes.submenu-start') @include('includes.submenu-start')
@endif @endif
<a id="settings" href="/dashboard/settings" title="settings"> <a id="settings" class="main-nav-secondary-highlight" href="/dashboard/settings" title="settings">
<button> <svg id="nav-settings-icon" class="icon">
<svg id="nav-settings-icon" class="icon">
<use id="nav-settings-icon" xlink:href="/assets/images/global/sprite.svg#entypo-cog"/> <use id="nav-settings-icon" xlink:href="/assets/images/global/sprite.svg#entypo-cog"/>
</svg> </svg>
</button>
</a> </a>
<a id="navigation" href="/dashboard/navigation" title="edit navigation"> <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/navigation" title="edit navigation">
<button> <svg id="nav-menu-icon" class="icon">
<svg id="nav-menu-icon" class="icon"> <use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-menu"/>
<use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-menu"/> </svg>
</svg>
</button>
</a> </a>
<a id="navigation" href="/dashboard/logout" title="log out"> <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/logout" title="log out">
<button> <svg id="nav-logout-icon" class="icon">
<svg id="nav-logout-icon" class="icon"> <use id="nav-logout-icon" xlink:href="/assets/images/global/sprite.svg#entypo-log-out"/>
<use id="nav-logout-icon" xlink:href="/assets/images/global/sprite.svg#entypo-log-out"/> </svg>
</svg>
</button>
</a> </a>
</div> </div>
@ -37,19 +31,19 @@
@elseif($title == "Start" ) @elseif($title == "Start" )
@include('includes.submenu-start') @include('includes.submenu-start')
@endif @endif
<a id="settings" href="/dashboard/settings" title="settings"> <a id="settings" class="main-nav-secondary-highlight" href="/dashboard/settings" title="settings">
<button> <svg id="nav-settings-icon" class="icon">
<i class="ti ti-home-cog"></i> <use id="nav-settings-icon" xlink:href="/assets/images/global/sprite.svg#entypo-cog"/>
</button> </svg>
</a> </a>
<a id="navigation" href="/dashboard/navigation" title="edit navigation"> <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/navigation" title="edit navigation">
<button> <svg id="nav-menu-icon" class="icon">
<i class="ti ti-arrow-autofit-height"></i> <use id="nav-menu-icon" xlink:href="/assets/images/global/sprite.svg#entypo-menu"/>
</button> </svg>
</a> </a>
<a id="navigation" href="/dashboard/logout" title="log out"> <a id="navigation" class="main-nav-secondary-highlight" href="/dashboard/logout" title="log out">
<button> <svg id="nav-logout-icon" class="icon">
<i class="ti ti-logout"></i> <use id="nav-logout-icon" xlink:href="/assets/images/global/sprite.svg#entypo-log-out"/>
</button> </svg>
</a> </a>
</div> </div>

18
resources/views/includes/submenu-start.blade.php
View file

@ -1,16 +1,12 @@
<div class="submenu"> <div class="submenu">
<a href='/dashboard/pages' title="view pages"> <a class="main-nav-primary" href='/dashboard/pages' title="view pages">
<button> <svg id="option-menu-pin" class="icon">
<svg id="option-menu-pin" class="icon">
<use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#minicute-book"/> <use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#minicute-book"/>
</svg> </svg>
</button>
</a> </a>
<a href='/dashboard/page/add/new' title="add new page"> <a class="main-nav-primary" href='/dashboard/page/add/new' title="add new page">
<button> <svg id="option-menu-pin" class="icon">
<svg id="option-menu-pin" class="icon"> <use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#entypo-squared-plus"/>
<use id="option-menu-pin" xlink:href="/assets/images/global/sprite.svg#entypo-squared-plus"/> </svg>
</svg>
</button>
</a> </a>
</div> </div>

31
routes/web.php
View file

@ -17,3 +17,34 @@ use App\Http\Controllers\RouteController;
//routing needs a bit more nuance, so requests are sent to a controller to sort traffic //routing needs a bit more nuance, so requests are sent to a controller to sort traffic
Route::get("/{first?}/{second?}/{third?}/{four?}", [RouteController::class, 'get']); Route::get("/{first?}/{second?}/{third?}/{four?}", [RouteController::class, 'get']);
Route::post("/{first?}/{second?}/{third?}", [RouteController::class, 'post']); Route::post("/{first?}/{second?}/{third?}", [RouteController::class, 'post']);
/*
REFACTOR: Routing should be handled here instead of a seperate controller, so this needs to be reworked
KEEP FOR REFERENCE FOR REBUILD
Route::get("/", [StartController::class, 'index']);
//DASHBOARD
//login stuff
Route::get("/dashboard", [IndexController::class, 'login']);
Route::post("/login", [AuthController::class, 'enter']);
//back
Route::group(['prefix' => 'dashboard', 'middleware' => 'member.check'], function () {
Route::get("/start", [IndexController::class, 'start'])->name('start');
Route::get("/pages/{pageFilter?}/{pageNum?}", [IndexController::class, 'book']);
Route::get("/page/{mode}/{uuid}", [IndexController::class, 'page']);
Route::get("/settings", [IndexController::class, 'settings']);
Route::get("/navigation", [IndexController::class, 'navigation']);
Route::get("/logout", [AuthController::class, 'exit']);
});
//theme kit
Route::group(['prefix' => 'theme', 'middleware' => 'member.check'], function () {
Route::get("/", [ThemeController::class, 'start']);
Route::get("/view/{view?}", [ThemeController::class, 'getView']);
});
*/