Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI変更 #208 #214

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

UI変更 #208 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd3e17a
fix: Nginxからwebsh_serverに疎通できてなかったのを修正
jiro4989 Jan 5, 2022
8ada0f0
fix: websh_frontのUIを変更
jiro4989 Jan 4, 2022
8e0ddb7
fix: 処理中の場合はスキップする処理を追加
jiro4989 Jan 5, 2022
7333546
fix: メッセージが空じゃないときだけ追加するように変更
jiro4989 Jan 5, 2022
e35bb62
fix: css
jiro4989 Jan 5, 2022
c74d2f2
fix: webshコマンドを追加
jiro4989 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ services:

websh_server:
build: *app-build
container_name: websh_server
volumes:
- "./websh_server:/work"
environment:
HOST_PWD: "$PWD/websh_server"
entrypoint: ./entrypoint.sh
ports:
- "5000:5000"
network_mode: "host"

websh_remover:
build: *app-build
Expand Down
2 changes: 1 addition & 1 deletion nginx/conf.d/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ server {
proxy_set_header X-Forwarded-for $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://127.0.1.1:5000/;
proxy_pass http://websh_server:5000/;
}

location = /favicon.ico {
Expand Down
51 changes: 48 additions & 3 deletions websh_front/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,62 @@
<head>
<title>websh</title>

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.8.0/css/bulma.min.css">
<link rel="icon" href="/favicon.ico">
<!--
#204 Karaxと干渉しているため
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-->
<style>
textarea {
body {
font-family: Consolas, 'Courier New', Courier, Monaco, monospace;
font-size: 14px;
line-height: 1.2;
color: #C9C9C9;
background-color: #202020;
height: 100vh;
}

.main-area {
width: 60vw;
margin-left: auto;
margin-right: auto;
}

.content {
margin-bottom: 10px;
width: 55vw;
}

textarea {
font-size: 14px;
border: none;
background-color: #202020;
color: #C9C9C9;
caret-color: #C9C9C9;
outline: none;
width: 100%;
resize: none;
}

.command-marker {
vertical-align: top;
}

.ct-info {
font-weight: bold;
color: #efefef;
}

.ct-history {
font-weight: bold;
}

.ct-stdout {
font-style: italic;
}

.ct-stderr {
font-style: italic;
color: #B0231D;
}
</style>

Expand Down
Loading