diff --git a/.gitignore b/.gitignore index 3e759b7..03f7507 100644 --- a/.gitignore +++ b/.gitignore @@ -1,330 +1,8 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +# Dependency directory +node_modules -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates +# Debug log from npm +npm-debug.log -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ +# Environment Variables should NEVER be published +.env diff --git a/starter-code/.vscode/launch.json b/.vscode/launch.json similarity index 100% rename from starter-code/.vscode/launch.json rename to .vscode/launch.json diff --git a/starter-code/.vscode/settings.json b/.vscode/settings.json similarity index 100% rename from starter-code/.vscode/settings.json rename to .vscode/settings.json diff --git a/README.md b/README.md index 4c9130d..553c785 100644 --- a/README.md +++ b/README.md @@ -1 +1,28 @@ -# jukebands \ No newline at end of file +# JukeBands + +## Presentación + +JukeBands es una aplicación web que trata de poner en contacto a músicos y promotores, para que puedan encontrar en cualquier ciudad a otros músicos dispuestos a participar en conciertos y/o festivales. + +## Aplicaciones + +Los usuario podrán crear su perfil, editarlo, colocar su ubicación a través de un mapa, y acceder al perfil de otros artistas también a través de un mapa que muestra dónde se encuentra cada uno de los grupos de música registrados. + +## Mayores retos + +Utilizar la API de Mapbox y pintar la información en el mapa. + +## Tecnologías utilizadas + +- Javascript +- MongoDB +- Express +- Passport +- Bcrypt +- Mapbox +- Axios +- Handlebars + +## Enlace + +[Pulsa aquí](https://jukebands.herokuapp.com/) diff --git a/starter-code/app.js b/app.js similarity index 96% rename from starter-code/app.js rename to app.js index b039b84..501a0f5 100644 --- a/starter-code/app.js +++ b/app.js @@ -15,7 +15,7 @@ const flash = require("connect-flash"); mongoose - .connect('mongodb://localhost/jukebands', {useNewUrlParser: true}) + .connect(process.env.DB_URL, {useNewUrlParser: true}) .then(x => { console.log(`Connected to Mongo! Database name: "${x.connections[0].name}"`) }) diff --git a/bin/seeds.js b/bin/seeds.js new file mode 100644 index 0000000..bb8f664 --- /dev/null +++ b/bin/seeds.js @@ -0,0 +1,47 @@ +// Seeds file that remove all users and create 2 new users + +// To execute this seed, run from the root of the project +// $ node bin/seeds.js + +const mongoose = require("mongoose"); +const bcrypt = require("bcrypt"); +const User = require("../models/User"); + +const bcryptSalt = 10; + +mongoose + .connect('mongodb://localhost/starter-code', {useNewUrlParser: true}) + .then(x => { + console.log(`Connected to Mongo! Database name: "${x.connections[0].name}"`) + }) + .catch(err => { + console.error('Error connecting to mongo', err) + }); + +let users = [ + { + username: "alice", + password: bcrypt.hashSync("alice", bcrypt.genSaltSync(bcryptSalt)), + }, + { + username: "bob", + password: bcrypt.hashSync("bob", bcrypt.genSaltSync(bcryptSalt)), + } +] + +User.deleteMany() +.then(() => { + return User.create(users) +}) +.then(usersCreated => { + console.log(`${usersCreated.length} users created with the following id:`); + console.log(usersCreated.map(u => u._id)); +}) +.then(() => { + // Close properly the connection to Mongoose + mongoose.disconnect() +}) +.catch(err => { + mongoose.disconnect() + throw err +}) \ No newline at end of file diff --git a/bin/www b/bin/www new file mode 100644 index 0000000..4d9f640 --- /dev/null +++ b/bin/www @@ -0,0 +1,46 @@ +#!/usr/bin/env node + +const http = require('http'); + +let app = require('../app'); + +// catch 404 and render a not-found.hbs template +app.use((req, res, next) => { + res.status(404); + res.render('not-found'); +}); + +app.use((err, req, res, next) => { + // always log the error + console.error('ERROR', req.method, req.path, err); + + // only render if the error ocurred before sending the response + if (!res.headersSent) { + res.status(500); + res.render('error'); + } +}); + +let server = http.createServer(app); + +server.on('error', error => { + if (error.syscall !== 'listen') { throw error } + + // handle specific listen errors with friendly messages + switch (error.code) { + case 'EACCES': + console.error(`Port ${process.env.PORT} requires elevated privileges`); + process.exit(1); + break; + case 'EADDRINUSE': + console.error(`Port ${process.env.PORT} is already in use`); + process.exit(1); + break; + default: + throw error; + } +}); + +server.listen(process.env.PORT, () => { + console.log(`Listening on http://localhost:${process.env.PORT}`); +}); diff --git a/starter-code/models/User.js b/models/User.js similarity index 85% rename from starter-code/models/User.js rename to models/User.js index 27a38fa..60bca75 100644 --- a/starter-code/models/User.js +++ b/models/User.js @@ -15,7 +15,10 @@ const userSchema = new Schema({ imgPath: String, place: Object }, { - timestamps: true + timestamps: { + createdAt: 'created_at', + updatedAt: 'updated_at' + } }); const User = mongoose.model('User', userSchema); module.exports = User; \ No newline at end of file diff --git a/starter-code/options/cloudinary.js b/options/cloudinary.js similarity index 100% rename from starter-code/options/cloudinary.js rename to options/cloudinary.js diff --git a/starter-code/package-lock.json b/package-lock.json similarity index 100% rename from starter-code/package-lock.json rename to package-lock.json diff --git a/starter-code/package.json b/package.json similarity index 97% rename from starter-code/package.json rename to package.json index e5d11a0..e700dd6 100644 --- a/starter-code/package.json +++ b/package.json @@ -16,7 +16,7 @@ "connect-flash": "^0.1.1", "connect-mongo": "^2.0.1", "cookie-parser": "^1.4.3", - "dotenv": "^6.0.0", + "dotenv": "^6.2.0", "express": "^4.16.3", "express-session": "^1.15.6", "hbs": "^4.0.1", diff --git a/starter-code/passport/index.js b/passport/index.js similarity index 100% rename from starter-code/passport/index.js rename to passport/index.js diff --git a/starter-code/passport/localStrategy.js b/passport/localStrategy.js similarity index 100% rename from starter-code/passport/localStrategy.js rename to passport/localStrategy.js diff --git a/starter-code/passport/serializers.js b/passport/serializers.js similarity index 100% rename from starter-code/passport/serializers.js rename to passport/serializers.js diff --git a/public/images/bipolar.jpg b/public/images/bipolar.jpg new file mode 100644 index 0000000..d68053d Binary files /dev/null and b/public/images/bipolar.jpg differ diff --git a/public/images/diddi.jpg b/public/images/diddi.jpg new file mode 100644 index 0000000..ff23e70 Binary files /dev/null and b/public/images/diddi.jpg differ diff --git a/starter-code/public/images/favicon.ico b/public/images/favicon.ico similarity index 100% rename from starter-code/public/images/favicon.ico rename to public/images/favicon.ico diff --git a/public/images/fondo-login.png b/public/images/fondo-login.png new file mode 100644 index 0000000..dddc10b Binary files /dev/null and b/public/images/fondo-login.png differ diff --git a/public/images/james-owen-653039-unsplash.jpg b/public/images/james-owen-653039-unsplash.jpg new file mode 100644 index 0000000..3562dc6 Binary files /dev/null and b/public/images/james-owen-653039-unsplash.jpg differ diff --git a/starter-code/public/images/musico.png b/public/images/musico.png similarity index 100% rename from starter-code/public/images/musico.png rename to public/images/musico.png diff --git a/public/images/pauLarrozea.jpg b/public/images/pauLarrozea.jpg new file mode 100644 index 0000000..87476d5 Binary files /dev/null and b/public/images/pauLarrozea.jpg differ diff --git a/starter-code/public/images/promotor.png b/public/images/promotor.png similarity index 100% rename from starter-code/public/images/promotor.png rename to public/images/promotor.png diff --git a/public/images/shadday.png b/public/images/shadday.png new file mode 100644 index 0000000..d6bd71f Binary files /dev/null and b/public/images/shadday.png differ diff --git a/public/images/signup.jpg b/public/images/signup.jpg new file mode 100644 index 0000000..e72ca5d Binary files /dev/null and b/public/images/signup.jpg differ diff --git a/public/images/vioz.jpg b/public/images/vioz.jpg new file mode 100644 index 0000000..3e1e7db Binary files /dev/null and b/public/images/vioz.jpg differ diff --git a/starter-code/doc b/public/javascripts/script.js similarity index 100% rename from starter-code/doc rename to public/javascripts/script.js diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css new file mode 100644 index 0000000..ab724b0 --- /dev/null +++ b/public/stylesheets/style.css @@ -0,0 +1,209 @@ +body { + padding: 0px; + margin: 0px; + box-sizing: border-box; + font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; } + +nav { + display: flex; + justify-content: flex-end; + padding-right: 50px; + background: #00796B; } + +.a-nav { + color: white; + transition-property: color; + transition-duration: 0.2s; + transition-timing-function: ease; + transition-delay: 0s; + text-decoration: none; } + +a:hover { + cursor: pointer; } + +.landing-half-header { + height: 96vh; + width: 50%; + float: left; + line-height: 200px; } + +.header-left { + background: url(../images/musico.png) no-repeat; + background-size: cover; } + +.header-left:hover { + background: #00796B; + transition: 0.5s; } + +.header-right { + background: url(../images/promotor.png) no-repeat; + background-size: cover; } + +.header-right:hover { + background: #00796B; + transition: 0.5s; } + +.landing-header .landing-half-header h1 { + color: white; + width: 100%; + font-size: 70px; + text-align: center; + padding-top: 35vh; + font-weight: 400; + transition: 0.5s; } + +.landing-header .landing-half-header h2 { + color: white; + width: 100%; + text-align: center; + font-weight: 300; + transition: 0.5s; } + +.form-signin { + box-shadow: 0px 3px 18px 0px rgba(50, 50, 50, 0.3); } + +.nav-link { + cursor: pointer; + border-bottom: 3px solid #00796B; } + .nav-link:hover { + color: #B2DFDB; + border-bottom-color: #B2DFDB; } + +.form-signin-heading { + text-align: center; + font-size: 3rem; + color: #00796B; } + +#mapid { + height: 400px; } + +#map { + top: 50px; + display: flex; + height: 400px; + width: 400px; } + +.left-content { + display: flex; + right: 150px; + top: 150px; + touch-action: pan-x pan-y; + margin-bottom: 4rem; } + +.img-profile { + position: relative; + margin: 0 auto; + display: block; } + +#profile-text { + padding-top: 30px; + text-align: center; + margin: 0 auto; + max-width: 700px; } + +.profile-textName { + font-size: 30px; + font-weight: bold; } + +.profile-textLocation { + font-size: 25px; + font-weight: bold; } + +.profile-textStyle { + font-size: 20px; + font-weight: bold; } + +.profile-other { + text-indent: 1.5em; + font-size: 15px; + font-weight: normal; } + +.btn { + background: none; + border: none; + cursor: pointer; + line-height: 1.5; + font: 700 1.2rem 'Roboto Slab', sans-serif; + padding: 1em 2em; + letter-spacing: 0.05rem; } + +.login-page { + background: url(../images/fondo-login.png) no-repeat; + background-size: cover; + height: 100vh; + padding-top: 180px; } + +.signup-page { + background: url(../images/signup.jpg) no-repeat; + background-size: cover; + height: 100vh; + padding-top: 180px; } + +.form-signin { + max-width: 380px; + padding: 15px 35px 25px; + margin: 0 auto; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 20px; } + .form-signin .form-signin-heading, + .form-signin .checkbox { + margin-bottom: 30px; } + .form-signin .checkbox { + font-weight: normal; } + .form-signin .form-control { + position: relative; + font-size: 16px; + height: auto; + padding: 10px; } + .form-signin .form-control:focus { + z-index: 2; } + .form-signin .no-bottom { + margin-bottom: 0px !important; } + .form-signin input[type="text"] { + margin-bottom: -1px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } + .form-signin input[type="password"] { + margin-bottom: 20px; + border-top-left-radius: 0; + border-top-right-radius: 0; } + +.flex-center { + display: flex; + align-content: center; + justify-content: center; + flex-direction: column; + align-items: center; } + .flex-center form { + display: flex; + justify-content: center; } + +.button { + display: inline-block; + margin: .5rem auto; + color: #ffffff; + background: #00796B; + border-color: #00796B; + font-size: 16px; + font-weight: 700; + text-transform: uppercase; + background: #00796B; + cursor: pointer; + min-width: 220px; + text-align: center; + line-height: 2.3em; + box-shadow: 0px 3px 18px 0px rgba(50, 50, 50, 0.3); + padding-right: 1em; + padding-left: 1em; + border-radius: 25px; + transition: all .2s ease-in-out; } + .button.full { + width: 100%; + margin-bottom: 1.5rem; } + .button:hover { + background: rgba(255, 255, 255, 0); + border-color: #00796B; + color: #00796B; } + +/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/public/stylesheets/style.css.map b/public/stylesheets/style.css.map new file mode 100644 index 0000000..5bef18e --- /dev/null +++ b/public/stylesheets/style.css.map @@ -0,0 +1,9 @@ +{ + "version": 3, + "file": "style.css", + "sources": [ + "style.scss" + ], + "names": [], + "mappings": "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" +} \ No newline at end of file diff --git a/public/stylesheets/style.scss b/public/stylesheets/style.scss new file mode 100644 index 0000000..1bc474f --- /dev/null +++ b/public/stylesheets/style.scss @@ -0,0 +1,271 @@ +$primary-color: #00796B; + +body { + padding: 0px; + margin: 0px; + box-sizing: border-box; + font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; +} + +//HOME + +nav { + display: flex; + justify-content: flex-end; + padding-right: 50px; + background: $primary-color; + +} + +.a-nav { + color: white; + transition-property: color; + transition-duration: 0.2s; + transition-timing-function: ease; + transition-delay: 0s; + text-decoration: none; +} + +a:hover { + cursor: pointer; +} + +.landing-half-header { + height: 96vh; + width: 50%; + float: left; + line-height: 200px; +} + +.header-left { + background: url(../images/musico.png) no-repeat; + background-size: cover; +} + +.header-left:hover { + background: $primary-color; + transition: 0.5s; +} + +.header-right { + background: url(../images/promotor.png) no-repeat; + background-size: cover; +} +.header-right:hover { + background: $primary-color; + transition: 0.5s; +} + +.landing-header .landing-half-header h1 { + color: white; + width: 100%; + font-size: 70px; + text-align: center; + padding-top: 35vh; + font-weight: 400; + transition: 0.5s; +} + +.landing-header .landing-half-header h2 { + color: white; + width: 100%; + text-align: center; + font-weight: 300; + transition: 0.5s; +} + +.form-signin { + box-shadow: 0px 3px 18px 0px rgba(50, 50, 50, 0.3); +} + +.nav-link { + cursor: pointer; + border-bottom: 3px solid $primary-color; + + &:hover { + color: #B2DFDB; + border-bottom-color: #B2DFDB; + } +} + + + +.form-signin-heading { + text-align: center; + font-size: 3rem; + color: $primary-color; +} + +//Profile-band + +#mapid { + height: 400px; +} + +#map { + top: 50px; + display: flex; + height: 400px; + width: 400px; +} + +.left-content{ + display: flex; + right:150px; + top: 150px; + touch-action: pan-x pan-y; + margin-bottom: 4rem; + +} + +.img-profile{ + position: relative ; + margin: 0 auto; + display: block; +} + +#profile-text{ + padding-top: 30px; + text-align: center; + margin: 0 auto; + max-width: 700px; +} + +.profile-textName{ + font-size: 30px; + font-weight: bold; +} + +.profile-textLocation{ + font-size: 25px; + font-weight: bold; +} + +.profile-textStyle{ + font-size: 20px; + font-weight: bold; +} + +.profile-other{ + text-indent: 1.5em; + font-size: 15px; + font-weight: normal; +} + +.btn { + background: none; + border: none; + cursor: pointer; + line-height: 1.5; + font: 700 1.2rem 'Roboto Slab', sans-serif; + padding: 1em 2em; + letter-spacing: 0.05rem; +} + +//Login + +.login-page { + background: url(../images/fondo-login.png) no-repeat; + background-size: cover; + height: 100vh; + padding-top: 180px; +} + +.signup-page { + background: url(../images/signup.jpg) no-repeat; + background-size: cover; + height: 100vh; + padding-top: 180px; +} + +.form-signin { + max-width: 380px; + padding: 15px 35px 25px; + margin: 0 auto; + background-color: #fff; + border: 1px solid rgba(0,0,0,0.1); + border-radius: 20px; + + .form-signin-heading, + .checkbox { + margin-bottom: 30px; + } + + .checkbox { + font-weight: normal; + } + + .form-control { + position: relative; + font-size: 16px; + height: auto; + padding: 10px; + + &:focus { + z-index: 2; + } + } + + .no-bottom { + margin-bottom: 0px !important; + } + + input[type="text"] { + margin-bottom: -1px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } + + input[type="password"] { + margin-bottom: 20px; + border-top-left-radius: 0; + border-top-right-radius: 0; + } +} + +.flex-center { + display: flex; + align-content: center; + justify-content: center; + flex-direction: column; + align-items: center; + + form { + display: flex; + justify-content: center; + } +} + + +// BUTTONS +.button { + display: inline-block; + margin: .5rem auto; + color: #ffffff; + background: $primary-color; + border-color: $primary-color; + font-size: 16px; + font-weight: 700; + text-transform: uppercase; + background: $primary-color; + cursor: pointer; + min-width: 220px; + text-align: center; + line-height: 2.3em ; + box-shadow: 0px 3px 18px 0px rgba(50, 50, 50, 0.3); + padding-right: 1em; + padding-left: 1em; + border-radius: 25px ; + transition: all .2s ease-in-out; + + &.full { + width: 100%; + margin-bottom: 1.5rem; + } + + &:hover { + background: rgba(255,255,255,0); + border-color: $primary-color; + color: $primary-color ; + } +} \ No newline at end of file diff --git a/starter-code/routes/auth.js b/routes/auth.js similarity index 88% rename from starter-code/routes/auth.js rename to routes/auth.js index eb5e493..eb0e027 100644 --- a/starter-code/routes/auth.js +++ b/routes/auth.js @@ -1,3 +1,4 @@ +require('dotenv').config(); const express = require("express"); const passport = require('passport'); const router = express.Router(); @@ -60,7 +61,7 @@ router.post("/signup-band", (req, res, next) => { newUser.save() .then(() => { - res.redirect("/auth/profile-band"); + res.redirect("/auth/login-band"); }) .catch(err => { res.render("auth/signup-band", { message: "Something went wrong" }); @@ -71,7 +72,7 @@ router.post("/signup-band", (req, res, next) => { router.get("/profile-band/", (req, res, next) => { - res.render("auth/profile-band", { user: req.user }); + res.render("auth/profile-band", { user: req.user, key:process.env.ROUTE_HEROKU }); }); router.post("/profile-band/", (req, res, next) => { @@ -83,7 +84,6 @@ User.findByIdAndUpdate(req.user.id, {$set:{place:{lat,lng}}},{new:true}).then(us }); router.get('/profile-band/getCurrentMarket',(req,res,next)=>{ - //res.send(JSON.stringify({hola:'hola'})) User.findById(req.user.id) .then((user) => { let place=user.place; @@ -140,7 +140,7 @@ router.post('/profile-band/:id/delete', (req, res, next) => { router.get("/search", (req, res, next) => { - res.render("auth/search"); + res.render("auth/search", {key: process.env.ROUTE_HEROKU, token: process.env.TOKEN}); }); router.get("/search/bands", (req, res, next) => { @@ -157,18 +157,18 @@ router.get("/search/bands", (req, res, next) => { }) }); -// router.get("/search/band-info/:id", (req, res, next) => { -// console.log(req.user) -// User.findById(req.user.id) -// .then((user) => { -// res.render("auth/band-info", {user: req.user}) -// }) +router.get("/search/band-info/:id", (req, res, next) => { + console.log(req.user) + User.findById(req.params.id) + .then((user) => { + res.render("auth/band-info", {user}) + }) -// }); +}); -router.get("/logout", (req, res) => { +router.get("/auth/logout", (req, res) => { req.logout(); - res.redirect("/"); + res.redirect("/login"); }); module.exports = router; diff --git a/starter-code/routes/index.js b/routes/index.js similarity index 100% rename from starter-code/routes/index.js rename to routes/index.js diff --git a/starter-code/.gitignore b/starter-code/.gitignore deleted file mode 100644 index 03f7507..0000000 --- a/starter-code/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Dependency directory -node_modules - -# Debug log from npm -npm-debug.log - -# Environment Variables should NEVER be published -.env diff --git a/starter-code/public/images/fondo-login.png b/starter-code/public/images/fondo-login.png deleted file mode 100644 index 2de73ce..0000000 Binary files a/starter-code/public/images/fondo-login.png and /dev/null differ diff --git a/starter-code/public/images/fondo-login2.png b/starter-code/public/images/fondo-login2.png deleted file mode 100644 index 5c5f1ef..0000000 Binary files a/starter-code/public/images/fondo-login2.png and /dev/null differ diff --git a/starter-code/public/javascripts/script.js b/starter-code/public/javascripts/script.js deleted file mode 100644 index ae3d4b7..0000000 --- a/starter-code/public/javascripts/script.js +++ /dev/null @@ -1,47 +0,0 @@ -var promise = new Promise(function(resolve, reject) { - navigator.geolocation.getCurrentPosition(function(position) { - resolve( - (pos = { - lat: position.coords.latitude, - lng: position.coords.longitude - }) - ); - }); -}); -promise.then(currentCoords => { - const URL = `http://localhost:3000/auth/profile-band`; - let currentMarker; - - mapboxgl.accessToken = - "pk.eyJ1IjoidmljYmFuIiwiYSI6ImNqczFobXl5cTFsbXI0M29jdXp6OXVqcGQifQ.YPIeCxviK0RvnP3aUa3qgg"; - - axios.get('http://localhost:3000/auth/profile-band/getCurrentMarket').then((currentmarket) => { - const placeUser = currentmarket.data.place; - if (placeUser != undefined){ - var el = document.createElement('div'); - el.className = 'marker'; - currentMarker = placeUser; - currentMarker = new mapboxgl.Marker() - .setLngLat(placeUser) - .addTo(map); - } - }); - - var map = new mapboxgl.Map({ - container: "map", - style: "mapbox://styles/mapbox/streets-v11", - center: [currentCoords.lng, currentCoords.lat], - zoom: 12 - }); - let clickedPos = new mapboxgl.Marker(); - map.on("click", function(e) { - clickedPos.setLngLat(e.lngLat).addTo(map); - - if (currentMarker) { - currentMarker.remove(); - } - - axios.post(URL, e.lngLat).then(function() { - }); - }); -}); diff --git a/starter-code/public/stylesheets/style.css b/starter-code/public/stylesheets/style.css deleted file mode 100644 index 45beb51..0000000 --- a/starter-code/public/stylesheets/style.css +++ /dev/null @@ -1,109 +0,0 @@ -body { - padding: 0px; - margin: 0px; - box-sizing: border-box; - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; } - -nav { - display: flex; - justify-content: flex-end; - padding-right: 50px; - background: #0edd9f; } - -.a-nav { - color: white; - transition-property: color; - transition-duration: 0.2s; - transition-timing-function: ease; - transition-delay: 0s; - text-decoration: none; } - -a:hover { - cursor: pointer; } - -.landing-half-header { - height: 96vh; - width: 50%; - float: left; - line-height: 200px; } - -.landing-half-header-left { - background: url(../images/musico.png) no-repeat; - background-size: cover; } - -.landing-half-header-left:hover { - background: #0edd9f; - transition: 0.5s; } - -.landing-half-header-right { - background: url(../images/promotor.png) no-repeat; - background-size: cover; } - -.landing-half-header-right:hover { - background: #0edd9f; - transition: 0.5s; } - -.landing-header .landing-half-header h1 { - color: white; - width: 100%; - font-size: 70px; - text-align: center; - padding-top: 35vh; - font-weight: 400; - transition: 0.5s; } - -.landing-header .landing-half-header h2 { - color: white; - width: 100%; - text-align: center; - font-weight: 300; - transition: 0.5s; } - -#mapid { - height: 400px; } - -#map { - display: flex; - z-index: 3; - position: absolute; - height: 400px; - width: 400px; - right: 150px; - top: 150px; - touch-action: pan-x pan-y; } - -.login-page { - background: url(../images/fondo-login.png) no-repeat; - background-size: cover; - height: 100vh; - padding-top: 180px; } - -.form-signin { - max-width: 380px; - padding: 15px 35px 25px; - margin: 0 auto; - background-color: #fff; - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 20px; } - .form-signin .form-signin-heading, - .form-signin .checkbox { - margin-bottom: 30px; } - .form-signin .checkbox { - font-weight: normal; } - .form-signin .form-control { - position: relative; - font-size: 16px; - height: auto; - padding: 10px; } - .form-signin .form-control:focus { - z-index: 2; } - .form-signin input[type="text"] { - margin-bottom: -1px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - .form-signin input[type="password"] { - margin-bottom: 20px; - border-top-left-radius: 0; - border-top-right-radius: 0; } - -/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/starter-code/public/stylesheets/style.css.map b/starter-code/public/stylesheets/style.css.map deleted file mode 100644 index 6afc32f..0000000 --- a/starter-code/public/stylesheets/style.css.map +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": 3, - "file": "style.css", - "sources": [ - "style.scss" - ], - "names": [], - "mappings": "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" -} \ No newline at end of file diff --git a/starter-code/public/stylesheets/style.scss b/starter-code/public/stylesheets/style.scss deleted file mode 100644 index f2e61d0..0000000 --- a/starter-code/public/stylesheets/style.scss +++ /dev/null @@ -1,135 +0,0 @@ -body { - padding: 0px; - margin: 0px; - box-sizing: border-box; - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; -} - -nav { - display: flex; - justify-content: flex-end; - padding-right: 50px; - background: rgb(14, 221, 159); - -} - -.a-nav { - color: white; - transition-property: color; - transition-duration: 0.2s; - transition-timing-function: ease; - transition-delay: 0s; - text-decoration: none; -} - -a:hover { - cursor: pointer; -} - -.landing-half-header { - height: 96vh; - width: 50%; - float: left; - line-height: 200px; -} - -.landing-half-header-left { - background: url(../images/musico.png) no-repeat; - background-size: cover; -} - -.landing-half-header-left:hover { - background: rgb(14, 221, 159); - transition: 0.5s; -} - -.landing-half-header-right { - background: url(../images/promotor.png) no-repeat; - background-size: cover; -} -.landing-half-header-right:hover { - background: rgb(14, 221, 159); - transition: 0.5s; -} - -.landing-header .landing-half-header h1 { - color: white; - width: 100%; - font-size: 70px; - text-align: center; - padding-top: 35vh; - font-weight: 400; - transition: 0.5s; -} - -.landing-header .landing-half-header h2 { - color: white; - width: 100%; - text-align: center; - font-weight: 300; - transition: 0.5s; -} - -#mapid { - height: 400px; -} - -#map { - display: flex; - z-index: 3; - position: absolute; - height: 400px; - width: 400px; - right:150px; - top: 150px; - touch-action: pan-x pan-y; -} - -.login-page { - background: url(../images/fondo-login.png) no-repeat; - background-size: cover; - height: 100vh; - padding-top: 180px; -} - -.form-signin { - max-width: 380px; - padding: 15px 35px 25px; - margin: 0 auto; - background-color: #fff; - border: 1px solid rgba(0,0,0,0.1); - border-radius: 20px; - - .form-signin-heading, - .checkbox { - margin-bottom: 30px; - } - - .checkbox { - font-weight: normal; - } - - .form-control { - position: relative; - font-size: 16px; - height: auto; - padding: 10px; - - &:focus { - z-index: 2; - } - } - - input[type="text"] { - margin-bottom: -1px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - - input[type="password"] { - margin-bottom: 20px; - border-top-left-radius: 0; - border-top-right-radius: 0; - } -} - diff --git a/starter-code/views/auth/allBands.hbs b/starter-code/views/auth/allBands.hbs deleted file mode 100644 index e69de29..0000000 diff --git a/starter-code/views/auth/band-info.hbs b/starter-code/views/auth/band-info.hbs deleted file mode 100644 index 2d611cf..0000000 --- a/starter-code/views/auth/band-info.hbs +++ /dev/null @@ -1 +0,0 @@ -

