質問編集履歴
3
修正
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -10,6 +10,156 @@
|
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
|
|
13
|
+
app/views/plans/application.html.erb
|
|
14
|
+
|
|
15
|
+
```html
|
|
16
|
+
|
|
17
|
+
<!DOCTYPE html>
|
|
18
|
+
|
|
19
|
+
<html lang="ja">
|
|
20
|
+
|
|
21
|
+
<head>
|
|
22
|
+
|
|
23
|
+
<title>Chance to Chance</title>
|
|
24
|
+
|
|
25
|
+
<meta name="viewpoint" content="width=devise-width,initial-scale=1.0">
|
|
26
|
+
|
|
27
|
+
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
|
|
28
|
+
|
|
29
|
+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
|
|
30
|
+
|
|
31
|
+
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
|
|
32
|
+
|
|
33
|
+
<%= csrf_meta_tags %>
|
|
34
|
+
|
|
35
|
+
<script type="text/javascript">
|
|
36
|
+
|
|
37
|
+
WebFontConfig = {
|
|
38
|
+
|
|
39
|
+
google: { families: [ 'Unica+One::latin' ] }
|
|
40
|
+
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
(function() {
|
|
44
|
+
|
|
45
|
+
var wf = document.createElement('script');
|
|
46
|
+
|
|
47
|
+
wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
|
|
48
|
+
|
|
49
|
+
'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
|
|
50
|
+
|
|
51
|
+
wf.type = 'text/javascript';
|
|
52
|
+
|
|
53
|
+
wf.async = 'true';
|
|
54
|
+
|
|
55
|
+
var s = document.getElementsByTagName('script')[0];
|
|
56
|
+
|
|
57
|
+
s.parentNode.insertBefore(wf, s);
|
|
58
|
+
|
|
59
|
+
})();
|
|
60
|
+
|
|
61
|
+
</script>
|
|
62
|
+
|
|
63
|
+
</head>
|
|
64
|
+
|
|
65
|
+
<body class="photo">
|
|
66
|
+
|
|
67
|
+
<header>
|
|
68
|
+
|
|
69
|
+
<div>
|
|
70
|
+
|
|
71
|
+
<div class="head-container">
|
|
72
|
+
|
|
73
|
+
<nav class="headed">
|
|
74
|
+
|
|
75
|
+
<li class="left"><a class="home" href="/plans">Chance to Chance</a></li>
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
<% if guider_signed_in? %>
|
|
80
|
+
|
|
81
|
+
<div class="guider_nav">
|
|
82
|
+
|
|
83
|
+
<span><%= current_guider.nickname %>
|
|
84
|
+
|
|
85
|
+
<ul>
|
|
86
|
+
|
|
87
|
+
<li class="category">
|
|
88
|
+
|
|
89
|
+
<a class="guider-category", href="/guiders/<%= current_guider.id %>">マイページ</a>
|
|
90
|
+
|
|
91
|
+
<a class="guider-category", href="/guiders/<%= current_guider.id %>/go">プロブレム</a>
|
|
92
|
+
|
|
93
|
+
<%= link_to "ログアウト", destroy_guider_session_path, method: :delete, class: 'guider-category' %>
|
|
94
|
+
|
|
95
|
+
</li>
|
|
96
|
+
|
|
97
|
+
</ul>
|
|
98
|
+
|
|
99
|
+
</span>
|
|
100
|
+
|
|
101
|
+
<a class="plan" href="/plans/new">プラン</a>
|
|
102
|
+
|
|
103
|
+
</div>
|
|
104
|
+
|
|
105
|
+
|
|
106
|
+
|
|
107
|
+
<% end %>
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
<% if tourist_signed_in? %>
|
|
112
|
+
|
|
113
|
+
<li class="first">
|
|
114
|
+
|
|
115
|
+
<%= link_to "Logout", destroy_tourist_session_path, method: :delete, class: 'logout' %>
|
|
116
|
+
|
|
117
|
+
</li>
|
|
118
|
+
|
|
119
|
+
<li class="second">
|
|
120
|
+
|
|
121
|
+
<a class='post' href="/tourists/show">Contact</a>
|
|
122
|
+
|
|
123
|
+
</li>
|
|
124
|
+
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
<% end %>
|
|
128
|
+
|
|
129
|
+
</nav>
|
|
130
|
+
|
|
131
|
+
<hr class="bar">
|
|
132
|
+
|
|
133
|
+
</div>
|
|
134
|
+
|
|
135
|
+
</div>
|
|
136
|
+
|
|
137
|
+
</header>
|
|
138
|
+
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
<%= yield %>
|
|
142
|
+
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
<footer>
|
|
146
|
+
|
|
147
|
+
<p>
|
|
148
|
+
|
|
149
|
+
Copyright © 2018 Chance to Chance. All rights reserved.
|
|
150
|
+
|
|
151
|
+
</p>
|
|
152
|
+
|
|
153
|
+
</footer>
|
|
154
|
+
|
|
155
|
+
</body>
|
|
156
|
+
|
|
157
|
+
</html>
|
|
158
|
+
|
|
159
|
+
```
|
|
160
|
+
|
|
161
|
+
|
|
162
|
+
|
|
13
163
|
app/views/plans/index.html.erb
|
|
14
164
|
|
|
15
165
|
```html
|
2
修正
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -607,3 +607,45 @@
|
|
|
607
607
|
// You can use Sass (SCSS) here: http://sass-lang.com/
|
|
608
608
|
|
|
609
609
|
```
|
|
610
|
+
|
|
611
|
+
|
|
612
|
+
|
|
613
|
+
```gemfile
|
|
614
|
+
|
|
615
|
+
gem 'pry-rails'
|
|
616
|
+
|
|
617
|
+
gem 'compass-rails','~> 2.0'
|
|
618
|
+
|
|
619
|
+
gem 'sprockets', '2.11.0'
|
|
620
|
+
|
|
621
|
+
#pagenation
|
|
622
|
+
|
|
623
|
+
gem 'kaminari'
|
|
624
|
+
|
|
625
|
+
#login_logout
|
|
626
|
+
|
|
627
|
+
gem 'devise'
|
|
628
|
+
|
|
629
|
+
gem 'paperclip'
|
|
630
|
+
|
|
631
|
+
|
|
632
|
+
|
|
633
|
+
#chat
|
|
634
|
+
|
|
635
|
+
gem 'websocket-rails'
|
|
636
|
+
|
|
637
|
+
gem 'faye-websocket', '0.10.0'
|
|
638
|
+
|
|
639
|
+
#image
|
|
640
|
+
|
|
641
|
+
gem 'carrierwave'
|
|
642
|
+
|
|
643
|
+
gem 'rmagick'
|
|
644
|
+
|
|
645
|
+
#date
|
|
646
|
+
|
|
647
|
+
gem 'momentjs-rails'
|
|
648
|
+
|
|
649
|
+
gem 'bootstrap3-datetimepicker-rails'
|
|
650
|
+
|
|
651
|
+
```
|
1
修正
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -10,6 +10,68 @@
|
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
|
|
13
|
+
app/views/plans/index.html.erb
|
|
14
|
+
|
|
15
|
+
```html
|
|
16
|
+
|
|
17
|
+
<div class="contents row">
|
|
18
|
+
|
|
19
|
+
<% @plans.each do |plan| %>
|
|
20
|
+
|
|
21
|
+
<div class="content_post" style="background-image: url(<%= plan.image %>);">
|
|
22
|
+
|
|
23
|
+
<div class="more">
|
|
24
|
+
|
|
25
|
+
<span><%= image_tag 'arrow_top.png' %></span>
|
|
26
|
+
|
|
27
|
+
<ul class="more_list">
|
|
28
|
+
|
|
29
|
+
<li>
|
|
30
|
+
|
|
31
|
+
<%= link_to 'detail', "/plans/#{plan.id}", method: :get %>
|
|
32
|
+
|
|
33
|
+
</li>
|
|
34
|
+
|
|
35
|
+
<% if guider_signed_in? && current_guider.id == plan.guider_id %>
|
|
36
|
+
|
|
37
|
+
<li>
|
|
38
|
+
|
|
39
|
+
<%= link_to '編集', "/plans/#{plan.id}/edit", method: :get %>
|
|
40
|
+
|
|
41
|
+
</li>
|
|
42
|
+
|
|
43
|
+
<li>
|
|
44
|
+
|
|
45
|
+
<%= link_to '削除', "/plans/#{plan.id}", method: :delete %>
|
|
46
|
+
|
|
47
|
+
</li>
|
|
48
|
+
|
|
49
|
+
<% end %>
|
|
50
|
+
|
|
51
|
+
</ul>
|
|
52
|
+
|
|
53
|
+
</div>
|
|
54
|
+
|
|
55
|
+
<%= simple_format(plan.title) %>
|
|
56
|
+
|
|
57
|
+
<span class="name">
|
|
58
|
+
|
|
59
|
+
<a href="/guiders/<%= plan.guider_id %>">
|
|
60
|
+
|
|
61
|
+
<span>guider</span><%= plan.guider.nickname %>
|
|
62
|
+
|
|
63
|
+
</a>
|
|
64
|
+
|
|
65
|
+
</span>
|
|
66
|
+
|
|
67
|
+
</div>
|
|
68
|
+
|
|
69
|
+
<% end %>
|
|
70
|
+
|
|
71
|
+
```
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
|
|
13
75
|
app/assets/stylesheets/setting.css
|
|
14
76
|
|
|
15
77
|
```css
|
|
@@ -291,3 +353,257 @@
|
|
|
291
353
|
*/
|
|
292
354
|
|
|
293
355
|
```
|
|
356
|
+
|
|
357
|
+
|
|
358
|
+
|
|
359
|
+
app/assets/stylesheets/style.scss
|
|
360
|
+
|
|
361
|
+
```scss
|
|
362
|
+
|
|
363
|
+
@import "compass";
|
|
364
|
+
|
|
365
|
+
|
|
366
|
+
|
|
367
|
+
/*
|
|
368
|
+
|
|
369
|
+
* "ほのか明朝" licensed under the IPA Font License Agreement v1.0
|
|
370
|
+
|
|
371
|
+
* http://fontfree.me/966（配布元のURL）
|
|
372
|
+
|
|
373
|
+
* http://ipafont.ipa.go.jp/（IPAフォントのURL）
|
|
374
|
+
|
|
375
|
+
* http://ipafont.ipa.go.jp/ipa_font_license_v1.html（IPAフォントライセンスv1.0のURL）
|
|
376
|
+
|
|
377
|
+
*/
|
|
378
|
+
|
|
379
|
+
@font-face {
|
|
380
|
+
|
|
381
|
+
font-family: 'ほのか明朝';
|
|
382
|
+
|
|
383
|
+
src: url('font_1_honokamin.ttf') format('truetype');
|
|
384
|
+
|
|
385
|
+
font-weight: normal;
|
|
386
|
+
|
|
387
|
+
font-style: normal;
|
|
388
|
+
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
|
|
392
|
+
|
|
393
|
+
@import url(http://fonts.googleapis.com/css?family=Unica+One);
|
|
394
|
+
|
|
395
|
+
|
|
396
|
+
|
|
397
|
+
div.contents.row {
|
|
398
|
+
|
|
399
|
+
h2 {
|
|
400
|
+
|
|
401
|
+
|
|
402
|
+
|
|
403
|
+
@include boxBase(20px 0, 0);
|
|
404
|
+
|
|
405
|
+
font-weight: normal;
|
|
406
|
+
|
|
407
|
+
|
|
408
|
+
|
|
409
|
+
strong {
|
|
410
|
+
|
|
411
|
+
font-weight: bold;
|
|
412
|
+
|
|
413
|
+
padding-right: 5px;
|
|
414
|
+
|
|
415
|
+
font-size: 1.2em;
|
|
416
|
+
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
}
|
|
420
|
+
|
|
421
|
+
|
|
422
|
+
|
|
423
|
+
div.avicii {
|
|
424
|
+
|
|
425
|
+
top: 12%;
|
|
426
|
+
|
|
427
|
+
bottom: 0;
|
|
428
|
+
|
|
429
|
+
right: 0;
|
|
430
|
+
|
|
431
|
+
font-size: 15px;
|
|
432
|
+
|
|
433
|
+
padding: 0 auto;
|
|
434
|
+
|
|
435
|
+
|
|
436
|
+
|
|
437
|
+
}
|
|
438
|
+
|
|
439
|
+
div.martin.garrix {
|
|
440
|
+
|
|
441
|
+
top: 12%;
|
|
442
|
+
|
|
443
|
+
bottom: 0;
|
|
444
|
+
|
|
445
|
+
right: 0;
|
|
446
|
+
|
|
447
|
+
font-size: 15px;
|
|
448
|
+
|
|
449
|
+
padding: 0 auto;
|
|
450
|
+
|
|
451
|
+
.clear {
|
|
452
|
+
|
|
453
|
+
clear: left;
|
|
454
|
+
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
|
|
460
|
+
|
|
461
|
+
.new_user{
|
|
462
|
+
|
|
463
|
+
font-family: "游ゴシック", "YuGothic";
|
|
464
|
+
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
|
|
468
|
+
|
|
469
|
+
div.content_post, .edm_post {
|
|
470
|
+
|
|
471
|
+
@include boxBase(20px 0 ,30px);
|
|
472
|
+
|
|
473
|
+
|
|
474
|
+
|
|
475
|
+
position: relative;
|
|
476
|
+
|
|
477
|
+
height: 400px;
|
|
478
|
+
|
|
479
|
+
color: #fff;
|
|
480
|
+
|
|
481
|
+
background-size: cover;
|
|
482
|
+
|
|
483
|
+
background-position: center center;
|
|
484
|
+
|
|
485
|
+
border-radius: 3px;
|
|
486
|
+
|
|
487
|
+
box-shadow: 0 0 10px rgba($black,0.2);
|
|
488
|
+
|
|
489
|
+
display: inline-block;
|
|
490
|
+
|
|
491
|
+
width: 300px;
|
|
492
|
+
|
|
493
|
+
&:after {
|
|
494
|
+
|
|
495
|
+
content: '';
|
|
496
|
+
|
|
497
|
+
position: absolute;
|
|
498
|
+
|
|
499
|
+
top: 0;
|
|
500
|
+
|
|
501
|
+
bottom: 0;
|
|
502
|
+
|
|
503
|
+
left: 0;
|
|
504
|
+
|
|
505
|
+
right: 0;
|
|
506
|
+
|
|
507
|
+
@include filter-gradient(#000000, #a60000, vertical);
|
|
508
|
+
|
|
509
|
+
@include background-image(linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0) 62%,rgba(0,0,0,0.85) 100%));
|
|
510
|
+
|
|
511
|
+
z-index: 1;
|
|
512
|
+
|
|
513
|
+
border-radius: 3px;
|
|
514
|
+
|
|
515
|
+
}
|
|
516
|
+
|
|
517
|
+
.more {
|
|
518
|
+
|
|
519
|
+
position: absolute;
|
|
520
|
+
|
|
521
|
+
cursor: pointer;
|
|
522
|
+
|
|
523
|
+
top: 20px;
|
|
524
|
+
|
|
525
|
+
right: 30px;
|
|
526
|
+
|
|
527
|
+
z-index: 2;
|
|
528
|
+
|
|
529
|
+
height: 100px;
|
|
530
|
+
|
|
531
|
+
width: 80px;
|
|
532
|
+
|
|
533
|
+
text-align: right;
|
|
534
|
+
|
|
535
|
+
&:hover ul.more_list {
|
|
536
|
+
|
|
537
|
+
display: block;
|
|
538
|
+
|
|
539
|
+
}
|
|
540
|
+
|
|
541
|
+
ul.more_list {
|
|
542
|
+
|
|
543
|
+
position: absolute;
|
|
544
|
+
|
|
545
|
+
text-align: left;
|
|
546
|
+
|
|
547
|
+
width: 80px;
|
|
548
|
+
|
|
549
|
+
right: 0;
|
|
550
|
+
|
|
551
|
+
font-size: 12px;
|
|
552
|
+
|
|
553
|
+
background-color: #fff;
|
|
554
|
+
|
|
555
|
+
border: 1px solid #ddd;
|
|
556
|
+
|
|
557
|
+
display: none;
|
|
558
|
+
|
|
559
|
+
box-shadow: 1px 1px 2px rgba(0,0,0,0.2);
|
|
560
|
+
|
|
561
|
+
border-radius: 3px;
|
|
562
|
+
|
|
563
|
+
li {
|
|
564
|
+
|
|
565
|
+
border-bottom: 1px solid #ddd;
|
|
566
|
+
|
|
567
|
+
&:last-child {
|
|
568
|
+
|
|
569
|
+
border-bottom: 0;
|
|
570
|
+
|
|
571
|
+
}
|
|
572
|
+
|
|
573
|
+
a {
|
|
574
|
+
|
|
575
|
+
display: block;
|
|
576
|
+
|
|
577
|
+
padding: 5px;
|
|
578
|
+
|
|
579
|
+
&:hover {
|
|
580
|
+
|
|
581
|
+
background-color: $accent;
|
|
582
|
+
|
|
583
|
+
color: #fff;
|
|
584
|
+
|
|
585
|
+
}
|
|
586
|
+
|
|
587
|
+
}
|
|
588
|
+
|
|
589
|
+
}
|
|
590
|
+
|
|
591
|
+
}
|
|
592
|
+
|
|
593
|
+
}
|
|
594
|
+
|
|
595
|
+
```
|
|
596
|
+
|
|
597
|
+
|
|
598
|
+
|
|
599
|
+
app/assets/stylesheets/plans.css.scss
|
|
600
|
+
|
|
601
|
+
```
|
|
602
|
+
|
|
603
|
+
// Place all the styles related to the plans controller here.
|
|
604
|
+
|
|
605
|
+
// They will automatically be included in application.css.
|
|
606
|
+
|
|
607
|
+
// You can use Sass (SCSS) here: http://sass-lang.com/
|
|
608
|
+
|
|
609
|
+
```
|