Skip to content
This repository has been archived by the owner on May 7, 2021. It is now read-only.

Commit

Permalink
embedded
Browse files Browse the repository at this point in the history
  • Loading branch information
rishiraj824 committed Aug 15, 2016
1 parent a7bc015 commit b9649ff
Show file tree
Hide file tree
Showing 23 changed files with 505 additions and 50 deletions.
62 changes: 62 additions & 0 deletions public/css/login.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
body{
background: rgb(51,51,51);
}

.gdg-logo{
padding: 2%;
}
form{
margin-left: -12%;
}
.custom-button{
background: rgb(69,133,234);
outline: none;
border: none;
border-radius: 20px;
min-width: 30%;
padding: 1%!important;
margin-top: 5%;
color: white;
}
input, .materialize-textarea{
color: white!important;
}
.input-field input:focus + label, .materialize-textarea:focus + label{
color: white!important;
}
.input-field input:focus, .materialize-textarea:focus{
border-bottom: 1px solid white!important;
box-shadow: 0 1px 0 0 white!important;
}
input[type="checkbox"].filled-in:checked + label:after{
border: 2px solid white!important;
background-color: transparent!important;
}
.custom-button:focus{
background: rgb(69,133,234);
border: none;
outline: none;
}
.custom-button:hover{
box-shadow: 5px 10px 10px rgba(31,31,31,1);
transition: 0.3s;
}
.select-dropdown li, .select-dropdown li span{
background: rgb(51,51,51);
color: rgb(145,145,145)!important;
}
.select-wrapper input{
color: rgb(145,145,145)!important;
text-indent: 2%;
}
.select-wrapper .caret{
color: rgb(145,145,145)!important;
}
.select-dropdown li, .select-dropdown li span:hover{
background: rgb(40,40,40);
transition: 0.3s;
}
.select-dropdown li.disabled span{
background: rgb(51,51,51);
color: rgb(145,145,145)!important;
}
4 changes: 4 additions & 0 deletions public/css/postlogin.css
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,7 @@ nav
display:none;
}
}
.input-field input:focus, .materialize-textarea:focus{
border-bottom: 1px solid #5690cf!important;
box-shadow: 0 1px 0 0 #5690cf!important;
}
19 changes: 15 additions & 4 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,21 @@ body{
min-height: 100vh;
max-height: 500vh;
border-top: 1px solid rgba(255,255,255,0.5);
z-index: 100;
}
.right-content{
padding: 2%!important;
}
.right-content img{
margin-top: -1%;
margin-top: -15%;
width: 100%;
z-index: 0;
}
.content{
min-height: 100vh;
margin-top: -17%!important;
height: 100vh;
overflow-y: scroll;
overflow-y: hidden;
border-right: 1px solid rgba(255,255,255,0.2);
}
::-webkit-scrollbar{
Expand Down Expand Up @@ -80,9 +82,18 @@ body{
height: 100vh;
margin-top: 0%;
}

@media only screen and (max-device-width: 600px){
.links{
top: 15vh;
}
}
@media only screen and (min-device-width: 1350px) and (max-device-width: 1920px){
.links{
left: 43.5vw;
left: 43vw;
}
}
@media only screen and (min-device-width: 1920px) and (max-device-width: 2000px){
.links{
left: 43.5vw;
}
}
Binary file modified public/images/illustration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions public/js/script.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
$(document).ready(function(){
$('#second-content').css('display','none');
$('#third-content').css('display','none');
$('#modal-trigger').click(function(){
swal({
title: '',
Expand Down Expand Up @@ -32,11 +30,4 @@ $(document).ready(function(){
$(this).addClass('active-link');
}
});
$.fn.scrollStopped = function(callback) {
var that = this, $this = $(that);
$this.scroll(function(ev) {
clearTimeout($this.data('scrollTimeout'));
$this.data('scrollTimeout', setTimeout(callback.bind(that), 100, ev));
});
};
});
118 changes: 115 additions & 3 deletions resources/views/User/Admin/addProblem.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,120 @@
@extends('layouts.app')

@section('content')
<div class="container">
<div class="container">
<div class="row">
<form name="#" id="add-problem-form" method="POST" action="{{ url('/admin/problem/add') }}">
<div class="col m8 l8 push-l2 push-l2">
<div class="row">
<div class="col m12 l12">
<div class="data-card">
<div class="card-head">
Login
</div>
{{ csrf_field() }}
<div class="card-body">
<div class="row">
<div class="col m4 l4 s12">
<div class="prob-field form-group{{ $errors->has('domain') ? ' has-error' : '' }}">
Domain
</div>
</div>
<div class="col m6 l6 s12">
<div class="input-field">
<select id="add-proj-select" name="domain">
<option value=1>Technical</option>
<option value=2>Management</option>
<option value=3>Design</option>
</select>
</div>
@if ($errors->has('domain'))
<span class="help-block">
<strong>{{ $errors->first('domain') }}</strong>
</span>
@endif
</div>
</div>
<div class="row">
<div class="col m4 l4 s12">
<div class="prob-field form-group{{ $errors->has('problem_statement') ? ' has-error' : '' }}">
Problem Statement
</div>
</div>
<div class="col m6 l6 s12">
<div class="input-field">
<textarea id="problemstatement-textarea" class="materialize-textarea" name="problem_statement"></textarea>
</div>
@if ($errors->has('problem_statement'))
<span class="help-block">
<strong>{{ $errors->first('problem_statement') }}</strong>
</span>
@endif
</div>
</div>
<div class="row">
<div class="col m4 l4 s12">
<div class="prob-field">
Comment
</div>
</div>
<div class="col m6 l6 s12">
<div class="input-field">
<textarea id="comment-textarea" class="materialize-textarea" name="comment"></textarea>
</div>
@if ($errors->has('comments'))
<span class="help-block">
<strong>{{ $errors->first('comments') }}</strong>
</span>
@endif
</div>
</div>
</div>
<div class="row">
<div class="col m2 l2 push-m4 push-l4">
<a onclick="$('#add-problem-form').submit();">
<div class="blue-button" id="view-submissions">
Add Problem
</div>
</a>
</div>
</div>
</div>
<br>
</div>
</div>
</div>
</form>
</div>
</div>

<script>
$('.dropdown-button').dropdown({
inDuration: 100,
outDuration: 100,
constrain_width: false, // Does not change width of dropdown to that of the activator
hover: true, // Activate on hover
gutter: 0, // Spacing from edge
belowOrigin: true, // Displays dropdown below the button
alignment: 'right' // Displays dropdown with edge aligned to the left of button
});
$('#uname-dropdown').dropdown({
inDuration: 100,
outDuration: 100,
constrain_width: true, // Does not change width of dropdown to that of the activator
hover: true, // Activate on hover
gutter: 0, // Spacing from edge
belowOrigin: true, // Displays dropdown below the button
alignment: 'right' // Displays dropdown with edge aligned to the left of button
});
$('select').material_select();
$(".button-collapse").sideNav();
$('#problemstatement-textarea').trigger('autoresize');
$('#comment-textarea').trigger('autoresize');
</script>
@endsection
<!-- <div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
Expand Down Expand Up @@ -67,5 +180,4 @@
</div>
</div>
</div>
</div>
@endsection
</div> -->
50 changes: 47 additions & 3 deletions resources/views/User/Admin/awardMarks.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,52 @@
@extends('layouts.app')

@section('content')
<div class="container">
<div class="container">
<div class="row">
<form name="#" id="award-form" method="POST" action="{{ url('/admin/update/marks') }}">
{{ csrf_field() }}
<div class="col m8 l8 push-l2 push-l2">
<div class="row">
<div class="col m12 l12">
<div class="data-card">
<div class="card-head">
Award Marks
</div>
<div class="card-body">
<div class="row">
<div class="col m4 l4 s12">
<div class="prob-field form-group{{ $errors->has('marks') ? ' has-error' : '' }}">
Marks
</div>
</div>
<div class="col m6 l6 s12">
<div class="input-field form-group{{ $errors->has('behance') ? ' has-error' : '' }}">
<input type="text" name="marks">
</div>
</div>
</div>
</div>
<input type="hidden" name = "userId" value="{{app('request')->input('userId')}}">
<input type="hidden" name="questionId" value="{{app('request')->input('questionId')}}">
<div class="row">
<div class="col m2 l2 push-m4 push-l4">
<a onclick="$('#award-form').submit();">
<div class="blue-button" id="view-submissions">
Award
</div>
</a>
</div>
</div>
</div>
<br>
</div>
</div>
</div>
</form>
</div>
</div>
@endsection<!--
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
Expand Down Expand Up @@ -38,5 +83,4 @@
</div>
</div>
</div>
</div>
@endsection
</div> -->
4 changes: 2 additions & 2 deletions resources/views/User/Admin/dashboard.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container">
<div class="row">

<div class="col-md-6 ">
<div class="col m6 ">
<div class="panel panel-default">
<div class="panel-heading">Registrations ({{$technicalRegistrations+$designRegistrations+$managementRegistrations}})</div>

Expand All @@ -16,7 +16,7 @@
</div>
</div>

<div class="col-md-6 ">
<div class="col m6 ">
<div class="panel panel-default">
<div class="panel-heading">Submissions ({{$checkedSubmissions+$uncheckedSubmissions}})</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@section('content')
<div class="container">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="col m10 offset-m1">

<div class="col-md-12">
<p style="color: green;">Following people are shortlisted</p>
Expand Down
10 changes: 5 additions & 5 deletions resources/views/User/Admin/shortListForm.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col m8 offset-md-2">
<div class="panel panel-default">
<div class="panel-heading">Shortlist Prople</div>
<div class="panel-body">
Expand All @@ -16,7 +16,7 @@
<label for="people" class="col-md-4 control-label">Number of People you want to shortlist</label>


<div class="col-md-6">
<div class="col m6">

<input type="text" class="form-control" name="number">

Expand All @@ -25,10 +25,10 @@
</div>
</div>
<div class="form-group{{ $errors->has('people') ? ' has-error' : '' }}">
<label for="people" class="col-md-4 control-label">Domain</label>
<label for="people" class="col m4 control-label">Domain</label>


<div class="col-md-6">
<div class="col m6">

<select class="form-control" name="domain">
<option value="1">Technical</option>
Expand All @@ -44,7 +44,7 @@

<br>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<div class="col m6 offset-m4">
<button type="submit" class="btn btn-primary">
<i class="fa fa-btn fa-sign-in"></i> Shortlist
</button>
Expand Down
Loading

0 comments on commit b9649ff

Please sign in to comment.