Hola band

\ No newline at end of file diff --git a/starter-code/views/auth/profile-band.hbs b/starter-code/views/auth/profile-band.hbs deleted file mode 100644 index 8da0af3..0000000 --- a/starter-code/views/auth/profile-band.hbs +++ /dev/null @@ -1,64 +0,0 @@ -

Profile

-
- -

Name: {{user.username}}

-

Contact: {{user.contact}}

-

Style of music: {{user.style}}

-

Description: {{user.description}}

-

Price: {{user.price}}

-

Localization: {{user.localization}}

-

Discography: {{user.discography}}

-

Rider: {{user.rider}}

-
-
- - - -
- - - -
-Edit profile -
- -
-Logout -
- - - diff --git a/starter-code/views/auth/signup-band.hbs b/starter-code/views/auth/signup-band.hbs deleted file mode 100644 index 2173ad5..0000000 --- a/starter-code/views/auth/signup-band.hbs +++ /dev/null @@ -1,46 +0,0 @@ -

Signup

- -
- - - -

- - - -
- {{#if message }} -
{{ message }}
- {{/if}} - -
- - - - -

- - - - - - -

- -

- Do you already have an account? - Login -

-
diff --git a/views/auth/band-info.hbs b/views/auth/band-info.hbs new file mode 100644 index 0000000..f4cf205 --- /dev/null +++ b/views/auth/band-info.hbs @@ -0,0 +1,52 @@ +
+ +
+
+

Nombre del grupo
{{user.username}}

+

Ciudad
{{user.localization}}

+

Estilo
{{user.style}}

+

Descripción
{{user.description}}

+ +

Price
{{user.price}}

+

Rider
{{user.rider}}

+ +

Contact
{{user.contact}}

+
+ + +
+Search musics +Logout +
+ +{{!-- + +

Profile public

+
+ +

Name: {{user.username}}

+

Contact: {{user.contact}}

+

Style of music: {{user.style}}

+

Description: {{user.description}}

+

Price: {{user.price}}

+

Localization: {{user.localization}}

+

Discography: {{user.discography}}

+

Rider: {{user.rider}}

+
+
+ + + +
+ + + +
+Logout +
+ + --}} diff --git a/starter-code/views/auth/band-public.hbs b/views/auth/band-public.hbs similarity index 100% rename from starter-code/views/auth/band-public.hbs rename to views/auth/band-public.hbs diff --git a/starter-code/views/auth/edit-band.hbs b/views/auth/edit-band.hbs similarity index 100% rename from starter-code/views/auth/edit-band.hbs rename to views/auth/edit-band.hbs diff --git a/starter-code/views/auth/login-band.hbs b/views/auth/login-band.hbs similarity index 89% rename from starter-code/views/auth/login-band.hbs rename to views/auth/login-band.hbs index d80667f..d1fa0b4 100644 --- a/starter-code/views/auth/login-band.hbs +++ b/views/auth/login-band.hbs @@ -7,7 +7,7 @@ - +

diff --git a/views/auth/profile-band.hbs b/views/auth/profile-band.hbs new file mode 100644 index 0000000..c23afd2 --- /dev/null +++ b/views/auth/profile-band.hbs @@ -0,0 +1,96 @@ +

+ +
+
+

Nombre del grupo
{{user.username}}

+

Ciudad
{{user.localization}}

+

Estilo
{{user.style}}

+

Descripción
{{user.description}}

+ +

Price
{{user.price}}

+

Rider
{{user.rider}}

+ +

Contact
{{user.contact}}

+ + + +
+ + + + + +
+

¿Dónde te encuentras?

+
+ + + +
+
+ +
+Edit profile +Search musics +
+ +
+Logout +
+ + + diff --git a/starter-code/views/auth/search.hbs b/views/auth/search.hbs similarity index 52% rename from starter-code/views/auth/search.hbs rename to views/auth/search.hbs index bff988e..fd61a91 100644 --- a/starter-code/views/auth/search.hbs +++ b/views/auth/search.hbs @@ -1,33 +1,66 @@ -

Map

+
+

Mapa

+

Selecciona un marcador para ver más información

+
+ - - + -
- + + +
+ \ No newline at end of file diff --git a/views/auth/signup-band.hbs b/views/auth/signup-band.hbs new file mode 100644 index 0000000..3f1d35e --- /dev/null +++ b/views/auth/signup-band.hbs @@ -0,0 +1,75 @@ + +
+
+ +
+
\ No newline at end of file diff --git a/starter-code/views/error.hbs b/views/error.hbs similarity index 100% rename from starter-code/views/error.hbs rename to views/error.hbs diff --git a/starter-code/views/index.hbs b/views/index.hbs similarity index 60% rename from starter-code/views/index.hbs rename to views/index.hbs index 4af02a7..b64ba18 100644 --- a/starter-code/views/index.hbs +++ b/views/index.hbs @@ -1,12 +1,12 @@
-
+

Backstage

Zona exclusiva músicos

 - -
+ +

Promotores

Conoce a los mejores músicos para tu evento

diff --git a/starter-code/views/layout.hbs b/views/layout.hbs similarity index 90% rename from starter-code/views/layout.hbs rename to views/layout.hbs index e81fa46..d75a366 100644 --- a/starter-code/views/layout.hbs +++ b/views/layout.hbs @@ -4,7 +4,7 @@ - {{title}} + Jukebands @@ -14,7 +14,7 @@ Home Login Signup - Logout + Logout {{{body}}} diff --git a/starter-code/views/not-found.hbs b/views/not-found.hbs similarity index 100% rename from starter-code/views/not-found.hbs rename to views/not-found.hbs