Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Readme to Master #26

Open
wants to merge 89 commits into
base: readme
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
7ef94b5
Report Modal now correctly updates the particular event in the database.
jviall Oct 31, 2017
dff3483
Added a Pipe filter to filter out events with >5 reports (needs addit…
jviall Oct 31, 2017
2231195
removed useless stuff from report modal.
jviall Oct 31, 2017
da6cc59
Track these files.
jviall Oct 31, 2017
6fa3b0d
Merge branch 'reportFix' into iteration1
jviall Oct 31, 2017
37eb120
Moved the report modal so that it displayed more towards the center o…
jviall Oct 31, 2017
57d7081
Created Pipes for all the different genres
jviall Nov 1, 2017
a150d9a
Made a tabbed dropped down menu for filters
Nov 1, 2017
5daa9ff
Merge branch 'iteration1' into pipes
jviall Nov 1, 2017
f07214d
Fixed a missing closing tag (*cough* Nicole *cough*).
jviall Nov 1, 2017
d45f40b
Merge branch 'pipes' into iteration1, adding the pipe filters for gen…
jviall Nov 1, 2017
6f4fcf8
Parsing for Isthmus complete. Still needs check for duplicates with d…
notjamesonincollege Nov 1, 2017
8af9cd4
Merge pull request #18 from rjheim/IsthmusRss
notjamesonincollege Nov 1, 2017
185e726
Our genre Pipes work! check them out in the event-list-data Component…
jviall Nov 1, 2017
ae7eaec
DAL added where query. Look at example in DAL HTML and DAL .ts for help
rjheim Nov 2, 2017
ad7d158
Merge remote-tracking branch 'origin/iteration1' into locationFilters
rjheim Nov 2, 2017
4817777
Merge pull request #19 from rjheim/dalWhereQuery
rjheim Nov 2, 2017
37a7f9f
Added some CSS to the header and event container. Fixed Search button.
Nov 2, 2017
7f0bb30
Added instructions for installation and running the program.
Nov 2, 2017
7dc79fb
Merge pull request #20 from rjheim/eventListCleanup
rjheim Nov 2, 2017
7f40db2
Merge pull request #21 from rjheim/readme
notjamesonincollege Nov 2, 2017
c900556
Update README.md
notjamesonincollege Nov 2, 2017
9d1394d
Made sure all pipes would function for event-list-data component. Nee…
rjheim Nov 2, 2017
a7c5add
Merge pull request #23 from rjheim/genreFilters
rjheim Nov 2, 2017
7c98520
Had two bugs that didn't show before merging last changes. Now fixed.
rjheim Nov 2, 2017
bf0e515
Another quick fix I'm so sorry oops
rjheim Nov 2, 2017
3559294
Added tabbing functionality to options menu.
jviall Nov 2, 2017
2b50b53
Merge branch 'iteration1' of https://github.com/rjheim/the8eam into i…
jviall Nov 2, 2017
071a003
Changed options menu, not using this for iteration2
Nov 2, 2017
c4ca054
Got buttons for genre filter working
rjheim Nov 2, 2017
77a8e13
Cost filter works, date does not
rjheim Nov 2, 2017
697271a
stuff
jviall Nov 2, 2017
35a1683
Merge branch 'iteration1' into costAndDateFilter
rjheim Nov 2, 2017
f62ce90
Merge pull request #24 from rjheim/costAndDateFilter
rjheim Nov 2, 2017
d3b3955
Merge pull request #25 from rjheim/iteration1
rjheim Nov 2, 2017
44215cc
Took out calendar div for date tab.
Nov 3, 2017
d01be07
Made some changes to the options menu that need to be merged with Nic…
jviall Nov 3, 2017
871f8b2
Merge branch 'optionsMenuStyles' into iteration2
Nov 3, 2017
be9011e
Merge Part 2 lol
Nov 3, 2017
29520df
Fixed some styles in the Options Menu, the view tabs, and the header.
Nov 3, 2017
232adb1
Added filter functionality to our new options menu. Only genre works …
jviall Nov 4, 2017
06b4a0e
Fixed up our README.md
jviall Nov 11, 2017
810c7df
Merge branch 'iteration2' into optionsMenuLogic
jviall Nov 11, 2017
83575b1
Minor change to README.md
jviall Nov 13, 2017
350d943
Merge branch 'optionsMenuLogic' into iteration2
jviall Nov 13, 2017
8157701
Fixed styles of report modal. Essentially just added bootstrap styles.
allenAnsar Nov 14, 2017
04af9bf
Fixed Too many things for one commit, such as:
jviall Nov 15, 2017
8b82e35
Another Big commit...
jviall Nov 15, 2017
42ad610
Moved .no-gutter class to styles.css for global use
jviall Nov 15, 2017
f257136
More of the same
jviall Nov 15, 2017
36b1e34
yet again
jviall Nov 15, 2017
ae3392d
Added the open-iconic icon font since Bootstrap 4 no longer comes with
jviall Nov 15, 2017
fb4b3e2
Made the filter menu more responsive and closer to our end goal.
jviall Nov 16, 2017
422e872
I GOT MAD STYLE BRO.
jviall Nov 16, 2017
39cd9cc
Fixed an incorrect border in the view tabs.
jviall Nov 16, 2017
40f8f8c
Made the header more responsive for smaller mobile views.
jviall Nov 16, 2017
1953e44
Fixed the messed up display of events and a weird effect that made the
jviall Nov 16, 2017
a0246bf
Removed obselete folders from Bootstrap 3.
jviall Nov 17, 2017
c43941c
Changed some button styles
Nov 17, 2017
f91611a
Fixed Bootstrap 4 issues with the report/feedback modal.
jviall Nov 17, 2017
5866965
Merge branch 'iteration2' of https://github.com/rjheim/the8eam into i…
jviall Nov 17, 2017
e6f8673
lil fixins
jviall Nov 19, 2017
40e6455
Updated angular (WHICH WAS ALREADY AT v4.4.5) to v4.4.6 (latest stable
jviall Nov 20, 2017
d34da5f
Minor changes to testing environment, and fixed test errors on
jviall Nov 21, 2017
a5e7ea4
Got istanbul code coverage working. use 'ng test --code-coverage' to …
jviall Nov 22, 2017
0fd3222
Made single instance for DAL, finished date pipe.
rjheim Nov 22, 2017
b920293
Merge branch 'iteration2' into dalUpdates
rjheim Nov 22, 2017
5b329ce
Merge pull request #27 from rjheim/dalUpdates
rjheim Nov 22, 2017
1ded986
unfinished testing for data-access-layer
jviall Nov 22, 2017
e7dfd86
Got more tests to work and made changes to testing environment.
jviall Nov 22, 2017
c50260b
Merge branch 'iteration2' into testing
jviall Nov 22, 2017
e5b25c5
Removed Data-Access-Layer from unit test suite and code coverage
jviall Nov 22, 2017
e2986a7
Removed DAL component, added DAL service. LEGGO
rjheim Nov 22, 2017
cbf6863
DATE AND COST OFFICIALLY WORK!
rjheim Nov 22, 2017
2828fda
Merge branch 'iteration2' into testing
jviall Nov 22, 2017
86414f7
all mods have been updated to work for production
rjheim Nov 22, 2017
12288e2
Unfinished test spec for Event List Data Component
jviall Nov 22, 2017
e420343
Merge branch 'iteration2' into testing
jviall Nov 22, 2017
0f385af
Ignores Event List Data Component in test list
jviall Nov 22, 2017
be1519f
Header Component Tested. 100% Code Coverage
jviall Nov 22, 2017
99c3a8c
Implemented a bunch of tests.
jviall Nov 23, 2017
d7a2cb8
Disabled tests for RSS and Report components. Any components that use
jviall Nov 23, 2017
6ea4881
Disabled rest of broken tests. cleaned up some descriptions.
jviall Nov 23, 2017
3542b03
updated README.md
jviall Nov 23, 2017
06692ff
Finished pipe testing for food, music and date.
rjheim Nov 23, 2017
26db2fd
Merge branch 'finishPipeTesting' into iteration2
rjheim Nov 23, 2017
4426401
Made Large screen sizes constrict content width to 992px.
jviall Nov 27, 2017
8845d32
Revert the following commit because I was supposed to leave this branch
jviall Nov 27, 2017
ffb6d73
Merge pull request #29 from rjheim/iteration2
rjheim Nov 27, 2017
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.
28 changes: 19 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,27 @@ Madison Arts and Event Calendar
##Instructions for Running

Please install the following:
angluar/cli - 1.4.7 (CURRENT LATEST 10/16)
sudo npm uninstall -g @angular/cli (sudo only for mac)
sudo npm install -g @angular/cli (THIS IS FOR REINSTALL AFTER NODE and NPM IS UPDATED)
angular/cli - 1.4.7 (CURRENT LATEST 10/16)

`sudo npm uninstall -g @angular/cli` (sudo only for mac)

`sudo npm install -g @angular/cli` (THIS IS FOR REINSTALL AFTER NODE and NPM IS UPDATED)

Npm - 5.5.1 (CURRENT LATEST 10/16)
sudo npm uninstall npm -g
A version of npm comes when you install Node
npm install npm@latest -g

`sudo npm uninstall npm -g`

A version of npm comes when you install Node

`npm install npm@latest -g`

Node - 6.11.4 (CURRENT LATEST RECOMMENDED 10/16)
Windows there is a uninstall node application
Once you clone the new git, change into the directory that contains package.json and use npm install to install all node dependencies.
Get to the repository, and through command line run npm install. Once that is finished, run ng serve. You can then open up a web browser and navigate to http://localhost:4200/.

Windows there is a uninstall node application

Once you clone the new git, change into the directory that contains package.json and use `npm install` to install all node dependencies.

Get to the repository, and through command line run npm install. Once that is finished, run `ng serve`. You can then open up a web browser and navigate to http://localhost:4200/.

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.4.7.

Expand Down
14 changes: 13 additions & 1 deletion the8eam/.angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
"../open-iconic/font/css/open-iconic-bootstrap.min.css",
"styles.css"
],
"scripts": [],
"scripts": [
"../node_modules/jquery/dist/jquery.min.js",
"../node_modules/popper.js/dist/umd/popper.min.js",
"../node_modules/bootstrap/dist/js/bootstrap.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
Expand Down Expand Up @@ -49,6 +55,12 @@
}
],
"test": {
"codeCoverage": {
"exclude": [
"src/app/rss/*",
"src/app/data-access-layer.service.*"
]
},
"karma": {
"config": "./karma.conf.js"
}
Expand Down
5 changes: 5 additions & 0 deletions the8eam/.firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "the-8-eam"
}
}
27 changes: 24 additions & 3 deletions the8eam/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,37 @@ Run `ng generate component component-name` to generate a new component. You can

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests
## Running unit tests with code coverage

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Run `ng test --code-coverage` to execute unit tests via [Karma](https://karma-runner.github.io) and generage a code coverage report via [Istanbul](https://github.com/gotwarlost/istanbul). To view the reports, navigate to the "coverage" folder in the root directory of the repository, and open `index.html`.

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

##Instructions for Running

In order to run our application as it is tested, we recommend following these steps to replicate our development environment.
// (sudo) --> for linux/mac //
1. Install Node - 6.11.4
[Download](https://nodejs.org/dist/latest-v6.x/)
Optional: If you have multiple node projects you can use Node Version Manager (NVM) Install:https://github.com/creationix/
2. Install npm - 5.5.1
A version of npm comes when you install Node, if it is less than 5.5.1, run:
'npm install npm@latest -g'
Navigate into the directory of the repository that contains package.json and use 'npm install' to install all node dependencies.

3. Install angular/cli - 1.4.7
(sudo) npm install -g @angular/cli
You can install the latest version of angular, and our repository's packages.json file will specify the correct version to use automatically.

4. Run 'npm install' in App's root folder (this directory should have 'src' folder in it).

5. Run ng serve.
You can then open up a web browser and navigate to http://localhost:4200/.
16 changes: 16 additions & 0 deletions the8eam/firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
5 changes: 3 additions & 2 deletions the8eam/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
require('@angular/cli/plugins/karma'),
require('karma-spec-reporter')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
Expand All @@ -22,7 +23,7 @@ module.exports = function (config) {
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'],
reporters: ['progress', 'kjhtml', 'coverage-istanbul'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
Expand Down
1 change: 1 addition & 0 deletions the8eam/open-iconic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
86 changes: 86 additions & 0 deletions the8eam/open-iconic/FONT-LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
SIL OPEN FONT LICENSE Version 1.1

Copyright (c) 2014 Waybury

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
21 changes: 21 additions & 0 deletions the8eam/open-iconic/ICON-LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Waybury

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
114 changes: 114 additions & 0 deletions the8eam/open-iconic/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
[Open Iconic v1.1.1](http://useiconic.com/open)
===========

### Open Iconic is the open source sibling of [Iconic](http://useiconic.com). It is a hyper-legible collection of 223 icons with a tiny footprint—ready to use with Bootstrap and Foundation. [View the collection](http://useiconic.com/open#icons)



## What's in Open Iconic?

* 223 icons designed to be legible down to 8 pixels
* Super-light SVG files - 61.8 for the entire set
* SVG sprite—the modern replacement for icon fonts
* Webfont (EOT, OTF, SVG, TTF, WOFF), PNG and WebP formats
* Webfont stylesheets (including versions for Bootstrap and Foundation) in CSS, LESS, SCSS and Stylus formats
* PNG and WebP raster images in 8px, 16px, 24px, 32px, 48px and 64px.


## Getting Started

#### For code samples and everything else you need to get started with Open Iconic, check out our [Icons](http://useiconic.com/open#icons) and [Reference](http://useiconic.com/open#reference) sections.

### General Usage

#### Using Open Iconic's SVGs

We like SVGs and we think they're the way to display icons on the web. Since Open Iconic are just basic SVGs, we suggest you display them like you would any other image (don't forget the `alt` attribute).

```
<img src="/open-iconic/svg/icon-name.svg" alt="icon name">
```

#### Using Open Iconic's SVG Sprite

Open Iconic also comes in a SVG sprite which allows you to display all the icons in the set with a single request. It's like an icon font, without being a hack.

Adding an icon from an SVG sprite is a little different than what you're used to, but it's still a piece of cake. *Tip: To make your icons easily style able, we suggest adding a general class to the* `<svg>` *tag and a unique class name for each different icon in the* `<use>` *tag.*

```
<svg class="icon">
<use xlink:href="open-iconic.svg#account-login" class="icon-account-login"></use>
</svg>
```

Sizing icons only needs basic CSS. All the icons are in a square format, so just set the `<svg>` tag with equal width and height dimensions.

```
.icon {
width: 16px;
height: 16px;
}
```

Coloring icons is even easier. All you need to do is set the `fill` rule on the `<use>` tag.

```
.icon-account-login {
fill: #f00;
}
```

To learn more about SVG Sprites, read [Chris Coyier's guide](http://css-tricks.com/svg-sprites-use-better-icon-fonts/).

#### Using Open Iconic's Icon Font...


##### …with Bootstrap

You can find our Bootstrap stylesheets in `font/css/open-iconic-bootstrap.{css, less, scss, styl}`


```
<link href="/open-iconic/font/css/open-iconic-bootstrap.css" rel="stylesheet">
```


```
<span class="oi oi-icon-name" title="icon name" aria-hidden="true"></span>
```

##### …with Foundation

You can find our Foundation stylesheets in `font/css/open-iconic-foundation.{css, less, scss, styl}`

```
<link href="/open-iconic/font/css/open-iconic-foundation.css" rel="stylesheet">
```


```
<span class="fi-icon-name" title="icon name" aria-hidden="true"></span>
```

##### …on its own

You can find our default stylesheets in `font/css/open-iconic.{css, less, scss, styl}`

```
<link href="/open-iconic/font/css/open-iconic.css" rel="stylesheet">
```

```
<span class="oi" data-glyph="icon-name" title="icon name" aria-hidden="true"></span>
```


## License

### Icons

All code (including SVG markup) is under the [MIT License](http://opensource.org/licenses/MIT).

### Fonts

All fonts are under the [SIL Licensed](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web).
21 changes: 21 additions & 0 deletions the8eam/open-iconic/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "open-iconic",
"description": "An open source icon set in SVG, webfont and raster formats",
"version": "1.1.1",
"license": [
"MIT",
"OFL-1.1"
],
"homepage": "https://useiconic.com/open",
"repository": {
"type": "git",
"url": "git://github.com/iconic/open-iconic.git"
},
"main": [
"./sprite/open-iconic.min.svg"
],
"ignore": [
"*.json",
"*.md"
]
}
Loading