Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
0d7ffe1
Dummy commit
nayan-mehta Feb 14, 2020
7d391ae
dumdum
nayan-mehta Feb 14, 2020
bc7faeb
Adding Studio files
nayan-mehta Feb 14, 2020
4b55a19
amend page2.html
ascourtas Feb 14, 2020
0d3f285
Merge pull request #1 from ArtAccess/git-tutorial-studio
nayan-mehta Feb 14, 2020
1085427
added comment to index
kjschmidt913 Feb 14, 2020
f0ef202
Merge pull request #2 from ArtAccess/git-tutorial-studio
nayan-mehta Feb 14, 2020
15d87b7
Updated page3.html
nayan-mehta Feb 14, 2020
95d57b3
Edit to page3.html
nayan-mehta Feb 14, 2020
a7ba935
Updated page4.html
nayan-mehta Feb 14, 2020
ac3d083
Merge pull request #3 from ArtAccess/git-tutorial-studio
kjschmidt913 Feb 14, 2020
5d91e11
Updated page4.html
nayan-mehta Feb 14, 2020
4d5f579
Merge pull request #4 from ArtAccess/git-tutorial-studio
ascourtas Feb 14, 2020
511bf25
Added a comment to index.html
VNeelanshi Feb 14, 2020
b549923
commented on css
akbar2020 Feb 16, 2020
4d9ea4d
Merge pull request #5 from ArtAccess/git-tutorial-studio
akbar2020 Feb 17, 2020
5fe69f1
updated
akbar2020 Feb 17, 2020
528c2ff
Merge pull request #6 from ArtAccess/git-tutorial-studio-master
VNeelanshi Feb 17, 2020
2799dd5
added bootstrap css and js
kjschmidt913 Feb 17, 2020
999f840
got rid of extra bootstrap files. linked to the css in the html
kjschmidt913 Feb 17, 2020
8866c51
added the rest of the bootstrap files in case we need the js. linked …
kjschmidt913 Feb 17, 2020
f79c5b7
added bootstrap and supporting scripts to index
kjschmidt913 Feb 17, 2020
63fb8eb
added some really simple styling via container, mx auto, col 12
kjschmidt913 Feb 17, 2020
5af4c0e
added input text field
kjschmidt913 Feb 17, 2020
450b372
added filter button (not functional)
kjschmidt913 Feb 17, 2020
3368f95
added nav bar for asthetic
kjschmidt913 Feb 17, 2020
fb70394
added files for font awesome
kjschmidt913 Feb 17, 2020
5b4c244
added some light styling. filter button still doesnt do anything
kjschmidt913 Feb 17, 2020
fab7fde
added paintbrush icon and pallete icon as a comment for nav header
kjschmidt913 Feb 17, 2020
3d67968
added minty bootswatch theme
kjschmidt913 Feb 19, 2020
f471da4
structure for filter selection is in place. need to fill in with actu…
kjschmidt913 Feb 19, 2020
407bbd9
added a text input box for country of origin
kjschmidt913 Feb 19, 2020
2f52f9e
made the apply button a more normal size
kjschmidt913 Feb 19, 2020
055a28c
small nav bar styling
kjschmidt913 Feb 19, 2020
0acce8f
made the start and end boxes in line
kjschmidt913 Feb 19, 2020
4c218d9
filled in content and adjusted spacing a small styling things
kjschmidt913 Feb 19, 2020
9234caa
added margin to bottom of images
kjschmidt913 Feb 19, 2020
fef4151
Merge branch 'master' into project-5
VNeelanshi Feb 19, 2020
f763585
Merge pull request #7 from ArtAccess/project-5
VNeelanshi Feb 19, 2020
cdc2c79
Trying to fix things
VNeelanshi Feb 19, 2020
5d107fc
Better fix
VNeelanshi Feb 19, 2020
aeafd2b
made search and buttons responsive without any weirdness near the bre…
kjschmidt913 Feb 22, 2020
f505aa4
resolved merge conflicts
kjschmidt913 Feb 22, 2020
19968d4
adjusted image size and positioning. will look good on mobile too
kjschmidt913 Feb 22, 2020
49591eb
made menu responsive to fit on mobile
kjschmidt913 Feb 22, 2020
10c14c6
added sidebar filter
kjschmidt913 Mar 2, 2020
7e964c4
small formatting fixes to sidebar
kjschmidt913 Mar 2, 2020
9c113e0
fixed search bar formatting stuff
kjschmidt913 Mar 2, 2020
6869274
removed irrelevant css
kjschmidt913 Mar 2, 2020
63571ee
added a background color to filters. not sure if I like it
kjschmidt913 Mar 2, 2020
2054cc6
added 2 more filters to filter options to fufill form requirement
kjschmidt913 Mar 2, 2020
e051562
removed more list formatting from movement catagory
kjschmidt913 Mar 2, 2020
f7d80e5
added a 'what are these?' link to movements
kjschmidt913 Mar 2, 2020
ec2c462
fix fontawesome and git styles
ascourtas Mar 2, 2020
e551a9f
created movements page
kjschmidt913 Mar 2, 2020
bb30d56
updated nav bar to link to index
kjschmidt913 Mar 2, 2020
f304d1c
added responsive code for sidebar to look good at each breakpoint and…
kjschmidt913 Mar 3, 2020
4c7a21c
in the process of adding mobile filter and making it responsive
kjschmidt913 Mar 3, 2020
0fa0a71
filter on mobile works but search bar and buttons are not centered
kjschmidt913 Mar 3, 2020
4f8720f
filter meu now responsive
kjschmidt913 Mar 3, 2020
74f63e9
fix issue with viewport formatting
ascourtas Mar 3, 2020
6639e89
finished responsive code i think
kjschmidt913 Mar 3, 2020
d502445
Merge branch 'project-7' of github.com:ArtAccess/AIC into project-7
kjschmidt913 Mar 3, 2020
0baf8cf
made a second movements.html when i tried to push. weird. deleted it:
kjschmidt913 Mar 3, 2020
432adf8
small search bar fix
kjschmidt913 Mar 3, 2020
c6542c0
add additional filter items to side bar and dropdown
ascourtas Mar 3, 2020
80d9040
Merge branch 'project-7' of https://github.com/ArtAccess/AIC into pro…
ascourtas Mar 3, 2020
7f17dc3
added year slider to mobile menu
kjschmidt913 Mar 3, 2020
2dff695
fix resizing of dropdown for mobile
ascourtas Mar 3, 2020
0bf629f
Merge branch 'project-7' of https://github.com/ArtAccess/AIC into pro…
ascourtas Mar 3, 2020
77ffabb
commented out toggle
kjschmidt913 Mar 4, 2020
c46c85e
Added movements description+years
VNeelanshi Mar 4, 2020
e3b86c6
Adding Thumbnail Images and Updating Icon index.html
nayan-mehta Mar 5, 2020
533e475
Added explore button
VNeelanshi Mar 5, 2020
af5c02b
Hide explore button for mobile devices
VNeelanshi Mar 5, 2020
ee47496
Merge pull request #9 from ArtAccess/project-8-neel
nayan-mehta Mar 5, 2020
7c1f232
Merge pull request #10 from ArtAccess/project-7
ascourtas Mar 9, 2020
6f5b1f3
fix bug with double nav bar
ascourtas Mar 9, 2020
9df1097
replace Features in navbar with Art Movements, link it to movements page
ascourtas Mar 9, 2020
35a16e9
added up to p2 to readme
kjschmidt913 Mar 9, 2020
394a851
hook up About page, with links in index.html and movements.html
ascourtas Mar 9, 2020
b20db86
added p3 and an images folder for readme images
kjschmidt913 Mar 9, 2020
7ff62b2
testing link format
kjschmidt913 Mar 9, 2020
e64e40d
removed test
kjschmidt913 Mar 9, 2020
26c4912
fixing links
kjschmidt913 Mar 9, 2020
a69d614
added the rest of the content from checkpoints. need to add images an…
kjschmidt913 Mar 9, 2020
669c81e
add content and styling for About
ascourtas Mar 9, 2020
43bbb80
first attempt linking to paper prototype video
kjschmidt913 Mar 9, 2020
3c06d51
trying to embedd video again
kjschmidt913 Mar 9, 2020
0fbbc75
trying video again
kjschmidt913 Mar 9, 2020
4c825c8
trying to link our own images
kjschmidt913 Mar 9, 2020
e351bc6
working youtube section for paper prototype
kjschmidt913 Mar 9, 2020
9eb05d2
added images for components
kjschmidt913 Mar 9, 2020
f1f9b2f
adjusted image sizes on readme
kjschmidt913 Mar 9, 2020
1216afe
Merge pull request #11 from ArtAccess/about_page
nayan-mehta Mar 9, 2020
f8cf770
trying to adjust readme images
kjschmidt913 Mar 9, 2020
48ca554
Merge branch 'project-8' of github.com:ArtAccess/AIC into project-8
kjschmidt913 Mar 9, 2020
8e53832
responsive image stopped showing up. it will show up now but just be …
kjschmidt913 Mar 9, 2020
900ae6b
attempting size change for readme img again
kjschmidt913 Mar 9, 2020
e96a633
trying another way to rezise readme image
kjschmidt913 Mar 9, 2020
a83fecd
making progress on readme img
kjschmidt913 Mar 9, 2020
71cef13
small formatting for readme
kjschmidt913 Mar 9, 2020
c52b6da
HardCoded search keywords
nayan-mehta Mar 10, 2020
ce2a56b
Shifted Icon next to Movements- Filter Section
nayan-mehta Mar 10, 2020
aa904a7
Merge branch 'project-8-wip-nayan' into project-8
nayan-mehta Mar 10, 2020
ce64da6
updated readme with more concise sections
kjschmidt913 Mar 11, 2020
a9ecd1d
Merge branch 'project-8' of github.com:ArtAccess/AIC into project-8
kjschmidt913 Mar 11, 2020
2cb520b
added how components contribute to tasks and links
kjschmidt913 Mar 11, 2020
be7d855
adding persona pics
kjschmidt913 Mar 11, 2020
7321ceb
experiementing with image sizes readme
kjschmidt913 Mar 11, 2020
fada2a8
formatting img on readme
kjschmidt913 Mar 11, 2020
3cbefe8
reformatting images for personas
kjschmidt913 Mar 11, 2020
7dd36e2
replaced form image
kjschmidt913 Mar 11, 2020
b340d5b
reformatting responzive img
kjschmidt913 Mar 11, 2020
f611bef
reformatting readme responzive img
kjschmidt913 Mar 11, 2020
4ada143
fixed links section formatting
kjschmidt913 Mar 11, 2020
a055054
added reflection section
kjschmidt913 Mar 11, 2020
7f4840d
added explore button
VNeelanshi Mar 11, 2020
8f215ff
explore responsive fix
VNeelanshi Mar 11, 2020
4d22b39
fixed image size
VNeelanshi Mar 11, 2020
a4df315
added multi-slider
akbar2020 Mar 11, 2020
d069089
added tooltip for search and explore
VNeelanshi Mar 11, 2020
7505d3b
added tooltip for search and explore
VNeelanshi Mar 11, 2020
710dfda
Delete form.png
VNeelanshi Mar 11, 2020
ad731dc
changed form image
VNeelanshi Mar 11, 2020
ba88174
add alert for when user clicks apply button; make it dismissable
ascourtas Mar 11, 2020
a12609b
Add files via upload
VNeelanshi Mar 11, 2020
ced8898
cleanup script
ascourtas Mar 11, 2020
db2d35b
Merge pull request #13 from ArtAccess/filters_applied_feedback
VNeelanshi Mar 11, 2020
e8acee9
Merge pull request #12 from ArtAccess/project-8-neel
ascourtas Mar 11, 2020
4023401
changed country dropdown options from numbers to real countries
ascourtas Mar 11, 2020
e0aa125
Merge pull request #14 from ArtAccess/fix-country-dropdown
nayan-mehta Mar 11, 2020
99a677e
added new responsive image for readme
kjschmidt913 Mar 11, 2020
06cb742
added new form/filter image to readme
kjschmidt913 Mar 11, 2020
a6ba265
added new support component paragraph for branding
kjschmidt913 Mar 11, 2020
0cb2436
Spinner on button click
nayan-mehta Mar 12, 2020
047de47
Merge branch 'project-8-wip-nayan' into project-8
nayan-mehta Mar 12, 2020
6519ee5
Fixing merge conflict
nayan-mehta Mar 12, 2020
c416d99
refixing image size
VNeelanshi Mar 12, 2020
b04c6e7
added slider
akbar2020 Mar 12, 2020
e297afc
files for slider
akbar2020 Mar 12, 2020
5d3528e
added slider v 2
akbar2020 Mar 12, 2020
88a8867
Merge branch 'project-8' into project-8-akbar
akbar2020 Mar 12, 2020
2a116f3
Merge pull request #15 from ArtAccess/project-8-akbar
akbar2020 Mar 12, 2020
5bee412
Image resize fixed, added slider to mobile view
nayan-mehta Mar 12, 2020
a367725
updated readme with current edits
kjschmidt913 Mar 12, 2020
bde9e00
Merge branch 'project-8' of github.com:ArtAccess/AIC into project-8
kjschmidt913 Mar 12, 2020
2d73319
new form component image
kjschmidt913 Mar 12, 2020
38e959f
image didn't update so rename and referenced it
kjschmidt913 Mar 12, 2020
ae0332d
removed p# labels from readme
kjschmidt913 Mar 12, 2020
57dc098
small formatting change to components on readme
kjschmidt913 Mar 12, 2020
ad43686
removed width auto on image since we are already specifying width in …
kjschmidt913 Mar 12, 2020
347cb3e
changed slide bar for mob version
akbar2020 Mar 12, 2020
bc4db51
updated features for mobile version
VNeelanshi Mar 12, 2020
5bcd141
removed tooltip code that was causing console error
kjschmidt913 Mar 12, 2020
ec3a4a8
small adjustments to mobile form styling
kjschmidt913 Mar 12, 2020
377d37a
fixed small inconsistency with cards on movements page
kjschmidt913 Mar 12, 2020
b0b138c
small formatting adjustments to image page so the images dont stretch
kjschmidt913 Mar 12, 2020
829d38c
Merge pull request #18 from ArtAccess/project-8
VNeelanshi Mar 12, 2020
82e3e01
temp mobile feature change
VNeelanshi Mar 12, 2020
dacfd27
fixed image smushing on main page
kjschmidt913 Mar 12, 2020
f13209e
Merge branch 'master' of github.com:ArtAccess/AIC
kjschmidt913 Mar 12, 2020
ed2f8a0
Update index.html
VNeelanshi Mar 12, 2020
45ec82a
styling form attempt for test
kjschmidt913 Mar 12, 2020
f95dd4a
another test for formatting mobile filter
kjschmidt913 Mar 12, 2020
d259773
cant tell if link has updated. added a way to test it
kjschmidt913 Mar 12, 2020
e7d8cde
another test
kjschmidt913 Mar 12, 2020
8f565be
added custom styling for input for mobile
kjschmidt913 Mar 12, 2020
2a45fb2
loses all styling when hosted. trying another route
kjschmidt913 Mar 12, 2020
50ac16c
added a testing flag so i know it's updated
kjschmidt913 Mar 12, 2020
65d2907
attempting styling again for hosting
kjschmidt913 Mar 12, 2020
500a29a
added testing
kjschmidt913 Mar 12, 2020
0283d15
this is a mess but seeing if order matters
kjschmidt913 Mar 12, 2020
3faf029
another test
kjschmidt913 Mar 12, 2020
2f2fcee
seeing if i can add medium back in
kjschmidt913 Mar 12, 2020
a0f54cb
cleaned up code. mobile filter should look good now
kjschmidt913 Mar 12, 2020
ccebf29
combined the hardcoded function with the api call function. flowers s…
kjschmidt913 Mar 12, 2020
9216758
fixed flowers search issue
kjschmidt913 Mar 12, 2020
1781fc9
removed old function call from year input fields on mobile
kjschmidt913 Mar 12, 2020
ea3e579
fixed exmplore button that i broke
kjschmidt913 Mar 12, 2020
ae99ca5
added search for flower just in case they dont search plural
kjschmidt913 Mar 12, 2020
6089533
made a small correction to task for prototype 1
kjschmidt913 Mar 13, 2020
44f08b9
updated flowers photo
kjschmidt913 Mar 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added .DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

