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

Commit d979eea

Browse files
fabriceyopafabriceyopa
committed
Merge branch 'dev' of github.com:laravelcm/website into dev
2 parents 9ca71f1 + eb75973 commit d979eea

File tree

18 files changed

+366
-39
lines changed

18 files changed

+366
-39
lines changed

‎.env.example‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,3 @@ PUSHER_APP_CLUSTER=mt1
3737

3838
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
3939
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
40-
41-
# Twitter Token API
42-
TWITTER_CONSUMER_KEY=ma4LWL1xSGxcPxJgJ6jfeTqtF
43-
TWITTER_CONSUMER_SECRET=nElHo8F4UaRVNSz16a2lttJjuwWlwvUK9vvC0iSJL4tfzZ1LCd
44-
TWITTER_ACCESS_TOKEN=1005079396804448256-pqd8YraXawCPKyw5rC1cep1JXDaVY6
45-
TWITTER_ACCESS_TOKEN_SECRET=5BZr0iIkxP0CbH2ZqenY2558uFIeRxCHQLnW0AwVYTLxG

‎app/Http/Controllers/UserController.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
namespace App\Http\Controllers;
4+
5+
use Illuminate\Http\Request;
6+
7+
class UserController extends Controller
8+
{
9+
public function __construct()
10+
{
11+
}
12+
13+
/**
14+
* User Profile
15+
*
16+
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
17+
*/
18+
public function account()
19+
{
20+
return view('frontend.users.account');
21+
}
22+
23+
/**
24+
* User update password
25+
*
26+
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
27+
*/
28+
public function updatePassword()
29+
{
30+
return view('frontend.users.password');
31+
}
32+
}

‎config/services.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,23 @@
3535
'secret' => env('STRIPE_SECRET'),
3636
],
3737

38+
'facebook' => [
39+
'client_id' => env('FACEBOOK_ID'),
40+
'client_secret' => env('FACEBOOK_SECRET'),
41+
'redirect' => env('FACEBOOK_REDIRECT')
42+
],
43+
44+
'google' => [
45+
'client_id' => env('GOOGLE_ID'),
46+
'client_secret' => env('GOOGLE_SECRET'),
47+
'redirect' => env('GOOGLE_REDIRECT')
48+
],
49+
50+
'github' => [
51+
'client_id' => env('GITHUB_ID'),
52+
'client_secret' => env('GITHUB_SECRET'),
53+
'redirect' => env('GITHUB_REDIRECT')
54+
],
55+
56+
3857
];

‎resources/assets/sass/_content.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
font-size: .8125rem;
2121
font-weight: 600;
2222
color: $gray-900;
23+
24+
&:hover {
25+
color: $primary-200;
26+
}
2327
}
2428

2529
&:after {

‎resources/assets/sass/_mixins.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
box-shadow: 3px 0 8px 0px rgba(42, 42, 42, .25)
1919
}
2020

21+
@mixin material-box-shadow-hover {
22+
box-shadow: 6px 6px 27px 4px rgba($gray-900, .3)
23+
}
24+
2125
// Event
2226
@mixin event {
2327
background-color: $white;
2428
margin-bottom: 25px;
29+
transition: all 0.13s ease-in;
2530
@include material-box-shadow;
2631
.event__thumb {
2732
position: relative;
@@ -82,4 +87,8 @@
8287
letter-spacing: .05rem;
8388
}
8489
}
90+
91+
&:hover {
92+
@include material-box-shadow-hover
93+
}
8594
}

‎resources/assets/sass/application.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@
4242
@import "pages/tutorial";
4343
@import "pages/package";
4444
@import "pages/forum";
45+
@import "pages/user";

‎resources/assets/sass/pages/_forum.scss‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#chatter{
1+
#chatter {
22

33
margin-top: 50px;
44
margin-bottom: 80px;
@@ -349,19 +349,19 @@
349349
margin-top: 5px;
350350

