Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
67fe3c4
init
Nov 4, 2018
b45b549
bootstrap+devise
Nov 4, 2018
39e1ab9
freeboard
Nov 4, 2018
4fe0b71
레스토랑+userrequest 모델 추가
Nov 7, 2018
719cfd2
signup
Nov 8, 2018
3556568
알러지정보추가
Nov 8, 2018
2d4c346
search 기본 기능
Nov 8, 2018
2ec3f8f
login+search 기본 기능
Nov 8, 2018
9c31724
메뉴별 제보 요청
Nov 8, 2018
e5e8446
first commit
PoSungKim Nov 8, 2018
6a8cd0a
게시판
Nov 8, 2018
75678d2
게시판
Nov 8, 2018
6c8db7b
Profile_page_link
PoSungKim Nov 8, 2018
20d9fe2
like function added
PoSungKim Nov 8, 2018
c902fd0
comments n commentalarm
Nov 8, 2018
892a892
my_page_first_rough_draft
PoSungKim Nov 9, 2018
0370ece
my_page_first_rough_draft
PoSungKim Nov 9, 2018
3659cfd
시군구 버그 수정 및 완료
Nov 10, 2018
ad77e86
대표 체인점만 뜸
Nov 10, 2018
6d21c72
내 알러지 정보 + 시군구 수정
Nov 10, 2018
e4455f0
알림보완+userrole추가
Nov 11, 2018
ae4c6cc
알림보완+userrole추가
Nov 11, 2018
80feaf9
uniq+omni_modified
Nov 18, 2018
4657a47
crowd+useractivities
Nov 18, 2018
436e623
unexpected commit?
PoSungKim Dec 26, 2018
3e1031d
unexpected commit2
PoSungKim Dec 26, 2018
5ecdb77
last commit before start
PoSungKim Dec 26, 2018
1fd69cc
Created Migrations for conversations and messages
PoSungKim Dec 26, 2018
77ef39b
search 오류
Dec 26, 2018
636b0ca
재검색 가능
Dec 26, 2018
ce6cadf
재검색 및 오류 수정
Dec 26, 2018
2a912f2
Merge branch 'master' of https://github.com/lsy044/foodfilter
Dec 26, 2018
1107c04
아이디닉네임비동기
Dec 26, 2018
1ace9f3
댓글수정
Dec 26, 2018
5a47118
알림다시
Dec 26, 2018
1ed3835
Merge branch 'master' of https://github.com/lsy044/foodfilter
Dec 27, 2018
f2b9b5a
Message Application Added
PoSungKim Dec 27, 2018
6a92d3b
Merge branch 'pskim' of https://github.com/lsy044/foodfilter
PoSungKim Dec 27, 2018
6738c5b
custom modal
Dec 27, 2018
7fb0e87
식당 지역 및 modal 추가+에러 수정 안함
Dec 29, 2018
04611a6
error/fail handling
Dec 30, 2018
3ca61c6
마스터받기
Dec 30, 2018
bcd49b6
Merge branch 'master' of https://github.com/lsy044/foodfilter
Dec 30, 2018
5b98f30
레시피 업로드 모양만 괜찮
Jan 6, 2019
24220ab
좋아요 ajax 변경+식당검색 오류 수정
Jan 7, 2019
d235b07
filtering tab 검색
Jan 7, 2019
456c27e
게시판기능추가,signup보완중
Jan 8, 2019
dec8a63
추천partial
Jan 9, 2019
043f24f
user보완
Jan 11, 2019
427d539
user
Jan 11, 2019
79a5b34
sy+jw
Jan 11, 2019
1c9dc20
user버그수정
Jan 20, 2019
e0374c7
레시피+게시판,프로필
Jan 20, 2019
a83a98e
home search
Jan 21, 2019
5c3d0d7
알림 수정1/2
Jan 21, 2019
b0a7517
레시피 태그 기능
Jan 21, 2019
26f711e
recipe 대표사진
Jan 21, 2019
aa72333
sy
Jan 22, 2019
acbcc04
first commit mysql
Jan 22, 2019
532d254
db csvfile
Jan 22, 2019
c74cf06
Merge branch 'master' of https://github.com/lsy044/foodfilter
Jan 22, 2019
2314a6f
Update secrets.yml
jiwonny Jan 22, 2019
ea055ba
vips_crawling
Jan 25, 2019
a37b6ba
던킨 + 피자스쿨
Jan 26, 2019
73f2e71
raracost
Jan 29, 2019
21d8f33
계절밥상 메뉴
Feb 1, 2019
1c7b1f3
계절밥상 지점 완료
Feb 1, 2019
cd54cef
메인 상단 css
Feb 2, 2019
7076250
사진까지 완료
Feb 3, 2019
0cb4ac5
allergy-search css
Feb 4, 2019
f02598c
allergy 기능 빼고 css 만
Feb 5, 2019
0f29e16
allergy
Feb 5, 2019
8a03597
allergy 기본 검색 기능 수정 및 css 완료
Feb 5, 2019
22b6d0f
Popeyes/Coffeebean_Menu
Feb 6, 2019
15cab60
allergy-custom 수정
Feb 6, 2019
ea2fe87
main-allergy css+기능 완성git add .
Feb 6, 2019
5e5cf91
Baskin/Bugerking_menu
Feb 6, 2019
dea3b3f
data+main_css
Feb 7, 2019
460df27
data11+main_front
Feb 7, 2019
7d5d392
메인 about+recipe
Feb 7, 2019
f64b35d
recipe main board main
Feb 8, 2019
a090391
Merge branch 'master' of https://github.com/lsy044/foodfilter
swimmie0 Feb 9, 2019
4c0aca8
search view_ing
swimmie0 Feb 11, 2019
8aac458
하단
Feb 11, 2019
0d63d8b
Merge branch 'sy' of https://github.com/lsy044/foodfilter
Feb 11, 2019
e85fb1f
재검색 가능
Feb 11, 2019
1286bed
start
PoSungKim Feb 13, 2019
6faaabc
res/index
Feb 13, 2019
2fbaf0e
Merge branch 'master' of https://github.com/lsy044/foodfilter into pskim
PoSungKim Feb 14, 2019
aae8c22
쪽지함&쪽지방 Rough Draft
PoSungKim Feb 14, 2019
d6d68a2
식당정보 윗부분
Feb 14, 2019
962dd74
ing
swimmie0 Feb 18, 2019
df78f4b
식당 상세 pagination 제외 css 끝
Feb 18, 2019
5c772c6
pagination
swimmie0 Feb 18, 2019
f7c6f4a
menu
swimmie0 Feb 18, 2019
d29cd1d
Merge branch 'master' of https://github.com/lsy044/foodfilter
swimmie0 Feb 18, 2019
d451363
card
swimmie0 Feb 19, 2019
416bbcc
routes
swimmie0 Feb 19, 2019
cbbe24c
card
swimmie0 Feb 19, 2019
a8729c3
card
swimmie0 Feb 19, 2019
f06cf1e
footer
Feb 23, 2019
eb7258f
식당 상세 완료
Feb 24, 2019
7a2aa84
마이페이지 상단 작업 중
PoSungKim Feb 25, 2019
7587729
recipe-searchbox
Feb 25, 2019
81a67d5
마이페이지Frame에 연결 전
PoSungKim Feb 26, 2019
fc51460
a
swimmie0 Feb 26, 2019
6527a94
recipe index
Feb 26, 2019
cf1cb88
권한 및 admin page 설정
Feb 28, 2019
c339ef5
지점정보 업데이트
Mar 1, 2019
03df4c6
1st ver_community,search
swimmie0 Mar 2, 2019
930be4d
pskim+master
Mar 2, 2019
ef188f2
1st_ver
swimmie0 Mar 2, 2019
d41b84f
My Page_Modified for Mobile Version
PoSungKim Mar 8, 2019
fcb63d3
recipe show upper
Mar 10, 2019
cbe8179
레시피 과정
Mar 10, 2019
c009fe7
recipe show 완성
Mar 10, 2019
fab4ea2
2nd ver
swimmie0 Mar 11, 2019
a3258d3
회원가입 페이지 CSS 중
PoSungKim Mar 11, 2019
444b5c4
2nd_ver
swimmie0 Mar 11, 2019
56de14c
pull pskim 3/11
Mar 11, 2019
54a0734
회원가입 CSS 중
PoSungKim Mar 11, 2019
549cd0a
pull rtnt 3/11
Mar 11, 2019
4fba386
jiwonny 3:15
Mar 11, 2019
a40aa40
회원가입 CSS 중
PoSungKim Mar 12, 2019
581fa01
Merge 수리 중
PoSungKim Mar 12, 2019
652af32
회원가입/수정 페이지 1차 CSS 완료
PoSungKim Mar 12, 2019
f073f56
Show Page 정리
PoSungKim Mar 12, 2019
f1e413c
2nd_ver
swimmie0 Mar 12, 2019
cc2ac63
restaurant_explain
Mar 12, 2019
8dbbfaf
회원가입 수정
PoSungKim Mar 12, 2019
f239a5b
profile 수정
Mar 12, 2019
e77e8f0
3rd_ver
swimmie0 Mar 12, 2019
39aa4a1
profile 2
Mar 12, 2019
144015a
프로필+게시판수정
swimmie0 Mar 12, 2019
433a836
Profile/Conversation/Message CSS modified
PoSungKim Mar 12, 2019
cc2284e
Profile/Conversation/Message CSS modified
PoSungKim Mar 12, 2019
a672496
프로필용
swimmie0 Mar 13, 2019
e93da18
merge
swimmie0 Mar 13, 2019
8d16f14
프로필
swimmie0 Mar 13, 2019
5715e5c
users/edit수정
swimmie0 Mar 13, 2019
f25275f
Profile/Conversation/Message CSS Modified for PC View
PoSungKim Mar 13, 2019
adf445d
css 잔수정
Mar 13, 2019
6313438
Profiles/Conversations/Messages Modified for PC Version
PoSungKim Mar 13, 2019
dbcf808
Profile Page modified for PC/Mobile Version
PoSungKim Mar 13, 2019
6eade0c
Profiles modified for PC/Mobile Version2
PoSungKim Mar 13, 2019
178775c
freeboard_index수정
swimmie0 Mar 15, 2019
9c6872c
탈퇴수정
swimmie0 Mar 15, 2019
47fc744
Merge branch 'master' of https://github.com/lsy044/foodfilter
swimmie0 Mar 15, 2019
829e1aa
오류수정
swimmie0 Mar 15, 2019
63c3132
.
swimmie0 Mar 15, 2019
84e1fac
freeboard js수정중
swimmie0 Mar 15, 2019
1846ae4
메인 css 낯선 완료
Mar 16, 2019
28812e2
팝업기능추가_레이아웃수정필요
swimmie0 Mar 16, 2019
11fc645
css 디자인 바꾸기 및 통일
Mar 16, 2019
6a8326c
sy+jw+css
Mar 16, 2019
9004409
지원 3/17
Mar 17, 2019
1cbeba2
user/edit버튼 수정
swimmie0 Mar 17, 2019
d17deb0
Merge branch 'master' of https://github.com/lsy044/foodfilter
swimmie0 Mar 17, 2019
eee233b
session오류수정
swimmie0 Mar 17, 2019
7051669
검색결과 수정
Mar 17, 2019
3bfdc4a
전체적인 수정 마침
Mar 17, 2019
30186a1
댓글수정
swimmie0 Mar 18, 2019
5ee3cc7
크롤링오류수정
swimmie0 Mar 18, 2019
3027f05
tinymce수정+e+user/edit수정
swimmie0 Mar 18, 2019
6c7174e
커뮤니티 수정
Mar 18, 2019
89045dd
front 마무리
Mar 18, 2019
5b33caa
merged 3/19
Mar 18, 2019
ee99075
서울시만 남김
Mar 18, 2019
2f7dd16
merge 전
Mar 19, 2019
f3afe98
오늘의 추천식당
Mar 19, 2019
78975a2
댓글수정
swimmie0 Mar 19, 2019
63c47e7
merge
swimmie0 Mar 19, 2019
11357c0
defaultimg
Mar 19, 2019
0452f69
howtoimg
Mar 19, 2019
8fd952d
프로필확인
swimmie0 Mar 19, 2019
10da7b3
a
swimmie0 Mar 19, 2019
cf266f6
repo merge
swimmie0 Apr 6, 2020
8efbe26
repo merge
swimmie0 Apr 6, 2020
78bbeba
Bump mini_magick from 4.9.2 to 4.9.4
dependabot[bot] Apr 6, 2020
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 Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.2)
mini_magick (4.9.2)
mini_magick (4.9.4)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/_reply.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
</div>