.idea/inspectionProfiles/

.idea/
248 changes: 247 additions & 1 deletion README.md

Large diffs are not rendered by default.

65 changes: 65 additions & 0 deletions about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<html lang="en">

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width initial-scale=1.0">
<title>Art Institute of Chicago Digital Exploration</title>

<!-- our bootstrap css -->
<link rel="stylesheet" type="text/css" href="bootstrap-4.4.1-dist/css/bootstrap.min.css">
<!-- our custom css -->
<link rel="stylesheet" type="text/css" href="styles.css">
<!-- our js for the api call -->
<script src="script.js"></script>
<!-- third parties bootstrap js may need -->
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<!-- our bootstrap js -->
<script src="bootstrap-4.4.1-dist/js/bootstrap.min.js"></script>
<!-- our font awesome icons -->
<script src="fontawesome-free-5.12.1-web/js/all.js"></script>

</head>

<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<a class="navbar-brand logo mb-0" href="index.html">
Art Access <i class="fas fa-paint-brush"></i>
</a>
<!-- also a good icon option:
<i class="fas fa-palette"></i> -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto ml-3">
<li class="nav-item">
<a class="nav-link" href="movements.html">Art Movements</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">About</a>
</li>
</ul>
</div>
</nav>
<div class="container mt-5">
<div class="mx-auto col-md-6 col-10 mt-3 mb-5">
<h1 class="about">About Art Access</h1>
<div class="mx-auto mt-5 about-body">

<p>In a largely technology driven world, sometimes it can be easy to forget the importance of art in our lives. Without art we would be missing one of the crucial ways we can express our fears, hopes, and dreams, which is all too important in an increasingly chaotic world.
</p>

<p> Consuming and creating art is a universal human experience, but unfortunately it’s often more accessible to some than others, and not everyone has the time or resources to spend a day at a museum. The cost of tickets, transportation, parking, and time make the experiencing and learning more about art, not accessible to everyone. For people who have a genuine interest in studying about art-and-culture from around the world, having every piece of information on hand would be great.
</p>
</div>

</div>
<h3 class="about">
Art Access utilizes the Art Institute of Chicago’s API to collect artworks and make them explorable for you.
</h3>
</div>
</body>
</html>
Binary file added bootstrap-4.4.1-dist/.DS_Store
Binary file not shown.
Binary file added bootstrap-4.4.1-dist/css/.DS_Store
Binary file not shown.
Loading