Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #13

Closed
wants to merge 23 commits into from
Closed

Dev #13

wants to merge 23 commits into from

Conversation

hvj7
Copy link
Contributor

@hvj7 hvj7 commented Feb 12, 2020

Updated package-json.lock to latest version

AetherPrior and others added 23 commits February 7, 2020 23:17
@AetherPrior
Initial setup
737a5f8
@VikramjeetD
Setup Express
6e9e8d5
@VikramjeetD
Setup MongoDB
2780327
@VikramjeetD
Setup react backend
2ffa035
@VikramjeetD
Remove unneeded files
3a6b910
@VikramjeetD
Revert to GNU License
0d0f0a8
@VikramjeetD
Revert to previous license
5b895dd
@VikramjeetD
Correct github repo link
8133fc4
@VikramjeetD
Minor changes
df46684
@Kushagra-0801
clean up dependencies and syntax
79c20e1
@Kushagra-0801
type module
88c835b
@Kushagra-0801
fix problems from changing to es6 imports
0ed6cc3
@hvj7
Merge pull request #8 from Kushagra-0801/another-initial-setup
1d3582a 
Another initial setup
@Aviral14
Add a generalized search component
a84e153
@Aviral14
Add component to list courses with search
ac3ae24
@Aviral14
Add search component and dummy data
6841806
@Aviral14
Use arrow function instead of ES5 syntax
810ba00
@Aviral14
Bind method in constructor and fix search in lower case
cae8831
@hvj7
Merge pull request #11 from Aviral14/search-courses
44e065f 
Implement Search Course functionality
@Aviral14
Modify Dummy Data
a82b2eb
@Aviral14
Add feature to search using course names also
127de1e
@VikramjeetD
Merge pull request #12 from Aviral14/search-courses
cceae8a 
Search courses
@hvj7
updated package-lock.json
a9a5b7d
@Kushagra-0801
Copy link
Contributor

Bro! WTF!?

@Kushagra-0801
Copy link
Contributor

You are committing directly to upstream?
Commit to your local repo then push to your origin then make a pr to upstream/dev

@VikramjeetD
Copy link
Contributor

VikramjeetD commented Feb 12, 2020 •
edited
Loading

Just fyi, package.lock.json is created by the system from package.json. Do NOT alter it manually. Delete package.lock.json and then do an npm install.

I'm assuming that happened as I'm getting a duplicate key warning in there now, which I doubt would happen through npm install.

amrataansh pushed a commit to amrataansh/ChronoFactorem that referenced this pull request Jan 23, 2022
@AetherPrior
Merge pull request Dryft-bits#13 from crux-bphc/logout-fix
4c6c566 
Logout workaround
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AetherPrior AetherPrior Awaiting requested review from AetherPrior

@Aviral14 Aviral14 Awaiting requested review from Aviral14

@VikramjeetD VikramjeetD Awaiting requested review from VikramjeetD

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hvj7 @Kushagra-0801 @VikramjeetD @AetherPrior @Aviral14