diff --git a/app/Http/Controllers/AnswersController.php b/app/Http/Controllers/AnswersController.php
index 6ecb6dec57c341b139ff052300dc6d400ce2ceb1..4aba591d9a864b252aa3d0d1f921c74f645a4dce 100644
--- a/app/Http/Controllers/AnswersController.php
+++ b/app/Http/Controllers/AnswersController.php
@@ -44,7 +44,7 @@ class AnswersController extends Controller
$questions = Question::orderBy('created_at','desc')->paginate(15);
if ($isAdmin) {
- return view('admin.addanswer')->with('questions', $questions)->with('question_id', $question_id);
+ return view('admin.showquestion')->with('questions', $questions)->with('question_id', $question_id);
} else {
return view('users.qna.addanswer')->with('questions', $questions)->with('question_id', $question_id);
}
diff --git a/app/Http/Controllers/MembersController.php b/app/Http/Controllers/MembersController.php
index a920dec81d620351da664a2a0f9ab5976e986c8e..b4a6bb5129917a4d95f3870955d32f525912f4f7 100644
--- a/app/Http/Controllers/MembersController.php
+++ b/app/Http/Controllers/MembersController.php
@@ -151,10 +151,6 @@ class MembersController extends Controller
]);
}else{
$this->validate($request, [
- //'email' =>
- // array(
- // 'required',
- // 'regex:/[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}/'),
'phone_number' =>
array(
'required',
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
deleted file mode 100644
index efaa21c6910c7cb0c699ebd2326e45a4153d6fc1..0000000000000000000000000000000000000000
--- a/app/Http/Controllers/UsersController.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\User;
-
-class UsersController extends Controller
-{
- /**
- * Display a listing of the resource.
- *
- * @return \Illuminate\Http\Response
- */
- public function index()
- {
- //
- }
-
- /**
- * Show the form for creating a new resource.
- *
- * @return \Illuminate\Http\Response
- */
- public function create()
- {
- //
- }
-
- /**
- * Store a newly created resource in storage.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Http\Response
- */
- public function store(Request $request)
- {
- //
- }
-
- /**
- * Display the specified resource.
- *
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function show($id)
- {
- //
- }
-
- /**
- * Show the form for editing the specified resource.
- *
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function edit($id)
- {
- //
- }
-
- /**
- * Update the specified resource in storage.
- *
- * @param \Illuminate\Http\Request $request
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function update(Request $request, $id)
- {
- //
- }
-
- /**
- * Remove the specified resource from storage.
- *
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function destroy($id)
- {
- //
- }
-}
diff --git a/public/storage/cover_images/logo_itb_1525794497.png b/public/storage/cover_images/logo_itb_1525794497.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5dda77c2665d926b0d6c04eaa7b471f17c9ce32
Binary files /dev/null and b/public/storage/cover_images/logo_itb_1525794497.png differ
diff --git a/public/storage/cover_images/logo_itb_1525794498.png b/public/storage/cover_images/logo_itb_1525794498.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5dda77c2665d926b0d6c04eaa7b471f17c9ce32
Binary files /dev/null and b/public/storage/cover_images/logo_itb_1525794498.png differ
diff --git a/public/storage/profile_image/logo_itb_1525794502.png b/public/storage/profile_image/logo_itb_1525794502.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5dda77c2665d926b0d6c04eaa7b471f17c9ce32
Binary files /dev/null and b/public/storage/profile_image/logo_itb_1525794502.png differ
diff --git a/public/storage/profile_image/logo_itb_1525794504.png b/public/storage/profile_image/logo_itb_1525794504.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5dda77c2665d926b0d6c04eaa7b471f17c9ce32
Binary files /dev/null and b/public/storage/profile_image/logo_itb_1525794504.png differ
diff --git a/resources/views/admin/addanswer.blade.php b/resources/views/admin/addanswer.blade.php
deleted file mode 100644
index 7b1034c78745b84a7218be6d975e30599e992c70..0000000000000000000000000000000000000000
--- a/resources/views/admin/addanswer.blade.php
+++ /dev/null
@@ -1,77 +0,0 @@
-@extends('layouts.app')
-
-@section('title', 'Questions')
-
-@section('content')
-
-@include('inc.adminmenu')
- <main role="main" class="col-7">
- <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
- <h1 class="h2">List of Questions</h1>
- </div>
- @if (count($questions) > 0)
- @foreach ($questions as $question)
- <div class="well">
- <div class="row">
- <div class="col-12 post-card">
- <h3><a href="/admin/questions/{{$question->id}}">{{$question->topic}}</a></h3>
- <p>{{$question->body}}</p>
- <small><i>Written on {{$question->created_at}} by {{$question->user->name}}</i></small><br>
- <a href="/admin/answers/add/{{$question->id}}" class="btn btn-primary" style="float:right;">
- Give Answer
- </a>
- </div>
-
- @foreach ($question->answers->sortByDesc('rating') as $answer)
- <div class="col-12 post-card" style="display:inline;">
- <hr>
- <div class="col-10" style="float:left;">
- <p>{{$answer->body}}</p>
- <a href="/admin/answers/{{$answer->id}}"><small>Written on {{$answer->created_at}} by {{$answer->user->name}}</small></a><br>
- @if ($answer->created_at != $answer->updated_at)
- <small style="color:green;">(edited)</small>
- @endif
- </div>
- <div class="col-2 pull-right">
- <center><h2>{{$answer->rating}}</h2></center>
- {!! Form::open(['action' => ['AnswersController@giveRating', $answer->id, Auth::user()->id], 'method' => 'POST']) !!}
-
- @if ($answer->users->contains(Auth::user()->id))
- {{Form::submit('VOTE', ['class' => 'btn'])}}
- @else
- {{Form::submit('VOTE', ['class' => 'btn btn-warning'])}}
- @endif
-
- {!! Form::close() !!}
- </div>
- </div>
- @endforeach
-
- @if ($question->id == $question_id)
- <div class="col-12 post-card">
- <hr>
- {!! Form::open(['action' => ['AnswersController@store'], 'method' => 'POST']) !!}
- <div class="form-group">
- {{Form::label('body','Answer')}}
- {{Form::text('body', '', ['class' => 'form-control'])}}
- </div>
- {{ Form::hidden('question_id', $question->id) }}
- {{Form::submit('Submit', ['class' => 'btn btn-primary'])}}
- <a onclick="return confirm('Are you sure you want to cancel?')" href="/admin/questions" class="btn btn-danger pull-right">Cancel</a>
- {!! Form::close() !!}
- </div>
- @endif
- </div>
- </div>
- @endforeach
- <ul class="pagination pull-right">{{$questions->links()}}</ul>
- @else
- <p>No question</p>
- @endif
- </main>
-
-<script>
- document.getElementById("nav-four").classList.add("active");
- document.getElementById("text-nav-four").classList.add("color-active");
-</script>
-@endsection
\ No newline at end of file
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 97cc436bda4ceeaac745cea8dc70e8caeb48f9c8..9e9e7f7274d98da9290058fe1a66f0ecd2f9a677 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -19,9 +19,6 @@
</div>
</div>
- <!-- Bootstrap core JavaScript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="../../../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
<script src="../../../../assets/js/vendor/popper.min.js"></script>
diff --git a/resources/views/admin/showeachpost.blade.php b/resources/views/admin/showeachpost.blade.php
index ee9789e62e4a8070ef76467f632665fbee5d596d..dc5ad7d8bf567e1a29531b461a749445b4c66a8e 100644
--- a/resources/views/admin/showeachpost.blade.php
+++ b/resources/views/admin/showeachpost.blade.php
@@ -42,8 +42,6 @@
{{Form::submit('Delete', ['class' => 'btn btn-danger', 'onclick' => "return confirm('Are you sure you want to delete?')"])}}
{!!Form::close() !!}
@endif
- <!--<br><br><br>
- <a href="/admin/posts" class="btn btn-info pull-down">← Back</a>-->
</div>
@endsection
\ No newline at end of file
diff --git a/resources/views/admin/showquestion.blade.php b/resources/views/admin/showquestion.blade.php
index 79dfc498616e05f68788d00ec2c0c0fc9d6c0073..57a72b70b740c27c4b48b4e6c107734762b587cc 100644
--- a/resources/views/admin/showquestion.blade.php
+++ b/resources/views/admin/showquestion.blade.php
@@ -121,7 +121,6 @@
document.getElementById("text-nav-four").classList.add("color-active");
$("div[id^='answers']").hide();
- //$("div[id^='answercontainer']").hide();
$(document).ready(function() {
$("input[id^='btn']" ).click(function() {
@@ -137,7 +136,6 @@
} else if ($('#btn-' + question_id).hasClass('hidden-button')) {
$('#answers-' + question_id).show();
- //$('#answercontainer-' + classname).show();
var top = $('#answercontainer-' + question_id).position().top;
$('html').scrollTop(top);
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 1fc8e523db8350dd6945456bf64b98cfeee9553a..e1248f03c74ac10f0138f3cb94d1a56e444e4cf6 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -314,44 +314,6 @@
</div>
</div>
@endif
-
- {{-- @if (count($homedata[1]) > 3)
- <div class="team-member">
- <img src="/storage/profile_image/{{$homedata[1][3]->profile_image}}" class="img-responsive" alt="">
- <div class="team-details">
- <h4>{{$homedata[1][3]->name}}</h4>
- <p>Alumni of STEI ITB</p>
- <ul>
- @if ((Auth::user() != null) || (Auth::guard('member')->user() != null))
- <li><a href="/members/{{$homedata[1][3]->id}}"><i class="fa fa-user"></i></a></li>
- @else
- <li class="popup" onclick="myFunction4()">
- <span class="popuptext" id="myPopup4">You must login first <a href="/login"><u>(LOGIN)</u></a></span>
- <i class="fa fa-user show-profile-icon-team-details"></i></li>
- @endif
- </ul>
- </div>
- </div>
- @endif
-
- @if (count($homedata[1]) > 4)
- <div class="team-member">
- <img src="/storage/profile_image/{{$homedata[1][4]->profile_image}}" class="img-responsive" alt="">
- <div class="team-details">
- <h4>{{$homedata[1][4]->name}}</h4>
- <p>Alumni of STEI ITB</p>
- <ul>
- @if ((Auth::user() != null) || (Auth::guard('member')->user() != null))
- <li><a href="/members/{{$homedata[1][4]->id}}"><i class="fa fa-user"></i></a></li>
- @else
- <li class="popup" onclick="myFunction5()">
- <span class="popuptext" id="myPopup5">You must login first <a href="/login"><u>(LOGIN)</u></a></span>
- <i class="fa fa-user show-profile-icon-team-details"></i></li>
- @endif
- </ul>
- </div>
- </div>
- @endif --}}
<div class="team-member">
<img src="/storage/view-more-members.jpg" class="img-responsive" alt="">
@@ -386,7 +348,6 @@
<div class="col-lg-12">
<div class="section-title text-center">
<h3>Contact Us</h3>
- <!--<h5 class="white-text lowercase"><strong>sisfo@std.stei.itb.ac.id</strong></h5>-->
</div>
</div>
</div>
diff --git a/resources/views/inc/adminmenu.blade.php b/resources/views/inc/adminmenu.blade.php
index 31fb60395dcdb99f213eacb0a73a8789f11cbce0..04cd831b7ed5414fde1434e9805d60d29cf5dfc5 100644
--- a/resources/views/inc/adminmenu.blade.php
+++ b/resources/views/inc/adminmenu.blade.php
@@ -38,8 +38,6 @@
</ul>
</div>
</nav>
- <!-- Icons -->
- <!--<script src="/vendor/unisharp/laravel-ckeditor/ckeditor.js"></script>-->
<script src="https://unpkg.com/feather-icons/dist/feather.min.js"></script>
<script>
feather.replace();
diff --git a/resources/views/inc/navbarhome.blade.php b/resources/views/inc/navbarhome.blade.php
index 6495013f95da2af2d263e93bbd46dd325cf4f6cd..aa66daa21230b20b75c797a2f705361e73e5b4e0 100644
--- a/resources/views/inc/navbarhome.blade.php
+++ b/resources/views/inc/navbarhome.blade.php
@@ -58,24 +58,6 @@
</ul>
</li>
</div>
- <!--<li class="on-page" id="home-navbar">
- <a class="dropdown-toggle" data-toggle="dropdown" href="/" style="color:white">Home
- <span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li class="dropdown-home">
- <a class="page-scroll" href="#page-top">Introduction</a>
- </li>
- <li class="dropdown-home">
- <a class="page-scroll" href="#service">Services</a>
- </li>
- <li class="dropdown-home">
- <a class="page-scroll" href="#team">New Member</a>
- </li>
- <li class="dropdown-home">
- <a class="page-scroll" href="#contact">Contact</a>
- </li>
- </ul>
- </li>-->
@else
<div class="navbar-nav ml-auto" style="margin-top: 1.20%; padding-left: 1%; padding-right: 1%">
<li class="nav-item dropdown" style="">
@@ -107,24 +89,6 @@
</ul>
</li>
</div>
- <!--<li>
- <a class="dropdown-toggle" data-toggle="dropdown" href="/">Home
- <span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li class="dropdown-home">
- <a class="page-scroll on-page" href="/#page-top">Introduction</a>
- </li>
- <li class="dropdown-home">
- <a class="page-scroll" href="/#service">Services</a>
- </li>
- <li class="dropdown-home">
- <a class="page-scroll" href="/#team">New Member</a>
- </li>
- <li class="dropdown-home">
- <a class="page-scroll" href="/#contact">Contact</a>
- </li>
- </ul>
- </li>-->
@endif
<ul class="nav navbar-nav navbar-left">
@if(Request::is('article'))
@@ -139,7 +103,7 @@
{{-- Forum --}}
@if(Auth::guard('member')->user() != null)
- @if(Request::is('questions')) <!-- URL Forum -->
+ @if(Request::is('questions'))
<li class="on-page">
<a href="#">Forum</a>
</li>
@@ -188,7 +152,6 @@
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
<li>
<a class="dropdown-item" href="/members/{{Auth::guard('member')->user()->id}}">
- {{-- <a class="dropdown-item" href="/profilemember/{{Auth::guard('member')->user()->id}}"> --}}
Profile
</a>
</li>
diff --git a/resources/views/showmember.blade.php b/resources/views/showmember.blade.php
index 2b47f704df63602c1ecaa1c401ae4e12bd6a0995..791ce44dcd5ef232ec3cb1edf68a0bcf4ed27a10 100644
--- a/resources/views/showmember.blade.php
+++ b/resources/views/showmember.blade.php
@@ -3,9 +3,6 @@
@section('title', 'Members List')
@section('content')
-<!--<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
- <img src="{{URL::asset('storage/banner.jpg')}}" id="bannerMember">
-</div>-->
<div class="col-10 col-xs-offset-1 col-sm-offset-1 col-md-offset-1 showmember-table" style="min-height: 60em; overflow-x: auto">
<div class="row" style="margin-top: 1%">
<div class="col-md-12 col-sm-12">