Skip to content

L
Liman MYS - Çekirdek
Kaydet (Commit) 6e850bb2 authored tarafından ertansoftware's avatar ertansoftware
Dosyalara gözat
Seçenekler

Merge remote-tracking branch 'remotes/origin/master' 

# Conflicts:
#	resources/views/scripts/index.blade.php
#	resources/views/server/index.blade.php
#	resources/views/server/one.blade.php
üst 52a6f9f9
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 133 deletions
composer.json
Dosyayı görüntüle @ 6e850bb2
......@@ -40,6 +40,7 @@
"extra": {
"laravel": {
"dont-discover": [
"laravel/dusk"
]
}
},
......
nginx.conf deleted 100644 → 0
Dosyayı görüntüle @ 52a6f9f9
server {
listen 80;
listen 443 ssl http2;
server_name localhost;
root "/var/www/liman/public";
index index.html index.htm index.php;
charset utf-8;
location / {
try_files $uri $uri/ /index.php?$query_string;
}
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
access_log off;
error_log /var/log/nginx/liman-error.log error;
sendfile off;
client_max_body_size 100m;
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_intercept_errors off;
fastcgi_buffer_size 16k;
fastcgi_buffers 4 16k;
fastcgi_connect_timeout 300;
fastcgi_send_timeout 300;
fastcgi_read_timeout 300;
}
location ~ /\.ht {
deny all;
}
ssl_certificate /etc/ssl/certs/nginx.crt;
ssl_certificate_key /etc/ssl/private/nginx.key;
}
\ No newline at end of file
public/css/main.css
Dosyayı görüntüle @ 6e850bb2
......@@ -135,4 +135,4 @@ body {
width: 50%;
padding: 10px;
height: 500px; /* Should be removed. Only for demonstration */
}
\ No newline at end of file
}
resources/views/scripts/add.blade.php
Dosyayı görüntüle @ 6e850bb2
......@@ -3,6 +3,7 @@
@section('content')
<script>
var data=[];
var color=["#5cb85c","#428bca","#f0ad4e"];
</script>
<!-- Styles -->
<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet">
......@@ -26,7 +27,7 @@
</div>
</td>
<td style="margin:10px;">
<select class="form-control" name="inputs" style="color:white;background-color:#5cb85c;" id="inputType">
<select class="form-control" name="inputs" style="color:white;background-color:#5cb85c;" id="inputType" onchange="myInputs()">
<option value="string" style="color:white;background-color:#5cb85c;">Metin</option>
<option value="number" style="color:white;background-color:#428bca;">Sayı</option>
<option value="ip" style="color:white;background-color:#f0ad4e;">Ip Adresi</option>
......@@ -40,7 +41,7 @@
</div>
<br>
<div class="inputs">
<div class="inputs" id="inputs">
</div>
</div>
......@@ -49,8 +50,9 @@
<div class="card-body">
<div class="form-group">
<label for="exampleFormControlTextarea1">Kodu buraya yazınız</label>
<div id="editor"></div>
</div>
<div>
<textarea id="code"></textarea>
</div>
</div>
</div>
<div class="card w-auto">
......@@ -65,7 +67,7 @@
</div>
</td>
<td style="margin:10px;">
<select class="form-control" name="inputs" id="inputTypeResult" style="color:white;background-color:#5cb85c;">
<select class="form-control" name="inputs" id="inputTypeResult" style="color:white;background-color:#5cb85c;" onchange="myResults()">
<option value="string" style="color:white;background-color:#5cb85c;">Metin</option>
<option value="number" style="color:white;background-color:#428bca;">Sayı</option>
<option value="ip" style="color:white;background-color:#f0ad4e;">Ip Adresi</option>
......@@ -97,25 +99,7 @@
</div>
</div>
</div>
@include('modal',[
"id"=>"settingsModal",
"title" => __("Betik Ayarları"),
"url" => "/user/add",
"inputs" => [
__("Adı") => "name:text",
__("Özellik") => "ip:text", /* @foreach ($extensions as $extension)
<option value="{{$extension->_id}}">{{$extension->name}}</option>
@endforeach*/
__("Versiyon") => "versiyon:text",
__("Açıklama") => "description:text",
__("Mail Adresi") => "mail:text",
__("Betik Türü") => [
"Sorgulama"=>"0",
"Çalıştırma"=>"1"
]
],
"submit_text" => "Ekle"
])
<div class="modal fade" id="settingsModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
......@@ -145,6 +129,13 @@
<h3>Versiyon</h3>
<input id="username" type="text" class="form-control" placeholder="Betik Versiyonu" value="1">
</div>
<div class="form-group">
<h3>Dil Seçimi</h3>
<select class="form-control" name="inputs" id="languagetype">
<option value="query">Python</option>
<option value="query">Bash</option>
</select>
</div>
</div>
<div class="column">
<div class="form-group">
......@@ -174,62 +165,35 @@
</div>
<script>
$('#inputType').on('change', function() {
$(this).css("backgroundColor", getRandomColor());
$(this).css("color", "white");
});
$('#inputTypeResult').on('change', function() {
$(this).css("backgroundColor",getRandomColor());
$(this).css("color", "white");
});
function myInputs(){
var x = document.getElementById("inputType");
x.style.backgroundColor=color[x.selectedIndex];
}
function myResults() {
var x = document.getElementById("inputTypeResult");
x.style.backgroundColor=color[x.selectedIndex];
}
function addInput() {
var name = $("#inputName").val();
var type = $("#inputType").val();
if(data["inputs"])
data["inputs"]=data["inputs"]+","+$("#inputName").val()+":"+$("#inputType").val();
data["inputs"]=data["inputs"]+","+document.getElementById("inputName").value+":"+document.getElementById("inputType").value;
else
data["inputs"]=$("#inputName").val()+":"+$("#inputType").val();
var r= $('<button class="btn btn-success" onclick="sil(this)" id="">value2</button>');
r.id=name;
r.text(name);
r.css("margin","10px");
if(type=="string"){
r.css("backgroundColor", "#5cb85c");
r.css("color", "white");}
else if(type=="number"){
r.css("backgroundColor", "#428bca");
r.css("color", "white");}
else if(type=="ip"){
r.css("backgroundColor", "#f0ad4e");
r.css("color", "white");}
$(".inputs").append(r);
data["inputs"]=document.getElementById("inputName").value+":"+document.getElementById("inputType").value;
var r= createButton(document.getElementById("inputName").value,document.getElementById("inputType").selectedIndex);
document.getElementById('inputs').appendChild(r);
}
function addResultParameters(){
var name= $("#ResultParameterName").val();
var type = $("#inputTypeResult").val();
if(data["outputs"])
data["outputs"]=data["outputs"]+","+$("#ResultParameterName").val()+":"+$("#inputTypeResult").val();
data["outputs"]=data["outputs"]+","+document.getElementById("ResultParameterName").value+":"+document.getElementById("inputTypeResult").value;
else
data["outputs"]=$("#ResultParameterName").val()+":"+$("#inputTypeResult").val();
var r= $('<button class="btn btn-success" onclick="sil(this)" id=""></button>');
r.id=name;
r.text(name);
r.css("margin","10px");
if(type=="string"){
r.css("backgroundColor", "#5cb85c");
r.css("color", "white");}
else if(type=="number"){
r.css("backgroundColor", "#428bca");
r.css("color", "white");}
else if(type=="ip"){
r.css("backgroundColor", "#f0ad4e");
r.css("color", "white");}
$(".Resultsinputs").append(r);
data["outputs"]=document.getElementById("ResultParameterName").value+":"+document.getElementById("inputTypeResult").value;
var r= createButton(document.getElementById("ResultParameterName").value,document.getElementById("inputTypeResult").selectedIndex);
document.getElementById('Resultsinputs').appendChild(r);
}
function add(){
data["name"]=$("#name").val();
data["feature"]=$( "#feature option:selected" ).text();
data["extension"]=$( "#feature option:selected" ).text();
data["version"]=$("#version").val();
data["description"]=$("#description").val();
data["email"]=$("#email").val();
......@@ -240,8 +204,8 @@
}
}
function addAll(){
var command=document.getElementById("editor");
data["code"]=command.textContent;
var command=document.getElementById("code");
data["code"]=command;
if( 'name' in data){
$.post("{{route('script_create')}}" ,{
data:data
......@@ -259,20 +223,20 @@
}
}
function sil(id){
$(id).remove();
var elem = document.getElementById(id);
elem.parentNode.removeChild(elem);
}
</script>
<script>
var editor = ace.edit("editor");
editor.session.setMode("ace/mode/python");
function getRandomColor() {
var letters = '0123456789ABCDEF';
var color = '#';
for (var i = 0; i < 6; i++) {
color += letters[Math.floor(Math.random() * 16)];
}
return color;
function createButton(name,index){
var button=document.createElement("BUTTON");
button.id=name;
button.className="btn btn-success";
button.innerHTML=name;
// button.onclick=sil(this);
button.style.margin="10px";
button.style.backgroundColor=color[index];
return button;
}
</script>
@endsection
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment