Project for the UPV to develop an app like BlaBlaCar but only for UPV people.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

adapted to style guide

+86 -16
+6
compose/postgis/Dockerfile
··· 1 + FROM postgres:9.6 2 + MAINTAINER Marcos Gabarda <hey@marcosgabarda.com> 3 + 4 + RUN apt-get update && apt-get install -y --no-install-recommends \ 5 + postgresql-9.6-postgis-2.3 \ 6 + postgresql-9.6-postgis-2.3-scripts
+16
dev.yml
··· 1 1 # Docker-compose file to launch services during the development. 2 2 version: '2' 3 3 4 + volumes: 5 + db-data: 6 + driver: local 7 + 4 8 services: 5 9 6 10 app: ··· 14 18 - .:/app 15 19 ports: 16 20 - "8888:8888" 21 + 22 + db: 23 + build: compose/postgis/. 24 + image: upvcarshare/postgis 25 + container_name: upvcarshare-db 26 + volumes: 27 + - db-data:/var/lib/postgresql 28 + ports: 29 + - "5432:5432" 30 + environment: 31 + POSTGRES_PASSWORD: potato 32 + POSTGRES_DB: upvcarshare
+26 -4
env.example
··· 1 - DATABASE_URL= 2 - DJANGO_DEBUG= 3 - DJANGO_ALLOWED_HOSTS= 4 - DJANGO_SECRET_KEY= 1 + # UPV Car Share project environment variables 2 + # ------------------------------------------------------------------------------ 3 + 4 + # Common vars 5 + # ------------------------------------------------------------------------------ 6 + DJANGO_SETTINGS_MODULE=config.settings.local 7 + DJANGO_SECRET_KEY=dummy 8 + UPV_LOGIN_DATA_USERNAME=username 9 + UPV_LOGIN_DATA_PASSWORD=password 10 + 11 + # Using Oracle connection 12 + # ------------------------------------------------------------------------------ 13 + ORACLE_HOME=/path/to/oracle 14 + VERSION=12.1.0.2.0 15 + ARCH=x86_64 16 + ORACLE_SID=sip 17 + DATABASE_URL=oraclegis://{user}:{password}@{server}:{port}/{sid} 18 + 19 + # Using local database 20 + # ------------------------------------------------------------------------------ 21 + DATABASE_URL=postgis://postgres:potato@localhost:5432/upvcarshare 22 + 23 + 24 + # Enable this for testing 25 + # ------------------------------------------------------------------------------ 26 + # SPATIALITE_LIBRARY_PATH=mod_spatialite
+1
requirements/local.txt
··· 3 3 django-test-plus==1.0.16 4 4 factory_boy==2.8.0 5 5 django-debug-toolbar==1.7 6 + psycopg2==2.7.1
upvcarshare/static/src/img/logo.png

This is a binary file and will not be displayed.

+9 -8
upvcarshare/static/src/sass/colors.scss
··· 1 1 // Palette colors 2 - $upv-darker-grey: #191919; 3 - $upv-dark-grey: #444444; 4 - $upv-grey: #636363; 5 - $upv-blue: #01a5cb; 6 - $upv-orange: #ec6409; 7 - $upv-green: #99c300; 8 - $upv-purple: #a9249c; 9 - $upv-yellow: #cbbc0f; 2 + $upv-darker-grey: #333333; 3 + $upv-dark-grey: #4B4B4B; 4 + $upv-grey: #666666; 5 + $upv-red: #CC0000; 6 + $upv-blue: #495069; 7 + $upv-orange: #AE320C; 8 + $upv-green: #515B0B; 9 + $upv-purple: #452637; 10 + $upv-yellow: #3D344E;
+16 -1
upvcarshare/static/src/sass/project.scss
··· 30 30 background-color: #000; 31 31 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); 32 32 .red { 33 - background-color: rgb(204, 1, 1); 33 + background-color: #666666; 34 34 height: 10px; 35 35 } 36 36 } ··· 39 39 padding-top: 16px; 40 40 padding-bottom: 16px; 41 41 box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); 42 + border-bottom: 3px solid #000; 42 43 } 43 44 44 45 .section-navbar { ··· 68 69 color: $gray-lighter; 69 70 background-color: $upv-dark-grey; 70 71 } 72 + 73 + h1, .h1 { 74 + color: $upv-red; font-weight: normal 75 + } 76 + h2, .h2 { 77 + color: $upv-darker-grey; font-weight: bold 78 + } 79 + h3, .h3 { 80 + color: #495069; font-weight: bold 81 + } 82 + 83 + .title { 84 + max-height: 49px; 85 + }
+10 -1
upvcarshare/static/src/sass/variables.scss
··· 9 9 10 10 $enable-flex: true; 11 11 12 - $font-family-sans-serif: Arial, sans-serif !default; 12 + $font-family-sans-serif: Arial, "Helvetica", sans-serif !default; 13 13 $body-color: $upv-grey; 14 14 $body-bg: #d7d6d1; 15 15 16 16 $font-size-root: 12.8px !default; 17 + 18 + // Override grid 19 + 20 + $container-max-widths: ( 21 + sm: 540px, 22 + md: 720px, 23 + lg: 950px, 24 + xl: 950px 25 + ) !default;
+2 -2
upvcarshare/templates/header.html
··· 17 17 <div class="col-sm-7"> 18 18 <img src="{% static "img/upv.png" %}"> 19 19 </div> 20 - <div class="col-sm-5"> 21 - <h1>{% trans "Compartir Coche en la UPV" %}</h1> 20 + <div class="col-sm-5 text-xs-right"> 21 + <img src="{% static "img/logo.png" %}" alt="{% trans "poli Car" %}" class="title"> 22 22 </div> 23 23 </div> 24 24 </div>