From 5108c22117d60a7673fb67c9df668cc133f28bf4 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sat, 3 Sep 2016 19:27:50 +0200 Subject: [PATCH 01/61] susper CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 00000000..878e9695 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +susper.com From 3e5113cb9ae138bc001282ca4b79ac76d678eec5 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sat, 3 Sep 2016 19:58:07 +0200 Subject: [PATCH 02/61] switch to private mode --- js/yacysearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/yacysearch.js b/js/yacysearch.js index d0262919..41cc387d 100644 --- a/js/yacysearch.js +++ b/js/yacysearch.js @@ -11,7 +11,7 @@ var SearchModel = Backbone.Model.extend({ defaults:{hl:'false',query:'',start:'0',rows:'100',layout:'paragraph',startTime:new Date(),servlet:"index.html",contentdom:"text"}, url:function(){ - return searchURL + '&hl=' + this.attributes.hl + '&query=' + this.attributes.query + '&startRecord=' + this.attributes.start + '&maximumRecords=' + this.attributes.rows + '&contentdom=' + (this.attributes.layout == "images" ? "image" : this.attributes.contentdom); + return searchURL + '&resource=local&hl=' + this.attributes.hl + '&query=' + this.attributes.query + '&startRecord=' + this.attributes.start + '&maximumRecords=' + this.attributes.rows + '&contentdom=' + (this.attributes.layout == "images" ? "image" : this.attributes.contentdom); }, parse:function(resp){ From 16e7e12829833b61e73894f05a804796f1c06fac Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Sun, 4 Sep 2016 19:36:59 +0200 Subject: [PATCH 03/61] replaced retrieval url --- js/setup.js | 2 +- js/yacysearch.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/setup.js b/js/setup.js index 79b88ed0..ae0191db 100644 --- a/js/setup.js +++ b/js/setup.js @@ -17,7 +17,7 @@ */ var server="search.yacy.net"; -var searchURL='http://' + server + '/yacysearch.json?callback=?'; +var searchURL='http://' + server + '/solr/select?callback=?'; var suggestUrl='http://' + server + '/suggest.json?callback=?'; var homepage="http://yacy.net"; var logo="../images/YaCyLogo2011_60.png"; diff --git a/js/yacysearch.js b/js/yacysearch.js index 41cc387d..7e65916d 100644 --- a/js/yacysearch.js +++ b/js/yacysearch.js @@ -11,7 +11,9 @@ var SearchModel = Backbone.Model.extend({ defaults:{hl:'false',query:'',start:'0',rows:'100',layout:'paragraph',startTime:new Date(),servlet:"index.html",contentdom:"text"}, url:function(){ - return searchURL + '&resource=local&hl=' + this.attributes.hl + '&query=' + this.attributes.query + '&startRecord=' + this.attributes.start + '&maximumRecords=' + this.attributes.rows + '&contentdom=' + (this.attributes.layout == "images" ? "image" : this.attributes.contentdom); + u = searchURL + '&hl=false&wt=yjson&facet=true&facet.mincount=1&facet.field=host_s&facet.field=url_file_ext_s&facet.field=url_protocol_s&facet.field=author_sxt&facet.field=collection_sxt&start=' + this.attributes.start + '&rows=' + this.attributes.rows + '&query=' + this.attributes.query; + if (this.attributes.layout == "images") u += "&fq=url_file_ext_s:(png+OR+jpeg+OR+jpg+OR+gif)"; + return u; }, parse:function(resp){ From 5c921054dcdb900a4f9143d76e7d9396aa50a78b Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 20:06:34 +0200 Subject: [PATCH 04/61] Updated info text --- js/setup.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/setup.js b/js/setup.js index ae0191db..f09bcfce 100644 --- a/js/setup.js +++ b/js/setup.js @@ -19,8 +19,8 @@ var server="search.yacy.net"; var searchURL='http://' + server + '/solr/select?callback=?'; var suggestUrl='http://' + server + '/suggest.json?callback=?'; -var homepage="http://yacy.net"; +var homepage="http://susper.com"; var logo="../images/YaCyLogo2011_60.png"; -var headline="Search Portal"; -var greeting="Document Search"; -var queryplaceholder="Document Retrieval"; +var headline=""; +var greeting=""; +var queryplaceholder=""; From 526a5bdac94e68828bdebcfb5f24e0bcb372a8ab Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 20:12:27 +0200 Subject: [PATCH 05/61] Update index.html --- yacysearch/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yacysearch/index.html b/yacysearch/index.html index 8b396e5f..2e922422 100644 --- a/yacysearch/index.html +++ b/yacysearch/index.html @@ -120,7 +120,7 @@ - + @@ -365,4 +365,4 @@ - \ No newline at end of file + From 4d88974200ac86ffcd9385f1a558ba0d895693e0 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 20:14:10 +0200 Subject: [PATCH 06/61] Update about.html --- yacysearch/about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yacysearch/about.html b/yacysearch/about.html index 2bbd6893..1cbeae62 100644 --- a/yacysearch/about.html +++ b/yacysearch/about.html @@ -65,7 +65,7 @@ - + About This Search Portal @@ -124,4 +124,4 @@

Beautiful CSS Framework

- \ No newline at end of file + From 27b0d1d7d2ef93dec2a291fd19470b3e05e63e55 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 20:14:59 +0200 Subject: [PATCH 07/61] Update usage.html --- yacysearch/usage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yacysearch/usage.html b/yacysearch/usage.html index b4482dbd..1eaa532f 100644 --- a/yacysearch/usage.html +++ b/yacysearch/usage.html @@ -65,7 +65,7 @@ - + Usage of Search Templates @@ -121,4 +121,4 @@

License: (CC-BY 2.0) and GPL2

- \ No newline at end of file + From 75a533943b795d2986eb47d102a7fb09132ab699 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 23:33:30 +0200 Subject: [PATCH 08/61] Create README.md --- README.md | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..236c6de7 --- /dev/null +++ b/README.md @@ -0,0 +1,75 @@ +# susper.com + +Susper is a decentral Search Engine that uses the peer to peer system yacy and Apache Solr to crawl and index search results. + +[![Build Status](https://travis-ci.org/fossasia/susper.com.svg?branch=gh-pages)](https://travis-ci.org/fossasia/susper.com?branch=gh-pages) +[![Dependencies](https://david-dm.org/fossasia/susper.com.svg)](https://david-dm.org/fossasia/susper.com) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c5b7e2ca3e4640c9b38e2f3274072583)](https://www.codacy.com/app/dev_19/open-event-webapp?utm_source=github.com&utm_medium=referral&utm_content=fossasia/open-event-webapp&utm_campaign=Badge_Grade) +[![Code Climate](https://codeclimate.com/github/fossasia/open-event-webapp/badges/gpa.svg?branch=development)](https://codeclimate.com/github/fossasia/open-event-webapp) +[![codecov](https://codecov.io/gh/fossasia/susper.com/branch/gh-pages/graph/badge.svg)](https://codecov.io/gh/fossasia/gh-pages) +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fossasia/susper.com?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +##Communication + +Our chat channel is on gitter here: https://gitter.im/fossasia/susper.com + +## Components and Technology + +1. The webapp generator uses Backbone.js + +2. Templates + + The HTML pages of the generated website are created using templates. You can find all the templates ... + +## Installation + +### How do I install on a Server + +Please check out [the documentation here](/docs/INSTALLATION.md). + +### How do I install on my local machine + +Please check out [the documentation here](/docs/INSTALLATION_LOCAL.md). + +### How do I install on Google Cloud + +To install the system on Google Cloud please refer to the [Google Cloud installation readme](/docs/INSTALLATION_GOOGLE.md). + +#### How do I install on AWS + +To install the system on AWS please refer to the [AWS installation readme](/docs/INSTALLATION_AWS.md). + +#### How do I install on Digital Ocean + +To install the system on Digital Ocean please refer to the [Digital Ocean installation readme](/docs/INSTALLATION_DIGITALOCEAN.md). + +#### How do I deploy Web App Generator with Heroku + +Please read how to deploy to [Heroku here](/docs/INSTALLATION_HEROKU.md) + + +## Contributions, Bug Reports, Feature Requests + +This is an Open Source project and we would be happy to see contributors who report bugs and file feature requests submitting pull requests as well. Please report issues here https://github.com/fossasia/open-event-webapp/issues + + +## Issue and Branch Policy + +Before making a pull request, please file an issue. So, other developers have the chance to give feedback or discuss details. Match every pull request with an issue please and add the issue number in description e.g. like "Fixes #123". + +We have the following branches + * **development** + All development goes on in this branch. If you're making a contribution, + you are supposed to make a pull request to _development_. + PRs to master must pass a build check and a unit-test (_app/src/test_) check on Travis + * **gh-pages** + This contains shipped code. After significant features/bugfixes are accumulated on development, we make a version update, and make a release. + + +## LICENSE + +## Maintainers +The project is maintained by +- Michael Christen ([@Orbiter](https://github.com/Orbiter)) +- Mario Behling ([@mariobehling](http://github.com/mariobehling)) + From 856508b0d93ff51c64a73191b6d9725e0341ffc4 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 23:36:42 +0200 Subject: [PATCH 09/61] Create .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..72c4429b --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +npm test From 4555f9230c105162039f56b63178d56bc8ea8081 Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 23:37:32 +0200 Subject: [PATCH 10/61] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 236c6de7..8d594793 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ Susper is a decentral Search Engine that uses the peer to peer system yacy and Apache Solr to crawl and index search results. [![Build Status](https://travis-ci.org/fossasia/susper.com.svg?branch=gh-pages)](https://travis-ci.org/fossasia/susper.com?branch=gh-pages) -[![Dependencies](https://david-dm.org/fossasia/susper.com.svg)](https://david-dm.org/fossasia/susper.com) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/c5b7e2ca3e4640c9b38e2f3274072583)](https://www.codacy.com/app/dev_19/open-event-webapp?utm_source=github.com&utm_medium=referral&utm_content=fossasia/open-event-webapp&utm_campaign=Badge_Grade) [![Code Climate](https://codeclimate.com/github/fossasia/open-event-webapp/badges/gpa.svg?branch=development)](https://codeclimate.com/github/fossasia/open-event-webapp) [![codecov](https://codecov.io/gh/fossasia/susper.com/branch/gh-pages/graph/badge.svg)](https://codecov.io/gh/fossasia/gh-pages) From e88cab1e25c646dcf135660b6bdb019b9135a13f Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 23:46:51 +0200 Subject: [PATCH 11/61] docs --- docs/INSTALLATION.md | 1 + docs/INSTALLATION_AWS.md | 1 + docs/INSTALLATION_DIGITALOCEAN.md | 1 + docs/INSTALLATION_DIGITAL_OCEAN.md | 1 + docs/INSTALLATION_DOCKER.md | 1 + docs/INSTALLATION_GOOGLE.md | 1 + docs/INSTALLATION_HEROKU.md | 1 + docs/INSTALLATION_LOCAL.md | 1 + docs/INSTALLATION_VAGRANT.md | 1 + 9 files changed, 9 insertions(+) create mode 100644 docs/INSTALLATION.md create mode 100644 docs/INSTALLATION_AWS.md create mode 100644 docs/INSTALLATION_DIGITALOCEAN.md create mode 100644 docs/INSTALLATION_DIGITAL_OCEAN.md create mode 100644 docs/INSTALLATION_DOCKER.md create mode 100644 docs/INSTALLATION_GOOGLE.md create mode 100644 docs/INSTALLATION_HEROKU.md create mode 100644 docs/INSTALLATION_LOCAL.md create mode 100644 docs/INSTALLATION_VAGRANT.md diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_AWS.md b/docs/INSTALLATION_AWS.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION_AWS.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_DIGITALOCEAN.md b/docs/INSTALLATION_DIGITALOCEAN.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION_DIGITALOCEAN.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_DIGITAL_OCEAN.md b/docs/INSTALLATION_DIGITAL_OCEAN.md new file mode 100644 index 00000000..00526233 --- /dev/null +++ b/docs/INSTALLATION_DIGITAL_OCEAN.md @@ -0,0 +1 @@ +## Deploying diff --git a/docs/INSTALLATION_DOCKER.md b/docs/INSTALLATION_DOCKER.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION_DOCKER.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_GOOGLE.md b/docs/INSTALLATION_GOOGLE.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION_GOOGLE.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_HEROKU.md b/docs/INSTALLATION_HEROKU.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION_HEROKU.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_LOCAL.md b/docs/INSTALLATION_LOCAL.md new file mode 100644 index 00000000..8a03910a --- /dev/null +++ b/docs/INSTALLATION_LOCAL.md @@ -0,0 +1 @@ +# How to install diff --git a/docs/INSTALLATION_VAGRANT.md b/docs/INSTALLATION_VAGRANT.md new file mode 100644 index 00000000..538b8e2b --- /dev/null +++ b/docs/INSTALLATION_VAGRANT.md @@ -0,0 +1 @@ +# How to install From 978fb006276cdd02a7171bb544f06f9e2181effe Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 23:48:37 +0200 Subject: [PATCH 12/61] docs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8d594793..8a0f9724 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Please read how to deploy to [Heroku here](/docs/INSTALLATION_HEROKU.md) ## Contributions, Bug Reports, Feature Requests -This is an Open Source project and we would be happy to see contributors who report bugs and file feature requests submitting pull requests as well. Please report issues here https://github.com/fossasia/open-event-webapp/issues +This is an Open Source project and we would be happy to see contributors who report bugs and file feature requests submitting pull requests as well. Please report issues here https://github.com/fossasia/susper.com/issues ## Issue and Branch Policy @@ -60,7 +60,7 @@ We have the following branches * **development** All development goes on in this branch. If you're making a contribution, you are supposed to make a pull request to _development_. - PRs to master must pass a build check and a unit-test (_app/src/test_) check on Travis + PRs must pass a build check and unit-tests check on Travis * **gh-pages** This contains shipped code. After significant features/bugfixes are accumulated on development, we make a version update, and make a release. From 900a131d3d01f375445c9a1b5f7116ed3e630fda Mon Sep 17 00:00:00 2001 From: Mario Behling Date: Sun, 4 Sep 2016 23:49:45 +0200 Subject: [PATCH 13/61] docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a0f9724..4da6483e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Our chat channel is on gitter here: https://gitter.im/fossasia/susper.com ## Components and Technology -1. The webapp generator uses Backbone.js +1. The app uses Backbone.js 2. Templates From 6e8a1dd075c29f9871584f26b75634e1a736ff42 Mon Sep 17 00:00:00 2001 From: Gurpreet Date: Mon, 5 Sep 2016 12:45:22 +0530 Subject: [PATCH 14/61] - removed the option to show results in different layouts --- .idea/vcs.xml | 6 + yacysearch/index.html | 404 +++++++++++++++++++++--------------------- 2 files changed, 211 insertions(+), 199 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yacysearch/index.html b/yacysearch/index.html index 2e922422..7235121a 100644 --- a/yacysearch/index.html +++ b/yacysearch/index.html @@ -6,21 +6,22 @@ --> - + - - - - - - - + + + + + + + @@ -42,203 +43,207 @@ - - + + - + + + - -