Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
schedules
Commits
ea5409e8
Commit
ea5409e8
authored
Sep 23, 2018
by
Zac Wood
Browse files
split view into partials
parent
cfe2d499
Pipeline
#2973
passed with stage
in 2 minutes and 13 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
schedules/app/assets/javascripts/search.js
View file @
ea5409e8
...
...
@@ -4,7 +4,7 @@
class
Schedule
{
constructor
()
{
this
.
isOpen
=
false
;
this
.
_ids
=
Array
.
from
(
document
.
getElementById
(
'
schedule
'
).
children
).
map
(
e
=>
Number
(
e
.
dataset
.
crn
)
)
;
this
.
_ids
=
Array
.
from
(
document
.
getElementById
(
'
schedule
'
).
children
).
map
(
e
=>
e
.
dataset
.
crn
);
}
get
ids
()
{
...
...
@@ -51,7 +51,7 @@ class Schedule {
const
section
=
cart
.
querySelector
(
`#section-
${
id
}
`
);
cart
.
removeChild
(
section
);
this
.
ids
=
this
.
ids
.
filter
(
_id
=>
_id
!=
Number
(
id
)
)
;
this
.
ids
=
this
.
ids
.
filter
(
_id
=>
_id
!=
id
);
}
_constructSectionCard
(
section
)
{
...
...
schedules/app/controllers/search_controller.rb
View file @
ea5409e8
...
...
@@ -6,7 +6,6 @@ class SearchController < ApplicationController
end
def
update
puts
params
[
:ids
]
cookies
[
:ids
]
=
params
[
:ids
]
end
end
schedules/app/views/home/index.html.erb
View file @
ea5409e8
<%=
render
partial:
'shared/navbar'
%>
<h1>
Home#index
</h1>
<p>
Find me in app/views/home/index.html.erb
</p>
schedules/app/views/layouts/application.html.erb
View file @
ea5409e8
<!DOCTYPE html>
<html>
<head>
<title>
Schedules
</title>
<%=
csrf_meta_tags
%>
<link
href=
"https://srct.gmu.io/masonstrap/css/masonstrap.min.css"
rel=
"stylesheet"
>
<script
src=
"https://srct.gmu.io/masonstrap/js/masonstrap.min.js"
></script>
<head>
<title>
Schedules
</title>
<%=
csrf_meta_tags
%>
<link
href=
"https://srct.gmu.io/masonstrap/css/masonstrap.min.css"
rel=
"stylesheet"
>
<script
src=
"https://srct.gmu.io/masonstrap/js/masonstrap.min.js"
></script>
<%=
stylesheet_link_tag
'application'
,
media:
'all'
,
'data-turbolinks-track'
:
'reload'
%>
<%=
javascript_include_tag
'application'
,
'data-turbolinks-track'
:
'reload'
%>
</head>
<%=
stylesheet_link_tag
'application'
,
media:
'all'
,
'data-turbolinks-track'
:
'reload'
%>
<%=
javascript_include_tag
'application'
,
'data-turbolinks-track'
:
'reload'
%>
</head>
<body>
<%=
yield
%>
</body>
<body>
<%=
render
partial:
'shared/navbar'
%>
<%=
yield
%>
<%=
render
partial:
'shared/cart'
%>
</body>
</html>
schedules/app/views/search/index.html.erb
View file @
ea5409e8
<%=
render
partial:
'shared/navbar'
%>
<div
class=
"container-fluid"
>
<!-- The main screen consists of a row with two columns: the search results, and the cart -->
<div
class=
"row"
>
<!-- Search result, List of Courses -->
<div
class=
"col-lg-7 col-md-10 mx-auto order-2 order-lg-0"
id=
"search-list"
>
<%
if
@courses
.
any?
%>
<%=
render
partial:
'shared/course'
,
collection:
@courses
%>
<%
else
%>
<h1>
Sorry, we couldn't find anything matching your search.
</h1>
<p>
Please try again!
</p>
<%
end
%>
</div>
<!-- List of sections in the cart -->
<div
class=
"col order-1 order-lg-1"
id=
"cart"
>
<div
class=
"card"
>
<div
class=
"card-body"
>
<h3
class=
"card-title"
>
Your Schedule
</h3>
</div>
<ul
class=
"list-group list-group-flush"
id=
"schedule"
>
<%=
render
partial:
'shared/section'
,
collection:
@cart
,
locals:
{
in_cart:
true
}
%>
</ul>
<div
class=
"card-body"
>
<button
type=
"button"
class=
"btn btn-primary"
data-toggle=
"modal"
data-target=
"#exampleModal"
onclick=
"setUrlInModal()"
>
Export schedule
</button>
</div>
</div>
</div>
</div>
</div>
<%
if
@courses
.
any?
%>
<%=
render
partial:
'shared/course'
,
collection:
@courses
%>
<%
else
%>
<h1>
Sorry, we couldn't find anything matching your search.
</h1>
<p>
Please try again!
</p>
<%
end
%>
<!-- Export Modal -->
<div
class=
"modal fade"
id=
"exampleModal"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"exampleModalLabel"
aria-hidden=
"true"
>
...
...
schedules/app/views/shared/_cart.html.erb
0 → 100644
View file @
ea5409e8
</div>
<!-- List of sections in the cart -->
<div
class=
"col order-1 order-lg-1"
id=
"cart"
>
<div
class=
"card"
>
<div
class=
"card-body"
>
<h3
class=
"card-title"
>
Your Schedule
</h3>
</div>
<ul
class=
"list-group list-group-flush"
id=
"schedule"
>
<%=
render
partial:
'shared/section'
,
collection:
@cart
,
locals:
{
in_cart:
true
}
%>
</ul>
<div
class=
"card-body"
>
<button
type=
"button"
class=
"btn btn-primary"
data-toggle=
"modal"
data-target=
"#exampleModal"
onclick=
"setUrlInModal()"
>
Export schedule
</button>
</div>
</div>
</div>
</div>
</div>
schedules/app/views/shared/_navbar.html.erb
View file @
ea5409e8
...
...
@@ -9,7 +9,6 @@
<div
class=
"col-4 col-sm align-center order-0 order-sm-1"
onclick=
"toggleSchedule()"
>
<h1
style=
"margin-top:24px"
>
<!-- <h2><i class="fas fa-shopping-cart" id="schedule-icon"></i></h2> -->
<span
class=
"fa-layers fa-fw"
id=
"schedule-icon"
>
<i
class=
"fas fa-shopping-cart"
></i>
<span
class=
"fa-layers fa-fw"
>
...
...
@@ -38,3 +37,10 @@
</div>
</div>
</div>
<div
class=
"container-fluid"
>
<!-- The main screen consists of a row with two columns: the search results, and the cart -->
<div
class=
"row"
>
<!-- Search result, List of Courses -->
<div
class=
"col-lg-7 col-md-10 mx-auto order-2 order-lg-0"
id=
"search-list"
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment