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

Commit

Permalink
Adapt UI to hardware dimensions
Browse files Browse the repository at this point in the history
  • Loading branch information
flowirtz committed Aug 11, 2017
1 parent b3635d2 commit 4b7185b
Show file tree
Hide file tree
Showing 133 changed files with 23,113 additions and 25,463 deletions.
88 changes: 44 additions & 44 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
# Jenz [![Build Status](https://travis-ci.org/openHPI/jenz.svg?branch=master)](https://travis-ci.org/openHPI/jenz)
## Documentation
Further documentation, especially about the components, can be found in the [Wiki](https://github.com/openHPI/jenz/wiki).

## First setup
[Node.js](https://nodejs.org/en/download/) and npm (included with node) are needed to run this project.
1. `cd jenz`
2. Run `npm install`
3. (optionally) if you get an error using windows, run: npm set registry https://registry.npmjs.org/
4. Run `npm install -g @angular/cli`
5. Copy file materialize.js from the root directory of this git into `jenz/node_modules/materialize-css/dist/js`
5. Run `npm start`

## Errors/ Warnings

When you run `npm install` there may occur one error regarding the canvas. The canvas is used for the qr-code-generator component. It´s an optional dependency, which we DON´T use. So we can ignore this error message. You can browse this link https://github.com/SuperiorJT/angular2-qrcode to get more details about this.

There are some further warning regarding optional dependencies. Feel free to ignore them as well.

Q: "Oh my god, the course component does weird things and skipps multiple courses at once"

A: "You forgot you replace the Materialize.js - this should fix it."

## Development
Once you have installed the dependencies, you can start a development server by running `npm start`.

## Deploy to production
Deployment is done in two phases: You need to build locally first, as building on Travis currently fails (see #18). Once building is done and succeeded you simply need to push it to the master branch ob Github.
Deployment will then be triggered by Travis automatically.

### Build locally
Simply run `npm run build-deploy`. This will set an environment variable and will trigger the Angular CLI build.

##### Troubleshooting the build
It might be possible that the build fails. This can either be due to an error with the cross-platform environemnt variable setting or because the code contains error.
In the prior case, set the environment variable manually (`NODE_ENV=production`) and build by hand: `ng build --prod --base-href https://openhpi.github.io/jenz/`.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.

## 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).
# Jenz [![Build Status](https://travis-ci.org/openHPI/jenz.svg?branch=master)](https://travis-ci.org/openHPI/jenz)
## Documentation
Further documentation, especially about the components, can be found in the [Wiki](https://github.com/openHPI/jenz/wiki).

## First setup
[Node.js](https://nodejs.org/en/download/) and npm (included with node) are needed to run this project.
1. `cd jenz`
2. Run `npm install`
3. (optionally) if you get an error using windows, run: npm set registry https://registry.npmjs.org/
4. Run `npm install -g @angular/cli`
5. Copy file materialize.js from the root directory of this git into `jenz/node_modules/materialize-css/dist/js`
5. Run `npm start`

## Errors/ Warnings

When you run `npm install` there may occur one error regarding the canvas. The canvas is used for the qr-code-generator component. It´s an optional dependency, which we DON´T use. So we can ignore this error message. You can browse this link https://github.com/SuperiorJT/angular2-qrcode to get more details about this.

There are some further warning regarding optional dependencies. Feel free to ignore them as well.

Q: "Oh my god, the course component does weird things and skipps multiple courses at once"

A: "You forgot you replace the Materialize.js - this should fix it."

## Development
Once you have installed the dependencies, you can start a development server by running `npm start`.

## Deploy to production
Deployment is done in two phases: You need to build locally first, as building on Travis currently fails (see #18). Once building is done and succeeded you simply need to push it to the master branch ob Github.
Deployment will then be triggered by Travis automatically.

### Build locally
Simply run `npm run build-deploy`. This will set an environment variable and will trigger the Angular CLI build.

##### Troubleshooting the build
It might be possible that the build fails. This can either be due to an error with the cross-platform environemnt variable setting or because the code contains error.
In the prior case, set the environment variable manually (`NODE_ENV=production`) and build by hand: `ng build --prod --base-href https://openhpi.github.io/jenz/`.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.

## 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).
Binary file added dist/assets/arrows/left-arrow-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/arrows/left-arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/arrows/right-arrow-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/assets/arrows/right-arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 62 additions & 61 deletions dist/assets/config/config.ts
Original file line number Diff line number Diff line change
@@ -1,62 +1,63 @@
import { Config, Platform, FeatureCard } from '../../app/dashboard';
import { OPEN_HPI_REVIEWS, OPEN_SAP_REVIEWS, MOOC_HOUSE_REVIEWS, OPEN_WHO_REVIEWS } from 'assets/reviews/reviews';

const OPEN_HPI: Platform = {
rootUrl: 'https://open.hpi.de',
logoUrl: 'assets/logos/open_hpi_logo.png',
mapMarkerUrl: 'assets/marker/hpi.svg',
reviews: OPEN_HPI_REVIEWS,
isFilterSelected: true,
citation: 'Be curious, be social, be successful.',
primaryColor: '#de6212'
};

const OPEN_SAP: Platform = {
rootUrl: 'https://open.sap.com',
logoUrl: 'assets/logos/openSAP_Logo_neg.png',
mapMarkerUrl: 'assets/marker/sap.svg',
reviews: OPEN_SAP_REVIEWS,
isFilterSelected: false,
citation: 'Learn anywhere, anytime and on any device!',
primaryColor: '#f0ab00'
};

const MOOC_HOUSE: Platform = {
rootUrl: 'https://mooc.house',
logoUrl: 'assets/logos/mooc_house_logo_neg_srgb_300.png',
mapMarkerUrl: 'assets/marker/mooc.svg',
reviews: MOOC_HOUSE_REVIEWS,
isFilterSelected: false,
citation: 'Learn online together. Anytime, anywhere.',
primaryColor: '#abb324'
};

const OPEN_WHO: Platform = {
rootUrl: 'https://openwho.org',
logoUrl: 'assets/logos/who_logo_white.png',
mapMarkerUrl: 'assets/marker/who.svg',
reviews: OPEN_WHO_REVIEWS,
isFilterSelected: false,
citation: 'Equip frontline responders with the knowledge to better manage health emergencies.',
primaryColor: '#0b72b5'
};

export const CONFIG: Config = {
platforms: [OPEN_HPI, OPEN_SAP, MOOC_HOUSE, OPEN_WHO],
courseSubUrl: '/api/v2/courses',
directCourseUrl: '/courses/',
geoSubUrl: '/api/v2/stats/geo.json',
geoStartParam: 'start_date',
geoEndParam: 'end_date',
globalsSubUrl: '/api/v2/stats/global.json',
activeUserSubUrl: '/api/v2/stats/active_users',
activeStartParam: 'start_date',
activeEndParam: 'end_date'
};

export const FEATURE_CARDS: FeatureCard[] = [
{ imageUrl: 'assets/many-people.svg', title: 'Massive', text: 'Learn with thousands of interested students.' },
{ imageUrl: 'assets/open-door.svg', title: 'Open', text: 'Everyone can participate. Sign-Up is free.' },
{ imageUrl: 'assets/online.svg', title: 'Online', text: 'Learn anywhere, at any time. Set your own plans.' },
{ imageUrl: 'assets/online-course.svg', title: 'Courses', text: 'A huge variety of topics, waiting to be explored.' }
import { Config, Platform, FeatureCard } from '../../app/dashboard';
import { OPEN_HPI_REVIEWS, OPEN_SAP_REVIEWS, MOOC_HOUSE_REVIEWS, OPEN_WHO_REVIEWS } from 'assets/reviews/reviews';

const OPEN_HPI: Platform = {
rootUrl: 'https://open.hpi.de',
logoUrl: 'assets/logos/open_hpi_logo.png',
mapMarkerUrl: 'assets/marker/hpi.svg',
reviews: OPEN_HPI_REVIEWS,
isFilterSelected: true,
citation: 'Be curious, be social, be successful.',
primaryColor: '#de6212'
};

const OPEN_SAP: Platform = {
rootUrl: 'https://open.sap.com',
logoUrl: 'assets/logos/openSAP_Logo_neg.png',
mapMarkerUrl: 'assets/marker/sap.svg',
reviews: OPEN_SAP_REVIEWS,
isFilterSelected: false,
citation: 'Learn anywhere, anytime and on any device!',
primaryColor: '#f0ab00'
};

const MOOC_HOUSE: Platform = {
rootUrl: 'https://mooc.house',
logoUrl: 'assets/logos/mooc_house_logo_neg_srgb_300.png',
mapMarkerUrl: 'assets/marker/mooc.svg',
reviews: MOOC_HOUSE_REVIEWS,
isFilterSelected: false,
citation: 'Learn online together. Anytime, anywhere.',
primaryColor: '#abb324'
};

const OPEN_WHO: Platform = {
rootUrl: 'https://openwho.org',
logoUrl: 'assets/logos/who_logo_white.png',
mapMarkerUrl: 'assets/marker/who.svg',
reviews: OPEN_WHO_REVIEWS,
isFilterSelected: false,
citation: 'Equip frontline responders with the knowledge to better manage health emergencies.',
primaryColor: '#0b72b5'
};

export const CONFIG: Config = {
platforms: [OPEN_HPI, OPEN_SAP, MOOC_HOUSE, OPEN_WHO],
courseSubUrl: '/api/v2/courses',
directCourseUrl: '/courses/',
geoSubUrl: '/api/v2/stats/geo.json',
geoStartParam: 'start_date',
geoEndParam: 'end_date',
globalsSubUrl: '/api/v2/stats/global.json',
activeUserSubUrl: '/api/v2/stats/active_users',
activeStartParam: 'start_date',
activeEndParam: 'end_date',
citationAll: 'Massive Open Online Courses'
};

export const FEATURE_CARDS: FeatureCard[] = [
{ imageUrl: 'assets/many-people.svg', title: 'Massive', text: 'Learn with thousands of interested students.' },
{ imageUrl: 'assets/open-door.svg', title: 'Open', text: 'Everyone can participate. Sign-Up is free.' },
{ imageUrl: 'assets/online.svg', title: 'Online', text: 'Learn anywhere, at any time. Set your own plans.' },
{ imageUrl: 'assets/online-course.svg', title: 'Courses', text: 'A huge variety of topics, waiting to be explored.' }
]
104 changes: 52 additions & 52 deletions dist/assets/many-people.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 38 additions & 38 deletions dist/assets/marker/dot-template.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4b7185b

Please sign in to comment.