Closed asiyani closed 7 years ago
@asiyani Cool work man :+1:
@alejandronanez Should I wait for this PR to merge, so that I can work on Webpack
@alejandronanez Should I wait for this PR to merge, so that I can work on Webpack
Yes sir!
@asiyani fix conflicts on index.html and we should be good to go 👍
I didnt change anything in index.html just moved it to public folder...
On Fri, 2 Jun 2017, 1:36 pm Alejandro Ñáñez Ortiz, notifications@github.com wrote:
@asiyani https://github.com/asiyani fix conflicts on index.html and we should be good to go 👍
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/curiositylab/curiosity/pull/40#issuecomment-305773624, or mute the thread https://github.com/notifications/unsubscribe-auth/AGz7sOoxkh_CsvCDjmvFtTvIyoCfoRnJks5sAAHLgaJpZM4NtnkN .
I didnt change anything in index.html just moved it to public folder...
Oh well, maybe that's the issue. Anyway we can't merge until that's resolved though :( Let me know if you have any issues with those conflicts maybe I can jump in.
I need index.html in public folder, otherwise i need to create route for index.html Ideally that file should be in public folder. Do you want me too move it to root for now just to merge PR.and then we move it back to public folder?
What merge conflict are you seeing? Feel free to change whatever you think is necessary to solve the conflict so we can merge your pr. On Fri, Jun 2, 2017 at 7:52 AM Ashok notifications@github.com wrote:
I need index.html in public folder, otherwise i need to create route for index.html Ideally that file should be in public folder. Do you want me too move it to root for now just to merge PR.and then we move it back to public folder?
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/curiositylab/curiosity/pull/40#issuecomment-305776947, or mute the thread https://github.com/notifications/unsubscribe-auth/AAcYUk0ekBF1VnDGk1ugDbico3AUbgAdks5sAAV5gaJpZM4NtnkN .
@asiyani You moved the index.html to public folder. After I made a change in the original index.html. Therefore, the git mv
didn't work properly. If you move the new index.html to public folder, it might work.
Thoughts @alejandronanez
Yeah that makes sense! On Fri, Jun 2, 2017 at 9:04 AM Mubaris NK notifications@github.com wrote:
@asiyani https://github.com/asiyani You moved the index.html to public folder. After I made a change in the original index.html. Therefore, the git mv didn't work properly. If you move the new index.html to public folder, it might work.
Thoughts @alejandronanez https://github.com/alejandronanez
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/curiositylab/curiosity/pull/40#issuecomment-305797426, or mute the thread https://github.com/notifications/unsubscribe-auth/AAcYUpRTSHbqwry-C4Pr8Tes_RxxFr8Iks5sABZfgaJpZM4NtnkN .
conflicts are now resolved.
Good stuff boys
This PR adds Nodejs and MongoDB as the backend to this project. Current functionality for this app is not disturbed. After running
yarn start
website works as it is working now.js
,css
andindex.html
file to thepublic
folder.server
,config
andtest
.app.js
,db
androutes
folder.db
folder contains schema/model for MongoDB database.routes
folder contains js files related to APIs and other web routesconfig
folder got the configuration fordotenv
to load Nodejs environment variables.MongoDB model
Routes
GET /api/username/all
-> will send username list as jasonGET /user
,GET /user/login
,GET /user/logout
-> will just print message on web.Configuration
dotenv
settings..dev.env
and.test.env
MONGODB_URI
is different in both files because we don't want to run lots of test on main db.Test
Mocha
andexpect
for backend testing.yarn run test-node
Readme
Please review this folder structure and code. let me know what you guys think? is DB schema properties enough or we need some additional information? I think we should create another issue to discuss schema design.