<% end %>
<% end %>
56 changes: 56 additions & 0 deletions app/views/conversations/show.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<style>
.glyphicon {
float: right;
margin-top: 2px;
margin-right: -6px;
}
</style>

<div class="list-group col-md-3">
<ul class="nav nav-pills nav-stacked">
<li><button type="button" class="list-group-item"
data-toggle="collapse" data-target="#mail"><h4>Conversations
<i class="glyphicon glyphicon-inbox"></i></h4></button>
</li>
<li><button type="button" class="list-group-item"
data-toggle="collapse" data-target="#new"><h4>New Message
<i class="glyphicon glyphicon-new-window" style="vertical-align:right;"></i></h4></button>
</li>
</ul>
</div>

<h1>My Inbox</h1>
<div class="panel panel-default">
<div class="col-lg-6">
<div id="mail" class="collapse">
<h1 class="panel-heading">All Conversations: </h1>
<div class="panel-body">
<div class="item">
<% @conversations.each do |conversation| %>
<% if conversation.sender_id == current_user.id || conversation.recipient_id == current_user.id %>
<% if conversation.sender_id == current_user.id %>
<% recipient = User.find(conversation.recipient_id) %>
<% else %>
<% recipient = User.find(conversation.sender_id) %>
<% end %>
<h3><%= link_to recipient.name, conversation_messages_path(conversation) %></h3>
<% end %>
<% end %>
</div>
</div>
</div>
<div id="new" class="collapse">
<div class="panel-body">
<h1 class="panel-heading">All Users:</h1>
<% @users.each do |user| %>
<% if user.id != current_user.id %>
<div class="items"><h3>
<%= link_to user.name,
conversations_path(sender_id: current_user.id, recipient_id: user.id), method: "post" %>
</h3></div>
<% end %>
<% end %>
</div>
</div>
</div>
</div>
1 change: 0 additions & 1 deletion app/views/zizuminfos/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,3 @@



</script>
1 change: 0 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)


module Foodfilter
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
Expand Down
590 changes: 590 additions & 0 deletions public/Zizuminfos.csv

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions public/restaurants.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
id,restaurant_name,a1_maemil,a2_mil,a3_daedu,a4_hodu,a5_ddangkong,a6_peach,a7_tomato,a8_piggogi,a9_nanryu,a10_milk,a11_ddakgogi,a12_shoigogi,a13_saewoo,a14_godeungeoh,a15_honghap,a16_junbok,a17_gul,a18_jogaeryu,a19_gye,a20_ohjingeoh,a21_ahwangsan,image,created_at,updated_at
1,서브웨이,,,,,,,,,,,,,,,,,,,,,,,2019-01-22 05:36:50.592528,2019-01-22 05:36:50.592528
2,맘스터치,,,,,,,,,,,,,,,,,,,,,,,2019-01-22 05:36:50.648435,2019-01-22 05:36:50.648435
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.