Skip to content
This repository has been archived by the owner on May 10, 2019. It is now read-only.

Commit

Permalink
Merge pull request #35 from Hypertopic/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
yassinedoghri authored Jun 19, 2016
2 parents 1a60ec5 + e1bdde3 commit f6f7890
Show file tree
Hide file tree
Showing 30 changed files with 1,089 additions and 50 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/bower_components/
/nbproject/
/node_modules/
27 changes: 27 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module.exports = function (grunt) {
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
uglify: {
my_target: {
files: {
'assets/js/vitraux-visiteurs.min.js': [
'assets/js/partials/_main.js',
'assets/js/partials/_courses.js',
'assets/js/partials/_map.js',
'assets/js/partials/_explore.js',
'assets/js/partials/_preview.js',
'assets/js/partials/_description.js'
]
}
}
}
});

// Load the plugin that provides the "uglify" task.
grunt.loadNpmTasks('grunt-contrib-uglify');

// Default task(s).
grunt.registerTask('default', ['uglify']);

};
73 changes: 73 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Vitraux Visiteurs

Vitraux Visiteurs is a Web App built to guide people into discovering the beauty
and history of stained-glass windows in Troyes, France.

## Table of contents

* [Setting up the development environment](#setting-up-the-development-environment)
* [Adding packages as dependencies](#adding-packages-as-dependencies)
* [Using Grunt](#using-grunt)
* [Versioning](#versioning)
* [Creators](#creators)
* [Copyright and licence](#copyright-and-licence)

## Setting up the development environment

1. [Install Bower](http://bower.io/#install-bower)
2. Open command line
3. Go to project root folder
4. Run the following command to install project dependencies:

```
bower install
```

## Adding packages as dependencies

You can search packages [here](https://bower.io/search/) and install them with the following command:

```
bower install <package> --save
```

Care to know more about Bower? [Bower docs](http://bower.io/docs/api/)


## Using Grunt

If you want to configure or use the project tasks, [install Grunt](http://gruntjs.com/getting-started)
The Gruntfile.js is setup to launch the following task(s) with the `grunt` command:

* [Uglify](https://github.com/gruntjs/grunt-contrib-uglify) to compress and mangle javascript files into vitraux-visiteurs.min.js

## Versioning

Vitraux Visiteurs is maintained under [the Semantic Versioning guidelines](http://semver.org/).

## Creators

This is a school project for the [University of Technology of Troyes
(UTT)](http://www.utt.fr/)

**Professor:**

* [Aurélien Bénel](https://github.com/benel)

**Student Team:**

* [Yassine Doghri](https://github.com/yassinedoghri)
* [Amine Benjelloun](https://github.com/aminebenj)
* [Denis Chenesseau](https://github.com/Wolfsister)
* [Alexandre Patelli](https://github.com/alexandrepa)
* [Maxime Couture](https://github.com/MaximeCouture)
* [Helene Ardo Sow](https://github.com/titiardo)
* [Othman Tariq](https://github.com/othmanetariq)
* [Nora Ouelasri](https://github.com/ouelasrn)
* [Imane Tarchoun](https://github.com/imaneIT)
* [Damien Brandao](https://github.com/brandaod)

## Copyright and licence

Code and documentation copyright 2016 Hypertopic.
// TO DO - Project licence.
2 changes: 2 additions & 0 deletions assets/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions assets/css/main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions assets/css/scss/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
Created on : 26 mai 2016, 20:10:40
Author : Yassine Doghri <http://yassine.doghri.fr>
*/

@import "pages/courses";
@import "pages/description";
@import "pages/explore";
@import "pages/preview";

@import "compass";
$primary-color: #f9c452;
$primary-color-darker: #d9a941;
$light-color: #fefefe;

body {
font-family: "Roboto";
}

button, input, select, textarea {
font-family: "Roboto";
}

.bar-nav {
background-color: $primary-color;
border: none;

h1 {
color: $light-color;
}
a {
color: $light-color;
}
}
86 changes: 86 additions & 0 deletions assets/css/scss/pages/_courses.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/*
Created on : 18 juin 2016, 13:23:15
Author : Yassine Doghri <http://yassine.doghri.fr>
*/

@import "compass";
$primary-color: #f9c452;
$primary-color-darker: #d9a941;
$light-color: #fefefe;

.search-bar {
background-color: $primary-color;
position: fixed;
height: 44px;
top: 44px;
left: 0;
width: 100%;
border-bottom: 1px solid $primary-color-darker;
z-index: 10;

.search {
background-color: transparent;
border: none;
border-bottom: 2px solid rgba($light-color, 0.5);
color: $light-color;
border-radius: 0;
margin-bottom: 0;
margin-right: 15px;
margin-left: 15px;
padding-left: 35px;
width : calc(100% - 30px);
@include transition(all 0.3s ease-in-out);

&:focus {
border-bottom: 2px solid rgba($light-color, 1);

+span {
color: $light-color;
}
}

@include input-placeholder {
color: rgba($light-color, 0.8);
font-style: italic;
}
}
span {
position: absolute;
top: 0;
left: 15px;
padding: 9px;
color: rgba($light-color, 0.5);
@include transition(all 0.3s ease-in-out);
}
}

#courses {
padding-top: 88px!important;
}

.course {
.course-header {
margin-bottom: 10px;

h2 {
font-size: 20px;
font-weight: 400;
margin-bottom: 0;
}
.course-vp {

}
}
.course-abstract {
font-weight: 300;

div {
width: 50%;
float: left;
}
}
}

.table-view {
border: none;
}
56 changes: 56 additions & 0 deletions assets/css/scss/pages/_description.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
Created on : 10 juin 2016, 00:54:33
Author : Maxime Couture
*/

.social{
display: inline-block;
vertical-align: middle;
width: 50%;
height: auto;
text-align: center;

span.fa {
margin-left: 10px;
}
}

#vitrail-thumbnail {
position: relative;
text-align: center;
display: inline-block;
width: 50%;
height: auto;
vertical-align: middle;

span.fa {
color: rgba(#fff, 0.8);
text-shadow: 0 0 5px rgba(#000, 0.8);
position: absolute;
bottom: 10px;
text-align: right;
padding-right: 5px;
width: 100%;
}

.thumbnail {
width: 100%;
}
}

.description {
text-align: justify;
}

#vitrailModal {

#vitrail-resource {
width: 100%;
}

a.btn {
position: absolute;
bottom: 0;
margin: 0;
}
}
27 changes: 27 additions & 0 deletions assets/css/scss/pages/_explore.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.table-img {
width: 100px;
}
.table-view {
margin-top: 0!important;
}
.stained-glass-desc {
float:right;
width: 50%;

}
.stained-glass-img {
float:left;
width: 50%;
text-align: center;
}

.place-info {
padding-top: 15px;
padding-right: 15px;
.place-name {
text-align: center;
}
p {
text-align: justify;
}
}
10 changes: 10 additions & 0 deletions assets/css/scss/pages/_preview.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.preview-img {
width: 100%;
height: auto;
}

#found-btn {
position: absolute;
bottom: 0;
margin: 0;
}
Binary file added assets/img/favicon.ico
Binary file not shown.
Loading

0 comments on commit f6f7890

Please sign in to comment.