Skip to content
This repository was archived by the owner on Mar 13, 2023. It is now read-only.

Commit ef88350

Browse files
author
Laravel Cameroon
committed
fix merge
2 parents bd3f44b + a9bfa91 commit ef88350

File tree

434 files changed

+59279
-2240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+59279
-2240
lines changed

‎.babelrc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"presets": [
3+
["env", {
4+
"modules": false,
5+
"targets": {
6+
"browsers": ["last 2 versions", "safari >= 7"]
7+
}
8+
}]
9+
],
10+
"plugins": ["syntax-dynamic-import"]
11+
}

‎.csscomb.json‎

Lines changed: 305 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,305 @@
1+
2+
{
3+
"always-semicolon": true,
4+
"block-indent": 2,
5+
"color-case": "lower",
6+
"color-shorthand": true,
7+
"element-case": "lower",
8+
"eof-newline": true,
9+
"leading-zero": false,
10+
"remove-empty-rulesets": true,
11+
"space-after-colon": 1,
12+
"space-after-combinator": 1,
13+
"space-before-selector-delimiter": 0,
14+
"space-between-declarations": "\n",
15+
"space-after-opening-brace": "\n",
16+
"space-before-closing-brace": "\n",
17+
"space-before-colon": 0,
18+
"space-before-combinator": 1,
19+
"space-before-opening-brace": 1,
20+
"strip-spaces": true,
21+
"unitless-zero": true,
22+
"vendor-prefix-align": true,
23+
"sort-order": [
24+
[
25+
"position",
26+
"top",
27+
"right",
28+
"bottom",
29+
"left",
30+
"z-index",
31+
"display",
32+
"float",
33+
"width",
34+
"min-width",
35+
"max-width",
36+
"height",
37+
"min-height",
38+
"max-height",
39+
"-webkit-box-sizing",
40+
"-moz-box-sizing",
41+
"box-sizing",
42+
"-webkit-appearance",
43+
"padding",
44+
"padding-top",
45+
"padding-right",
46+
"padding-bottom",
47+
"padding-left",
48+
"margin",
49+
"margin-top",
50+
"margin-right",
51+
"margin-bottom",
52+
"margin-left",
53+
"overflow",
54+
"overflow-x",
55+
"overflow-y",
56+
"-webkit-overflow-scrolling",
57+
"-ms-overflow-x",
58+
"-ms-overflow-y",
59+
"-ms-overflow-style",
60+
"clip",
61+
"clear",
62+
"font",
63+
"font-family",
64+
"font-size",
65+
"font-style",
66+
"font-weight",
67+
"font-variant",
68+
"font-size-adjust",
69+
"font-stretch",
70+
"font-effect",
71+
"font-emphasize",
72+
"font-emphasize-position",
73+
"font-emphasize-style",
74+
"font-smooth",
75+
"-webkit-hyphens",
76+
"-moz-hyphens",
77+
"hyphens",
78+
"line-height",
79+
"color",
80+
"text-align",
81+
"-webkit-text-align-last",
82+
"-moz-text-align-last",
83+
"-ms-text-align-last",
84+
"text-align-last",
85+
"text-emphasis",
86+
"text-emphasis-color",
87+
"text-emphasis-style",
88+
"text-emphasis-position",
89+
"text-decoration",
90+
"text-indent",
91+
"text-justify",
92+
"text-outline",
93+
"-ms-text-overflow",
94+
"text-overflow",
95+
"text-overflow-ellipsis",
96+
"text-overflow-mode",
97+
"text-shadow",
98+
"text-transform",
99+
"text-wrap",
100+
"-webkit-text-size-adjust",
101+
"-ms-text-size-adjust",
102+
"letter-spacing",
103+
"-ms-word-break",
104+
"word-break",
105+
"word-spacing",
106+
"-ms-word-wrap",
107+
"word-wrap",
108+
"-moz-tab-size",
109+
"-o-tab-size",
110+
"tab-size",
111+
"white-space",
112+
"vertical-align",
113+
"list-style",
114+
"list-style-position",
115+
"list-style-type",
116+
"list-style-image",
117+
"pointer-events",
118+
"-ms-touch-action",
119+
"touch-action",
120+
"cursor",
121+
"visibility",
122+
"zoom",
123+
"flex-direction",
124+
"flex-order",
125+
"flex-pack",
126+
"flex-align",
127+
"table-layout",
128+
"empty-cells",
129+
"caption-side",
130+
"border-spacing",
131+
"border-collapse",
132+
"content",
133+
"quotes",
134+
"counter-reset",
135+
"counter-increment",
136+
"resize",
137+
"-webkit-user-select",
138+
"-moz-user-select",
139+
"-ms-user-select",
140+
"-o-user-select",
141+
"user-select",
142+
"nav-index",
143+
"nav-up",
144+
"nav-right",
145+
"nav-down",
146+
"nav-left",
147+
"background",
148+
"background-color",
149+
"background-image",
150+
"-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
151+
"filter:progid:DXImageTransform.Microsoft.gradient",
152+
"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
153+
"filter",
154+
"background-repeat",
155+
"background-attachment",
156+
"background-position",
157+
"background-position-x",
158+
"background-position-y",
159+
"-webkit-background-clip",
160+
"-moz-background-clip",
161+
"background-clip",
162+
"background-origin",
163+
"-webkit-background-size",
164+
"-moz-background-size",
165+
"-o-background-size",
166+
"background-size",
167+
"border",
168+
"border-color",
169+
"border-style",
170+
"border-width",
171+
"border-top",
172+
"border-top-color",
173+
"border-top-style",
174+
"border-top-width",
175+
"border-right",
176+
"border-right-color",
177+
"border-right-style",
178+
"border-right-width",
179+
"border-bottom",
180+
"border-bottom-color",
181+
"border-bottom-style",
182+
"border-bottom-width",
183+
"border-left",
184+
"border-left-color",
185+
"border-left-style",
186+
"border-left-width",
187+
"border-radius",
188+
"border-top-left-radius",
189+
"border-top-right-radius",
190+
"border-bottom-right-radius",
191+
"border-bottom-left-radius",
192+
"-webkit-border-image",
193+
"-moz-border-image",
194+
"-o-border-image",
195+
"border-image",
196+
"-webkit-border-image-source",
197+
"-moz-border-image-source",
198+
"-o-border-image-source",
199+
"border-image-source",
200+
"-webkit-border-image-slice",
201+
"-moz-border-image-slice",
202+
"-o-border-image-slice",
203+
"border-image-slice",
204+
"-webkit-border-image-width",
205+
"-moz-border-image-width",
206+
"-o-border-image-width",
207+
"border-image-width",
208+
"-webkit-border-image-outset",
209+
"-moz-border-image-outset",
210+
"-o-border-image-outset",
211+
"border-image-outset",
212+
"-webkit-border-image-repeat",
213+
"-moz-border-image-repeat",
214+
"-o-border-image-repeat",
215+
"border-image-repeat",
216+
"outline",
217+
"outline-width",
218+
"outline-style",
219+
"outline-color",
220+
"outline-offset",
221+
"-webkit-box-shadow",
222+
"-moz-box-shadow",
223+
"box-shadow",
224+
"filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
225+
"-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
226+
"opacity",
227+
"-ms-interpolation-mode",
228+
"-webkit-transition",
229+
"-moz-transition",
230+
"-ms-transition",
231+
"-o-transition",
232+
"transition",
233+
"-webkit-transition-delay",
234+
"-moz-transition-delay",
235+
"-ms-transition-delay",
236+
"-o-transition-delay",
237+
"transition-delay",
238+
"-webkit-transition-timing-function",
239+
"-moz-transition-timing-function",
240+
"-ms-transition-timing-function",
241+
"-o-transition-timing-function",
242+
"transition-timing-function",
243+
"-webkit-transition-duration",
244+
"-moz-transition-duration",
245+
"-ms-transition-duration",
246+
"-o-transition-duration",
247+
"transition-duration",
248+
"-webkit-transition-property",
249+
"-moz-transition-property",
250+
"-ms-transition-property",
251+
"-o-transition-property",
252+
"transition-property",
253+
"-webkit-transform",
254+
"-moz-transform",
255+
"-ms-transform",
256+
"-o-transform",
257+
"transform",
258+
"-webkit-transform-origin",
259+
"-moz-transform-origin",
260+
"-ms-transform-origin",
261+
"-o-transform-origin",
262+
"transform-origin",
263+
"-webkit-animation",
264+
"-moz-animation",
265+
"-ms-animation",
266+
"-o-animation",
267+
"animation",
268+
"-webkit-animation-name",
269+
"-moz-animation-name",
270+
"-ms-animation-name",
271+
"-o-animation-name",
272+
"animation-name",
273+
"-webkit-animation-duration",
274+
"-moz-animation-duration",
275+
"-ms-animation-duration",
276+
"-o-animation-duration",
277+
"animation-duration",
278+
"-webkit-animation-play-state",
279+
"-moz-animation-play-state",
280+
"-ms-animation-play-state",
281+
"-o-animation-play-state",
282+
"animation-play-state",
283+
"-webkit-animation-timing-function",
284+
"-moz-animation-timing-function",
285+
"-ms-animation-timing-function",
286+
"-o-animation-timing-function",
287+
"animation-timing-function",
288+
"-webkit-animation-delay",
289+
"-moz-animation-delay",
290+
"-ms-animation-delay",
291+
"-o-animation-delay",
292+
"animation-delay",
293+
"-webkit-animation-iteration-count",
294+
"-moz-animation-iteration-count",
295+
"-ms-animation-iteration-count",
296+
"-o-animation-iteration-count",
297+
"animation-iteration-count",
298+
"-webkit-animation-direction",
299+
"-moz-animation-direction",
300+
"-ms-animation-direction",
301+
"-o-animation-direction",
302+
"animation-direction"
303+
]
304+
]
305+
}

