Skip to content

Commit

Permalink
Merge pull request #181 from jumang4423/master
Browse files Browse the repository at this point in the history
UIの改善及び英文法チェック
  • Loading branch information
gpioblink authored Oct 30, 2020
2 parents f5b5715 + 5b9dc13 commit 29e3c95
Show file tree
Hide file tree
Showing 7 changed files with 172 additions and 86 deletions.
72 changes: 67 additions & 5 deletions front/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,23 +1,85 @@
<template>
<div id="app" class="container">
<router-link to="/">Back to top</router-link>
<div style="background: #EEEEEE;">
<div id="app" class="container">
<div style="position:fixed; height: 100px;">
<router-link to="/" id="totopPos">←</router-link>
</div>
<h2 id='clockPos'>{{ clocktext }}</h2>
<router-view/>
</div>
</div>
</template>

<script>
export default {
name: 'App'
name: 'App',
data: function () {
return {
clocktext: '0000/00/00 00:00:00'
}
},
mounted: function () {
const self = this
setInterval(() => {
const da = new Date()
const year = da.getFullYear()
const month = da.getMonth() + 1
const date = da.getDate()
const hour = da.getHours()
const minute = da.getMinutes()
const second = da.getSeconds()
self.clocktext = `${year}/`
if (month < 10) {
self.clocktext += '0'
}
self.clocktext += `${month}/`
if (date < 10) {
self.clocktext += '0'
}
self.clocktext += `${date} `
if (hour < 10) {
self.clocktext += '0'
}
self.clocktext += `${hour}:`
if (minute < 10) {
self.clocktext += '0'
}
self.clocktext += `${minute}:`
if (second < 10) {
self.clocktext += '0'
}
self.clocktext += `${second}`
}, 1000);
}
}
</script>