351351
.chatter_cat {
352-
background:#ccc;
353-
border-radius:$border-radius;
354-
font-weight:bold;
355-
font-size:10px;
356-
padding:3px 7px;
357-
display:inline;
358-
color:#fff;
352+
background: #ccc;
353+
border-radius: $border-radius;
354+
font-weight: bold;
355+
font-size: 10px;
356+
padding: 3px 7px;
357+
display: inline;
358+
color: #fff;
359359
position:relative;
360-
top:-2px;
360+
top: -2px;
361361
}
362362
}
363-
span.chatter_middle_details{
364-
font-size:10px;
363+
span.chatter_middle_details {
364+
font-size: 12px;
365365
color:#9DADC4;
366366
transition:color 0.3s ease;
367367
}
@@ -414,7 +414,7 @@
414414
&:hover{
415415
background: $gray-400;
416416
text-decoration:none;
417-
.chatter_middle{
417+
.chatter_middle {
418418
h3 {
419419
color: #212121;
420420
}
@@ -525,7 +525,7 @@
525525
padding-bottom:0px;
526526
color:#aaa;
527527
transition:color 0.3s ease;
528-
font-size:12px;
528+
font-size: 15px;
529529
}
530530
}
531531
}
@@ -585,8 +585,6 @@
585585

586586
}
587587

588-
589-
590588
#chatter_category_id{
591589
height:50px;
592590
color:#777;
@@ -860,6 +858,19 @@
860858

861859
/********** END LOADER **********/
862860

861+
// Profil section
862+
.card-profile {
863+
margin-top: 50px;
864+
865+
.profil_content {
866+
a {
867+
color: $white;
868+
&:hover {
869+
color: darken($white, 15%);
870+
}
871+
}
872+
}
873+
}
863874
}
864875

865876
/********** MORE COLOR PICKER STYLE OVERRIDES **********/

‎resources/assets/sass/pages/_home.scss‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ section.posts-events {
5555
.lastest-post {
5656
@include make-col-ready();
5757
display: none;
58+
59+
.block_header {
60+
margin-bottom: 0;
61+
}
5862
}
5963

6064
.next-event {
@@ -77,6 +81,7 @@ section.posts-events {
7781
.lastest-post__title {
7882
margin-bottom: 35px;
7983
color: $primary;
84+
font-size: 2rem;
8085
}
8186

8287
.last-posts {
@@ -89,6 +94,11 @@ section.posts-events {
8994
background-color: $white;
9095
padding: 15px 12px;
9196
margin-bottom: 20px;
97+
transition: all 0.13s ease-in;
98+
99+
&:hover {
100+
@include material-box-shadow;
101+
}
92102

93103
.last-post__date {
94104
font-size: 14px;

‎resources/assets/sass/pages/_user.scss‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
section.account {
2+
margin: 100px 0;
3+
4+
.forum_account, .account_setting {
5+
padding: 30px 50px;
6+
h2, h3 {
7+
color: $primary;
8+
padding-bottom: 15px;
9+
margin-bottom: 25px;
10+
border-bottom: 1px solid $gray-900;
11+
}
12+
}
13+
14+
.forum_account {
15+
.account__grid {
16+
display: grid;
17+
grid-template-columns: 1fr;
18+
grid-column-gap: 16px;
19+
}
20+
img {
21+
display: block;
22+
margin-bottom: 15px;
23+
height: 150px;
24+
width: 150px;
25+
}
26+
}
27+
28+
.account_setting {
29+
30+
}
31+
32+
@include media-breakpoint-up(lg) {
33+
.forum_account {
34+
.account__grid {
35+
grid-template-columns: 2fr 1fr;
36+
}
37+
}
38+
}
39+
}

‎resources/lang/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Tutorials": "Tutorials",
77
"Packages": "Packages",
88
"Events": "Events",
9-
"Your account": "Your account",
9+
"My account": "My account",
1010
"Welcome to the website of the PHP and Laravel developers community of Cameroon": "Welcome to the website of the PHP and Laravel developers community of Cameroon",
1111
"Last Posts": "Last Posts",
1212
"Next Event": "Next Event",

0 commit comments

Comments
 (0)