‎.editorconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,13 @@ trim_trailing_whitespace = false
1414
[*.yml]
1515
indent_style = space
1616
indent_size = 2
17+
18+
# 2 space indentation
19+
[*.{scss,js}]
20+
indent_style = space
21+
indent_size = 2
22+
23+
# Matches the package.json
24+
[package.json]
25+
indent_style = space
26+
indent_size = 2

‎app/Helpers/AssetHelper.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
namespace App\Helpers;
4+
5+
class AssetHelper
6+
{
7+
public static $json = null;
8+
9+
public static function path($file)
10+
{
11+
$parts = explode('.', $file);
12+
if (self::isLocal()) {
13+
if ($parts[1] === 'css') {
14+
return;
15+
}
16+
17+
return 'http://localhost:3003/assets/'.$file;
18+
}
19+
if (! self::$json) {
20+
self::$json = json_decode(file_get_contents(public_path().'/assets/assets.json'));
21+
}
22+
23+
return self::$json->{$parts[0]}->{$parts[1]};
24+
}
25+
26+
public static function isLocal()
27+
{
28+
return strpos($_SERVER['HTTP_HOST'], 'localhost') !== false;
29+
}
30+
}

‎app/Http/Controllers/Admin/EventController.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Admin;
4+
5+
use Illuminate\Http\Request;
6+
use TCG\Voyager\Http\Controllers\VoyagerBaseController as BaseVoyagerBaseController;
7+
8+
class EventController extends BaseVoyagerBaseController
9+
{
10+
//
11+
}

‎app/Http/Controllers/Admin/ForumController.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Admin;
4+
5+
use Illuminate\Http\Request;
6+
use TCG\Voyager\Http\Controllers\VoyagerBaseController as BaseVoyagerBaseController;
7+
8+
class ForumController extends BaseVoyagerBaseController
9+
{
10+
11+
}

‎app/Http/Controllers/Admin/PackageController.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Admin;
4+
5+
use Illuminate\Http\Request;
6+
use TCG\Voyager\Http\Controllers\VoyagerBaseController as BaseVoyagerBaseController;
7+
8+
class PackageController extends BaseVoyagerBaseController
9+
{
10+
//
11+
}

0 commit comments

Comments
 (0)