<style>
#app {
font-family: verdana;
vertical-align: middle;
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
overflow: hidden;
}
#clockPos{
text-align: right;
padding: 24px 48px;
font-size: 2rem;
font-weight: normal;
letter-spacing: 0.05rem;
}
#totopPos{
position: absolute;
left: 0px;
padding: 24px 48px;
font-size: 2rem;
font-weight: bold;
letter-spacing: 0.05rem;
color: #3282ce;
}
</style>
34 changes: 21 additions & 13 deletions front/src/components/forgot.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<template>
<div id='forgot' style="width: 100%;">
<div class="studentNUM">
<h1>Please Input Your Student Number</h1>
<h1>Input: {{ sid }}</h1>
<input v-on:keyup.enter="forgot" v-model="sid" placeholder="s120000">
<h5><br>Push enter key after inputting your student number</h5>
<h1>Input your student number</h1>
<input v-on:keyup.enter="forgot" v-model="sid" placeholder="s12xxxxx">
<h4 style="color:#aaaaaa;"><br><span style="color:#88aace;">Enter</span> key to continue -></h4>
</div>
</div>
</template>
Expand All @@ -26,8 +25,8 @@ export default {
.then(res => {
console.log(res)
if (res['UserName'] === '') {
console.log('The ID is not found.')
alert('The ID is not found.')
console.log('Your ID is incorrect.')
alert('Your ID is incorrect.')
} else {
if (res['IsEnter']) {
self.$router.push({ name: 'question', params: { userinfo: res } })
Expand All @@ -47,23 +46,32 @@ export default {

<style scoped>
h1 {
font-size: 72px;
width: 100%;
font-size: 4rem;
font-weight: normal;
letter-spacing: 0.05rem;
}
h2 {
font-size: 50px;
width: 100%;
font-weight: normal;
}
input {
width: 300px;
height: 100px;
font-size: 26px;
border: 2px, #42b983, double;
width: 325px;
height: 125px;
font-size: 2.2rem;
font-weight: lighter;
letter-spacing: 0.05rem;
margin: 15px;
}
div .studentNUM {
width: 100%;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin: auto;
width: 80%;
height: 200px;
display: flex;
flex-flow: column nowrap;
justify-content: center;
Expand Down
6 changes: 4 additions & 2 deletions front/src/components/goodbye.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div id='goodbye'>
<h1>Good bye</h1>
<h1>Bye!</h1>
</div>
</template>

Expand All @@ -18,7 +18,9 @@ export default {

<style scoped>
h1{
font-size: 72px;
font-size: 5rem;
font-weight: normal;
letter-spacing: 0.05rem;
}
div #goodbye {
position: absolute;
Expand Down
53 changes: 40 additions & 13 deletions front/src/components/question.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
<div class="checkboxes alignment" data-toggle="buttons-radio">
<div class="checkbox">
<input class="btn btn-info" type="checkbox" value="3DPrinter" v-model="checkedUse">
<label for="3DPrinter" style="font-size: 20px">3DPrinter</label>
<label for="3DPrinter" style="font-size: 18px">3D Printer</label>
</div>
<div class="checkbox">
<input class="btn btn-info" type="checkbox" value="LaserCutter" v-model="checkedUse">
<label for="LaserCutter" style="font-size: 20px">LaserCutter</label>
<label for="LaserCutter" style="font-size: 18px">Laser Cutter</label>
</div>
<div class="checkbox">
<input class="btn btn-info" type="checkbox" value="Training session" v-model="checkedUse">
<label for="Training" style="font-size: 20px">Training</label>
<label for="Training" style="font-size: 18px">Training</label>
</div>
<div class="checkbox">
<input class="btn btn-info" type="checkbox" value="Other" v-model="checkedUse">
<label for="Other" style="font-size: 20px">Other</label>
<label for="Other" style="font-size: 18px">Other</label>
</div>
</div>
<h3>If you have any request please fill in.</h3>
<h3>If you have any request, please fill in.</h3>
<br>
<textarea v-model="message" placeholder="" @keyup.ctrl.enter="send"></textarea>
<br>
<button ref="sendbtn" class="btn btn-info" v-on:click="send">send</button>
<br>
<h5>You can also use Control+Enter to submit your request.</h5>
<h5 style="color:#aaaaaa;"><span style="color:#88aace;">Ctrl + Enter</span> to submit your request.</h5>
</div>
</div>
</template>
Expand Down Expand Up @@ -74,41 +74,68 @@ export default {
</script>

<style scoped>
h1, h2 {
font-size: 60px;
h2 {
font-size: 3rem;
font-weight: normal;
letter-spacing: 0.05rem;
width: 100%;
font-weight: normal;
}
h3 {
font-size: 1.5rem;
font-weight: normal;
letter-spacing: 0.05rem;
width: 100%;
font-weight: normal;
}
input {
font-size: 26px;
}
.checkbox input {
width: 50px;
height:50px;
width: 3rem;
height:3rem;
}
.checkbox {
display: flex;
flex-flow: column nowrap;
justify-content: center;
align-items: center;
}
.checkboxes {
width: 500px;
height: 200px;
width: 50%;
height: 175px;
display: flex;
justify-content: center;
align-items: center;
}
div .question textarea{
resize: none;
width:500px;
height:200px;
}
div .question {
width: 100%;
display: flex;
flex-flow: column nowrap;
justify-content: center;
text-align: center;
align-items: center;
}
</style>
div #ques {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin: auto;
height: 600px;
}
</style>
30 changes: 19 additions & 11 deletions front/src/components/register.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<template>
<div id="regist" style="width: 100%;">
<div class="studentNUM">
<h1>Please Input Your Student Number</h1>
<h2>Input: {{ sid }}</h2>
<input v-on:keyup.enter="regist" v-model="sid" placeholder="s120000">
<h5><br>Push enter key after inputting your student number</h5>
<h1>Input your student number</h1>
<input v-on:keyup.enter="regist" v-model="sid" placeholder="s12xxxxx">
<h4 style="color:#aaaaaa;"><br><span style="color:#88aace;">Enter</span> key to continue -></h4>
</div>
</div>
</template>
Expand Down Expand Up @@ -50,23 +49,32 @@ export default {

<style scoped>
h1 {
font-size: 72px;
width: 100%;
font-size: 4rem;
font-weight: normal;
letter-spacing: 0.05rem;
}
h2 {
font-size: 50px;
width: 100%;
font-weight: normal;
}
input {
width: 300px;
height: 100px;
font-size: 26px;
border: 2px, #42b983, double;
width: 325px;
height: 125px;
font-size: 2.2rem;
font-weight: lighter;
letter-spacing: 0.05rem;
margin: 15px;
}
div .studentNUM {
width: 100%;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin: auto;
width: 80%;
height: 200px;
display: flex;
flex-flow: column nowrap;
justify-content: center;
Expand Down
Loading

0 comments on commit 29e3c95

Please sign in to comment.